fixes

[henge/webcc.git] / src / apc / lexer_lex.rl

diff --git a/src/apc/lexer_lex.rl b/src/apc/lexer_lex.rl
index d27c40b..4c9aeea 100644 (file)
--- a/src/apc/lexer_lex.rl
+++ b/src/apc/lexer_lex.rl
@@ -15,25 +15,23 @@ char* ttos(const char* str, int);
 #define MAX_TOK_LEN 64
 #define MAX_TOKENS 16
 #define MAX_STR_SIZE (MAX_TOK_LEN * MAX_TOKENS)
-
+#define $($)#$
+#define PUSHTOK(TOK,LFUNC,UTYPE)                       \
+  do {                                                 \
+    printf("PUSHTOK(" $(TOK) $(LFUNC) $(UTYPE) ")\n"); \
+    tok_t = TOK;                                       \
+    yylval.UTYPE = LFUNC(ts, p-ts);                    \
+    lexer_pushtok(tok_t, yylval);                      \
+    ++ntok;                                            \
+  } while (0)
 
 %%{
   machine token_matcher;
 
   # set up yylval and tok_t to be pushed to stack
-  action set_ref {
-                   tok_t = REF;                      \
-                   yylval.ref = ttor(ts, p-ts);      \
-                   lexer_pushtok(tok_t, yylval); }
-
-  action set_val { tok_t = NUM;                      \
-                   yylval.val = ttov(ts, p-ts);      \
-                   lexer_pushtok(tok_t, yylval); }
-
-  action set_name { tok_t = NAME;                    \
-                    yylval.str = ttos(ts, p-ts);     \
-                    lexer_pushtok(tok_t, yylval); }
-
+  action set_ref  { PUSHTOK(REF, ttor, ref); }
+  action set_val  { PUSHTOK(NUM, ttov, val); }
+  action set_name { PUSHTOK(NAME, ttos, str); }
   action set_ts   { ts = p; }
 
   # instantiate machines for each possible token
@@ -54,17 +52,14 @@ char* ttos(const char* str, int);
 int lexer_lex (const char* str)
 {
   const char *p, *pe, *ts, *eof;
-  int  cs, tok_t ; //tok_t == token type
-
+  int  cs, tok_t, ntok = 0;
+  printf ("Lexing: %s\n",str);
   p = ts = str;
   pe = p + strlen(str) + 1;
   %%write init;
   %%write exec;
-
-  lexer_pushtok(tok_t, yylval);
-
-  printf (str);
-  return 1;
+  printf ("Lexed %i tokens\n",ntok);
+  return ntok;
 }
 
 int ipow(int base, int exp)