identifiers are now [a-z][a-b0-9]*
[henge/apc.git] / src / lexer.rl
index f6d25aa..9b4dc41 100644 (file)
@@ -10,13 +10,23 @@ extern //lexer.c
 void lexer_pushtok(int, YYSTYPE);
 /* Public */
 int lexer_setdirection(uint8_t*, int);
-int lexer_lexstring(uint8_t*, int);
+int lexer_lexfile(const uint8_t*);
+int lexer_lexstring(const uint8_t*, int);
 int lexer_setstr(uint8_t*, int);
 //apc.c
 extern
 yypstate* apc_pstate;
 extern
 yycstate* apc_cstate;
+#define PUSHTOK(T,L) yypush_parse(apc_pstate, T, (YYSTYPE*)(L), apc_cstate)
+#define LEXTOK(T,L) do {                       \
+    PUSHTOK(T,L);                              \
+    ntok++;                                    \
+  } while (0);
+#define LEXFACE(F) do {                                \
+    lval.face = F;                             \
+    LEXTOK(FACING, &lval.face);                        \
+  } while (0);
 
 /* Lexstring is the main lexer for APC and is generated by ragel. It lexes file names of files 
    that have been scanned and pushes their types and values into the tok_stack, which yyparse 
@@ -26,9 +36,8 @@ yycstate* apc_cstate;
   machine lexstring;
 
   # set up yylval and tok_t to be pushed to stack
-  action push_ref       { long long ref;
-                          te = NULL; errno = 0;
-                          ref = strtoll((char*)ts,(char**)&te,16);
+  action push_ref       { te = NULL; errno = 0;
+                          lval.ref = strtoll((char*)ts,(char**)&te,16);
                          if (errno | (te != NULL))
                            { fprintf(stderr, "Invalid hex number in file %s\n",(char*)str);
                              if (te != NULL)
@@ -38,78 +47,51 @@ yycstate* apc_cstate;
                                }
                              exit(1);
                            }
-                         tok_val.ref = ref;
-                         yypush_parse(apc_pstate, REF, &tok_val, apc_cstate);
-                          ntok++;
+                         LEXTOK(REF, &lval.ref);
                        }
-  action push_link      { tok_val.val = 0; yypush_parse(apc_pstate, LINK, &tok_val , apc_cstate);}
-  action push_val       { int val;
-                          te = NULL; errno = 0;
-                          val = strtoll((char*)ts,(char**)&te,10);
+  action push_link      { lval.val = 0;
+                          PUSHTOK(LINK, &lval.val); }
+  action push_val       { te = NULL; errno = 0;
+                          lval.val = strtoll((char*)ts,(char**)&te,10);
                          if (errno)
                            { fprintf(stderr, "strtoll could not parse %s\n", (char*)str);
                              exit(1);
                            }
-                         tok_val.val = val;
-                         yypush_parse(apc_pstate, NUM, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXTOK(NUM, &lval.val);
                         }
   action push_name      { printf("Lexer_lexstring:: action:push_name: from %s to %s\n", ts, p);
-                          *p = '\0';
-                         tok_val.str = ts;
-                          yypush_parse( apc_pstate, NAME, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXTOK(NAME, ts);
                         }
   action push_map       { printf("Lexer_lexstring:: action:push_map: pushing map token\n");
-                          tok_val.str = (uint8_t*) '~';
-                          yypush_parse(apc_pstate, MAP, &tok_val, apc_cstate);
-                          ntok++;
+                          LEXTOK(MAP, "~");
                        }
   action set_ts         { printf("Lexer_lexstring:: action:set_ts. ts = %s\n", p); ts = p; }
   action push_SS        { printf("Lexer_lexstring:: action:push_SS. p = %s\n",p);
-                          tok_val.str = (uint8_t*) "SS";
-                          yypush_parse(apc_pstate, SS, &tok_val, apc_cstate);
-                          ntok++;
+                          LEXTOK(SS, "SS");
                         }
   action push_S         { printf("Lexer_lexstring:: action:push_S. p = %s\n", p);
-                          tok_val.val = 0;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXFACE(SFACE);
                         }
   action push_SW        { printf("Lexer_lexstring:: action:push_SW. p = %s\n", p);
-                          tok_val.val = 1;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                          LEXFACE(SWFACE);
                        }
   action push_W         { printf("Lexer_lexstring:: action:push_W. p = %s\n", p);
-                          tok_val.val = 2;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                          LEXFACE(WFACE);
                         }
   action push_NW        { printf("Lexer_lexstring:: action:push_NW. p = %s\n", p);
-                          tok_val.val = 3;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXFACE(NWFACE);
                         }
   action push_N         { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
-                          tok_val.val = 4;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                          LEXFACE(NFACE);
                         }
   action push_NE        { printf("Lexer_lexstring:: action:push_NE. p = %s\n", p);
-                          tok_val.val = 5;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXFACE(NEFACE);
                         }
   action push_E         { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
-                          tok_val.val = 6;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXFACE(EFACE);
                         }
   action push_SE        { printf("Lexer_lexstring:: action:push_N. p = %s\n", p);
-                          tok_val.val = 7;
-                          yypush_parse(apc_pstate, FACING, &tok_val, apc_cstate);
-                         ntok++;
+                         LEXFACE(SEFACE);
                         }
   action ref_error      { printf("ref from %s to %s has an inappropriate amount of hex digits, it must have eight.\n", ts, p);
                           exit(1);
@@ -133,7 +115,7 @@ yycstate* apc_cstate;
   SS = ('+SS' %to(push_SS)) | ('+SS' %to(push_SS) link ) ;
   ref = '0x' >set_ts alnum{8} $err(ref_error) %push_ref ;
   val = digit+ >set_ts %push_val ;
-  name = (lower+ >set_ts) %push_name ;
+  name = lower >set_ts (lower | digit)*  %push_name ;
   map = '+MAP' %to(push_map);
   tok = (name | val | ref | dimensions | map | link | SS | direction);
   
@@ -145,13 +127,13 @@ yycstate* apc_cstate;
 }%%
 
 int lexer_lexstring
-( uint8_t* str, 
+( const uint8_t* str, 
   int size
 )
-{ uint8_t *p; 
-  uint8_t *ts, *pe, *te, *eof;
+{ const uint8_t *p; 
+  const uint8_t *ts, *pe, *te, *eof;
   int cs, ntok;
-  union YYSTYPE tok_val; 
+  YYSTYPE lval;
 
   ntok = 0;
   p = ts = str;
@@ -168,6 +150,26 @@ int lexer_lexstring
   return ntok;
 }
 
+/* Lexical analysis of a file
+   Strips a filename to its base name, then sends it to lexer_lexstring before
+   pushing a PATH token with the filename
+   Returns the number of tokens pushed to the parser.
+*/
+int lexer_lexfile
+( uint8_t const* filename )
+{ uint8_t const* last_period,* iter;
+  int            ntok;
+  last_period = NULL;
+  for (iter = filename; *iter; iter++)
+    if (*iter ==  '.')
+      last_period = iter;
+  ntok = (last_period) ?
+    lexer_lexstring(filename, (int)(last_period - filename))
+  : lexer_lexstring(filename, (int)(iter - filename));
+  PUSHTOK(PATH,&filename);
+  return ntok + 1;
+  return en_main == 1;
+}
 
 /**************************/
 /****Abandon All Hope******/