shithub: scc

Info  •  Files  •  Log  •  Branches

[as] Fix +1 problems in parser

--- a/as/expr.c

+++ b/as/expr.c

@@ -175,7 +175,7 @@

 	int c;

 	char *p;

-	for (endp = textp; isalnum(c = *endp) || c == '_' || c == '.'; ++endp)

+	for (endp = textp+1; isalnum(c = *endp) || c == '_' || c == '.'; ++endp)

 		/* nothing */;

 	tok2str();

 	yylval.sym = lookup(yytext);

@@ -189,7 +189,7 @@

 	int c;

 	char *p;

-	for (endp = textp; isxdigit(*endp); ++endp)

+	for (endp = textp+1; isxdigit(*endp); ++endp)

 		/* nothing */;

 	tok2str();

 	yylval.sym = tmpsym(atoi(yytext));  /* TODO: parse the string */

@@ -239,9 +239,8 @@

 		c = character();

 	else if (c == '\"')

 		c = string();

-	tok2str();

-	return c;

+	return yytoken = c;

 }

 static void

--- a/as/parser.c

+++ b/as/parser.c

@@ -53,8 +53,9 @@

 		for (t = s; *s && *s != ','; s++)

 			/* nothing */;

-		*s++ = '\0';

 		len = t - s;

+		if (*s != '\0')

+			*s++ = '\0';

 		if (len == 0)

 			error("wrong operand '%s'", t);

 	}