Eliminated sendBackText from Input. This was used only for Repl and Pattern

input structures and was necessary because of named langEls. Now a named langEl
causes a new runBuf so we no longer need to send back parts of runBufs just
before a named langEl is sent back.

The fact that we create a new runBuf means some extra cost, but this is only
for compile-time activities and is justified compared to the added complexity
of an inconsistent interface.

1 files changed, 10 insertions, 13 deletions

diff --git a/colm/ctinput.cpp b/colm/ctinput.cpp
index ebb9ba2d..4c7de97b 100644
--- a/colm/ctinput.cpp
+++ b/colm/ctinput.cpp
@@ -22,6 +22,7 @@
 #include "parsedata.h"
 #include "parsetree.h"
 #include "input.h"
+#include "fsmrun.h"
 
 /*
  * Pattern
@@ -108,8 +109,11 @@ void InputStreamPattern::backup()
 		patItem = patItem->prev;
 }
 
-void InputStreamPattern::pushBackData( char *data, long length )
+void InputStreamPattern::pushBackBuf( RunBuf *runBuf )
 {
+	char *data = runBuf->buf + runBuf->offset;
+	long length = runBuf->length;
+
 	if ( length == 0 )
 		return;
 
@@ -126,11 +130,6 @@ void InputStreamPattern::pushBackData( char *data, long length )
 	assert( memcmp( &patItem->data[offset], data, length ) == 0 );
 }
 
-void InputStreamPattern::pushBackBuf( RunBuf *runBuf )
-{
-	assert( false );
-}
-
 void InputStreamPattern::pushBackNamed()
 {
 	backup();
@@ -237,10 +236,13 @@ void InputStreamRepl::backup()
 		replItem = replItem->prev;
 }
 
-void InputStreamRepl::pushBackData( char *data, long length )
+void InputStreamRepl::pushBackBuf( RunBuf *runBuf )
 {
+	char *data = runBuf->buf + runBuf->offset;
+	long length = runBuf->length;
+
 	if ( colm_log_parse ) {
-		cerr << "pushBackData: ";
+		cerr << "push back data: ";
 		cerr.write( data, length );
 		cerr << endl;
 	}
@@ -261,11 +263,6 @@ void InputStreamRepl::pushBackData( char *data, long length )
 	assert( memcmp( &replItem->data[offset], data, length ) == 0 );
 }
 
-void InputStreamRepl::pushBackBuf( RunBuf *runBuf )
-{
-	assert( false );
-}
-
 void InputStreamRepl::pushBackNamed()
 {
 	backup();