summaryrefslogtreecommitdiff
path: root/src/ast.ml
diff options
context:
space:
mode:
Diffstat (limited to 'src/ast.ml')
-rw-r--r--src/ast.ml401
1 files changed, 225 insertions, 176 deletions
diff --git a/src/ast.ml b/src/ast.ml
index 9a831d14..e777ba4f 100644
--- a/src/ast.ml
+++ b/src/ast.ml
@@ -1,22 +1,24 @@
-(* generated by Ott 0.21.2 from: l2.ott *)
+(* generated by Ott 0.22 from: l2.ott *)
-type text = Ulib.Text.t
+type text = string
type l =
| Unknown
| Trans of string * l option
| Range of Lexing.position * Lexing.position
+type 'a annot = l * 'a
+
exception Parse_error_locn of l * string
type ml_comment =
- | Chars of Ulib.Text.t
+ | Chars of string
| Comment of ml_comment list
type lex_skip =
| Com of ml_comment
- | Ws of Ulib.Text.t
+ | Ws of string
| Nl
type lex_skips = lex_skip list option
@@ -32,7 +34,7 @@ let pp_lex_skips ppf sk =
(* TODO: fix? *)
Format.fprintf ppf "(**)"
| Ws(r) ->
- Format.fprintf ppf "%s" (Ulib.Text.to_string r)
+ Format.fprintf ppf "%s" r (*(Ulib.Text.to_string r)*)
| Nl -> Format.fprintf ppf "\\n")
sks
@@ -57,19 +59,14 @@ base_kind_aux = (* base kind *)
type
-id_aux = (* Identifier *)
- Id of x
- | DeIid of terminal * x * terminal (* remove infix status *)
-
-
-type
base_kind =
BK_aux of base_kind_aux * l
type
-id =
- Id_aux of id_aux * l
+id_aux = (* Identifier *)
+ Id of x
+ | DeIid of terminal * x * terminal (* remove infix status *)
type
@@ -78,15 +75,8 @@ kind_aux = (* kinds *)
type
-nexp_aux = (* expression of kind $_$, for vector sizes and origins *)
- Nexp_id of id (* identifier *)
- | Nexp_constant of terminal * int (* constant *)
- | Nexp_times of nexp * terminal * nexp (* product *)
- | Nexp_sum of nexp * terminal * nexp (* sum *)
- | Nexp_exp of terminal * terminal * nexp (* exponential *)
-
-and nexp =
- Nexp_aux of nexp_aux * l
+id =
+ Id_aux of id_aux * l
type
@@ -106,11 +96,15 @@ kind =
type
-nexp_constraint_aux = (* constraint over kind $_$ *)
- NC_fixed of nexp * terminal * nexp
- | NC_bounded_ge of nexp * terminal * nexp
- | NC_bounded_le of nexp * terminal * nexp
- | NC_nat_set_bounded of id * terminal * terminal * (terminal * int * terminal) list * terminal
+nexp_aux = (* expression of kind $_$, for vector sizes and origins *)
+ Nexp_id of id (* identifier *)
+ | Nexp_constant of terminal * int (* constant *)
+ | Nexp_times of nexp * terminal * nexp (* product *)
+ | Nexp_sum of nexp * terminal * nexp (* sum *)
+ | Nexp_exp of terminal * terminal * nexp (* exponential *)
+
+and nexp =
+ Nexp_aux of nexp_aux * l
type
@@ -119,14 +113,23 @@ effect =
type
-kinded_id = (* optionally kind-annotated identifier *)
+kinded_id_aux = (* optionally kind-annotated identifier *)
KOpt_none of id (* identifier *)
| KOpt_kind of kind * id (* kind-annotated variable *)
type
-nexp_constraint =
- NC_aux of nexp_constraint_aux * l
+'a nexp_constraint_aux = (* constraint over kind $_$ *)
+ NC_fixed of nexp * terminal * nexp
+ | NC_bounded_ge of nexp * terminal * nexp
+ | NC_bounded_le of nexp * terminal * nexp
+ | NC_nat_set_bounded of id * terminal * terminal * (terminal * int * terminal) list * terminal
+
+
+type
+effects_aux = (* effect set, of kind $_$ *)
+ Effects_var of id
+ | Effects_set of terminal * (effect * terminal) list * terminal (* effect set *)
type
@@ -137,16 +140,18 @@ order_aux = (* vector order specifications, of kind $_$ *)
type
-effects_aux = (* effect set, of kind $_$ *)
- Effects_var of id
- | Effects_set of terminal * (effect * terminal) list * terminal (* effect set *)
+kinded_id =
+ KOpt_aux of kinded_id_aux * l
type
-typquant_aux = (* type quantifiers and constraints *)
- TypQ_tq of terminal * (kinded_id) list * terminal * (nexp_constraint * terminal) list * terminal
- | TypQ_no_constraint of terminal * (kinded_id) list * terminal (* sugar, omitting constraints *)
- | TypQ_no_forall (* sugar, omitting quantifier and constraints *)
+'a nexp_constraint =
+ NC_aux of 'a nexp_constraint_aux * 'a annot
+
+
+type
+effects =
+ Effects_aux of effects_aux * l
type
@@ -155,246 +160,285 @@ order =
type
-effects =
- Effects_aux of effects_aux * l
+'a typquant_aux = (* type quantifiers and constraints *)
+ TypQ_tq of terminal * (kinded_id) list * terminal * ('a nexp_constraint * terminal) list * terminal
+ | TypQ_no_constraint of terminal * (kinded_id) list * terminal (* sugar, omitting constraints *)
+ | TypQ_no_forall (* sugar, omitting quantifier and constraints *)
type
-typquant =
- TypQ_aux of typquant_aux * l
+lit_aux = (* Literal constant *)
+ L_unit of terminal * terminal (* $() : _$ *)
+ | L_zero of terminal (* $_ : _$ *)
+ | L_one of terminal (* $_ : _$ *)
+ | L_true of terminal (* $_ : _$ *)
+ | L_false of terminal (* $_ : _$ *)
+ | L_num of terminal * int (* natural number constant *)
+ | L_hex of terminal * string (* bit vector constant, C-style *)
+ | L_bin of terminal * string (* bit vector constant, C-style *)
+ | L_string of terminal * string (* string constant *)
type
-typ = (* Type expressions, of kind $_$ *)
+typ_aux = (* Type expressions, of kind $_$ *)
Typ_wild of terminal (* Unspecified type *)
| Typ_var of id (* Type variable *)
| Typ_fn of typ * terminal * typ * effects (* Function type (first-order only in user code) *)
| Typ_tup of (typ * terminal) list (* Tuple type *)
| Typ_app of id * (typ_arg) list (* type constructor application *)
-and typ_arg = (* Type constructor arguments of all kinds *)
+and typ =
+ Typ_aux of typ_aux * l
+
+and typ_arg_aux = (* Type constructor arguments of all kinds *)
Typ_arg_nexp of nexp
| Typ_arg_typ of typ
| Typ_arg_order of order
| Typ_arg_effects of effects
+and typ_arg =
+ Typ_arg_aux of typ_arg_aux * l
+
type
-typschm_aux = (* type scheme *)
- TypSchm_ts of typquant * typ
+'a typquant =
+ TypQ_aux of 'a typquant_aux * 'a annot
type
-lit = (* Literal constant *)
- L_unit of terminal * terminal (* $() : _$ *)
- | L_zero of terminal (* $_ : _$ *)
- | L_one of terminal (* $_ : _$ *)
- | L_true of terminal (* $_ : _$ *)
- | L_false of terminal (* $_ : _$ *)
- | L_num of terminal * int (* natural number constant *)
- | L_hex of terminal * string (* bit vector constant, C-style *)
- | L_bin of terminal * string (* bit vector constant, C-style *)
- | L_string of terminal * Ulib.UTF8.t (* string constant *)
+lit =
+ L_aux of lit_aux * l
type
-typschm =
- TypSchm_aux of typschm_aux * l
+'a typschm_aux = (* type scheme *)
+ TypSchm_ts of 'a typquant * typ
type
-pat_aux = (* Pattern *)
+'a pat_aux = (* Pattern *)
P_lit of lit (* literal constant pattern *)
| P_wild of terminal (* wildcard *)
- | P_as of terminal * pat * terminal * id * terminal (* named pattern *)
- | P_typ of terminal * typ * pat * terminal (* typed pattern *)
+ | P_as of terminal * 'a pat * terminal * id * terminal (* named pattern *)
+ | P_typ of terminal * typ * 'a pat * terminal (* typed pattern *)
| P_id of id (* identifier *)
- | P_app of id * (pat) list (* union constructor pattern *)
- | P_record of terminal * (fpat * terminal) list * terminal * bool * terminal (* struct pattern *)
- | P_vector of terminal * (pat * terminal) list * terminal (* vector pattern *)
- | P_vector_indexed of terminal * ((terminal * int * terminal * pat) * terminal) list * terminal (* vector pattern (with explicit indices) *)
- | P_vector_concat of (pat * terminal) list (* concatenated vector pattern *)
- | P_tup of terminal * (pat * terminal) list * terminal (* tuple pattern *)
- | P_list of terminal * (pat * terminal) list * terminal (* list pattern *)
+ | P_app of id * ('a pat) list (* union constructor pattern *)
+ | P_record of terminal * ('a fpat * terminal) list * terminal * bool * terminal (* struct pattern *)
+ | P_vector of terminal * ('a pat * terminal) list * terminal (* vector pattern *)
+ | P_vector_indexed of terminal * ((terminal * int * terminal * 'a pat) * terminal) list * terminal (* vector pattern (with explicit indices) *)
+ | P_vector_concat of ('a pat * terminal) list (* concatenated vector pattern *)
+ | P_tup of terminal * ('a pat * terminal) list * terminal (* tuple pattern *)
+ | P_list of terminal * ('a pat * terminal) list * terminal (* list pattern *)
+
+and 'a pat =
+ P_aux of 'a pat_aux * 'a annot
-and pat =
- P_aux of pat_aux * l
+and 'a fpat_aux = (* Field pattern *)
+ FP_Fpat of id * terminal * 'a pat
-and fpat_aux = (* Field pattern *)
- FP_Fpat of id * terminal * pat
+and 'a fpat =
+ FP_aux of 'a fpat_aux * 'a annot
-and fpat =
- FP_aux of fpat_aux * l
+
+type
+'a typschm =
+ TypSchm_aux of 'a typschm_aux * 'a annot
type
-exp_aux = (* Expression *)
- E_block of terminal * (exp * terminal) list * terminal (* block (parsing conflict with structs?) *)
+'a letbind =
+ LB_aux of 'a letbind_aux * 'a annot
+
+and 'a exp_aux = (* Expression *)
+ E_block of terminal * ('a exp * terminal) list * terminal (* block (parsing conflict with structs?) *)
| E_id of id (* identifier *)
| E_lit of lit (* literal constant *)
- | E_cast of terminal * typ * terminal * exp (* cast *)
- | E_app of exp * (exp) list (* function application *)
- | E_app_infix of exp * id * exp (* infix function application *)
- | E_tuple of terminal * (exp * terminal) list * terminal (* tuple *)
- | E_if of terminal * exp * terminal * exp * terminal * exp (* conditional *)
- | E_vector of terminal * (exp * terminal) list * terminal (* vector (indexed from 0) *)
- | E_vector_indexed of terminal * ((terminal * int * terminal * exp) * terminal) list * terminal (* vector (indexed consecutively) *)
- | E_vector_access of exp * terminal * exp * terminal (* vector access *)
- | E_vector_subrange of exp * terminal * exp * terminal * exp * terminal (* subvector extraction *)
- | E_vector_update of terminal * exp * terminal * exp * terminal * exp * terminal (* vector functional update *)
- | E_vector_update_subrange of terminal * exp * terminal * exp * terminal * exp * terminal * exp * terminal (* vector subrange update (with vector) *)
- | E_list of terminal * (exp * terminal) list * terminal (* list *)
- | E_cons of exp * terminal * exp (* cons *)
- | E_record of terminal * fexps * terminal (* struct *)
- | E_record_update of terminal * exp * terminal * fexps * terminal (* functional update of struct *)
- | E_field of exp * terminal * id (* field projection from struct *)
- | E_case of terminal * exp * terminal * ((terminal * pexp)) list * terminal (* pattern matching *)
- | E_let of letbind * terminal * exp (* let expression *)
- | E_assign of lexp * terminal * exp (* imperative assignment *)
-
-and exp =
- E_aux of exp_aux * l
-
-and lexp = (* lvalue expression *)
+ | E_cast of terminal * typ * terminal * 'a exp (* cast *)
+ | E_app of 'a exp * ('a exp) list (* function application *)
+ | E_app_infix of 'a exp * id * 'a exp (* infix function application *)
+ | E_tuple of terminal * ('a exp * terminal) list * terminal (* tuple *)
+ | E_if of terminal * 'a exp * terminal * 'a exp * terminal * 'a exp (* conditional *)
+ | E_vector of terminal * ('a exp * terminal) list * terminal (* vector (indexed from 0) *)
+ | E_vector_indexed of terminal * ((terminal * int * terminal * 'a exp) * terminal) list * terminal (* vector (indexed consecutively) *)
+ | E_vector_access of 'a exp * terminal * 'a exp * terminal (* vector access *)
+ | E_vector_subrange of 'a exp * terminal * 'a exp * terminal * 'a exp * terminal (* subvector extraction *)
+ | E_vector_update of terminal * 'a exp * terminal * 'a exp * terminal * 'a exp * terminal (* vector functional update *)
+ | E_vector_update_subrange of terminal * 'a exp * terminal * 'a exp * terminal * 'a exp * terminal * 'a exp * terminal (* vector subrange update (with vector) *)
+ | E_list of terminal * ('a exp * terminal) list * terminal (* list *)
+ | E_cons of 'a exp * terminal * 'a exp (* cons *)
+ | E_record of terminal * 'a fexps * terminal (* struct *)
+ | E_record_update of terminal * 'a exp * terminal * 'a fexps * terminal (* functional update of struct *)
+ | E_field of 'a exp * terminal * id (* field projection from struct *)
+ | E_case of terminal * 'a exp * terminal * ((terminal * 'a pexp)) list * terminal (* pattern matching *)
+ | E_let of 'a letbind * terminal * 'a exp (* let expression *)
+ | E_assign of 'a lexp * terminal * 'a exp (* imperative assignment *)
+
+and 'a exp =
+ E_aux of 'a exp_aux * 'a annot
+
+and 'a lexp_aux = (* lvalue expression *)
LEXP_id of id (* identifier *)
- | LEXP_vector of lexp * terminal * exp * terminal (* vector element *)
- | LEXP_vector_range of lexp * terminal * exp * terminal * exp * terminal (* subvector *)
- | LEXP_field of lexp * terminal * id (* struct field *)
+ | LEXP_vector of 'a lexp * terminal * 'a exp * terminal (* vector element *)
+ | LEXP_vector_range of 'a lexp * terminal * 'a exp * terminal * 'a exp * terminal (* subvector *)
+ | LEXP_field of 'a lexp * terminal * id (* struct field *)
+
+and 'a lexp =
+ LEXP_aux of 'a lexp_aux * 'a annot
-and fexp_aux = (* Field-expression *)
- FE_Fexp of id * terminal * exp
+and 'a fexp_aux = (* Field-expression *)
+ FE_Fexp of id * terminal * 'a exp
-and fexp =
- FE_aux of fexp_aux * l
+and 'a fexp =
+ FE_aux of 'a fexp_aux * 'a annot
-and fexps_aux = (* Field-expression list *)
- FES_Fexps of (fexp * terminal) list * terminal * bool
+and 'a fexps_aux = (* Field-expression list *)
+ FES_Fexps of ('a fexp * terminal) list * terminal * bool
-and fexps =
- FES_aux of fexps_aux * l
+and 'a fexps =
+ FES_aux of 'a fexps_aux * 'a annot
+
+and 'a pexp_aux = (* Pattern match *)
+ Pat_exp of 'a pat * terminal * 'a exp
+
+and 'a pexp =
+ Pat_aux of 'a pexp_aux * 'a annot
+
+and 'a letbind_aux = (* Let binding *)
+ LB_val_explicit of 'a typschm * 'a pat * terminal * 'a exp (* value binding, explicit type ('a pat must be total) *)
+ | LB_val_implicit of terminal * 'a pat * terminal * 'a exp (* value binding, implicit type ('a pat must be total) *)
+
+
+type
+naming_scheme_opt_aux = (* Optional variable-naming-scheme specification for variables of defined type *)
+ Name_sect_none
+ | Name_sect_some of terminal * terminal * terminal * terminal * string * terminal
-and pexp_aux = (* Pattern match *)
- Pat_exp of pat * terminal * exp
-and pexp =
- Pat_aux of pexp_aux * l
+type
+rec_opt_aux = (* Optional recursive annotation for functions *)
+ Rec_nonrec (* non-recursive *)
+ | Rec_rec of terminal (* recursive *)
-and letbind_aux = (* Let binding *)
- LB_val_explicit of typschm * pat * terminal * exp (* value binding, explicit type (pat must be total) *)
- | LB_val_implicit of terminal * pat * terminal * exp (* value binding, implicit type (pat must be total) *)
-and letbind =
- LB_aux of letbind_aux * l
+type
+'a funcl_aux = (* Function clause *)
+ FCL_Funcl of id * 'a pat * terminal * 'a exp
type
-funcl_aux = (* Function clause *)
- FCL_Funcl of id * pat * terminal * exp
+'a tannot_opt_aux = (* Optional type annotation for functions *)
+ Typ_annot_opt_none
+ | Typ_annot_opt_some of terminal * typ
type
-effects_opt_aux = (* Optional effect annotation for functions *)
+'a effects_opt_aux = (* Optional effect annotation for functions *)
Effects_opt_pure (* sugar for empty effect set *)
| Effects_opt_effects of effects
type
-funcl =
- FCL_aux of funcl_aux * l
+index_range_aux = (* index specification, for bitfields in register types *)
+ BF_single of terminal * int (* single index *)
+ | BF_range of terminal * int * terminal * terminal * int (* index range *)
+ | BF_concat of index_range * terminal * index_range (* concatenation of index ranges *)
+
+and index_range =
+ BF_aux of index_range_aux * l
type
-rec_opt = (* Optional recursive annotation for functions *)
- Rec_nonrec (* non-recursive *)
- | Rec_rec of terminal (* recursive *)
+naming_scheme_opt =
+ Name_sect_aux of naming_scheme_opt_aux * l
type
-effects_opt =
- Effects_opt_aux of effects_opt_aux * l
+rec_opt =
+ Rec_aux of rec_opt_aux * l
type
-tannot_opt = (* Optional type annotation for functions *)
- Typ_annot_opt_none
- | Typ_annot_opt_some of terminal * typ
+'a funcl =
+ FCL_aux of 'a funcl_aux * 'a annot
type
-val_spec_aux = (* Value type specification *)
- VS_val_spec of terminal * typschm * id
+'a tannot_opt =
+ Typ_annot_opt_aux of 'a tannot_opt_aux * 'a annot
type
-naming_scheme_opt = (* Optional variable-naming-scheme specification for variables of defined type *)
- Name_sect_none
- | Name_sect_some of terminal * terminal * terminal * terminal * string * terminal
+'a effects_opt =
+ Effects_opt_aux of 'a effects_opt_aux * 'a annot
type
-index_range = (* index specification, for bitfields in register types *)
- BF_single of terminal * int (* single index *)
- | BF_range of terminal * int * terminal * terminal * int (* index range *)
- | BF_concat of index_range * terminal * index_range (* concatenation of index ranges *)
+'a type_def_aux = (* Type definition body *)
+ TD_abbrev of terminal * id * naming_scheme_opt * terminal * 'a typschm (* type abbreviation *)
+ | TD_record of terminal * id * naming_scheme_opt * terminal * terminal * terminal * 'a typquant * terminal * ((typ * id) * terminal) list * terminal * bool * terminal (* struct type definition *)
+ | TD_variant of terminal * id * naming_scheme_opt * terminal * terminal * terminal * 'a typquant * terminal * ((typ * id) * terminal) list * terminal * bool * terminal (* union type definition *)
+ | TD_enum of terminal * id * naming_scheme_opt * terminal * terminal * terminal * (id * terminal) list * terminal * bool * terminal (* enumeration type definition *)
+ | TD_register of terminal * id * terminal * terminal * terminal * terminal * nexp * terminal * nexp * terminal * terminal * ((index_range * terminal * id) * terminal) list * terminal (* register mutable bitfield type definition *)
type
-fundef_aux = (* Function definition *)
- FD_function of terminal * rec_opt * tannot_opt * effects_opt * (funcl * terminal) list
+'a val_spec_aux = (* Value type specification *)
+ VS_val_spec of terminal * 'a typschm * id
type
-default_typing_spec_aux = (* Default kinding or typing assumption *)
+'a default_typing_spec_aux = (* Default kinding or typing assumption *)
DT_kind of terminal * base_kind * id
- | DT_typ of terminal * typschm * id
+ | DT_typ of terminal * 'a typschm * id
type
-val_spec =
- VS_aux of val_spec_aux * l
+'a fundef_aux = (* Function definition *)
+ FD_function of terminal * rec_opt * 'a tannot_opt * 'a effects_opt * ('a funcl * terminal) list
type
-type_def = (* Type definition body *)
- TD_abbrev of terminal * id * naming_scheme_opt * terminal * typschm (* type abbreviation *)
- | TD_record of terminal * id * naming_scheme_opt * terminal * terminal * terminal * typquant * terminal * ((typ * id) * terminal) list * terminal * bool * terminal (* struct type definition *)
- | TD_variant of terminal * id * naming_scheme_opt * terminal * terminal * terminal * typquant * terminal * ((typ * id) * terminal) list * terminal * bool * terminal (* union type definition *)
- | TD_enum of terminal * id * naming_scheme_opt * terminal * terminal * terminal * (id * terminal) list * terminal * bool * terminal (* enumeration type definition *)
- | TD_register of terminal * id * terminal * terminal * terminal * terminal * nexp * terminal * nexp * terminal * terminal * ((index_range * terminal * id) * terminal) list * terminal (* register mutable bitfield type definition *)
+'a type_def =
+ TD_aux of 'a type_def_aux * 'a annot
+
+
+type
+'a val_spec =
+ VS_aux of 'a val_spec_aux * 'a annot
type
-fundef =
- FD_aux of fundef_aux * l
+'a default_typing_spec =
+ DT_aux of 'a default_typing_spec_aux * 'a annot
type
-default_typing_spec =
- DT_aux of default_typing_spec_aux * l
+'a fundef =
+ FD_aux of 'a fundef_aux * 'a annot
type
-def_aux = (* Top-level definition *)
- DEF_type of type_def (* type definition *)
- | DEF_fundef of fundef (* function definition *)
- | DEF_val of letbind (* value definition *)
- | DEF_spec of val_spec (* top-level type constraint *)
- | DEF_default of default_typing_spec (* default kind and type assumptions *)
+'a def_aux = (* Top-level definition *)
+ DEF_type of 'a type_def (* type definition *)
+ | DEF_fundef of 'a fundef (* function definition *)
+ | DEF_val of 'a letbind (* value definition *)
+ | DEF_spec of 'a val_spec (* top-level type constraint *)
+ | DEF_default of 'a default_typing_spec (* default kind and type assumptions *)
| DEF_reg_dec of terminal * typ * id (* register declaration *)
- | DEF_scattered_function of terminal * terminal * rec_opt * tannot_opt * effects_opt * id (* scattered function definition header *)
- | DEF_scattered_funcl of terminal * terminal * funcl (* scattered function definition clause *)
- | DEF_scattered_variant of terminal * terminal * id * naming_scheme_opt * terminal * terminal * terminal * typquant (* scattered union definition header *)
+ | DEF_scattered_function of terminal * terminal * rec_opt * 'a tannot_opt * 'a effects_opt * id (* scattered function definition header *)
+ | DEF_scattered_funcl of terminal * terminal * 'a funcl (* scattered function definition clause *)
+ | DEF_scattered_variant of terminal * terminal * id * naming_scheme_opt * terminal * terminal * terminal * 'a typquant (* scattered union definition header *)
| DEF_scattered_unioncl of terminal * id * terminal * typ * id (* scattered union definition member *)
| DEF_scattered_end of terminal * id (* scattered definition end *)
type
-typ_lib_aux = (* library types and syntactic sugar for them *)
+'a typ_lib_aux = (* library types and syntactic sugar for them *)
Typ_lib_unit of terminal (* unit type with value $()$ *)
| Typ_lib_bool of terminal (* booleans $_$ and $_$ *)
| Typ_lib_bit of terminal (* pure bit values (not mutable bits) *)
| Typ_lib_nat of terminal (* natural numbers 0,1,2,... *)
- | Typ_lib_string of terminal * Ulib.UTF8.t (* UTF8 strings *)
+ | Typ_lib_string of terminal * string (* UTF8 strings *)
| Typ_lib_enum of terminal * nexp * nexp * order (* natural numbers nexp .. nexp+nexp-1, ordered by order *)
| Typ_lib_enum1 of terminal * nexp * terminal (* sugar for \texttt{enum nexp 0 inc} *)
| Typ_lib_enum2 of terminal * nexp * terminal * nexp * terminal (* sugar for \texttt{enum (nexp'-nexp+1) nexp inc} or \texttt{enum (nexp-nexp'+1) nexp' dec} *)
@@ -407,23 +451,28 @@ typ_lib_aux = (* library types and syntactic sugar for them *)
type
-def =
- DEF_aux of def_aux * l
+'a ctor_def_aux = (* Datatype constructor definition clause *)
+ CT_ct of id * terminal * 'a typschm
+
+
+type
+'a def =
+ DEF_aux of 'a def_aux * 'a annot
type
-ctor_def = (* Datatype constructor definition clause *)
- CT_ct of id * terminal * typschm
+'a typ_lib =
+ Typ_lib_aux of 'a typ_lib_aux * l
type
-typ_lib =
- Typ_lib_aux of typ_lib_aux * l
+'a ctor_def =
+ CT_aux of 'a ctor_def_aux * 'a annot
type
-defs = (* Definition sequence *)
- Defs of (def) list
+'a defs = (* Definition sequence *)
+ Defs of ('a def) list