removed unused position info from source stream

3 files changed, 1 insertions, 21 deletions

diff --git a/colm/ctinput.cc b/colm/ctinput.cc
index 20aa7c1f..18bf1aa4 100644
--- a/colm/ctinput.cc
+++ b/colm/ctinput.cc
@@ -54,7 +54,6 @@ LangEl *inputStreamPatternGetLangEl( SourceStream *is, long *bindId, char **data
 	*bindId = is->patItem->bindId;
 	*data = 0;
 	*length = 0;
-	is->line = is->patItem->loc.line;
 
 	is->patItem = is->patItem->next;
 	is->offset = 0;
@@ -75,9 +74,6 @@ int inputStreamPatternGetData( SourceStream *is, int skip, char *dest, int lengt
 		if ( buf->type == PatternItem::FactorType )
 			return INPUT_LANG_EL;
 
-		if ( offset == 0 )
-			is->line = buf->loc.line;
-
 		assert ( buf->type == PatternItem::InputText );
 		int avail = buf->data.length() - offset;
 
@@ -221,7 +217,6 @@ LangEl *inputStreamConsGetLangEl( SourceStream *is, long *bindId, char **data, l
 
 	*data = 0;
 	*length = 0;
-	is->line = is->consItem->loc.line;
 
 	if ( is->consItem->type == ConsItem::FactorType ) {
 		if ( is->consItem->factor->typeRef->pdaLiteral != 0 ) {
@@ -254,9 +249,6 @@ int inputStreamConsGetData( SourceStream *is, int skip, char *dest, int length,
 		if ( buf->type == ConsItem::ExprType || buf->type == ConsItem::FactorType )
 			return INPUT_LANG_EL;
 
-		if ( offset == 0 )
-			is->line = buf->loc.line;
-
 		assert ( buf->type == ConsItem::InputText );
 		int avail = buf->data.length() - offset;
 
diff --git a/colm/input.c b/colm/input.c
index a5c42806..27595bd5 100644
--- a/colm/input.c
+++ b/colm/input.c
@@ -51,10 +51,6 @@ struct SourceFuncs fdFuncs;
 
 void initSourceStream( SourceStream *inputStream )
 {
-	/* FIXME: correct values here. */
-	inputStream->line = 1;
-	inputStream->column = 1;
-	inputStream->byte = 0;
 }
 
 void clearSourceStream( struct ColmProgram *prg, Tree **sp, SourceStream *sourceStream )
@@ -84,8 +80,6 @@ SourceStream *newSourceStreamFile( FILE *file )
 {
 	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
 	memset( is, 0, sizeof(SourceStream) );
-	is->line = 1;
-	is->column = 1;
 	is->file = file;
 	is->funcs = &fileFuncs;
 	return is;
@@ -95,8 +89,6 @@ SourceStream *newSourceStreamFd( long fd )
 {
 	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
 	memset( is, 0, sizeof(SourceStream) );
-	is->line = 1;
-	is->column = 1;
 	is->fd = fd;
 	is->funcs = &fdFuncs;
 	return is;
diff --git a/colm/input.h b/colm/input.h
index 9e73b3a9..eaaab65d 100644
--- a/colm/input.h
+++ b/colm/input.h
@@ -105,11 +105,9 @@ struct SourceFuncs
 struct _SourceStream
 {
 	struct SourceFuncs *funcs;
+	struct _FsmRun *attached;
 
 	char eof;
-	long line;
-	long column;
-	long byte;
 
 	RunBuf *queue;
 	RunBuf *queueTail;
@@ -125,8 +123,6 @@ struct _SourceStream
 	struct PatternItem *patItem;
 	struct Constructor *constructor;
 	struct ConsItem *consItem;
-
-	struct _FsmRun *attached;
 };
 
 SourceStream *newSourceStreamPat( struct Pattern *pattern );