Dafny: Since it's no longer true that all types support equality at run-time (in particular, codatatypes), Dafny needs to check this. In these changes, Dafny supports the "(==)" suffix to type parameters, infers that suffix in some cases, and enforces equality support in many places. Refinement and datatypes still need more attention in the Dafny implementation.

1 files changed, 297 insertions, 274 deletions

diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index 26b98833..0c1920a6 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -315,7 +315,7 @@ bool IsAttribute() {
 			Attribute(ref attrs);

 		}

 		Ident(out id);

-		if (la.kind == 22) {

+		if (la.kind == 25) {

 			GenericParameters(typeArgs);

 		}

 		Expect(6);

@@ -351,7 +351,7 @@ bool IsAttribute() {
 			Attribute(ref attrs);

 		}

 		Ident(out id);

-		if (la.kind == 22) {

+		if (la.kind == 25) {

 			GenericParameters(typeArgs);

 		}

 		Expect(16);

@@ -376,13 +376,20 @@ bool IsAttribute() {
 	void ArbitraryTypeDecl(ModuleDecl/*!*/ module, out ArbitraryTypeDecl at) {

 		IToken/*!*/ id;

 		Attributes attrs = null;

+		var eqSupport = TypeParameter.EqualitySupportValue.Unspecified;

 		

 		Expect(21);

 		while (la.kind == 6) {

 			Attribute(ref attrs);

 		}

 		Ident(out id);

-		at = new ArbitraryTypeDecl(id, id.val, module, attrs); 

+		if (la.kind == 22) {

+			Get();

+			Expect(23);

+			Expect(24);

+			eqSupport = TypeParameter.EqualitySupportValue.Required; 

+		}

+		at = new ArbitraryTypeDecl(id, id.val, module, eqSupport, attrs); 

 		while (!(la.kind == 0 || la.kind == 18)) {SynErr(113); Get();}

 		Expect(18);

 	}

@@ -405,10 +412,10 @@ bool IsAttribute() {
 		}

 		if (la.kind == 19) {

 			FieldDecl(mmod, mm);

-		} else if (la.kind == 44 || la.kind == 45) {

+		} else if (la.kind == 45 || la.kind == 46) {

 			FunctionDecl(mmod, out f);

 			mm.Add(f); 

-		} else if (la.kind == 24 || la.kind == 25) {

+		} else if (la.kind == 27 || la.kind == 28) {

 			MethodDecl(mmod, allowConstructors, out m);

 			mm.Add(m); 

 		} else SynErr(114);

@@ -416,16 +423,32 @@ bool IsAttribute() {
 

 	void GenericParameters(List<TypeParameter/*!*/>/*!*/ typeArgs) {

 		Contract.Requires(cce.NonNullElements(typeArgs));

-		IToken/*!*/ id; 

-		Expect(22);

+		IToken/*!*/ id;

+		TypeParameter.EqualitySupportValue eqSupport;

+		

+		Expect(25);

 		Ident(out id);

-		typeArgs.Add(new TypeParameter(id, id.val)); 

+		eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

+		if (la.kind == 22) {

+			Get();

+			Expect(23);

+			Expect(24);

+			eqSupport = TypeParameter.EqualitySupportValue.Required; 

+		}

+		typeArgs.Add(new TypeParameter(id, id.val, eqSupport)); 

 		while (la.kind == 20) {

 			Get();

 			Ident(out id);

-			typeArgs.Add(new TypeParameter(id, id.val)); 

+			eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

+			if (la.kind == 22) {

+				Get();

+				Expect(23);

+				Expect(24);

+				eqSupport = TypeParameter.EqualitySupportValue.Required; 

+			}

+			typeArgs.Add(new TypeParameter(id, id.val, eqSupport)); 

 		}

-		Expect(23);

+		Expect(26);

 	}

 

 	void FieldDecl(MemberModifiers mmod, List<MemberDecl/*!*/>/*!*/ mm) {

@@ -470,9 +493,9 @@ bool IsAttribute() {
 		IToken bodyEnd = Token.NoToken;

 		bool signatureOmitted = false;

 		

-		if (la.kind == 44) {

+		if (la.kind == 45) {

 			Get();

-			if (la.kind == 24) {

+			if (la.kind == 27) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -482,22 +505,22 @@ bool IsAttribute() {
 				Attribute(ref attrs);

 			}

 			Ident(out id);

-			if (la.kind == 22 || la.kind == 33) {

-				if (la.kind == 22) {

+			if (la.kind == 22 || la.kind == 25) {

+				if (la.kind == 25) {

 					GenericParameters(typeArgs);

 				}

 				Formals(true, isFunctionMethod, formals, out openParen);

 				Expect(5);

 				Type(out returnType);

-			} else if (la.kind == 27) {

+			} else if (la.kind == 30) {

 				Get();

 				signatureOmitted = true;

 				openParen = Token.NoToken; 

 			} else SynErr(117);

-		} else if (la.kind == 45) {

+		} else if (la.kind == 46) {

 			Get();

 			isPredicate = true; 

-			if (la.kind == 24) {

+			if (la.kind == 27) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -508,17 +531,17 @@ bool IsAttribute() {
 			}

 			Ident(out id);

 			if (StartOf(4)) {

-				if (la.kind == 22) {

+				if (la.kind == 25) {

 					GenericParameters(typeArgs);

 				}

-				if (la.kind == 33) {

+				if (la.kind == 22) {

 					Formals(true, isFunctionMethod, formals, out openParen);

 					if (la.kind == 5) {

 						Get();

 						SemErr(t, "predicates do not have an explicitly declared return type; it is always bool"); 

 					}

 				}

-			} else if (la.kind == 27) {

+			} else if (la.kind == 30) {

 				Get();

 				signatureOmitted = true;

 				openParen = Token.NoToken; 

@@ -562,10 +585,10 @@ bool IsAttribute() {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

-		while (!(la.kind == 0 || la.kind == 24 || la.kind == 25)) {SynErr(120); Get();}

-		if (la.kind == 24) {

+		while (!(la.kind == 0 || la.kind == 27 || la.kind == 28)) {SynErr(120); Get();}

+		if (la.kind == 27) {

 			Get();

-		} else if (la.kind == 25) {

+		} else if (la.kind == 28) {

 			Get();

 			if (allowConstructor) {

 			 isConstructor = true;

@@ -587,17 +610,17 @@ bool IsAttribute() {
 			Attribute(ref attrs);

 		}

 		Ident(out id);

-		if (la.kind == 22 || la.kind == 33) {

-			if (la.kind == 22) {

+		if (la.kind == 22 || la.kind == 25) {

+			if (la.kind == 25) {

 				GenericParameters(typeArgs);

 			}

 			Formals(true, !mmod.IsGhost, ins, out openParen);

-			if (la.kind == 26) {

+			if (la.kind == 29) {

 				Get();

 				if (isConstructor) { SemErr(t, "constructors cannot have out-parameters"); } 

 				Formals(false, !mmod.IsGhost, outs, out openParen);

 			}

-		} else if (la.kind == 27) {

+		} else if (la.kind == 30) {

 			Get();

 			signatureOmitted = true; openParen = Token.NoToken; 

 		} else SynErr(122);

@@ -629,7 +652,7 @@ bool IsAttribute() {
 			Attribute(ref attrs);

 		}

 		Ident(out id);

-		if (la.kind == 33) {

+		if (la.kind == 22) {

 			FormalsOptionalIds(formals);

 		}

 		ctors.Add(new DatatypeCtor(id, id.val, formals, attrs)); 

@@ -637,7 +660,7 @@ bool IsAttribute() {
 

 	void FormalsOptionalIds(List<Formal/*!*/>/*!*/ formals) {

 		Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id;  Type/*!*/ ty;  string/*!*/ name;  bool isGhost; 

-		Expect(33);

+		Expect(22);

 		if (StartOf(7)) {

 			TypeIdentOptional(out id, out name, out ty, out isGhost);

 			formals.Add(new Formal(id, name, ty, true, isGhost)); 

@@ -647,7 +670,7 @@ bool IsAttribute() {
 				formals.Add(new Formal(id, name, ty, true, isGhost)); 

 			}

 		}

-		Expect(34);

+		Expect(24);

 	}

 

 	void IdentType(out IToken/*!*/ id, out Type/*!*/ ty) {

@@ -731,22 +754,22 @@ bool IsAttribute() {
 		List<Type/*!*/>/*!*/ gt;

 		

 		switch (la.kind) {

-		case 35: {

+		case 36: {

 			Get();

 			tok = t; 

 			break;

 		}

-		case 36: {

+		case 37: {

 			Get();

 			tok = t;  ty = new NatType(); 

 			break;

 		}

-		case 37: {

+		case 38: {

 			Get();

 			tok = t;  ty = new IntType(); 

 			break;

 		}

-		case 38: {

+		case 39: {

 			Get();

 			tok = t;  gt = new List<Type/*!*/>(); 

 			GenericInstantiation(gt);

@@ -757,7 +780,7 @@ bool IsAttribute() {
 			

 			break;

 		}

-		case 39: {

+		case 40: {

 			Get();

 			tok = t;  gt = new List<Type/*!*/>(); 

 			GenericInstantiation(gt);

@@ -768,7 +791,7 @@ bool IsAttribute() {
 			

 			break;

 		}

-		case 40: {

+		case 41: {

 			Get();

 			tok = t;  gt = new List<Type/*!*/>(); 

 			GenericInstantiation(gt);

@@ -779,7 +802,7 @@ bool IsAttribute() {
 			

 			break;

 		}

-		case 41: {

+		case 42: {

 			Get();

 			tok = t;  gt = new List<Type/*!*/>(); 

 			GenericInstantiation(gt);

@@ -790,7 +813,7 @@ bool IsAttribute() {
 			

 			break;

 		}

-		case 1: case 3: case 42: {

+		case 1: case 3: case 43: {

 			ReferenceType(out tok, out ty);

 			break;

 		}

@@ -800,7 +823,7 @@ bool IsAttribute() {
 

 	void Formals(bool incoming, bool allowGhostKeyword, List<Formal/*!*/>/*!*/ formals, out IToken openParen) {

 		Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id;  Type/*!*/ ty;  bool isGhost; 

-		Expect(33);

+		Expect(22);

 		openParen = t; 

 		if (la.kind == 1 || la.kind == 8) {

 			GIdentType(allowGhostKeyword, out id, out ty, out isGhost);

@@ -811,7 +834,7 @@ bool IsAttribute() {
 				formals.Add(new Formal(id, id.val, ty, incoming, isGhost)); 

 			}

 		}

-		Expect(34);

+		Expect(24);

 	}

 

 	void MethodSpec(List<MaybeFreeExpression/*!*/>/*!*/ req, List<FrameExpression/*!*/>/*!*/ mod, List<MaybeFreeExpression/*!*/>/*!*/ ens,

@@ -820,7 +843,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ e;  FrameExpression/*!*/ fe;  bool isFree = false; Attributes ensAttrs = null;

 		

 		while (!(StartOf(8))) {SynErr(124); Get();}

-		if (la.kind == 28) {

+		if (la.kind == 31) {

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref modAttrs);

@@ -836,18 +859,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			while (!(la.kind == 0 || la.kind == 18)) {SynErr(125); Get();}

 			Expect(18);

-		} else if (la.kind == 29 || la.kind == 30 || la.kind == 31) {

-			if (la.kind == 29) {

+		} else if (la.kind == 32 || la.kind == 33 || la.kind == 34) {

+			if (la.kind == 32) {

 				Get();

 				isFree = true; 

 			}

-			if (la.kind == 30) {

+			if (la.kind == 33) {

 				Get();

 				Expression(out e);

 				while (!(la.kind == 0 || la.kind == 18)) {SynErr(126); Get();}

 				Expect(18);

 				req.Add(new MaybeFreeExpression(e, isFree)); 

-			} else if (la.kind == 31) {

+			} else if (la.kind == 34) {

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

@@ -857,7 +880,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expect(18);

 				ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs)); 

 			} else SynErr(128);

-		} else if (la.kind == 32) {

+		} else if (la.kind == 35) {

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decAttrs);

@@ -885,7 +908,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void FrameExpression(out FrameExpression/*!*/ fe) {

 		Contract.Ensures(Contract.ValueAtReturn(out fe) != null); Expression/*!*/ e;  IToken/*!*/ id;  string fieldName = null; 

 		Expression(out e);

-		if (la.kind == 48) {

+		if (la.kind == 49) {

 			Get();

 			Ident(out id);

 			fieldName = id.val; 

@@ -920,7 +943,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void GenericInstantiation(List<Type/*!*/>/*!*/ gt) {

 		Contract.Requires(cce.NonNullElements(gt)); Type/*!*/ ty; 

-		Expect(22);

+		Expect(25);

 		Type(out ty);

 		gt.Add(ty); 

 		while (la.kind == 20) {

@@ -928,7 +951,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Type(out ty);

 			gt.Add(ty); 

 		}

-		Expect(23);

+		Expect(26);

 	}

 

 	void ReferenceType(out IToken/*!*/ tok, out Type/*!*/ ty) {

@@ -937,7 +960,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken moduleName = null;

 		List<Type/*!*/>/*!*/ gt;

 		

-		if (la.kind == 42) {

+		if (la.kind == 43) {

 			Get();

 			tok = t;  ty = new ObjectType(); 

 		} else if (la.kind == 3) {

@@ -956,12 +979,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 1) {

 			Ident(out tok);

 			gt = new List<Type/*!*/>(); 

-			if (la.kind == 43) {

+			if (la.kind == 44) {

 				moduleName = tok; 

 				Get();

 				Ident(out tok);

 			}

-			if (la.kind == 22) {

+			if (la.kind == 25) {

 				GenericInstantiation(gt);

 			}

 			ty = new UserDefinedType(tok, tok.val, gt, moduleName); 

@@ -971,14 +994,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void FunctionSpec(List<Expression/*!*/>/*!*/ reqs, List<FrameExpression/*!*/>/*!*/ reads, List<Expression/*!*/>/*!*/ ens, List<Expression/*!*/>/*!*/ decreases) {

 		Contract.Requires(cce.NonNullElements(reqs)); Contract.Requires(cce.NonNullElements(reads)); Contract.Requires(cce.NonNullElements(decreases));

 		Expression/*!*/ e;  FrameExpression/*!*/ fe; 

-		if (la.kind == 30) {

-			while (!(la.kind == 0 || la.kind == 30)) {SynErr(132); Get();}

+		if (la.kind == 33) {

+			while (!(la.kind == 0 || la.kind == 33)) {SynErr(132); Get();}

 			Get();

 			Expression(out e);

 			while (!(la.kind == 0 || la.kind == 18)) {SynErr(133); Get();}

 			Expect(18);

 			reqs.Add(e); 

-		} else if (la.kind == 46) {

+		} else if (la.kind == 47) {

 			Get();

 			if (StartOf(11)) {

 				PossiblyWildFrameExpression(out fe);

@@ -991,13 +1014,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			while (!(la.kind == 0 || la.kind == 18)) {SynErr(134); Get();}

 			Expect(18);

-		} else if (la.kind == 31) {

+		} else if (la.kind == 34) {

 			Get();

 			Expression(out e);

 			while (!(la.kind == 0 || la.kind == 18)) {SynErr(135); Get();}

 			Expect(18);

 			ens.Add(e); 

-		} else if (la.kind == 32) {

+		} else if (la.kind == 35) {

 			Get();

 			DecreasesList(decreases, false);

 			while (!(la.kind == 0 || la.kind == 18)) {SynErr(136); Get();}

@@ -1016,7 +1039,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void PossiblyWildFrameExpression(out FrameExpression/*!*/ fe) {

 		Contract.Ensures(Contract.ValueAtReturn(out fe) != null); fe = dummyFrameExpr; 

-		if (la.kind == 47) {

+		if (la.kind == 48) {

 			Get();

 			fe = new FrameExpression(new WildcardExpr(t), null); 

 		} else if (StartOf(9)) {

@@ -1027,7 +1050,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void PossiblyWildExpression(out Expression/*!*/ e) {

 		Contract.Ensures(Contract.ValueAtReturn(out e)!=null);

 		e = dummyExpr; 

-		if (la.kind == 47) {

+		if (la.kind == 48) {

 			Get();

 			e = new WildcardExpr(t); 

 		} else if (StartOf(9)) {

@@ -1056,19 +1079,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			s = bs; 

 			break;

 		}

-		case 66: {

+		case 67: {

 			AssertStmt(out s);

 			break;

 		}

-		case 54: {

+		case 55: {

 			AssumeStmt(out s);

 			break;

 		}

-		case 67: {

+		case 68: {

 			PrintStmt(out s);

 			break;

 		}

-		case 1: case 2: case 17: case 33: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {

+		case 1: case 2: case 17: case 22: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {

 			UpdateStmt(out s);

 			break;

 		}

@@ -1076,23 +1099,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			VarDeclStatement(out s);

 			break;

 		}

-		case 59: {

+		case 60: {

 			IfStmt(out s);

 			break;

 		}

-		case 63: {

+		case 64: {

 			WhileStmt(out s);

 			break;

 		}

-		case 65: {

+		case 66: {

 			MatchStmt(out s);

 			break;

 		}

-		case 68: {

+		case 69: {

 			ParallelStmt(out s);

 			break;

 		}

-		case 49: {

+		case 50: {

 			Get();

 			x = t; 

 			Ident(out id);

@@ -1101,14 +1124,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			s.Labels = new LList<Label>(new Label(x, id.val), s.Labels); 

 			break;

 		}

-		case 50: {

+		case 51: {

 			Get();

 			x = t; breakCount = 1; label = null; 

 			if (la.kind == 1) {

 				Ident(out id);

 				label = id.val; 

-			} else if (la.kind == 18 || la.kind == 50) {

-				while (la.kind == 50) {

+			} else if (la.kind == 18 || la.kind == 51) {

+				while (la.kind == 51) {

 					Get();

 					breakCount++; 

 				}

@@ -1118,11 +1141,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			s = label != null ? new BreakStmt(x, label) : new BreakStmt(x, breakCount); 

 			break;

 		}

-		case 51: {

+		case 52: {

 			ReturnStmt(out s);

 			break;

 		}

-		case 27: {

+		case 30: {

 			Get();

 			s = new SkeletonStatement(t); 

 			Expect(18);

@@ -1136,14 +1159,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;

 		Expression/*!*/ e = null; Attributes attrs = null;

 		

-		Expect(66);

+		Expect(67);

 		x = t; s = null;

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

 		if (StartOf(9)) {

 			Expression(out e);

-		} else if (la.kind == 27) {

+		} else if (la.kind == 30) {

 			Get();

 		} else SynErr(144);

 		Expect(18);

@@ -1157,7 +1180,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void AssumeStmt(out Statement/*!*/ s) {

 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;  Expression/*!*/ e; 

-		Expect(54);

+		Expect(55);

 		x = t; 

 		Expression(out e);

 		Expect(18);

@@ -1168,7 +1191,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;  Attributes.Argument/*!*/ arg;

 		List<Attributes.Argument/*!*/> args = new List<Attributes.Argument/*!*/>();

 		

-		Expect(67);

+		Expect(68);

 		x = t; 

 		AttributeArg(out arg);

 		args.Add(arg); 

@@ -1199,14 +1222,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			Expect(18);

 			rhss.Add(new ExprRhs(e, attrs)); 

-		} else if (la.kind == 20 || la.kind == 52 || la.kind == 53) {

+		} else if (la.kind == 20 || la.kind == 53 || la.kind == 54) {

 			lhss.Add(e);  lhs0 = e; 

 			while (la.kind == 20) {

 				Get();

 				Lhs(out e);

 				lhss.Add(e); 

 			}

-			if (la.kind == 52) {

+			if (la.kind == 53) {

 				Get();

 				x = t; 

 				Rhs(out r, lhs0);

@@ -1216,10 +1239,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					Rhs(out r, lhs0);

 					rhss.Add(r); 

 				}

-			} else if (la.kind == 53) {

+			} else if (la.kind == 54) {

 				Get();

 				x = t; 

-				if (la.kind == 54) {

+				if (la.kind == 55) {

 					Get();

 					suchThatAssume = t; 

 				}

@@ -1260,8 +1283,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			LocalIdentTypeOptional(out d, isGhost);

 			lhss.Add(d); 

 		}

-		if (la.kind == 52 || la.kind == 53) {

-			if (la.kind == 52) {

+		if (la.kind == 53 || la.kind == 54) {

+			if (la.kind == 53) {

 				Get();

 				assignTok = t;

 				lhs0 = new IdentifierExpr(lhss[0].Tok, lhss[0].Name);

@@ -1277,7 +1300,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			} else {

 				Get();

 				assignTok = t; 

-				if (la.kind == 54) {

+				if (la.kind == 55) {

 					Get();

 					suchThatAssume = t; 

 				}

@@ -1316,19 +1339,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;

 		ifStmt = dummyStmt;  // to please the compiler

 		

-		Expect(59);

+		Expect(60);

 		x = t; 

-		if (la.kind == 27 || la.kind == 33) {

-			if (la.kind == 33) {

+		if (la.kind == 22 || la.kind == 30) {

+			if (la.kind == 22) {

 				Guard(out guard);

 			} else {

 				Get();

 				guardOmitted = true; 

 			}

 			BlockStmt(out thn, out bodyStart, out bodyEnd);

-			if (la.kind == 60) {

+			if (la.kind == 61) {

 				Get();

-				if (la.kind == 59) {

+				if (la.kind == 60) {

 					IfStmt(out s);

 					els = s; 

 				} else if (la.kind == 6) {

@@ -1361,10 +1384,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;

 		stmt = dummyStmt;  // to please the compiler

 		

-		Expect(63);

+		Expect(64);

 		x = t; 

-		if (la.kind == 27 || la.kind == 33) {

-			if (la.kind == 33) {

+		if (la.kind == 22 || la.kind == 30) {

+			if (la.kind == 22) {

 				Guard(out guard);

 				Contract.Assume(guard == null || cce.Owner.None(guard)); 

 			} else {

@@ -1374,7 +1397,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			LoopSpec(out invariants, out decreases, out mod, ref decAttrs, ref modAttrs);

 			if (la.kind == 6) {

 				BlockStmt(out body, out bodyStart, out bodyEnd);

-			} else if (la.kind == 27) {

+			} else if (la.kind == 30) {

 				Get();

 				bodyOmitted = true; 

 			} else SynErr(149);

@@ -1402,11 +1425,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null);

 		Token x;  Expression/*!*/ e;  MatchCaseStmt/*!*/ c;

 		List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>(); 

-		Expect(65);

+		Expect(66);

 		x = t; 

 		Expression(out e);

 		Expect(6);

-		while (la.kind == 61) {

+		while (la.kind == 62) {

 			CaseStatement(out c);

 			cases.Add(c); 

 		}

@@ -1426,9 +1449,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BlockStmt/*!*/ block;

 		IToken bodyStart, bodyEnd;

 		

-		Expect(68);

+		Expect(69);

 		x = t; 

-		Expect(33);

+		Expect(22);

 		if (la.kind == 1) {

 			List<BoundVar/*!*/> bvarsX;  Attributes attrsX;  Expression rangeX; 

 			QuantifierDomain(out bvarsX, out attrsX, out rangeX);

@@ -1438,14 +1461,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (bvars == null) { bvars = new List<BoundVar>(); }

 		if (range == null) { range = new LiteralExpr(x, true); }

 		

-		Expect(34);

-		while (la.kind == 29 || la.kind == 31) {

+		Expect(24);

+		while (la.kind == 32 || la.kind == 34) {

 			isFree = false; 

-			if (la.kind == 29) {

+			if (la.kind == 32) {

 				Get();

 				isFree = true; 

 			}

-			Expect(31);

+			Expect(34);

 			Expression(out e);

 			Expect(18);

 			ens.Add(new MaybeFreeExpression(e, isFree)); 

@@ -1459,7 +1482,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<AssignmentRhs> rhss = null;

 		AssignmentRhs r;

 		

-		Expect(51);

+		Expect(52);

 		returnTok = t; 

 		if (StartOf(14)) {

 			Rhs(out r, null);

@@ -1483,27 +1506,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		r = null;  // to please compiler

 		Attributes attrs = null;

 		

-		if (la.kind == 55) {

+		if (la.kind == 56) {

 			Get();

 			newToken = t; 

 			TypeAndToken(out x, out ty);

-			if (la.kind == 33 || la.kind == 43 || la.kind == 56) {

-				if (la.kind == 56) {

+			if (la.kind == 22 || la.kind == 44 || la.kind == 57) {

+				if (la.kind == 57) {

 					Get();

 					ee = new List<Expression>(); 

 					Expressions(ee);

-					Expect(57);

+					Expect(58);

 					UserDefinedType tmp = theBuiltIns.ArrayType(x, ee.Count, new IntType(), true);

 					

-				} else if (la.kind == 43) {

+				} else if (la.kind == 44) {

 					Get();

 					Ident(out x);

-					Expect(33);

+					Expect(22);

 					args = new List<Expression/*!*/>(); 

 					if (StartOf(9)) {

 						Expressions(args);

 					}

-					Expect(34);

+					Expect(24);

 					initCall = new CallStmt(x, new List<Expression>(), receiverForInitCall, x.val, args); 

 				} else {

 					Get();

@@ -1521,7 +1544,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					if (StartOf(9)) {

 						Expressions(args);

 					}

-					Expect(34);

+					Expect(24);

 					if (x != null) {

 					 initCall = new CallStmt(x, new List<Expression>(), receiverForInitCall, x.val, args);

 					}

@@ -1534,12 +1557,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 r = new TypeRhs(newToken, ty, initCall);

 			}

 			

-		} else if (la.kind == 58) {

+		} else if (la.kind == 59) {

 			Get();

 			x = t; 

 			Expression(out e);

 			r = new ExprRhs(new UnaryExpr(x, UnaryExpr.Opcode.SetChoose, e)); 

-		} else if (la.kind == 47) {

+		} else if (la.kind == 48) {

 			Get();

 			r = new HavocRhs(t); 

 		} else if (StartOf(9)) {

@@ -1557,13 +1580,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		if (la.kind == 1) {

 			DottedIdentifiersAndFunction(out e);

-			while (la.kind == 43 || la.kind == 56) {

+			while (la.kind == 44 || la.kind == 57) {

 				Suffix(ref e);

 			}

 		} else if (StartOf(15)) {

 			ConstAtomExpression(out e);

 			Suffix(ref e);

-			while (la.kind == 43 || la.kind == 56) {

+			while (la.kind == 44 || la.kind == 57) {

 				Suffix(ref e);

 			}

 		} else SynErr(152);

@@ -1582,15 +1605,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void Guard(out Expression e) {

 		Expression/*!*/ ee;  e = null; 

-		Expect(33);

-		if (la.kind == 47) {

+		Expect(22);

+		if (la.kind == 48) {

 			Get();

 			e = null; 

 		} else if (StartOf(9)) {

 			Expression(out ee);

 			e = ee; 

 		} else SynErr(153);

-		Expect(34);

+		Expect(24);

 	}

 

 	void AlternativeBlock(out List<GuardedAlternative> alternatives) {

@@ -1600,11 +1623,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Statement> body;

 		

 		Expect(6);

-		while (la.kind == 61) {

+		while (la.kind == 62) {

 			Get();

 			x = t; 

 			Expression(out e);

-			Expect(62);

+			Expect(63);

 			body = new List<Statement>(); 

 			while (StartOf(10)) {

 				Stmt(body);

@@ -1622,13 +1645,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		mod = null;

 		

 		while (StartOf(16)) {

-			if (la.kind == 29 || la.kind == 64) {

+			if (la.kind == 32 || la.kind == 65) {

 				Invariant(out invariant);

 				while (!(la.kind == 0 || la.kind == 18)) {SynErr(154); Get();}

 				Expect(18);

 				invariants.Add(invariant); 

-			} else if (la.kind == 32) {

-				while (!(la.kind == 0 || la.kind == 32)) {SynErr(155); Get();}

+			} else if (la.kind == 35) {

+				while (!(la.kind == 0 || la.kind == 35)) {SynErr(155); Get();}

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref decAttrs);

@@ -1637,7 +1660,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				while (!(la.kind == 0 || la.kind == 18)) {SynErr(156); Get();}

 				Expect(18);

 			} else {

-				while (!(la.kind == 0 || la.kind == 28)) {SynErr(157); Get();}

+				while (!(la.kind == 0 || la.kind == 31)) {SynErr(157); Get();}

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref modAttrs);

@@ -1660,12 +1683,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void Invariant(out MaybeFreeExpression/*!*/ invariant) {

 		bool isFree = false; Expression/*!*/ e; List<string> ids = new List<string>(); invariant = null; Attributes attrs = null; 

-		while (!(la.kind == 0 || la.kind == 29 || la.kind == 64)) {SynErr(159); Get();}

-		if (la.kind == 29) {

+		while (!(la.kind == 0 || la.kind == 32 || la.kind == 65)) {SynErr(159); Get();}

+		if (la.kind == 32) {

 			Get();

 			isFree = true; 

 		}

-		Expect(64);

+		Expect(65);

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

@@ -1680,10 +1703,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

 		List<Statement/*!*/> body = new List<Statement/*!*/>();

 		

-		Expect(61);

+		Expect(62);

 		x = t; 

 		Ident(out id);

-		if (la.kind == 33) {

+		if (la.kind == 22) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

@@ -1692,9 +1715,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

 			}

-			Expect(34);

+			Expect(24);

 		}

-		Expect(62);

+		Expect(63);

 		while (StartOf(10)) {

 			Stmt(body);

 		}

@@ -1737,7 +1760,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void EquivExpression(out Expression/*!*/ e0) {

 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 

 		ImpliesExpression(out e0);

-		while (la.kind == 69 || la.kind == 70) {

+		while (la.kind == 70 || la.kind == 71) {

 			EquivOp();

 			x = t; 

 			ImpliesExpression(out e1);

@@ -1748,7 +1771,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void ImpliesExpression(out Expression/*!*/ e0) {

 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 

 		LogicalExpression(out e0);

-		if (la.kind == 71 || la.kind == 72) {

+		if (la.kind == 72 || la.kind == 73) {

 			ImpliesOp();

 			x = t; 

 			ImpliesExpression(out e1);

@@ -1757,9 +1780,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void EquivOp() {

-		if (la.kind == 69) {

+		if (la.kind == 70) {

 			Get();

-		} else if (la.kind == 70) {

+		} else if (la.kind == 71) {

 			Get();

 		} else SynErr(161);

 	}

@@ -1768,12 +1791,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 

 		RelationalExpression(out e0);

 		if (StartOf(17)) {

-			if (la.kind == 73 || la.kind == 74) {

+			if (la.kind == 74 || la.kind == 75) {

 				AndOp();

 				x = t; 

 				RelationalExpression(out e1);

 				e0 = new BinaryExpr(x, BinaryExpr.Opcode.And, e0, e1); 

-				while (la.kind == 73 || la.kind == 74) {

+				while (la.kind == 74 || la.kind == 75) {

 					AndOp();

 					x = t; 

 					RelationalExpression(out e1);

@@ -1784,7 +1807,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				x = t; 

 				RelationalExpression(out e1);

 				e0 = new BinaryExpr(x, BinaryExpr.Opcode.Or, e0, e1); 

-				while (la.kind == 75 || la.kind == 76) {

+				while (la.kind == 76 || la.kind == 77) {

 					OrOp();

 					x = t; 

 					RelationalExpression(out e1);

@@ -1795,9 +1818,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void ImpliesOp() {

-		if (la.kind == 71) {

+		if (la.kind == 72) {

 			Get();

-		} else if (la.kind == 72) {

+		} else if (la.kind == 73) {

 			Get();

 		} else SynErr(162);

 	}

@@ -1893,17 +1916,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void AndOp() {

-		if (la.kind == 73) {

+		if (la.kind == 74) {

 			Get();

-		} else if (la.kind == 74) {

+		} else if (la.kind == 75) {

 			Get();

 		} else SynErr(163);

 	}

 

 	void OrOp() {

-		if (la.kind == 75) {

+		if (la.kind == 76) {

 			Get();

-		} else if (la.kind == 76) {

+		} else if (la.kind == 77) {

 			Get();

 		} else SynErr(164);

 	}

@@ -1924,17 +1947,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken y;

 		

 		switch (la.kind) {

-		case 77: {

+		case 23: {

 			Get();

 			x = t;  op = BinaryExpr.Opcode.Eq; 

 			break;

 		}

-		case 22: {

+		case 25: {

 			Get();

 			x = t;  op = BinaryExpr.Opcode.Lt; 

 			break;

 		}

-		case 23: {

+		case 26: {

 			Get();

 			x = t;  op = BinaryExpr.Opcode.Gt; 

 			break;

@@ -2004,7 +2027,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void Factor(out Expression/*!*/ e0) {

 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; 

 		UnaryExpression(out e0);

-		while (la.kind == 47 || la.kind == 89 || la.kind == 90) {

+		while (la.kind == 48 || la.kind == 89 || la.kind == 90) {

 			MulOp(out x, out op);

 			UnaryExpression(out e1);

 			e0 = new BinaryExpr(x, op, e0, e1); 

@@ -2039,32 +2062,32 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new UnaryExpr(x, UnaryExpr.Opcode.Not, e); 

 			break;

 		}

-		case 19: case 38: case 54: case 59: case 65: case 66: case 101: case 102: case 103: case 104: {

+		case 19: case 39: case 55: case 60: case 66: case 67: case 101: case 102: case 103: case 104: {

 			EndlessExpression(out e);

 			break;

 		}

 		case 1: {

 			DottedIdentifiersAndFunction(out e);

-			while (la.kind == 43 || la.kind == 56) {

+			while (la.kind == 44 || la.kind == 57) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 6: case 56: {

+		case 6: case 57: {

 			DisplayExpr(out e);

 			break;

 		}

-		case 39: {

+		case 40: {

 			MultiSetExpr(out e);

 			break;

 		}

-		case 41: {

+		case 42: {

 			MapExpr(out e);

 			break;

 		}

-		case 2: case 17: case 33: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {

+		case 2: case 17: case 22: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {

 			ConstAtomExpression(out e);

-			while (la.kind == 43 || la.kind == 56) {

+			while (la.kind == 44 || la.kind == 57) {

 				Suffix(ref e);

 			}

 			break;

@@ -2075,7 +2098,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void MulOp(out IToken/*!*/ x, out BinaryExpr.Opcode op) {

 		Contract.Ensures(Contract.ValueAtReturn(out x) != null); x = Token.NoToken;  op = BinaryExpr.Opcode.Add/*(dummy)*/; 

-		if (la.kind == 47) {

+		if (la.kind == 48) {

 			Get();

 			x = t;  op = BinaryExpr.Opcode.Mul; 

 		} else if (la.kind == 89) {

@@ -2103,18 +2126,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<BoundVar> letVars;  List<Expression> letRHSs;

 		

 		switch (la.kind) {

-		case 59: {

+		case 60: {

 			Get();

 			x = t; 

 			Expression(out e);

 			Expect(99);

 			Expression(out e0);

-			Expect(60);

+			Expect(61);

 			Expression(out e1);

 			e = new ITEExpr(x, e, e0, e1); 

 			break;

 		}

-		case 65: {

+		case 66: {

 			MatchExpression(out e);

 			break;

 		}

@@ -2122,11 +2145,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			QuantifierGuts(out e);

 			break;

 		}

-		case 38: {

+		case 39: {

 			ComprehensionExpr(out e);

 			break;

 		}

-		case 66: {

+		case 67: {

 			Get();

 			x = t; 

 			Expression(out e0);

@@ -2135,7 +2158,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new AssertExpr(x, e0, e1); 

 			break;

 		}

-		case 54: {

+		case 55: {

 			Get();

 			x = t; 

 			Expression(out e0);

@@ -2156,7 +2179,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				IdentTypeOptional(out d);

 				letVars.Add(d); 

 			}

-			Expect(52);

+			Expect(53);

 			Expression(out e);

 			letRHSs.Add(e); 

 			while (la.kind == 20) {

@@ -2180,18 +2203,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		Ident(out id);

 		idents.Add(id); 

-		while (la.kind == 43) {

+		while (la.kind == 44) {

 			Get();

 			Ident(out id);

 			idents.Add(id); 

 		}

-		if (la.kind == 33) {

+		if (la.kind == 22) {

 			Get();

 			openParen = t;  args = new List<Expression>(); 

 			if (StartOf(9)) {

 				Expressions(args);

 			}

-			Expect(34);

+			Expect(24);

 		}

 		e = new IdentifierSequence(idents, openParen, args); 

 	}

@@ -2202,20 +2225,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Expression> multipleIndices = null;

 		bool func = false;

 		

-		if (la.kind == 43) {

+		if (la.kind == 44) {

 			Get();

 			Ident(out id);

-			if (la.kind == 33) {

+			if (la.kind == 22) {

 				Get();

 				IToken openParen = t;  args = new List<Expression/*!*/>();  func = true; 

 				if (StartOf(9)) {

 					Expressions(args);

 				}

-				Expect(34);

+				Expect(24);

 				e = new FunctionCallExpr(id, id.val, e, openParen, args); 

 			}

 			if (!func) { e = new ExprDotName(id, e, id.val); } 

-		} else if (la.kind == 56) {

+		} else if (la.kind == 57) {

 			Get();

 			x = t; 

 			if (StartOf(9)) {

@@ -2228,11 +2251,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 						Expression(out ee);

 						e1 = ee; 

 					}

-				} else if (la.kind == 52) {

+				} else if (la.kind == 53) {

 					Get();

 					Expression(out ee);

 					e1 = ee; 

-				} else if (la.kind == 20 || la.kind == 57) {

+				} else if (la.kind == 20 || la.kind == 58) {

 					while (la.kind == 20) {

 						Get();

 						Expression(out ee);

@@ -2274,7 +2297,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 }

 			}

 			

-			Expect(57);

+			Expect(58);

 		} else SynErr(173);

 	}

 

@@ -2291,14 +2314,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			e = new SetDisplayExpr(x, elements);

 			Expect(7);

-		} else if (la.kind == 56) {

+		} else if (la.kind == 57) {

 			Get();

 			x = t;  elements = new List<Expression/*!*/>(); 

 			if (StartOf(9)) {

 				Expressions(elements);

 			}

 			e = new SeqDisplayExpr(x, elements); 

-			Expect(57);

+			Expect(58);

 		} else SynErr(174);

 	}

 

@@ -2307,7 +2330,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken/*!*/ x = null;  List<Expression/*!*/>/*!*/ elements;

 		e = dummyExpr;

 		

-		Expect(39);

+		Expect(40);

 		x = t; 

 		if (la.kind == 6) {

 			Get();

@@ -2317,12 +2340,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			e = new MultiSetDisplayExpr(x, elements);

 			Expect(7);

-		} else if (la.kind == 33) {

+		} else if (la.kind == 22) {

 			Get();

 			x = t;  elements = new List<Expression/*!*/>(); 

 			Expression(out e);

 			e = new MultiSetFormingExpr(x, e); 

-			Expect(34);

+			Expect(24);

 		} else if (StartOf(19)) {

 			SemErr("multiset must be followed by multiset literal or expression to coerce in parentheses."); 

 		} else SynErr(175);

@@ -2334,16 +2357,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<ExpressionPair/*!*/>/*!*/ elements;

 		e = dummyExpr;

 		

-		Expect(41);

+		Expect(42);

 		x = t; 

-		if (la.kind == 56) {

+		if (la.kind == 57) {

 			Get();

 			elements = new List<ExpressionPair/*!*/>(); 

 			if (StartOf(9)) {

 				MapLiteralExpressions(out elements);

 			}

 			e = new MapDisplayExpr(x, elements);

-			Expect(57);

+			Expect(58);

 		} else if (la.kind == 1) {

 			BoundVar/*!*/ bv;

 			List<BoundVar/*!*/> bvars = new List<BoundVar/*!*/>();

@@ -2396,27 +2419,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		case 96: {

 			Get();

 			x = t; 

-			Expect(33);

+			Expect(22);

 			Expression(out e);

-			Expect(34);

+			Expect(24);

 			e = new FreshExpr(x, e); 

 			break;

 		}

 		case 97: {

 			Get();

 			x = t; 

-			Expect(33);

+			Expect(22);

 			Expression(out e);

-			Expect(34);

+			Expect(24);

 			e = new AllocatedExpr(x, e); 

 			break;

 		}

 		case 98: {

 			Get();

 			x = t; 

-			Expect(33);

+			Expect(22);

 			Expression(out e);

-			Expect(34);

+			Expect(24);

 			e = new OldExpr(x, e); 

 			break;

 		}

@@ -2428,12 +2451,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expect(17);

 			break;

 		}

-		case 33: {

+		case 22: {

 			Get();

 			x = t; 

 			Expression(out e);

 			e = new ParensExpression(x, e); 

-			Expect(34);

+			Expect(24);

 			break;

 		}

 		default: SynErr(177); break;

@@ -2455,13 +2478,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ d, r;

 		elements = new List<ExpressionPair/*!*/>(); 

 		Expression(out d);

-		Expect(52);

+		Expect(53);

 		Expression(out r);

 		elements.Add(new ExpressionPair(d,r)); 

 		while (la.kind == 20) {

 			Get();

 			Expression(out d);

-			Expect(52);

+			Expect(53);

 			Expression(out r);

 			elements.Add(new ExpressionPair(d,r)); 

 		}

@@ -2479,10 +2502,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x;  MatchCaseExpr/*!*/ c;

 		List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();

 		

-		Expect(65);

+		Expect(66);

 		x = t; 

 		Expression(out e);

-		while (la.kind == 61) {

+		while (la.kind == 62) {

 			CaseExpression(out c);

 			cases.Add(c); 

 		}

@@ -2523,7 +2546,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ range;

 		Expression body = null;

 		

-		Expect(38);

+		Expect(39);

 		x = t; 

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

@@ -2549,10 +2572,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

 		Expression/*!*/ body;

 		

-		Expect(61);

+		Expect(62);

 		x = t; 

 		Ident(out id);

-		if (la.kind == 33) {

+		if (la.kind == 22) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

@@ -2561,9 +2584,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

 			}

-			Expect(34);

+			Expect(24);

 		}

-		Expect(62);

+		Expect(63);

 		Expression(out body);

 		c = new MatchCaseExpr(x, id.val, arguments, body); 

 	}

@@ -2617,27 +2640,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	static readonly bool[,]/*!*/ set = {

-		{T,T,T,x, x,x,T,x, T,x,x,x, T,x,T,T, x,T,T,T, x,x,x,x, T,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,T,x, x,x,x,T, x,x,x,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, x,x,x,T, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, T,x,x,x, T,T,T,T, x,x,x,T, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, x,x,x,T, x,T,T,x, T,T,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

-		{x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,T,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

-		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,x,x,T, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

-		{T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,T,x, x,x,x,T, x,x,x,T, x,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,T, x,x,x,x, x,x,T,T, T,x,T,T, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

-		{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

-		{x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,x,x, x,T,x,x, T,T,T,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,T,x, x},

-		{x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x}

+		{T,T,T,x, x,x,T,x, T,x,x,x, T,x,T,T, x,T,T,T, x,x,T,x, x,x,x,T, T,x,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,T, x,x,x,x, T,x,x,x, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, x,x,x,T, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, T,x,x,x, T,T,T,T, x,x,x,T, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, x,x,x,T, x,T,T,x, x,T,x,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

+		{x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,T, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

+		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

+		{T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,T, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, T,T,x,T, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},

+		{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

+		{x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,x, T,x,x,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,x, x,x,T,x, x,T,T,T, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,T,x, x},

+		{x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x}

 

 	};

 } // end Parser

@@ -2684,62 +2707,62 @@ public class Errors {
 			case 19: s = "\"var\" expected"; break;

 			case 20: s = "\",\" expected"; break;

 			case 21: s = "\"type\" expected"; break;

-			case 22: s = "\"<\" expected"; break;

-			case 23: s = "\">\" expected"; break;

-			case 24: s = "\"method\" expected"; break;

-			case 25: s = "\"constructor\" expected"; break;

-			case 26: s = "\"returns\" expected"; break;

-			case 27: s = "\"...\" expected"; break;

-			case 28: s = "\"modifies\" expected"; break;

-			case 29: s = "\"free\" expected"; break;

-			case 30: s = "\"requires\" expected"; break;

-			case 31: s = "\"ensures\" expected"; break;

-			case 32: s = "\"decreases\" expected"; break;

-			case 33: s = "\"(\" expected"; break;

-			case 34: s = "\")\" expected"; break;

-			case 35: s = "\"bool\" expected"; break;

-			case 36: s = "\"nat\" expected"; break;

-			case 37: s = "\"int\" expected"; break;

-			case 38: s = "\"set\" expected"; break;

-			case 39: s = "\"multiset\" expected"; break;

-			case 40: s = "\"seq\" expected"; break;

-			case 41: s = "\"map\" expected"; break;

-			case 42: s = "\"object\" expected"; break;

-			case 43: s = "\".\" expected"; break;

-			case 44: s = "\"function\" expected"; break;

-			case 45: s = "\"predicate\" expected"; break;

-			case 46: s = "\"reads\" expected"; break;

-			case 47: s = "\"*\" expected"; break;

-			case 48: s = "\"`\" expected"; break;

-			case 49: s = "\"label\" expected"; break;

-			case 50: s = "\"break\" expected"; break;

-			case 51: s = "\"return\" expected"; break;

-			case 52: s = "\":=\" expected"; break;

-			case 53: s = "\":|\" expected"; break;

-			case 54: s = "\"assume\" expected"; break;

-			case 55: s = "\"new\" expected"; break;

-			case 56: s = "\"[\" expected"; break;

-			case 57: s = "\"]\" expected"; break;

-			case 58: s = "\"choose\" expected"; break;

-			case 59: s = "\"if\" expected"; break;

-			case 60: s = "\"else\" expected"; break;

-			case 61: s = "\"case\" expected"; break;

-			case 62: s = "\"=>\" expected"; break;

-			case 63: s = "\"while\" expected"; break;

-			case 64: s = "\"invariant\" expected"; break;

-			case 65: s = "\"match\" expected"; break;

-			case 66: s = "\"assert\" expected"; break;

-			case 67: s = "\"print\" expected"; break;

-			case 68: s = "\"parallel\" expected"; break;

-			case 69: s = "\"<==>\" expected"; break;

-			case 70: s = "\"\\u21d4\" expected"; break;

-			case 71: s = "\"==>\" expected"; break;

-			case 72: s = "\"\\u21d2\" expected"; break;

-			case 73: s = "\"&&\" expected"; break;

-			case 74: s = "\"\\u2227\" expected"; break;

-			case 75: s = "\"||\" expected"; break;

-			case 76: s = "\"\\u2228\" expected"; break;

-			case 77: s = "\"==\" expected"; break;

+			case 22: s = "\"(\" expected"; break;

+			case 23: s = "\"==\" expected"; break;

+			case 24: s = "\")\" expected"; break;

+			case 25: s = "\"<\" expected"; break;

+			case 26: s = "\">\" expected"; break;

+			case 27: s = "\"method\" expected"; break;

+			case 28: s = "\"constructor\" expected"; break;

+			case 29: s = "\"returns\" expected"; break;

+			case 30: s = "\"...\" expected"; break;

+			case 31: s = "\"modifies\" expected"; break;

+			case 32: s = "\"free\" expected"; break;

+			case 33: s = "\"requires\" expected"; break;

+			case 34: s = "\"ensures\" expected"; break;

+			case 35: s = "\"decreases\" expected"; break;

+			case 36: s = "\"bool\" expected"; break;

+			case 37: s = "\"nat\" expected"; break;

+			case 38: s = "\"int\" expected"; break;

+			case 39: s = "\"set\" expected"; break;

+			case 40: s = "\"multiset\" expected"; break;

+			case 41: s = "\"seq\" expected"; break;

+			case 42: s = "\"map\" expected"; break;

+			case 43: s = "\"object\" expected"; break;

+			case 44: s = "\".\" expected"; break;

+			case 45: s = "\"function\" expected"; break;

+			case 46: s = "\"predicate\" expected"; break;

+			case 47: s = "\"reads\" expected"; break;

+			case 48: s = "\"*\" expected"; break;

+			case 49: s = "\"`\" expected"; break;

+			case 50: s = "\"label\" expected"; break;

+			case 51: s = "\"break\" expected"; break;

+			case 52: s = "\"return\" expected"; break;

+			case 53: s = "\":=\" expected"; break;

+			case 54: s = "\":|\" expected"; break;

+			case 55: s = "\"assume\" expected"; break;

+			case 56: s = "\"new\" expected"; break;

+			case 57: s = "\"[\" expected"; break;

+			case 58: s = "\"]\" expected"; break;

+			case 59: s = "\"choose\" expected"; break;

+			case 60: s = "\"if\" expected"; break;

+			case 61: s = "\"else\" expected"; break;

+			case 62: s = "\"case\" expected"; break;

+			case 63: s = "\"=>\" expected"; break;

+			case 64: s = "\"while\" expected"; break;

+			case 65: s = "\"invariant\" expected"; break;

+			case 66: s = "\"match\" expected"; break;

+			case 67: s = "\"assert\" expected"; break;

+			case 68: s = "\"print\" expected"; break;

+			case 69: s = "\"parallel\" expected"; break;

+			case 70: s = "\"<==>\" expected"; break;

+			case 71: s = "\"\\u21d4\" expected"; break;

+			case 72: s = "\"==>\" expected"; break;

+			case 73: s = "\"\\u21d2\" expected"; break;

+			case 74: s = "\"&&\" expected"; break;

+			case 75: s = "\"\\u2227\" expected"; break;

+			case 76: s = "\"||\" expected"; break;

+			case 77: s = "\"\\u2228\" expected"; break;

 			case 78: s = "\"<=\" expected"; break;

 			case 79: s = "\">=\" expected"; break;

 			case 80: s = "\"!=\" expected"; break;