+/*
+ * Copyright (C) 2005 Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+
#include <grammar.h>
#include <rdp.h>
#include <scanner.h>
gchar c;
- if (scanner->buffer->len == 0)
+ if (scanner->buffer->len == i)
{
int r;
r = scanner->cb (scanner->data, buffer, 256);
BNF_NONTERMINAL
};
-void grammar_tree (Grammar* grammar, GNode* tree)
+void grammar_tree (grammar_t* grammar, GNode* tree)
{
GNode* child_rules;
}
-Grammar* grammar_load (char* filename)
+grammar_t* grammar_load (char* filename)
{
- Grammar* grammar;
+ grammar_t* grammar;
rule_t* rule;
scanner_t* scanner;
- Rdp* parser;
+ rdp_t* parser;
GNode* tree;
int fd;
scanner = scanner_new (read, fd);
- parser = rdp_new (bnf_scanner_next, scanner, BNF_GRAMMAR);
- grammar = (Grammar*) parser;
+ grammar = grammar_new ();
+ 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 (parser);
+ grammar_delete (grammar);
if (tree == NULL)
{
}
else
{
- Grammar* gr;
- gr = g_object_new (GRAMMAR_TYPE, NULL);
+ grammar_t* gr;
+ gr = grammar_new ();
grammar_tree (gr, tree);
return gr;
}