GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-22 01:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop the symbol_meta method

Browse Source
This commit is contained in:
krangelov
2021-12-09 08:56:32 +01:00
parent 72982d2344
commit 09de911499
6 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/c/pgf/graphviz.cxx
View File

@@ -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) void PgfLinearizationGraphvizOutput::generate_graphviz_level(PgfPrinter *printer, PgfGraphvizOptions* opts, ParseLevel *level)
{ {
printer->puts("\n subgraph {\n rank=same;\n"); printer->puts("\n subgraph {\n rank=same;\n");

1
src/runtime/c/pgf/graphviz.h
View File

@@ -41,7 +41,6 @@ public:
virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun); virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun);
virtual void symbol_ne(); virtual void symbol_ne();
virtual void symbol_bind(); virtual void symbol_bind();
virtual void symbol_meta(PgfMetaId id);
}; };
class PGF_INTERNAL_DECL PgfAbstractGraphvizOutput : public PgfUnmarshaller { class PGF_INTERNAL_DECL PgfAbstractGraphvizOutput : public PgfUnmarshaller {

5
src/runtime/c/pgf/linearizer.cxx
View File

@@ -740,8 +740,3 @@ void PgfLinearizationOutput::symbol_bind()
{ {
bind = true; bind = true;
} }
void PgfLinearizationOutput::symbol_meta(PgfMetaId id)
{
printer.nprintf(32, "?%d", id);
}

1
src/runtime/c/pgf/linearizer.h
View File

@@ -16,7 +16,6 @@ public:
virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun); virtual void end_phrase(PgfText *cat, int fid, PgfText *ann, PgfText *fun);
virtual void symbol_ne(); virtual void symbol_ne();
virtual void symbol_bind(); virtual void symbol_bind();
virtual void symbol_meta(PgfMetaId id);
}; };
class PGF_INTERNAL_DECL PgfLinearizer : public PgfUnmarshaller { class PGF_INTERNAL_DECL PgfLinearizer : public PgfUnmarshaller {

6
src/runtime/c/pgf/pgf.h
View File

@@ -599,9 +599,6 @@ struct PgfLinearizationOutputIface
/// token binding /// token binding
virtual void symbol_bind()=0; virtual void symbol_bind()=0;
/// meta variable
virtual void symbol_meta(PgfMetaId id)=0;
}; };
#else #else
typedef struct PgfLinearizationOutputIface PgfLinearizationOutputIface; typedef struct PgfLinearizationOutputIface PgfLinearizationOutputIface;
@@ -622,9 +619,6 @@ struct PgfLinearizationOutputIfaceVtbl
/// token binding /// token binding
void (*symbol_bind)(PgfLinearizationOutputIface *this); void (*symbol_bind)(PgfLinearizationOutputIface *this);
/// meta variable
void (*symbol_meta)(PgfLinearizationOutputIface *this, PgfMetaId id);
}; };
struct PgfLinearizationOutputIface struct PgfLinearizationOutputIface
{ {

8
src/runtime/haskell/PGF2.hsc
View File

@@ -685,14 +685,12 @@ bracketedLinearize c e = unsafePerformIO $ do
bracket (wrapSymbol2 (begin_phrase ref)) freeHaskellFunPtr $ \c_begin_phrase -> bracket (wrapSymbol2 (begin_phrase ref)) freeHaskellFunPtr $ \c_begin_phrase ->
bracket (wrapSymbol2 (end_phrase ref)) freeHaskellFunPtr $ \c_end_phrase -> bracket (wrapSymbol2 (end_phrase ref)) freeHaskellFunPtr $ \c_end_phrase ->
bracket (wrapSymbol0 (symbol_bind ref)) freeHaskellFunPtr $ \c_symbol_bind -> bracket (wrapSymbol0 (symbol_bind ref)) freeHaskellFunPtr $ \c_symbol_bind ->
bracket (wrapSymbol0 (symbol_ne ref)) freeHaskellFunPtr $ \c_symbol_ne -> bracket (wrapSymbol0 (symbol_ne ref)) freeHaskellFunPtr $ \c_symbol_ne -> do
bracket (wrapSymbol3 (symbol_meta ref)) freeHaskellFunPtr $ \c_symbol_meta -> do
(#poke PgfLinearizationOutputIfaceVtbl, symbol_token) vtbl c_symbol_token (#poke PgfLinearizationOutputIfaceVtbl, symbol_token) vtbl c_symbol_token
(#poke PgfLinearizationOutputIfaceVtbl, begin_phrase) vtbl c_begin_phrase (#poke PgfLinearizationOutputIfaceVtbl, begin_phrase) vtbl c_begin_phrase
(#poke PgfLinearizationOutputIfaceVtbl, end_phrase) vtbl c_end_phrase (#poke PgfLinearizationOutputIfaceVtbl, end_phrase) vtbl c_end_phrase
(#poke PgfLinearizationOutputIfaceVtbl, symbol_bind) vtbl c_symbol_bind (#poke PgfLinearizationOutputIfaceVtbl, symbol_bind) vtbl c_symbol_bind
(#poke PgfLinearizationOutputIfaceVtbl, symbol_ne) vtbl c_symbol_ne (#poke PgfLinearizationOutputIfaceVtbl, symbol_ne) vtbl c_symbol_ne
(#poke PgfLinearizationOutputIfaceVtbl, symbol_meta) vtbl c_symbol_meta
(#poke PgfLinearizationOutputIface, vtbl) c_out vtbl (#poke PgfLinearizationOutputIface, vtbl) c_out vtbl
withPgfExn "bracketedLinearize" (pgf_bracketed_linearize (c_db c) c_revision c_e nullPtr m c_out)) withPgfExn "bracketedLinearize" (pgf_bracketed_linearize (c_db c) c_revision c_e nullPtr m c_out))
(ne,_,bs) <- readIORef ref (ne,_,bs) <- readIORef ref
@@ -727,10 +725,6 @@ bracketedLinearize c e = unsafePerformIO $ do
(ne,stack,bs) <- readIORef ref (ne,stack,bs) <- readIORef ref
writeIORef ref (True,[],[]) 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 :: Concr -> Expr -> [[BracketedString]]
bracketedLinearizeAll = error "TODO: bracketedLinearizeAll" bracketedLinearizeAll = error "TODO: bracketedLinearizeAll"