diff options
| author | Adrian Thurston <thurston@complang.org> | 2013-02-09 12:40:27 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2013-02-09 12:40:27 -0500 |
| commit | 3853e924647f680a8ec7d70367562cf11a29189d (patch) | |
| tree | c7a12e46bd313f49a82bde3a3f02d004a4095cb6 | |
| parent | 290fcd2059200a17b27e98a904cd412fe76beb13 (diff) | |
| download | colm-3853e924647f680a8ec7d70367562cf11a29189d.tar.gz | |
merged call to newToken into initPdaRun, made it static
| -rw-r--r-- | colm/compiler.cc | 1 | ||||
| -rw-r--r-- | colm/pdarun.c | 3 | ||||
| -rw-r--r-- | colm/pdarun.h | 1 | ||||
| -rw-r--r-- | colm/tree.c | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/colm/compiler.cc b/colm/compiler.cc index 45eb35cb..f87f39ad 100644 --- a/colm/compiler.cc +++ b/colm/compiler.cc @@ -1251,7 +1251,6 @@ PdaRun *Compiler::parsePattern( Program *prg, Tree **sp, const InputLoc &loc, in->funcs->appendStream( in, (Tree*)res ); in->funcs->setEof( in ); - newToken( prg, pdaRun, fsmRun ); long pcr = parseLoop( prg, sp, pdaRun, fsmRun, in, PcrStart ); assert( pcr == PcrDone ); if ( pdaRun->parseError ) { diff --git a/colm/pdarun.c b/colm/pdarun.c index 5bf9216e..360d426f 100644 --- a/colm/pdarun.c +++ b/colm/pdarun.c @@ -939,7 +939,7 @@ static void sendEof( Program *prg, Tree **sp, StreamImpl *is, FsmRun *fsmRun, Pd pdaRun->parseInput = parseTree; } -void newToken( Program *prg, PdaRun *pdaRun, FsmRun *fsmRun ) +static void newToken( Program *prg, PdaRun *pdaRun, FsmRun *fsmRun ) { fsmRun->p = fsmRun->pe = 0; fsmRun->toklen = 0; @@ -1480,6 +1480,7 @@ void initPdaRun( Program *prg, PdaRun *pdaRun, FsmRun *fsmRun, PdaTables *tables pdaRun->rcBlockCount = 0; initFsmRun( prg, fsmRun ); + newToken( prg, pdaRun, fsmRun ); } long stackTopTarget( Program *prg, PdaRun *pdaRun ) diff --git a/colm/pdarun.h b/colm/pdarun.h index c43997f7..6b9b065c 100644 --- a/colm/pdarun.h +++ b/colm/pdarun.h @@ -453,7 +453,6 @@ long sendBackQueuedIgnore( struct ColmProgram *prg, Tree **sp, StreamImpl *input void clearIgnoreList( struct ColmProgram *prg, Tree **sp, Kid *kid ); Head *extractMatch( struct ColmProgram *prg, FsmRun *fsmRun, StreamImpl *inputStream ); Head *extractMatch( struct ColmProgram *prg, FsmRun *fsmRun, StreamImpl *inputStream ); -void newToken( struct ColmProgram *prg, PdaRun *pdaRun, FsmRun *fsmRun ); void fsmExecute( FsmRun *fsmRun, StreamImpl *inputStream ); void sendNamedLangEl( struct ColmProgram *prg, Tree **sp, PdaRun *pdaRun, FsmRun *fsmRun, StreamImpl *inputStream ); long parseLoop( struct ColmProgram *prg, Tree **sp, PdaRun *pdaRun, diff --git a/colm/tree.c b/colm/tree.c index b14273f5..86474779 100644 --- a/colm/tree.c +++ b/colm/tree.c @@ -992,7 +992,6 @@ Tree *createGeneric( Program *prg, long genericId ) /* Start off the parsing process. */ initPdaRun( prg, parser->pdaRun, parser->fsmRun, prg->rtd->pdaTables, genericInfo->parserId, false, false, 0 ); - newToken( prg, parser->pdaRun, parser->fsmRun ); newGeneric = (Tree*) parser; break; |