shithub: trueawk

Info  •  Files  •  Log  •  Branches

Improve error reporting messages

--- a/lex.c

+++ b/lex.c

@@ -198,6 +198,7 @@

 		yylval.i = c;

 		switch (c) {

 		case '\n':	/* {EOL} */

+			lineno++;

 			RET(NL);

 		case '\r':	/* assume \n is coming */

 		case ' ':	/* {WS}+ */

@@ -213,6 +214,7 @@

 		case '\\':

 			if (peek() == '\n') {

 				input();

+				lineno++;

 			} else if (peek() == '\r') {

 				input(); input();	/* \n */

 				lineno++;

@@ -370,10 +372,11 @@

 		case '\n':

 		case '\r':

 		case 0:

+			*bp = '\0';

 			SYNTAX( "non-terminated string %.10s...", buf );

-			lineno++;

 			if (c == 0)	/* hopeless */

 				FATAL( "giving up" );

+			lineno++;

 			break;

 		case '\\':

 			c = input();

@@ -515,6 +518,7 @@

 		if (!adjbuf(&buf, &bufsz, bp-buf+3, 500, &bp, "regexpr"))

 			FATAL("out of space for reg expr %.10s...", buf);

 		if (c == '\n') {

+			*bp = '\0';

 			SYNTAX( "newline in regular expression %.10s...", buf ); 

 			unput('\n');

 			break;

@@ -553,19 +557,19 @@

 			lexprog++;

 	} else				/* awk -f ... */

 		c = pgetc();

-	if (c == '\n')

-		lineno++;

-	else if (c == EOF)

+	if (c == EOF)

 		c = 0;

 	if (ep >= ebuf + sizeof ebuf)

 		ep = ebuf;

-	return *ep++ = c;

+	*ep = c;

+	if (c != 0) {

+		ep++;

+	}

+	return (c);

 }

 void unput(int c)	/* put lexical character back on input */

 {

-	if (c == '\n')

-		lineno--;

 	if (yysptr >= yysbuf + sizeof(yysbuf))

 		FATAL("pushed back too much: %.20s...", yysbuf);

 	*yysptr++ = c;

-- 

⑨