diff options
| author | Kathy Gray | 2013-07-23 18:56:44 +0100 |
|---|---|---|
| committer | Kathy Gray | 2013-07-23 18:56:44 +0100 |
| commit | 16a3fa0e32839bdf39684b7ba8b2ed039e2eb51d (patch) | |
| tree | 84aa7c790b97977ec521350475b5192abf14a8d6 /language | |
| parent | 33c8450d506db246be6255edcd17b601783c882f (diff) | |
Down to 7 shift/reduce conflicts (with 0 reduce/reduce). Possibly some syntax needs to change.
ott file now builds a pdf again
Diffstat (limited to 'language')
| -rw-r--r-- | language/l2.ott | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/language/l2.ott b/language/l2.ott index 4bcd1ba3..47283a84 100644 --- a/language/l2.ott +++ b/language/l2.ott @@ -392,7 +392,7 @@ typ_lib :: 'Typ_lib_' ::= | nat :: :: nat {{ com natural numbers 0,1,2,... }} | string :: :: string {{ com UTF8 strings }} % finite subranges of nat - | enum nexp1 nexp2 order :: :: enum {{ com natural numbers [[nexp2]] .. [[nexp2]]+[[nexp1]]-1, ordered by $[[order]]$ }} + | enum nexp1 nexp2 order :: :: enum {{ com natural numbers [[nexp2]] .. [[nexp2]]+[[nexp1]]-1, ordered by [[order]] }} | [ nexp ] :: :: enum1 {{ com sugar for \texttt{enum nexp 0 inc} }} | [ nexp '..' nexp' ] :: :: enum2 {{ com sugar for \texttt{enum (nexp'-nexp+1) nexp inc} or \texttt{enum (nexp-nexp'+1) nexp' dec} }} % use .. not - to avoid ambiguity with nexp - |
