yylineno fixed to properly track parser line numbers

indianlarry · mpictor · commit 3e4d1507a821 · 2011-07-09T10:57:46.000-04:00
git-svn-id: https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk/src/other/step@34193 2f96ce8b-6d43-0410-b8df-bffccc660ffb
diff --git a/include/express/lexact.h b/include/express/lexact.h
@@ -164,7 +164,7 @@ SCANnextchar(char* buffer)
 #endif
 	buffer[0] = *(SCANcurrent++);
 	if (!isascii(buffer[0])) {
-	    ERRORreport_with_line(ERROR_nonascii_char,expyylineno,
+	    ERRORreport_with_line(ERROR_nonascii_char,yylineno,
 				  0xff & buffer[0]);
 	    buffer[0] = ' ';	/* substitute space */
 	}
diff --git a/include/express/memory.h b/include/express/memory.h
@@ -74,7 +74,7 @@ char *nnew();
 /* space allocation macros with error package: */
 /***********************************************/
 
-extern int expyylineno;
+extern int yylineno;
 
 /* CALLOC grabs and initializes to all 0s space for the indicated */
 /* number of instances of the indicated type */
diff --git a/include/express/symbol.h b/include/express/symbol.h
@@ -93,7 +93,7 @@ GLOBAL struct freelist_head SYMBOL_fl;
 #define SYMBOL_new()		(struct Symbol_ *)MEM_new(&SYMBOL_fl)
 #define SYMBOL_destroy(x)	MEM_destroy(&SYMBOL_fl,(Freelist *)(Generic)x)
 
-#define SYMBOLset(obj)		obj->symbol.line = expyylineno; \
+#define SYMBOLset(obj)		obj->symbol.line = yylineno; \
 				obj->symbol.filename = current_filename
 /* for backwards compatibility only, no one should ever need this */
 #define SYMBOLget_name(sym)	((sym)->name)
diff --git a/src/express/lexact.c b/src/express/lexact.c
@@ -66,7 +66,7 @@ static char rcsid[] = "$Id: lexact.c,v 1.10 1997/09/24 20:05:38 dar Exp $";
 #include "dict.h"
 #include "memory.h"
 
-extern int		expyylineno;
+extern int		yylineno;
 extern FILE*		yyin;
 
 #ifdef FLEX
@@ -219,8 +219,8 @@ void
 SCANpush_buffer(char *filename,FILE *fp)
 {
 	SCANbuffer.savedPos = SCANcurrent;
-	SCANbuffer.lineno = expyylineno;
-	expyylineno = 1;
+	SCANbuffer.lineno = yylineno;
+	yylineno = 1;
 	++SCAN_current_buffer;
 #ifdef keep_nul
 	SCANbuffer.numRead = 0;
@@ -240,7 +240,7 @@ SCANpop_buffer()
 		fclose(SCANbuffer.file);
 	--SCAN_current_buffer;
 	SCANcurrent = SCANbuffer.savedPos;
-	expyylineno = SCANbuffer.lineno;	/* DEL */
+	yylineno = SCANbuffer.lineno;	/* DEL */
 	current_filename = SCANbuffer.filename;
 }
 
@@ -371,7 +371,7 @@ SCANprocess_identifier_or_keyword(void)
     } else {
 #endif
 
-	yylval.symbol =SYMBOLcreate(test_string,expyylineno,current_filename);
+	yylval.symbol =SYMBOLcreate(test_string,yylineno,current_filename);
 	if (k) {
 		/* built-in function/procedure */
 		return(k->token);
@@ -442,12 +442,12 @@ SCANprocess_encoded_string(void)
 	count = 0;
 	for (s = yylval.string;*s;s++,count++) {
 		if (!isxdigit(*s)) {
-			ERRORreport_with_line(ERROR_encoded_string_bad_digit,expyylineno,*s);
+			ERRORreport_with_line(ERROR_encoded_string_bad_digit,yylineno,*s);
 		}
 	}
 
 	if (0 != (count%8)) {
-		ERRORreport_with_line(ERROR_encoded_string_bad_count,expyylineno,count);
+		ERRORreport_with_line(ERROR_encoded_string_bad_count,yylineno,count);
 	}
 
 	return TOK_STRING_LITERAL_ENCODED;
@@ -548,11 +548,11 @@ SCANinclude_file(char *filename)
 	FILE *fp;
 
 	if ((fp = fopen(filename, "r")) == NULL) {
-		ERRORreport_with_line(ERROR_include_file, expyylineno);
+		ERRORreport_with_line(ERROR_include_file, yylineno);
 	} else {
 		if (print_objects_while_running & OBJ_SCHEMA_BITS) {
 			fprintf(stderr,"parse: including %s at line %d of %s\n",
-				filename,expyylineno,SCANbuffer.filename);
+				filename,yylineno,SCANbuffer.filename);
 		}
 		SCANpush_buffer(filename,fp);
 	}
@@ -586,5 +586,5 @@ SCANstrdup(char *s)
 
 long
 SCANtell() {
-    return expyylineno;
+    return yylineno;
 }
diff --git a/src/express/symbol.c b/src/express/symbol.c
@@ -58,7 +58,7 @@ char *filename;
 {
 	Symbol *sym = SYMBOL_new();
 	sym->name = name;
-	sym->line = expyylineno;
+	sym->line = line;
 	sym->filename = current_filename;
 	return sym;
 }

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ SCANnextchar(char* buffer)`
`164`	`164`	`#endif`
`165`	`165`	`buffer[0] = *(SCANcurrent++);`
`166`	`166`	`if (!isascii(buffer[0])) {`
`167`		`- ERRORreport_with_line(ERROR_nonascii_char,expyylineno,`
	`167`	`+ ERRORreport_with_line(ERROR_nonascii_char,yylineno,`
`168`	`168`	`0xff & buffer[0]);`
`169`	`169`	`buffer[0] = ' '; /* substitute space */`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ char *filename;`
`58`	`58`	`{`
`59`	`59`	`Symbol *sym = SYMBOL_new();`
`60`	`60`	`sym->name = name;`
`61`		`- sym->line = expyylineno;`
	`61`	`+ sym->line = line;`
`62`	`62`	`sym->filename = current_filename;`
`63`	`63`	`return sym;`
`64`	`64`	`}`