improved variable naming

SourceStream was derived from InputStream and a number of SourceStream pointers
were named is. Changed to ss.

3 files changed, 133 insertions, 133 deletions

diff --git a/colm/ctinput.cc b/colm/ctinput.cc
index 18bf1aa4..dca56a3b 100644
--- a/colm/ctinput.cc
+++ b/colm/ctinput.cc
@@ -40,32 +40,32 @@ SourceFuncs replFuncs;
 
 SourceStream *newSourceStreamPat( Pattern *pattern )
 {
-	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
-	memset( is, 0, sizeof(SourceStream) );
-	is->pattern = pattern;
-	is->patItem = pattern->list->head;
-	is->funcs = &patternFuncs;
-	return is;
+	SourceStream *ss = (SourceStream*)malloc(sizeof(SourceStream));
+	memset( ss, 0, sizeof(SourceStream) );
+	ss->pattern = pattern;
+	ss->patItem = pattern->list->head;
+	ss->funcs = &patternFuncs;
+	return ss;
 }
 
-LangEl *inputStreamPatternGetLangEl( SourceStream *is, long *bindId, char **data, long *length )
+LangEl *inputStreamPatternGetLangEl( SourceStream *ss, long *bindId, char **data, long *length )
 { 
-	LangEl *klangEl = is->patItem->factor->langEl;
-	*bindId = is->patItem->bindId;
+	LangEl *klangEl = ss->patItem->factor->langEl;
+	*bindId = ss->patItem->bindId;
 	*data = 0;
 	*length = 0;
 
-	is->patItem = is->patItem->next;
-	is->offset = 0;
+	ss->patItem = ss->patItem->next;
+	ss->offset = 0;
 	return klangEl;
 }
 
-int inputStreamPatternGetData( SourceStream *is, int skip, char *dest, int length, int *copied )
+int inputStreamPatternGetData( SourceStream *ss, int skip, char *dest, int length, int *copied )
 { 
 	*copied = 0;
 
-	PatternItem *buf = is->patItem;
-	int offset = is->offset;
+	PatternItem *buf = ss->patItem;
+	int offset = ss->offset;
 
 	while ( true ) {
 		if ( buf == 0 )
@@ -107,15 +107,15 @@ int inputStreamPatternGetData( SourceStream *is, int skip, char *dest, int lengt
 	return INPUT_DATA;
 }
 
-void inputStreamPatternBackup( SourceStream *is )
+void inputStreamPatternBackup( SourceStream *ss )
 {
-	if ( is->patItem == 0 )
-		is->patItem = is->pattern->list->tail;
+	if ( ss->patItem == 0 )
+		ss->patItem = ss->pattern->list->tail;
 	else
-		is->patItem = is->patItem->prev;
+		ss->patItem = ss->patItem->prev;
 }
 
-void inputStreamPatternPushBackBuf( SourceStream *is, RunBuf *runBuf )
+void inputStreamPatternPushBackBuf( SourceStream *ss, RunBuf *runBuf )
 {
 	char *data = runBuf->data + runBuf->offset;
 	long length = runBuf->length;
@@ -124,41 +124,41 @@ void inputStreamPatternPushBackBuf( SourceStream *is, RunBuf *runBuf )
 		return;
 
 	/* While pushing back past the current pattern item start. */
-	while ( length > is->offset ) {
-		length -= is->offset;
-		if ( is->offset > 0 )
-			assert( memcmp( is->patItem->data, data-length, is->offset ) == 0 );
-		inputStreamPatternBackup( is );
-		is->offset = is->patItem->data.length();
+	while ( length > ss->offset ) {
+		length -= ss->offset;
+		if ( ss->offset > 0 )
+			assert( memcmp( ss->patItem->data, data-length, ss->offset ) == 0 );
+		inputStreamPatternBackup( ss );
+		ss->offset = ss->patItem->data.length();
 	}
 
-	is->offset -= length;
-	assert( memcmp( &is->patItem->data[is->offset], data, length ) == 0 );
+	ss->offset -= length;
+	assert( memcmp( &ss->patItem->data[ss->offset], data, length ) == 0 );
 }
 
-void inputStreamPatternUndoConsumeLangEl( SourceStream *is )
+void inputStreamPatternUndoConsumeLangEl( SourceStream *ss )
 {
-	inputStreamPatternBackup( is );
-	is->offset = is->patItem->data.length();
+	inputStreamPatternBackup( ss );
+	ss->offset = ss->patItem->data.length();
 }
 
-int inputStreamPatternConsumeData( SourceStream *is, int length )
+int inputStreamPatternConsumeData( SourceStream *ss, int length )
 {
 	debug( REALM_INPUT, "consuming %ld bytes\n", length );
 
 	int consumed = 0;
 
 	while ( true ) {
-		if ( is->patItem == 0 )
+		if ( ss->patItem == 0 )
 			break;
 
-		int avail = is->patItem->data.length() - is->offset;
+		int avail = ss->patItem->data.length() - ss->offset;
 
 		if ( length >= avail ) {
 			/* Read up to the end of the data. Advance the
 			 * pattern item. */
-			is->patItem = is->patItem->next;
-			is->offset = 0;
+			ss->patItem = ss->patItem->next;
+			ss->offset = 0;
 
 			length -= avail;
 			consumed += avail;
@@ -167,7 +167,7 @@ int inputStreamPatternConsumeData( SourceStream *is, int length )
 				break;
 		}
 		else {
-			is->offset += length;
+			ss->offset += length;
 			consumed += length;
 			break;
 		}
@@ -176,9 +176,9 @@ int inputStreamPatternConsumeData( SourceStream *is, int length )
 	return consumed;
 }
 
-int inputStreamPatternUndoConsumeData( SourceStream *is, const char *data, int length )
+int inputStreamPatternUndoConsumeData( SourceStream *ss, const char *data, int length )
 {
-	is->offset -= length;
+	ss->offset -= length;
 	return length;
 }
 
@@ -201,46 +201,46 @@ extern "C" void initPatFuncs()
 
 SourceStream *newSourceStreamCons( Constructor *constructor )
 {
-	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
-	memset( is, 0, sizeof(SourceStream) );
-	is->constructor = constructor;
-	is->consItem = constructor->list->head;
-	is->funcs = &replFuncs;
-	return is;
+	SourceStream *ss = (SourceStream*)malloc(sizeof(SourceStream));
+	memset( ss, 0, sizeof(SourceStream) );
+	ss->constructor = constructor;
+	ss->consItem = constructor->list->head;
+	ss->funcs = &replFuncs;
+	return ss;
 }
 
-LangEl *inputStreamConsGetLangEl( SourceStream *is, long *bindId, char **data, long *length )
+LangEl *inputStreamConsGetLangEl( SourceStream *ss, long *bindId, char **data, long *length )
 { 
-	LangEl *klangEl = is->consItem->type == ConsItem::ExprType ? 
-			is->consItem->langEl : is->consItem->factor->langEl;
-	*bindId = is->consItem->bindId;
+	LangEl *klangEl = ss->consItem->type == ConsItem::ExprType ? 
+			ss->consItem->langEl : ss->consItem->factor->langEl;
+	*bindId = ss->consItem->bindId;
 
 	*data = 0;
 	*length = 0;
 
-	if ( is->consItem->type == ConsItem::FactorType ) {
-		if ( is->consItem->factor->typeRef->pdaLiteral != 0 ) {
+	if ( ss->consItem->type == ConsItem::FactorType ) {
+		if ( ss->consItem->factor->typeRef->pdaLiteral != 0 ) {
 			bool unusedCI;
-			prepareLitString( is->consItem->data, unusedCI, 
-					is->consItem->factor->typeRef->pdaLiteral->data,
-					is->consItem->factor->typeRef->pdaLiteral->loc );
+			prepareLitString( ss->consItem->data, unusedCI, 
+					ss->consItem->factor->typeRef->pdaLiteral->data,
+					ss->consItem->factor->typeRef->pdaLiteral->loc );
 
-			*data = is->consItem->data;
-			*length = is->consItem->data.length();
+			*data = ss->consItem->data;
+			*length = ss->consItem->data.length();
 		}
 	}
 
-	is->consItem = is->consItem->next;
-	is->offset = 0;
+	ss->consItem = ss->consItem->next;
+	ss->offset = 0;
 	return klangEl;
 }
 
-int inputStreamConsGetData( SourceStream *is, int skip, char *dest, int length, int *copied )
+int inputStreamConsGetData( SourceStream *ss, int skip, char *dest, int length, int *copied )
 { 
 	*copied = 0;
 
-	ConsItem *buf = is->consItem;
-	int offset = is->offset;
+	ConsItem *buf = ss->consItem;
+	int offset = ss->offset;
 
 	while ( true ) {
 		if ( buf == 0 )
@@ -282,15 +282,15 @@ int inputStreamConsGetData( SourceStream *is, int skip, char *dest, int length,
 	return INPUT_DATA;
 }
 
-void inputStreamConsBackup( SourceStream *is )
+void inputStreamConsBackup( SourceStream *ss )
 {
-	if ( is->consItem == 0 )
-		is->consItem = is->constructor->list->tail;
+	if ( ss->consItem == 0 )
+		ss->consItem = ss->constructor->list->tail;
 	else
-		is->consItem = is->consItem->prev;
+		ss->consItem = ss->consItem->prev;
 }
 
-void inputStreamConsPushBackBuf( SourceStream *is, RunBuf *runBuf )
+void inputStreamConsPushBackBuf( SourceStream *ss, RunBuf *runBuf )
 {
 	char *data = runBuf->data + runBuf->offset;
 	long length = runBuf->length;
@@ -303,39 +303,39 @@ void inputStreamConsPushBackBuf( SourceStream *is, RunBuf *runBuf )
 		return;
 
 	/* While pushing back past the current pattern item start. */
-	while ( length > is->offset ) {
-		length -= is->offset;
-		if ( is->offset > 0 ) 
-			assert( memcmp( is->consItem->data, data-length, is->offset ) == 0 );
-		inputStreamConsBackup( is );
-		is->offset = is->consItem->data.length();
+	while ( length > ss->offset ) {
+		length -= ss->offset;
+		if ( ss->offset > 0 ) 
+			assert( memcmp( ss->consItem->data, data-length, ss->offset ) == 0 );
+		inputStreamConsBackup( ss );
+		ss->offset = ss->consItem->data.length();
 	}
 
-	is->offset -= length;
-	assert( memcmp( &is->consItem->data[is->offset], data, length ) == 0 );
+	ss->offset -= length;
+	assert( memcmp( &ss->consItem->data[ss->offset], data, length ) == 0 );
 }
 
-void inputStreamConsUndoConsumeLangEl( SourceStream *is )
+void inputStreamConsUndoConsumeLangEl( SourceStream *ss )
 {
-	inputStreamConsBackup( is );
-	is->offset = is->consItem->data.length();
+	inputStreamConsBackup( ss );
+	ss->offset = ss->consItem->data.length();
 }
 
-int inputStreamConsConsumeData( SourceStream *is, int length )
+int inputStreamConsConsumeData( SourceStream *ss, int length )
 {
 	int consumed = 0;
 
 	while ( true ) {
-		if ( is->consItem == 0 )
+		if ( ss->consItem == 0 )
 			break;
 
-		int avail = is->consItem->data.length() - is->offset;
+		int avail = ss->consItem->data.length() - ss->offset;
 
 		if ( length >= avail ) {
 			/* Read up to the end of the data. Advance the
 			 * pattern item. */
-			is->consItem = is->consItem->next;
-			is->offset = 0;
+			ss->consItem = ss->consItem->next;
+			ss->offset = 0;
 
 			length -= avail;
 			consumed += avail;
@@ -344,7 +344,7 @@ int inputStreamConsConsumeData( SourceStream *is, int length )
 				break;
 		}
 		else {
-			is->offset += length;
+			ss->offset += length;
 			consumed += length;
 			break;
 		}
@@ -353,9 +353,9 @@ int inputStreamConsConsumeData( SourceStream *is, int length )
 	return consumed;
 }
 
-int inputStreamConsUndoConsumeData( SourceStream *is, const char *data, int length )
+int inputStreamConsUndoConsumeData( SourceStream *ss, const char *data, int length )
 {
-	is->offset -= length;
+	ss->offset -= length;
 	return length;
 }
 
diff --git a/colm/input.c b/colm/input.c
index 27595bd5..16a777db 100644
--- a/colm/input.c
+++ b/colm/input.c
@@ -78,58 +78,58 @@ void clearSourceStream( struct ColmProgram *prg, Tree **sp, SourceStream *source
 
 SourceStream *newSourceStreamFile( FILE *file )
 {
-	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
-	memset( is, 0, sizeof(SourceStream) );
-	is->file = file;
-	is->funcs = &fileFuncs;
-	return is;
+	SourceStream *ss = (SourceStream*)malloc(sizeof(SourceStream));
+	memset( ss, 0, sizeof(SourceStream) );
+	ss->file = file;
+	ss->funcs = &fileFuncs;
+	return ss;
 }
 
 SourceStream *newSourceStreamFd( long fd )
 {
-	SourceStream *is = (SourceStream*)malloc(sizeof(SourceStream));
-	memset( is, 0, sizeof(SourceStream) );
-	is->fd = fd;
-	is->funcs = &fdFuncs;
-	return is;
+	SourceStream *ss = (SourceStream*)malloc(sizeof(SourceStream));
+	memset( ss, 0, sizeof(SourceStream) );
+	ss->fd = fd;
+	ss->funcs = &fdFuncs;
+	return ss;
 }
 
-static RunBuf *sourceStreamPopHead( SourceStream *is )
+static RunBuf *sourceStreamPopHead( SourceStream *ss )
 {
-	RunBuf *ret = is->queue;
-	is->queue = is->queue->next;
-	if ( is->queue == 0 )
-		is->queueTail = 0;
+	RunBuf *ret = ss->queue;
+	ss->queue = ss->queue->next;
+	if ( ss->queue == 0 )
+		ss->queueTail = 0;
 	else
-		is->queue->prev = 0;
+		ss->queue->prev = 0;
 	return ret;
 }
 
-static void sourceStreamAppend( SourceStream *is, RunBuf *runBuf )
+static void sourceStreamAppend( SourceStream *ss, RunBuf *runBuf )
 {
-	if ( is->queue == 0 ) {
+	if ( ss->queue == 0 ) {
 		runBuf->prev = runBuf->next = 0;
-		is->queue = is->queueTail = runBuf;
+		ss->queue = ss->queueTail = runBuf;
 	}
 	else {
-		is->queueTail->next = runBuf;
-		runBuf->prev = is->queueTail;
+		ss->queueTail->next = runBuf;
+		runBuf->prev = ss->queueTail;
 		runBuf->next = 0;
-		is->queueTail = runBuf;
+		ss->queueTail = runBuf;
 	}
 }
 
-static void sourceStreamPrepend( SourceStream *is, RunBuf *runBuf )
+static void sourceStreamPrepend( SourceStream *ss, RunBuf *runBuf )
 {
-	if ( is->queue == 0 ) {
+	if ( ss->queue == 0 ) {
 		runBuf->prev = runBuf->next = 0;
-		is->queue = is->queueTail = runBuf;
+		ss->queue = ss->queueTail = runBuf;
 	}
 	else {
-		is->queue->prev = runBuf;
+		ss->queue->prev = runBuf;
 		runBuf->prev = 0;
-		runBuf->next = is->queue;
-		is->queue = runBuf;
+		runBuf->next = ss->queue;
+		ss->queue = runBuf;
 	}
 }
 
@@ -145,19 +145,19 @@ void initInputFuncs()
  * Base run-time input streams.
  */
 
-int fdGetData( SourceStream *is, int skip, char *dest, int length, int *copied )
+int fdGetData( SourceStream *ss, int skip, char *dest, int length, int *copied )
 {
 	int ret = 0;
 	*copied = 0;
 
 	/* Move over skip bytes. */
-	RunBuf *buf = is->queue;
+	RunBuf *buf = ss->queue;
 	while ( true ) {
 		if ( buf == 0 ) {
 			/* Got through the in-mem buffers without copying anything. */
 			RunBuf *runBuf = newRunBuf();
-			sourceStreamAppend( is, runBuf );
-			int received = is->funcs->getDataImpl( is, runBuf->data, FSM_BUFSIZE );
+			sourceStreamAppend( ss, runBuf );
+			int received = ss->funcs->getDataImpl( ss, runBuf->data, FSM_BUFSIZE );
 			if ( received == 0 ) {
 				ret = INPUT_EOD;
 				break;
@@ -204,7 +204,7 @@ int fdGetData( SourceStream *is, int skip, char *dest, int length, int *copied )
 	return ret;
 }
 
-int fdConsumeData( SourceStream *is, int length )
+int fdConsumeData( SourceStream *ss, int length )
 {
 	debug( REALM_INPUT, "source consuming %ld bytes\n", length );
 
@@ -212,7 +212,7 @@ int fdConsumeData( SourceStream *is, int length )
 
 	/* Move over skip bytes. */
 	while ( true ) {
-		RunBuf *buf = is->queue;
+		RunBuf *buf = ss->queue;
 
 		if ( buf == 0 )
 			break;
@@ -237,21 +237,21 @@ int fdConsumeData( SourceStream *is, int length )
 		if ( length == 0 )
 			break;
 
-		RunBuf *runBuf = sourceStreamPopHead( is );
+		RunBuf *runBuf = sourceStreamPopHead( ss );
 		free( runBuf );
 	}
 
 	return consumed;
 }
 
-int fdUndoConsumeData( SourceStream *is, const char *data, int length )
+int fdUndoConsumeData( SourceStream *ss, const char *data, int length )
 {
 	debug( REALM_INPUT, "undoing consume of %ld bytes\n", length );
 
 	RunBuf *newBuf = newRunBuf();
 	newBuf->length = length;
 	memcpy( newBuf->data, data, length );
-	sourceStreamPrepend( is, newBuf );
+	sourceStreamPrepend( ss, newBuf );
 
 	return length;
 }
@@ -260,10 +260,10 @@ int fdUndoConsumeData( SourceStream *is, const char *data, int length )
  * File
  */
 
-int fileGetDataImpl( SourceStream *is, char *dest, int length )
+int fileGetDataImpl( SourceStream *ss, char *dest, int length )
 {
 	debug( REALM_INPUT, "inputStreamFileGetDataImpl length = %ld\n", length );
-	size_t res = fread( dest, 1, length, is->file );
+	size_t res = fread( dest, 1, length, ss->file );
 	return res;
 }
 
@@ -280,14 +280,14 @@ void initFileFuncs()
  * FD
  */
 
-int fdGetDataImpl( SourceStream *is, char *dest, int length )
+int fdGetDataImpl( SourceStream *ss, char *dest, int length )
 {
-	if ( is->eof )
+	if ( ss->eof )
 		return 0;
 	else {
-		long got = read( is->fd, dest, length );
+		long got = read( ss->fd, dest, length );
 		if ( got == 0 )
-			is->eof = true;
+			ss->eof = true;
 		return got;
 	}
 }
diff --git a/colm/input.h b/colm/input.h
index a7f4a6a9..01601cfe 100644
--- a/colm/input.h
+++ b/colm/input.h
@@ -88,16 +88,16 @@ typedef struct _SourceStream SourceStream;
 struct SourceFuncs
 {
 	/* Data. */
-	int (*getData)( SourceStream *is, int offset, char *dest, int length, int *copied );
-	int (*consumeData)( SourceStream *is, int length );
-	int (*undoConsumeData)( SourceStream *is, const char *data, int length );
+	int (*getData)( SourceStream *ss, int offset, char *dest, int length, int *copied );
+	int (*consumeData)( SourceStream *ss, int length );
+	int (*undoConsumeData)( SourceStream *ss, const char *data, int length );
 
 	/* Language elments (compile-time). */
-	struct LangEl *(*consumeLangEl)( SourceStream *is, long *bindId, char **data, long *length );
-	void (*undoConsumeLangEl)( SourceStream *is );
+	struct LangEl *(*consumeLangEl)( SourceStream *ss, long *bindId, char **data, long *length );
+	void (*undoConsumeLangEl)( SourceStream *ss );
 
 	/* Private implmentation for some shared get data functions. */
-	int (*getDataImpl)( SourceStream *is, char *dest, int length );
+	int (*getDataImpl)( SourceStream *ss, char *dest, int length );
 };
 
 /* Implements a single source of input data such as a file, string, pattern.