From e3f122ddb9a970a2a0038fcc9486d72eb49d9231 Mon Sep 17 00:00:00 2001
From: Adrian Thurston <thurston@complang.org>
Date: Tue, 1 Jan 2013 12:36:49 -0500
Subject: adding missing stream class renames to code generation

---
 colm/compiler.cc   | 2 +-
 colm/fsmcodegen.cc | 4 ++--
 colm/input.c       | 4 ++--
 colm/pdarun.h      | 4 ++--
 colm/tree.c        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/colm/compiler.cc b/colm/compiler.cc
index 2c0d1a0e..8043b45f 100644
--- a/colm/compiler.cc
+++ b/colm/compiler.cc
@@ -1243,7 +1243,7 @@ PdaRun *Compiler::parsePattern( Program *prg, Tree **sp, const InputLoc &loc,
 	FsmRun *fsmRun = new FsmRun;
 	PdaRun *pdaRun = new PdaRun;
 
-	initInputStream( in );
+	initStreamImpl( in );
 	initPdaRun( pdaRun, prg, pdaTables, fsmRun, parserId, 0, false, 0 );
 	initFsmRun( fsmRun, prg );
 
diff --git a/colm/fsmcodegen.cc b/colm/fsmcodegen.cc
index e05f3a22..212de648 100644
--- a/colm/fsmcodegen.cc
+++ b/colm/fsmcodegen.cc
@@ -846,7 +846,7 @@ void FsmCodeGen::writeExec()
 	setLabelsNeeded();
 
 	out <<
-		"void fsmExecute( FsmRun *fsmRun, InputStream *inputStream )\n"
+		"void fsmExecute( FsmRun *fsmRun, StreamImpl *inputStream )\n"
 		"{\n"
 		"/*_resume:*/\n";
 
@@ -910,7 +910,7 @@ void FsmCodeGen::writeCode()
 	 * should use the preprocessor to make these go away. */
 	out <<
 		"void sendNamedLangEl( Program *prg, Tree **tree, PdaRun *pdaRun,\n"
-		"		FsmRun *fsmRun, InputStream *inputStream ) { }\n"
+		"		FsmRun *fsmRun, StreamImpl *inputStream ) { }\n"
 		"void initBindings( PdaRun *pdaRun ) {}\n"
 		"void pushBinding( PdaRun *pdaRun, ParseTree *parseTree ) {}\n"
 		"void popBinding( PdaRun *pdaRun, ParseTree *tree ) {}\n"
diff --git a/colm/input.c b/colm/input.c
index 951222d4..294039de 100644
--- a/colm/input.c
+++ b/colm/input.c
@@ -337,7 +337,7 @@ void initFdFuncs()
  * StreamImpl struct, this wraps the list of input streams.
  */
 
-void initInputStream( StreamImpl *inputStream )
+void initStreamImpl( StreamImpl *inputStream )
 {
 	memset( inputStream, 0, sizeof(StreamImpl) );
 
@@ -348,7 +348,7 @@ void initInputStream( StreamImpl *inputStream )
 	inputStream->funcs = &streamFuncs;
 }
 
-void clearInputStream( struct ColmProgram *prg, Tree **sp, StreamImpl *inputStream )
+void clearStreamImpl( struct ColmProgram *prg, Tree **sp, StreamImpl *inputStream )
 {
 	RunBuf *buf = inputStream->queue;
 	while ( buf != 0 ) {
diff --git a/colm/pdarun.h b/colm/pdarun.h
index 6017ccf1..73b3d0bb 100644
--- a/colm/pdarun.h
+++ b/colm/pdarun.h
@@ -400,8 +400,8 @@ void initPdaRun( PdaRun *pdaRun, struct ColmProgram *prg, PdaTables *tables,
 		FsmRun *fsmRun, int parserId, long stopTarget, int revertOn, Tree *context );
 void clearPdaRun( struct ColmProgram *prg, Tree **root, PdaRun *pdaRun );
 
-void initInputStream( StreamImpl *inputStream );
-void clearInputStream( struct ColmProgram *prg, Tree **sp, StreamImpl *inputStream );
+void initStreamImpl( StreamImpl *inputStream );
+void clearStreamImpl( struct ColmProgram *prg, Tree **sp, StreamImpl *inputStream );
 void initSourceStream( StreamImpl *in );
 void clearSourceStream( struct ColmProgram *prg, Tree **sp, StreamImpl *sourceStream );
 
diff --git a/colm/tree.c b/colm/tree.c
index df409cc8..89e30e48 100644
--- a/colm/tree.c
+++ b/colm/tree.c
@@ -325,7 +325,7 @@ Tree *constructInput( Program *prg )
 	input->refs = 0;
 	input->id = LEL_ID_INPUT;
 	input->in = malloc( sizeof(StreamImpl) );
-	initInputStream( input->in );
+	initStreamImpl( input->in );
 	return (Tree*)input;
 }
 
@@ -1078,7 +1078,7 @@ free_tree:
 		}
 		else if ( tree->id == LEL_ID_INPUT ) {
 			Input *input = (Input*)tree;
-			clearInputStream( prg, sp, input->in );
+			clearStreamImpl( prg, sp, input->in );
 			free( input->in );
 			inputFree( prg, input );
 		}
-- 
cgit v1.2.1