From 6150d15647afc739329019f7e9de595187ecc282 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Mon, 9 May 2016 16:08:50 +0200
Subject: Removing the Entry module now that rules need not be marshalled.

---
 intf/extend.mli | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'intf')

diff --git a/intf/extend.mli b/intf/extend.mli
index 381d47dd18..3deb8233f0 100644
--- a/intf/extend.mli
+++ b/intf/extend.mli
@@ -8,6 +8,8 @@
 
 (** Entry keys for constr notations *)
 
+type 'a entry = 'a Compat.GrammarMake(CLexer).entry
+
 type side = Left | Right
 
 type gram_assoc = NonA | RightA | LeftA
@@ -84,8 +86,8 @@ type ('self, 'a) symbol =
 | Aopt : ('self, 'a) symbol -> ('self, 'a option) symbol
 | Aself : ('self, 'self) symbol
 | Anext : ('self, 'self) symbol
-| Aentry : 'a Entry.t -> ('self, 'a) symbol
-| Aentryl : 'a Entry.t * int -> ('self, 'a) symbol
+| Aentry : 'a entry -> ('self, 'a) symbol
+| Aentryl : 'a entry * int -> ('self, 'a) symbol
 | Arules : 'a rules -> ('self, 'a index) symbol
 
 and ('self, _, 'r) rule =
-- 
cgit v1.2.3


From 946a3d4a800ae1f459cb67cc15c9e6ec44fb3f94 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Tue, 10 May 2016 08:56:15 +0200
Subject: Simpler data structure for Arules token.

---
 intf/extend.mli | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'intf')

diff --git a/intf/extend.mli b/intf/extend.mli
index 3deb8233f0..bf5a18c47d 100644
--- a/intf/extend.mli
+++ b/intf/extend.mli
@@ -66,17 +66,6 @@ type 'a user_symbol =
 
 (** {5 Type-safe grammar extension} *)
 
-(** (a, b, r) adj => [a = x₁ -> ... xₙ -> r] & [b = x₁ * (... (xₙ * unit))]. *)
-type (_, _, _) adj =
-| Adj0 : ('r, unit, 'r) adj
-| AdjS : ('s, 'b, 'r) adj -> ('a -> 's, 'a * 'b, 'r) adj
-
-type _ index =
-| I0 : 'a -> ('a * 'r) index
-| IS : 'a index -> ('b * 'a) index
-
-(** This type should be marshallable, this is why we use a convoluted
-    representation in the [Arules] constructor instead of putting a function. *)
 type ('self, 'a) symbol =
 | Atoken : Tok.t -> ('self, string) symbol
 | Alist1 : ('self, 'a) symbol -> ('self, 'a list) symbol
@@ -88,18 +77,16 @@ type ('self, 'a) symbol =
 | Anext : ('self, 'self) symbol
 | Aentry : 'a entry -> ('self, 'a) symbol
 | Aentryl : 'a entry * int -> ('self, 'a) symbol
-| Arules : 'a rules -> ('self, 'a index) symbol
+| Arules : 'a rules list -> ('self, 'a) symbol
 
 and ('self, _, 'r) rule =
 | Stop : ('self, 'r, 'r) rule
 | Next : ('self, 'a, 'r) rule * ('self, 'b) symbol -> ('self, 'b -> 'a, 'r) rule
 
+and ('a, 'r) norec_rule = { norec_rule : 's. ('s, 'a, 'r) rule }
+
 and 'a rules =
-| Rule0 : unit rules
-| RuleS :
-  ('any, 'act, Loc.t -> Loc.t * 'a) rule *
-  ('act, 'a, Loc.t -> Loc.t * 'a) adj *
-  'b rules -> ((Loc.t * 'a) * 'b) rules
+| Rules : ('act, Loc.t -> 'a) norec_rule * 'act -> 'a rules
 
 type 'a production_rule =
 | Rule : ('a, 'act, Loc.t -> 'a) rule * 'act -> 'a production_rule
-- 
cgit v1.2.3


From 61f79019be6082c3ebabd503c322fb2edb05a99a Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Tue, 10 May 2016 11:11:39 +0200
Subject: AlistNsep token now accepts an arbitrary separator.

---
 intf/extend.mli | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intf')

diff --git a/intf/extend.mli b/intf/extend.mli
index bf5a18c47d..7ba332f709 100644
--- a/intf/extend.mli
+++ b/intf/extend.mli
@@ -69,9 +69,9 @@ type 'a user_symbol =
 type ('self, 'a) symbol =
 | Atoken : Tok.t -> ('self, string) symbol
 | Alist1 : ('self, 'a) symbol -> ('self, 'a list) symbol
-| Alist1sep : ('self, 'a) symbol * string -> ('self, 'a list) symbol
+| Alist1sep : ('self, 'a) symbol * ('self, _) symbol -> ('self, 'a list) symbol
 | Alist0 : ('self, 'a) symbol -> ('self, 'a list) symbol
-| Alist0sep : ('self, 'a) symbol * string -> ('self, 'a list) symbol
+| Alist0sep : ('self, 'a) symbol * ('self, _) symbol -> ('self, 'a list) symbol
 | Aopt : ('self, 'a) symbol -> ('self, 'a option) symbol
 | Aself : ('self, 'self) symbol
 | Anext : ('self, 'self) symbol
-- 
cgit v1.2.3