Added scanner module and fixed BNF dependency on it

[cascardo/grammar.git] / bnf.c

diff --git a/bnf.c b/bnf.c
index 8d960f8..4ee7241 100644 (file)
--- a/bnf.c
+++ b/bnf.c
@@ -6,7 +6,16 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-static gint scanner_next (scanner_t* scanner, GString** val)
+typedef enum
+  {
+    NONE = 0,
+    EQUAL = 1,
+    ID = 2,
+    STRING = 3,
+    EOL = 4
+  } token_t;
+
+static gint bnf_scanner_next (scanner_t* scanner, GString** val)
 {
 
   int state;
@@ -249,7 +258,7 @@ Grammar* grammar_load (char* filename)
 
   scanner = scanner_new (read, fd);
 
-  parser = rdp_new (scanner_next, scanner, BNF_GRAMMAR);
+  parser = rdp_new (bnf_scanner_next, scanner, BNF_GRAMMAR);
   grammar = (Grammar*) parser;
 
   rule = grammar_rule_new (grammar, symbol_new (FALSE, BNF_GRAMMAR));