From 16a3fa0e32839bdf39684b7ba8b2ed039e2eb51d Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Tue, 23 Jul 2013 18:56:44 +0100 Subject: Down to 7 shift/reduce conflicts (with 0 reduce/reduce). Possibly some syntax needs to change. ott file now builds a pdf again --- language/l2.ott | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'language') 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 - -- cgit v1.2.3