Updated from branch dev

[cascardo/grammar.git] / bnf.c

diff --git a/bnf.c b/bnf.c
index 4ee7241..92d385f 100644 (file)
--- a/bnf.c
+++ b/bnf.c
@@ -135,7 +135,7 @@ enum
     BNF_NONTERMINAL
   };
 
-void grammar_tree (Grammar* grammar, GNode* tree)
+void grammar_tree (grammar_t* grammar, GNode* tree)
 {
 
   GNode* child_rules;
@@ -242,14 +242,14 @@ void grammar_tree (Grammar* grammar, GNode* tree)
 
 }
 
-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;
@@ -258,8 +258,8 @@ Grammar* grammar_load (char* filename)
 
   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));
@@ -291,6 +291,8 @@ Grammar* grammar_load (char* filename)
 
   close (fd);
   scanner_delete (scanner);
+  rdp_delete (parser);
+  grammar_delete (grammar);
 
   if (tree == NULL)
     {
@@ -298,8 +300,8 @@ Grammar* grammar_load (char* filename)
     }
   else
     {
-      Grammar* gr;
-      gr = g_object_new (GRAMMAR_TYPE, NULL);
+      grammar_t* gr;
+      gr = grammar_new ();
       grammar_tree (gr, tree);
       return gr;
     }