Update BasicSyntax to keep the location of every producer identifier.

src/Drop.ml

@@ -33,7 +33,7 @@ let drop_parameter (param : S.parameter) : S.symbol =
 
 let drop_producer ((id, param, attrs) : S.producer) : T.producer =
   {
-    T.producer_identifier = value id;
+    T.producer_identifier = id;
     T.producer_symbol     = drop_parameter param;
     T.producer_attributes = attrs
   }

src/basicSyntax.ml

@@ -31,11 +31,12 @@ open Syntax
 
 (* ------------------------------------------------------------------------ *)
 
-(* A producer is a pair of identifier and a symbol. In concrete syntax, it
-   could be [e = expr], for instance. It carries a number of attributes. *)
+(* A producer is a pair of a (located) identifier and a symbol. In concrete
+   syntax, it could be [e = expr], for instance. It carries a number of
+   attributes. *)
 
 type producer = {
-    producer_identifier : identifier;
+    producer_identifier : identifier located;
     producer_symbol     : symbol;
     producer_attributes : attributes;
   }
@@ -95,9 +96,17 @@ type grammar =  {
 
 (* Accessors for the type [producer]. *)
 
-let producer_identifier { producer_identifier } = producer_identifier
-let producer_symbol { producer_symbol } = producer_symbol
-let producer_attributes { producer_attributes } = producer_attributes
+let producer_identifier { producer_identifier } : identifier =
+  Positions.value producer_identifier
+
+let producer_identifier_located { producer_identifier } : identifier located =
+  producer_identifier
+
+let producer_symbol { producer_symbol } =
+  producer_symbol
+
+let producer_attributes { producer_attributes } =
+  producer_attributes
 
 (* -------------------------------------------------------------------------- *)
 

src/inlining.ml

@@ -161,12 +161,14 @@ let rec fresh names x =
 let rename (used : StringSet.t) producers: Action.subst * producers =
   let phi, _used, producers =
     List.fold_left (fun (phi, used, producers) producer ->
-      let x = producer_identifier producer in
+      let id = producer_identifier_located producer in
+      let x = Positions.value id in
       if StringSet.mem x used then
         let x' = fresh used x in
+        let id' = Positions.map (fun _x -> x') id in
         (x, x') :: phi,
         StringSet.add x' used,
-        { producer with producer_identifier = x' } :: producers
+        { producer with producer_identifier = id' } :: producers
       else
         (phi, StringSet.add x used, producer :: producers)
     ) ([], used, []) producers