merge with lr1 branch

Patches applied:

 * cascardo@tlscascardo--private/libgrammatic--lr1--0.1--patch-4
   Item collection building returns the collection

git-archimport-id: cascardo@tlscascardo--private/libgrammatic--nogobject-lr1--0.1--patch-3

diff --git a/item.c b/item.c
index ef98647..eef188d 100644 (file)
--- a/item.c
+++ b/item.c
@@ -420,7 +420,8 @@ GHashTable* item_collection_goto (GHashTable* collection, grammar_t* grammar,
     }
 }
 
-void item_set_collection (grammar_t* grammar, GHashTable* first, symbol_t* start)
+GHashTable* item_set_collection (grammar_t* grammar, GHashTable* first,
+                                symbol_t* start)
 {
   GHashTable* collection;
   GHashTable* item_set;
@@ -469,5 +470,5 @@ void item_set_collection (grammar_t* grammar, GHashTable* first, symbol_t* start
 #ifdef DEBUG
   item_collection_print (collection);
 #endif
-  g_hash_table_destroy (collection);
+  return collection;
 }