#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;
gchar c;
- if (scanner->buffer->len == 0)
+ if (scanner->buffer->len == i)
{
int r;
r = scanner->cb (scanner->data, buffer, 256);
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));
close (fd);
scanner_delete (scanner);
- rdp_delete (rdp);
+ rdp_delete (parser);
grammar_delete (grammar);
if (tree == NULL)
else
{
grammar_t* gr;
- gr = g_object_new (GRAMMAR_TYPE, NULL);
+ gr = grammar_new ();
grammar_tree (gr, tree);
return gr;
}