X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Flexer_lex.rl;h=a84575efa67b6dbaf5d09a8c9472f08b57b92b42;hp=d27c40b13ae225f5cb0403e12375b581c548c407;hb=301cac5f6e2edcecf2e1bd89aee5182130a213fc;hpb=11b211969922e81e7ae294625b9ecf2d8589fb1e

diff --git a/src/apc/lexer_lex.rl b/src/apc/lexer_lex.rl
old mode 100644
new mode 100755
index d27c40b..a84575e
--- a/src/apc/lexer_lex.rl
+++ b/src/apc/lexer_lex.rl
@@ -1,119 +1,87 @@
-/* Ragel State Machine for tokenizing text */
-#include <stdio.h>
-#include <string.h>
-#include <apc/parser.tab.h>
-
-extern void lexer_pushtok(int, YYSTYPE);
-
-int lexer_lex(const char*);
-int ipow(int, int);
-int ttov(const char* str, int);
-uint64_t ttor(const char* str, int);
-char* ttos(const char* str, int);
-
-
-#define MAX_TOK_LEN 64
-#define MAX_TOKENS 16
-#define MAX_STR_SIZE (MAX_TOK_LEN * MAX_TOKENS)
-
-
-%%{
-  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_ts   { ts = p; }
-
-  # instantiate machines for each possible token
-  ref = '0x' xdigit+ %set_ref;
-  val = digit+ %set_val;
-  name = alpha+ %set_name;
-  tok = ref | val | name;
-  segment = (tok . '_') %set_ts;
-
-  main := segment* . tok;
-}%%
-
-
-%%write data;
-
-/* Scan filename and push the its tokens
-   onto the stack */
-int lexer_lex (const char* str)
-{
-  const char *p, *pe, *ts, *eof;
-  int  cs, tok_t ; //tok_t == token type
-
-  p = ts = str;
-  pe = p + strlen(str) + 1;
-  %%write init;
-  %%write exec;
-
-  lexer_pushtok(tok_t, yylval);
-
-  printf (str);
-  return 1;
-}
-
-int ipow(int base, int exp)
-{
-  int result = 1;
-  while (exp)
-    {
-      if (exp & 1)
-        result = result * base;
-      exp = exp >> 1;
-      base *= base;
-    }
-
-  return result;
-}
-
-/*  Token to Value */
-int ttov(const char* str, int len)
-{
-  int i, val = 0;
-
-  for (i = 0; i < len; i++)
-    {
-      val += ((str[len - (i + 1)] - '0') * ipow(10,i));
-    }
-
-  return val;
-}
-
-uint64_t ttor(const char* str, int len)
-{
-  int i;
-  uint64_t num = 0;
-
-  for (i = 0; i < len; i++)
-    {
-      num += ((str[len - (i + 1)] - '0') * ipow(10,i));
-    }
-
-  return num;
-}
-
-char* ttos(const char* str, int len)
-{
-  int i;
-  char token_buf[MAX_TOK_LEN];
-
-  memmove(token_buf, str, len);
-  token_buf[len+1] = '\0';
-
-  return strdup(token_buf);
-}
+/* Ragel State Machine for tokenizing text */
+#include <stdio.h>
+#include <string.h>
+#include <apc/parser.tab.h>
+
+
+extern void lexer_pushtok(int, YYSTYPE);
+//extern char* scanner_current_file();
+extern int lexer_ismapfile(const char*, int);
+extern int lexer_tokfile(const char*, int);
+
+
+int lexer_lex(const char*);
+int ipow(int, int);
+int ttov(const uint8_t* , int);
+uint64_t ttor(const uint8_t* , int);
+char* ttos(const uint8_t* , int);
+
+
+#define MAX_TOK_LEN 64
+#define MAX_TOKENS 16
+#define MAX_STR_SIZE (MAX_TOK_LEN * MAX_TOKENS)
+
+/* Scan filename and push the its tokens
+   onto the stack */
+int lexer_lex (const char* str)
+{
+  int ntok, len;
+
+
+  len = strlen(str);
+  printf("Calling lexer_lex on %s\n", str);
+  
+  
+  return ntok;
+}
+
+int ipow(int base, int exp)
+{
+  int result = 1;
+  while (exp)
+    {
+      if (exp & 1)
+        result = result * base;
+      exp = exp >> 1;
+      base *= base;
+    }
+
+  return result;
+}
+
+/*  Token to Value */
+int ttov(const uint8_t* str, int len)
+{
+  int i, val = 0;
+
+  for (i = 0; i < len; i++)
+    {
+      val += ((str[len - (i + 1)] - '0') * ipow(10,i));
+    }
+
+  return val;
+}
+
+uint64_t ttor(const uint8_t* str, int len)
+{
+  int i;
+  uint64_t num = 0;
+
+  for (i = 0; i < len; i++)
+    {
+      num += ((str[len - (i + 1)] - '0') * ipow(10,i));
+    }
+
+  return num;
+}
+
+char* ttos(const uint8_t* str, int len)
+{
+  int i;
+  char token_buf[MAX_TOK_LEN];
+
+  memmove(token_buf, str, len);
+  token_buf[len+1] = '\0';
+
+  return strdup(token_buf);
+}