diff options
Diffstat (limited to 'language/l2_parse.ml')
| -rw-r--r-- | language/l2_parse.ml | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/language/l2_parse.ml b/language/l2_parse.ml index b12651c0..703fc49e 100644 --- a/language/l2_parse.ml +++ b/language/l2_parse.ml @@ -248,26 +248,26 @@ naming_scheme_opt_aux = (* Optional variable-naming-scheme specification for va type -tannot_opt_aux = (* Optional type annotation for functions *) - Typ_annot_opt_none - | Typ_annot_opt_some of typquant * atyp +rec_opt_aux = (* Optional recursive annotation for functions *) + Rec_nonrec (* non-recursive *) + | Rec_rec (* recursive *) type -effects_opt_aux = (* Optional effect annotation for functions *) - Effects_opt_pure (* sugar for empty effect set *) - | Effects_opt_effects of atyp +tannot_opt_aux = (* Optional type annotation for functions *) + Typ_annot_opt_none + | Typ_annot_opt_some of typquant * atyp type -rec_opt_aux = (* Optional recursive annotation for functions *) - Rec_nonrec (* non-recursive *) - | Rec_rec (* recursive *) +funcl_aux = (* Function clause *) + FCL_Funcl of id * pat * exp type -funcl_aux = (* Function clause *) - FCL_Funcl of id * pat * exp +effects_opt_aux = (* Optional effect annotation for functions *) + Effects_opt_pure (* sugar for empty effect set *) + | Effects_opt_effects of atyp type @@ -286,28 +286,29 @@ naming_scheme_opt = type -tannot_opt = - Typ_annot_opt_aux of tannot_opt_aux * l +rec_opt = + Rec_aux of rec_opt_aux * l type -effects_opt = - Effects_opt_aux of effects_opt_aux * l +tannot_opt = + Typ_annot_opt_aux of tannot_opt_aux * l type -rec_opt = - Rec_aux of rec_opt_aux * l +funcl = + FCL_aux of funcl_aux * l type -funcl = - FCL_aux of funcl_aux * l +effects_opt = + Effects_opt_aux of effects_opt_aux * l type -val_spec_aux = (* Value type specification *) - VS_val_spec of typschm * id +default_typing_spec_aux = (* Default kinding or typing assumption *) + DT_kind of base_kind * id + | DT_typ of typschm * id type @@ -320,9 +321,8 @@ type_def_aux = (* Type definition body *) type -default_typing_spec_aux = (* Default kinding or typing assumption *) - DT_kind of base_kind * id - | DT_typ of typschm * id +val_spec_aux = (* Value type specification *) + VS_val_spec of typschm * id type @@ -331,8 +331,8 @@ fundef_aux = (* Function definition *) type -val_spec = - VS_aux of val_spec_aux * l +default_typing_spec = + DT_aux of default_typing_spec_aux * l type @@ -341,8 +341,8 @@ type_def = type -default_typing_spec = - DT_aux of default_typing_spec_aux * l +val_spec = + VS_aux of val_spec_aux * l type @@ -371,11 +371,6 @@ def = type -ctor_def_aux = (* Datatype constructor definition clause *) - CT_ct of id * typschm - - -type typ_lib_aux = (* library types and syntactic sugar for them *) Typ_lib_unit (* unit type with value $()$ *) | Typ_lib_bool (* booleans $_$ and $_$ *) @@ -410,11 +405,6 @@ defs = (* Definition sequence *) type -ctor_def = - CT_aux of ctor_def_aux * l - - -type typ_lib = Typ_lib_aux of typ_lib_aux * l |