l2.ott: factor ocaml 'l' type reference into ott definition of 'l'

1 files changed, 23 insertions, 25 deletions

diff --git a/language/l2.ml b/language/l2.ml
index 5b924498..318ed604 100644
--- a/language/l2.ml
+++ b/language/l2.ml
@@ -1,8 +1,6 @@
 (* generated by Ott 0.25 from: l2.ott *)
 
 
-type l = Parse_ast.l
-
 type 'a annot = l * 'a
 
 
@@ -19,7 +17,7 @@ base_kind_aux =  (* base kind *)
 
 type 
 base_kind = 
-   BK_aux of base_kind_aux * l
+   BK_aux of base_kind_aux * Parse_ast.l
 
 
 type 
@@ -40,17 +38,17 @@ kind_aux =  (* kinds *)
 
 type 
 id = 
-   Id_aux of id_aux * l
+   Id_aux of id_aux * Parse_ast.l
 
 
 type 
 kid = 
-   Kid_aux of kid_aux * l
+   Kid_aux of kid_aux * Parse_ast.l
 
 
 type 
 kind = 
-   K_aux of kind_aux * l
+   K_aux of kind_aux * Parse_ast.l
 
 
 type 
@@ -65,7 +63,7 @@ nexp_aux =  (* numeric expression, of kind $_$ *)
  | Nexp_neg of nexp (* for internal use only *)
 
 and nexp = 
-   Nexp_aux of nexp_aux * l
+   Nexp_aux of nexp_aux * Parse_ast.l
 
 
 type 
@@ -88,7 +86,7 @@ base_effect_aux =  (* effect *)
 
 type 
 base_effect = 
-   BE_aux of base_effect_aux * l
+   BE_aux of base_effect_aux * Parse_ast.l
 
 
 type 
@@ -106,12 +104,12 @@ effect_aux =  (* effect set, of kind $_$ *)
 
 type 
 order = 
-   Ord_aux of order_aux * l
+   Ord_aux of order_aux * Parse_ast.l
 
 
 type 
 effect = 
-   Effect_aux of effect_aux * l
+   Effect_aux of effect_aux * Parse_ast.l
 
 
 type 
@@ -130,12 +128,12 @@ n_constraint_aux =  (* constraint over kind $_$ *)
 
 type 
 kinded_id = 
-   KOpt_aux of kinded_id_aux * l
+   KOpt_aux of kinded_id_aux * Parse_ast.l
 
 
 type 
 n_constraint = 
-   NC_aux of n_constraint_aux * l
+   NC_aux of n_constraint_aux * Parse_ast.l
 
 
 type 
@@ -146,7 +144,7 @@ quant_item_aux =  (* kinded identifier or $_$ constraint *)
 
 type 
 quant_item = 
-   QI_aux of quant_item_aux * l
+   QI_aux of quant_item_aux * Parse_ast.l
 
 
 type 
@@ -171,7 +169,7 @@ lit_aux =  (* literal constant *)
 
 type 
 typquant = 
-   TypQ_aux of typquant_aux * l
+   TypQ_aux of typquant_aux * Parse_ast.l
 
 
 type 
@@ -184,7 +182,7 @@ typ_aux =  (* type expressions, of kind $_$ *)
  | Typ_app of id * (typ_arg) list (* type constructor application *)
 
 and typ = 
-   Typ_aux of typ_aux * l
+   Typ_aux of typ_aux * Parse_ast.l
 
 and typ_arg_aux =  (* type constructor arguments of all kinds *)
    Typ_arg_nexp of nexp
@@ -193,12 +191,12 @@ and typ_arg_aux =  (* type constructor arguments of all kinds *)
  | Typ_arg_effect of effect
 
 and typ_arg = 
-   Typ_arg_aux of typ_arg_aux * l
+   Typ_arg_aux of typ_arg_aux * Parse_ast.l
 
 
 type 
 lit = 
-   L_aux of lit_aux * l
+   L_aux of lit_aux * Parse_ast.l
 
 
 type 
@@ -233,7 +231,7 @@ and 'a fpat =
 
 type 
 typschm = 
-   TypSchm_aux of typschm_aux * l
+   TypSchm_aux of typschm_aux * Parse_ast.l
 
 
 type 
@@ -379,7 +377,7 @@ type
 
 type 
 type_union = 
-   Tu_aux of type_union_aux * l
+   Tu_aux of type_union_aux * Parse_ast.l
 
 
 type 
@@ -389,17 +387,17 @@ index_range_aux =  (* index specification, for bitfields in register types *)
  | BF_concat of index_range * index_range (* concatenation of index ranges *)
 
 and index_range = 
-   BF_aux of index_range_aux * l
+   BF_aux of index_range_aux * Parse_ast.l
 
 
 type 
 name_scm_opt = 
-   Name_sect_aux of name_scm_opt_aux * l
+   Name_sect_aux of name_scm_opt_aux * Parse_ast.l
 
 
 type 
 effect_opt = 
-   Effect_opt_aux of effect_opt_aux * l
+   Effect_opt_aux of effect_opt_aux * Parse_ast.l
 
 
 type 
@@ -409,12 +407,12 @@ type
 
 type 
 rec_opt = 
-   Rec_aux of rec_opt_aux * l
+   Rec_aux of rec_opt_aux * Parse_ast.l
 
 
 type 
 tannot_opt = 
-   Typ_annot_opt_aux of tannot_opt_aux * l
+   Typ_annot_opt_aux of tannot_opt_aux * Parse_ast.l
 
 
 type 
@@ -478,7 +476,7 @@ type
 
 type 
 'a default_spec = 
-   DT_aux of 'a default_spec_aux * l
+   DT_aux of 'a default_spec_aux * Parse_ast.l
 
 
 type