shithub: scc

Info  •  Files  •  Log  •  Branches

Make simplest next()

Once we know we have to look ahead next character, is common to all cases
ungetc the character already read, so instead of having an ungetc in all the
cases, the best solution is doing an unique ungetc.

--- a/lex.c

+++ b/lex.c

@@ -160,15 +160,14 @@

 		aheadtok = NOTOK;

 	} else if (!skip()) {

 		yytoken = EOFTOK;

-	} else if (isalpha(c = getc(yyin)) || c == '_') {

-		ungetc(c, yyin);

-		yytoken = iden();

-	} else if (isdigit(c)) {

-		ungetc(c, yyin);

-		yytoken = number();

 	} else {

-		ungetc(c, yyin);

-		yytoken = operator();

+		ungetc(c = getc(yyin), yyin);

+		if (isalpha(c) || c == '_')

+			yytoken = iden();

+		else if (isdigit(c))

+			yytoken = number();

+		else

+			yytoken = operator();

 	}

 }