X-Git-Url: http://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/3a3760ad26782403f6686183be3faa8b22cf849b..bc35d987289cb3815a2b59d99c05034cc13a8f40:/src/scan.l

diff --git a/src/scan.l b/src/scan.l
index 6718381..7549e6f 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -19,6 +19,9 @@
 
 #include <config.h>
 #include "parse.h"
+
+#define YY_NO_INPUT 1
+#define YY_NO_UNPUT 1
 }
 
 %option nodefault noyywrap bison-locations reentrant never-interactive
@@ -45,16 +48,6 @@
 #define STRTOUMAX strtoul
 #endif
 
-#define dup_token() do { \
-	yylval->strval = malloc(yyleng+1); \
-	if (!yylval->strval) { \
-		cdecl__errmsg(CDECL__ENOMEM); \
-		return T_LEX_ERROR; \
-	} \
-	memcpy(yylval->strval, yytext, yyleng); \
-	yylval->strval[yyleng] = 0; \
-} while(0)
-
 static char *to_octal(char *dst, unsigned val)
 {
 	unsigned i;
@@ -124,11 +117,6 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 
 %{
 	char *c;
-
-	if (yyextra > 0) {
-		yyextra = -yyextra;
-		return T_ENGLISH;
-	}
 %}
 
 "..."|[][;*(),] {
@@ -169,8 +157,11 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 }
 
 {IDENT} {
-	int ret = cdecl__to_keyword(yytext, yyleng, yyextra);
-	if (ret == T_IDENT) {
+	unsigned x = cdecl__to_keyword(yytext, yyleng, yyextra);
+	int tok;
+
+	yylval->spectype = UNPACK_SPEC(x & 0xff);
+	if ((tok = (x >> 8)) == PACK_TOKEN(T_IDENT)) {
 		/*
 		 * Our IDENT pattern includes hyphens so we can match
 		 * "variable-length" as a keyword.  In all other cases a
@@ -187,9 +178,11 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 #else
 		yyless(strcspn(yytext, "-"));
 #endif
-		dup_token();
+		if (!(yylval->item = cdecl__alloc_item(yyleng+1)))
+			return T_LEX_ERROR; \
+		memcpy(yylval->item->s, yytext, yyleng+1);
 	}
-	return ret;
+	return UNPACK_TOKEN(tok);
 }
 
 [[:space:]]+