diff options
| author | Kathy Gray | 2013-08-08 15:35:06 +0100 |
|---|---|---|
| committer | Kathy Gray | 2013-08-08 15:35:06 +0100 |
| commit | d174f6ec333a8a959ed610781326ca4d125e3c89 (patch) | |
| tree | 435c754658bc0a08c24c7d5f0e7fdd7440fc6ce6 /language | |
| parent | c349ec8fa9d4f7125b2652d880619c2821531e50 (diff) | |
More forms converting from parse_ast to ast; also removed some annot aux homs for terms that only need locations and not full annotations
Diffstat (limited to 'language')
| -rw-r--r-- | language/l2.ott | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/language/l2.ott b/language/l2.ott index a20f14ee..8949f098 100644 --- a/language/l2.ott +++ b/language/l2.ott @@ -375,7 +375,7 @@ grammar nexp_constraint :: 'NC_' ::= {{ com constraint over kind $[[Nat]]$ }} - {{ aux _ annot }} {{ auxparam 'a }} + {{ aux _ l }} | nexp = nexp' :: :: fixed | nexp >= nexp' :: :: bounded_ge | nexp '<=' nexp' :: :: bounded_le @@ -392,20 +392,20 @@ kinded_id :: 'KOpt_' ::= quant_item :: 'QI_' ::= {{ com Either a kinded identifier or a nexp constraint for a typquant }} - {{ aux _ annot }} {{ auxparam 'a }} + {{ aux _ l }} | kinded_id :: :: id {{ com An optionally kinded identifier }} | nexp_constraint :: :: const {{ com A constraint for this type }} typquant :: 'TypQ_' ::= {{ com type quantifiers and constraints}} - {{ aux _ annot }} {{ auxparam 'a }} + {{ aux _ l }} | forall quant_item1 , ... , quant_itemn . :: :: tq {{ texlong }} % WHY ARE CONSTRAINTS HERE AND NOT IN THE KIND LANGUAGE | :: :: no_forall {{ com sugar, omitting quantifier and constraints }} typschm :: 'TypSchm_' ::= {{ com type scheme }} - {{ aux _ annot }} {{ auxparam 'a }} + {{ aux _ l }} | typquant typ :: :: ts |