Update to branch lr1

Patches applied:

 * cascardo@tlscascardo--private/libgrammatic--lr1--0.1--patch-6
   Fixed some building issues

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

diff --cc item.h
index 4924562,477be22..0457099
--- 1/item.h
--- 2/item.h
+++ b/item.h
@@@ -9,6 -12,6 +12,6 @@@ typedef struc
    symbol_t* lookahead;
  } item_t;
  
--GHashTable* item_set_collection (Grammar*, GHashTable*, symbol_t*);
++GHashTable* item_set_collection (grammar_t*, GHashTable*, symbol_t*);
  
  #endif

diff --cc lr1.c
Simple merge

diff --cc lr1.h
index de4faa8,f949613..4f665aa
--- 1/lr1.h
--- 2/lr1.h
+++ b/lr1.h
@@@ -12,8 -12,7 +12,8 @@@ transition_t* transition_accept_new ()
  void transition_delete (transition_t*);
  lr1_t* lr1_new (nextcb, gpointer);
  void lr1_delete (lr1_t*);
- void lr1_add (lr1_t*, gint, symbol_t*, transition_t*);
+ gboolean lr1_add (lr1_t*, gint, symbol_t*, transition_t*);
 +void lr1_push (lr1_t*, gint, gpointer);
  gpointer lr1_build (lr1_t*);
  
  #endif