X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=bnf.c;h=1e0ab1cec4f606b8f57c8adcb76b6bf39b782061;hb=b854111c3da17fbba15ae05157bf681b6265be97;hp=44cc72e1abc19ebee218c501344635187f5af1c8;hpb=a823a9bfed3bad6a91d05904b535b63282b8c286;p=cascardo%2Fgrammar.git

diff --git a/bnf.c b/bnf.c
index 44cc72e..1e0ab1c 100644
--- 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;
@@ -26,7 +35,7 @@ static gint scanner_next (scanner_t* scanner, GString** val)
 
       gchar c;
 
-      if (scanner->buffer->len == 0)
+      if (scanner->buffer->len == i)
 	{
 	  int r;
 	  r = scanner->cb (scanner->data, buffer, 256);
@@ -250,7 +259,7 @@ grammar_t* grammar_load (char* filename)
   scanner = scanner_new (read, fd);
 
   grammar = grammar_new ();
-  parser = rdp_new (scanner_next, scanner, BNF_GRAMMAR, grammar);
+  parser = rdp_new (bnf_scanner_next, scanner, BNF_GRAMMAR, grammar);
 
   rule = grammar_rule_new (grammar, symbol_new (FALSE, BNF_GRAMMAR));
   rule_append (rule, symbol_new (FALSE, BNF_RULES));