diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse_ast.ml | 12 | ||||
| -rw-r--r-- | src/parser.mly | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/parse_ast.ml b/src/parse_ast.ml index da716969..948b8ab8 100644 --- a/src/parse_ast.ml +++ b/src/parse_ast.ml @@ -411,12 +411,12 @@ type | Typ_lib_enum of terminal * terminal * terminal * terminal (* natural numbers _ .. _+_-1, ordered by order *) | Typ_lib_enum1 of terminal * terminal * terminal (* sugar for \texttt{enum nexp 0 inc} *) | Typ_lib_enum2 of terminal * terminal * terminal * terminal * terminal (* sugar for \texttt{enum (nexp'-nexp+1) nexp inc} or \texttt{enum (nexp-nexp'+1) nexp' dec} *) - | Typ_lib_vector of terminal * terminal * terminal * terminal * terminal (* vector of _, indexed by natural range *) - | Typ_lib_vector2 of atyp * terminal * terminal * terminal (* sugar for vector indexed by [ _ ] *) - | Typ_lib_vector3 of atyp * terminal * terminal * terminal * terminal * terminal (* sugar for vector indexed by [ _.._ ] *) - | Typ_lib_list of terminal * atyp (* list of _ *) - | Typ_lib_set of terminal * atyp (* finite set of _ *) - | Typ_lib_reg of terminal * atyp (* mutable register components holding _ *) + | Typ_lib_vector of terminal * terminal * terminal * terminal * atyp (* vector of atyp, indexed by natural range *) + | Typ_lib_vector2 of atyp * terminal * terminal * terminal (* sugar for vector indexed by [ atyp ] *) + | Typ_lib_vector3 of atyp * terminal * terminal * terminal * terminal * terminal (* sugar for vector indexed by [ atyp.._ ] *) + | Typ_lib_list of terminal * atyp (* list of atyp *) + | Typ_lib_set of terminal * atyp (* finite set of atyp *) + | Typ_lib_reg of terminal * atyp (* mutable register components holding atyp *) type diff --git a/src/parser.mly b/src/parser.mly index 823792d6..d2669ea0 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -603,7 +603,6 @@ fun_def: { } | Function_ Rec atomic_typ funcl_ands { $1,$2,$3,$4 } - /* The below causes 2 shift/reduce conflicts because it can't here tell the difference between the start of the function the potential start of a type */ | Function_ Rec funcl_ands { $1,$2,$3 } | Function_ typquant atomic_typ effect_typ funcl_ands |