removed the FsmRun arg from the parseLoop call

4 files changed, 10 insertions, 9 deletions

diff --git a/colm/bytecode.c b/colm/bytecode.c
index 1b105a76..ff407332 100644
--- a/colm/bytecode.c
+++ b/colm/bytecode.c
@@ -192,7 +192,7 @@ case PcrStart:
 	if ( ! parser->pdaRun->parseError ) {
 		parser->pdaRun->stopTarget = stopId;
 
-		long pcr = parseLoop( prg, sp, parser->pdaRun, parser->pdaRun->fsmRun, parser->input->in, entry );
+		long pcr = parseLoop( prg, sp, parser->pdaRun, parser->input->in, entry );
 
 		while ( pcr != PcrDone ) {
 
@@ -202,7 +202,7 @@ case PcrGeneration:
 case PcrPreEof:
 case PcrReverse:
 
-			pcr = parseLoop( prg, sp, parser->pdaRun, parser->pdaRun->fsmRun, parser->input->in, entry );
+			pcr = parseLoop( prg, sp, parser->pdaRun, parser->input->in, entry );
 		}
 	}
 
@@ -222,7 +222,7 @@ case PcrStart:
 		parser->input->in->funcs->setEof( parser->input->in );
 
 		if ( ! parser->pdaRun->parseError ) {
-			long pcr = parseLoop( prg, sp, parser->pdaRun, parser->pdaRun->fsmRun, parser->input->in, entry );
+			long pcr = parseLoop( prg, sp, parser->pdaRun, parser->input->in, entry );
 
 		 	while ( pcr != PcrDone ) {
 
@@ -232,7 +232,7 @@ case PcrGeneration:
 case PcrPreEof:
 case PcrReverse:
 
-				pcr = parseLoop( prg, sp, parser->pdaRun, parser->pdaRun->fsmRun, parser->input->in, entry );
+				pcr = parseLoop( prg, sp, parser->pdaRun, parser->input->in, entry );
 			}
 		}
 	}
@@ -277,7 +277,7 @@ case PcrStart:
 		pdaRun->triggerUndo = 1;
 
 		/* The parse loop will recognise the situation. */
-		long pcr = parseLoop( prg, sp, pdaRun, fsmRun, is, entry );
+		long pcr = parseLoop( prg, sp, pdaRun, is, entry );
 		while ( pcr != PcrDone ) {
 
 return pcr;
@@ -286,7 +286,7 @@ case PcrGeneration:
 case PcrPreEof:
 case PcrReverse:
 
-			pcr = parseLoop( prg, sp, pdaRun, fsmRun, is, entry );
+			pcr = parseLoop( prg, sp, pdaRun, is, entry );
 		}
 
 		/* Reset environment. */
diff --git a/colm/compiler.cc b/colm/compiler.cc
index 23262385..25d95397 100644
--- a/colm/compiler.cc
+++ b/colm/compiler.cc
@@ -1251,7 +1251,7 @@ PdaRun *Compiler::parsePattern( Program *prg, Tree **sp, const InputLoc &loc,
 	in->funcs->appendStream( in, (Tree*)res );
 	in->funcs->setEof( in );
 
-	long pcr = parseLoop( prg, sp, pdaRun, pdaRun->fsmRun, in, PcrStart );
+	long pcr = parseLoop( prg, sp, pdaRun, in, PcrStart );
 	assert( pcr == PcrDone );
 	if ( pdaRun->parseError ) {
 		cout << "PARSE ERROR " << loc.line << ":" << loc.col;
diff --git a/colm/pdarun.c b/colm/pdarun.c
index 0e48efc0..cff8854b 100644
--- a/colm/pdarun.c
+++ b/colm/pdarun.c
@@ -1108,8 +1108,9 @@ long scanToken( Program *prg, PdaRun *pdaRun, FsmRun *fsmRun, StreamImpl *is )
  */
 
 long parseLoop( Program *prg, Tree **sp, PdaRun *pdaRun, 
-		FsmRun *fsmRun, StreamImpl *is, long entry )
+		StreamImpl *is, long entry )
 {
+	FsmRun *fsmRun = pdaRun->fsmRun;
 	LangElInfo *lelInfo = prg->rtd->lelInfo;
 
 switch ( entry ) {
diff --git a/colm/pdarun.h b/colm/pdarun.h
index 818a753c..17ea1ab8 100644
--- a/colm/pdarun.h
+++ b/colm/pdarun.h
@@ -458,7 +458,7 @@ Head *extractMatch( struct ColmProgram *prg, FsmRun *fsmRun, StreamImpl *inputSt
 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, 
-		FsmRun *fsmRun, StreamImpl *inputStream, long entry );
+		StreamImpl *inputStream, long entry );
 void initBindings( PdaRun *pdaRun );
 Tree *getParsedRoot( PdaRun *pdaRun, int stop );
 void undoParseStream( struct ColmProgram *prg, Tree **sp, StreamImpl *inputStream, FsmRun *fsmRun,