diff --git a/src/runtime/c/pgf/graphviz.cxx b/src/runtime/c/pgf/graphviz.cxx index a86b41481..3b31be5f4 100644 --- a/src/runtime/c/pgf/graphviz.cxx +++ b/src/runtime/c/pgf/graphviz.cxx @@ -91,11 +91,6 @@ void PgfLinearizationGraphvizOutput::symbol_bind() { } -void PgfLinearizationGraphvizOutput::symbol_meta(PgfMetaId id) -{ - new ParseNode(&leaves, 100000 + leaves.n_nodes, parent, NULL, meta); -} - void PgfLinearizationGraphvizOutput::generate_graphviz_level(PgfPrinter *printer, PgfGraphvizOptions* opts, ParseLevel *level) { printer->puts("\n subgraph {\n rank=same;\n"); diff --git a/src/runtime/c/pgf/graphviz.h b/src/runtime/c/pgf/graphviz.h index 586a5139c..1158e2163 100644 --- a/src/runtime/c/pgf/graphviz.h +++ b/src/runtime/c/pgf/graphviz.h @@ -41,7 +41,6 @@ public: virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun); virtual void symbol_ne(); virtual void symbol_bind(); - virtual void symbol_meta(PgfMetaId id); }; class PGF_INTERNAL_DECL PgfAbstractGraphvizOutput : public PgfUnmarshaller { diff --git a/src/runtime/c/pgf/linearizer.cxx b/src/runtime/c/pgf/linearizer.cxx index 0e68cad08..b2152e3e1 100644 --- a/src/runtime/c/pgf/linearizer.cxx +++ b/src/runtime/c/pgf/linearizer.cxx @@ -740,8 +740,3 @@ void PgfLinearizationOutput::symbol_bind() { bind = true; } - -void PgfLinearizationOutput::symbol_meta(PgfMetaId id) -{ - printer.nprintf(32, "?%d", id); -} diff --git a/src/runtime/c/pgf/linearizer.h b/src/runtime/c/pgf/linearizer.h index eef86f5b0..78ead3802 100644 --- a/src/runtime/c/pgf/linearizer.h +++ b/src/runtime/c/pgf/linearizer.h @@ -16,7 +16,6 @@ public: virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun); virtual void symbol_ne(); virtual void symbol_bind(); - virtual void symbol_meta(PgfMetaId id); }; class PGF_INTERNAL_DECL PgfLinearizer : public PgfUnmarshaller { diff --git a/src/runtime/c/pgf/pgf.h b/src/runtime/c/pgf/pgf.h index f949abb3d..e1078338c 100644 --- a/src/runtime/c/pgf/pgf.h +++ b/src/runtime/c/pgf/pgf.h @@ -599,9 +599,6 @@ struct PgfLinearizationOutputIface /// token binding virtual void symbol_bind()=0; - - /// meta variable - virtual void symbol_meta(PgfMetaId id)=0; }; #else typedef struct PgfLinearizationOutputIface PgfLinearizationOutputIface; @@ -622,9 +619,6 @@ struct PgfLinearizationOutputIfaceVtbl /// token binding void (*symbol_bind)(PgfLinearizationOutputIface *this); - - /// meta variable - void (*symbol_meta)(PgfLinearizationOutputIface *this, PgfMetaId id); }; struct PgfLinearizationOutputIface { diff --git a/src/runtime/haskell/PGF2.hsc b/src/runtime/haskell/PGF2.hsc index 24c187dd4..be0f9eab0 100644 --- a/src/runtime/haskell/PGF2.hsc +++ b/src/runtime/haskell/PGF2.hsc @@ -685,14 +685,12 @@ bracketedLinearize c e = unsafePerformIO $ do bracket (wrapSymbol2 (begin_phrase ref)) freeHaskellFunPtr $ \c_begin_phrase -> bracket (wrapSymbol2 (end_phrase ref)) freeHaskellFunPtr $ \c_end_phrase -> bracket (wrapSymbol0 (symbol_bind ref)) freeHaskellFunPtr $ \c_symbol_bind -> - bracket (wrapSymbol0 (symbol_ne ref)) freeHaskellFunPtr $ \c_symbol_ne -> - bracket (wrapSymbol3 (symbol_meta ref)) freeHaskellFunPtr $ \c_symbol_meta -> do + bracket (wrapSymbol0 (symbol_ne ref)) freeHaskellFunPtr $ \c_symbol_ne -> do (#poke PgfLinearizationOutputIfaceVtbl, symbol_token) vtbl c_symbol_token (#poke PgfLinearizationOutputIfaceVtbl, begin_phrase) vtbl c_begin_phrase (#poke PgfLinearizationOutputIfaceVtbl, end_phrase) vtbl c_end_phrase (#poke PgfLinearizationOutputIfaceVtbl, symbol_bind) vtbl c_symbol_bind (#poke PgfLinearizationOutputIfaceVtbl, symbol_ne) vtbl c_symbol_ne - (#poke PgfLinearizationOutputIfaceVtbl, symbol_meta) vtbl c_symbol_meta (#poke PgfLinearizationOutputIface, vtbl) c_out vtbl withPgfExn "bracketedLinearize" (pgf_bracketed_linearize (c_db c) c_revision c_e nullPtr m c_out)) (ne,_,bs) <- readIORef ref @@ -727,10 +725,6 @@ bracketedLinearize c e = unsafePerformIO $ do (ne,stack,bs) <- readIORef ref writeIORef ref (True,[],[]) - symbol_meta ref _ meta_id = do - (ne,stack,bs) <- readIORef ref - writeIORef ref (ne,stack,Leaf "?" : bs) - bracketedLinearizeAll :: Concr -> Expr -> [[BracketedString]] bracketedLinearizeAll = error "TODO: bracketedLinearizeAll"