1 files changed, 712 insertions, 662 deletions

diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index b812bf1d..9da363a2 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -32,7 +32,7 @@ public class Parser {
 	public const int _closeparen = 16;

 	public const int _star = 17;

 	public const int _notIn = 18;

-	public const int maxT = 127;

+	public const int maxT = 129;

 

 	const bool T = true;

 	const bool x = false;

@@ -255,6 +255,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		// to support multiple files, create a default module only if theModule is null

 		DefaultModuleDecl defaultModule = (DefaultModuleDecl)((LiteralModuleDecl)theModule).ModuleDef;

 		// theModule should be a DefaultModuleDecl (actually, the singular DefaultModuleDecl)

+		TraitDecl/*!*/ trait;

 		Contract.Assert(defaultModule != null);

 		

 		while (la.kind == 19) {

@@ -285,22 +286,27 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				defaultModule.TopLevelDecls.Add(c); 

 				break;

 			}

-			case 31: case 32: {

+			case 33: case 34: {

 				DatatypeDecl(defaultModule, out dt);

 				defaultModule.TopLevelDecls.Add(dt); 

 				break;

 			}

-			case 36: {

+			case 38: {

 				OtherTypeDecl(defaultModule, out td);

 				defaultModule.TopLevelDecls.Add(td); 

 				break;

 			}

-			case 38: {

+			case 40: {

 				IteratorDecl(defaultModule, out iter);

 				defaultModule.TopLevelDecls.Add(iter); 

 				break;

 			}

-			case 29: case 30: case 34: case 44: case 45: case 46: case 47: case 48: case 64: case 65: case 66: {

+			case 30: {

+				TraitDecl(defaultModule, out trait);

+				defaultModule.TopLevelDecls.Add(trait); 

+				break;

+			}

+			case 31: case 32: case 36: case 46: case 47: case 48: case 49: case 50: case 66: case 67: case 68: {

 				ClassMemberDecl(membersDefaultClass, false);

 				break;

 			}

@@ -324,6 +330,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 	void SubModuleDecl(ModuleDefinition parent, out ModuleDecl submodule) {

 		ClassDecl/*!*/ c; DatatypeDecl/*!*/ dt; TopLevelDecl td; IteratorDecl iter;

 		Attributes attrs = null;  IToken/*!*/ id;

+		TraitDecl/*!*/ trait;

 		List<MemberDecl/*!*/> namedModuleDefaultClassMembers = new List<MemberDecl>();;

 		List<IToken> idRefined = null, idPath = null, idAssignment = null;

 		ModuleDefinition module;

@@ -361,22 +368,27 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 					module.TopLevelDecls.Add(c); 

 					break;

 				}

-				case 31: case 32: {

+				case 30: {

+					TraitDecl(module, out trait);

+					module.TopLevelDecls.Add(trait); 

+					break;

+				}

+				case 33: case 34: {

 					DatatypeDecl(module, out dt);

 					module.TopLevelDecls.Add(dt); 

 					break;

 				}

-				case 36: {

+				case 38: {

 					OtherTypeDecl(module, out td);

 					module.TopLevelDecls.Add(td); 

 					break;

 				}

-				case 38: {

+				case 40: {

 					IteratorDecl(module, out iter);

 					module.TopLevelDecls.Add(iter); 

 					break;

 				}

-				case 29: case 30: case 34: case 44: case 45: case 46: case 47: case 48: case 64: case 65: case 66: {

+				case 31: case 32: case 36: case 46: case 47: case 48: case 49: case 50: case 66: case 67: case 68: {

 					ClassMemberDecl(namedModuleDefaultClassMembers, false);

 					break;

 				}

@@ -409,7 +421,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				}

 			}

 			if (la.kind == 8) {

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

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

 				Get();

 			}

 			if (submodule == null) {

@@ -418,34 +430,39 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			 submodule = new AliasModuleDecl(idPath, id, parent, opened);

 			}

 			

-		} else SynErr(129);

+		} else SynErr(131);

 	}

 

 	void ClassDecl(ModuleDefinition/*!*/ module, out ClassDecl/*!*/ c) {

 		Contract.Requires(module != null);

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

 		IToken/*!*/ id;

+		List<IToken>/*!*/ traitId=null;

 		Attributes attrs = null;

 		List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>();

 		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

 		IToken bodyStart;

 		

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

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

 		Expect(28);

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 42) {

+		if (la.kind == 44) {

 			GenericParameters(typeArgs);

 		}

+		if (la.kind == 29) {

+			Get();

+			QualifiedName(out traitId);

+		}

 		Expect(13);

 		bodyStart = t; 

 		while (StartOf(2)) {

 			ClassMemberDecl(members, true);

 		}

 		Expect(14);

-		c = new ClassDecl(id, id.val, module, typeArgs, members, attrs);

+		c = new ClassDecl(id, id.val, module, typeArgs, members, attrs, traitId);

 		c.BodyStartTok = bodyStart;

 		c.BodyEndTok = t;

 		

@@ -461,29 +478,29 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken bodyStart = Token.NoToken;  // dummy assignment

 		bool co = false;

 		

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

-		if (la.kind == 31) {

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

+		if (la.kind == 33) {

 			Get();

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

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

 			Get();

 			co = true; 

-		} else SynErr(132);

+		} else SynErr(134);

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 42) {

+		if (la.kind == 44) {

 			GenericParameters(typeArgs);

 		}

 		Expect(25);

 		bodyStart = t; 

 		DatatypeMemberDecl(ctors);

-		while (la.kind == 33) {

+		while (la.kind == 35) {

 			Get();

 			DatatypeMemberDecl(ctors);

 		}

 		if (la.kind == 8) {

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

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

 			Get();

 		}

 		if (co) {

@@ -504,21 +521,21 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		td = null;

 		Type ty;

 		

-		Expect(36);

+		Expect(38);

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

 		if (la.kind == 15) {

 			Get();

-			Expect(37);

+			Expect(39);

 			Expect(16);

 			eqSupport = TypeParameter.EqualitySupportValue.Required; 

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericParameters(typeArgs);

 			}

 		} else if (StartOf(3)) {

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericParameters(typeArgs);

 			}

 			if (la.kind == 25) {

@@ -526,13 +543,13 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				Type(out ty);

 				td = new TypeSynonymDecl(id, id.val, typeArgs, module, ty, attrs); 

 			}

-		} else SynErr(134);

+		} else SynErr(136);

 		if (td == null) {

 		 td = new OpaqueTypeDecl(id, id.val, module, eqSupport, typeArgs, attrs);

 		}

 		

 		if (la.kind == 8) {

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

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

 			Get();

 		}

 	}

@@ -561,19 +578,19 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

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

-		Expect(38);

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

+		Expect(40);

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 15 || la.kind == 42) {

-			if (la.kind == 42) {

+		if (la.kind == 15 || la.kind == 44) {

+			if (la.kind == 44) {

 				GenericParameters(typeArgs);

 			}

 			Formals(true, true, ins, out openParen);

-			if (la.kind == 39 || la.kind == 40) {

-				if (la.kind == 39) {

+			if (la.kind == 41 || la.kind == 42) {

+				if (la.kind == 41) {

 					Get();

 				} else {

 					Get();

@@ -581,10 +598,10 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				}

 				Formals(false, true, outs, out openParen);

 			}

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

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

 			Get();

 			signatureEllipsis = t; openParen = Token.NoToken; 

-		} else SynErr(137);

+		} else SynErr(139);

 		while (StartOf(4)) {

 			IteratorSpec(reads, mod, decreases, req, ens, yieldReq, yieldEns, ref readsAttrs, ref modAttrs, ref decrAttrs);

 		}

@@ -602,14 +619,44 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		

 	}

 

+	void TraitDecl(ModuleDefinition/*!*/ module, out TraitDecl/*!*/ trait) {

+		Contract.Requires(module != null);

+		Contract.Ensures(Contract.ValueAtReturn(out trait) != null);

+		IToken/*!*/ id;

+		Attributes attrs = null;

+		List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>(); //traits should not support type parameters at the moment

+		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

+		IToken bodyStart;

+		

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

+		Expect(30);

+		while (la.kind == 13) {

+			Attribute(ref attrs);

+		}

+		NoUSIdent(out id);

+		if (la.kind == 44) {

+			GenericParameters(typeArgs);

+		}

+		Expect(13);

+		bodyStart = t; 

+		while (StartOf(2)) {

+			ClassMemberDecl(members, true);

+		}

+		Expect(14);

+		trait = new TraitDecl(id, id.val, module, typeArgs, members, attrs);

+		trait.BodyStartTok = bodyStart;

+		trait.BodyEndTok = t;

+		

+	}

+

 	void ClassMemberDecl(List<MemberDecl/*!*/>/*!*/ mm, bool allowConstructors) {

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

 		Method/*!*/ m;

 		Function/*!*/ f;

 		MemberModifiers mmod = new MemberModifiers();

 		

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

-			if (la.kind == 29) {

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

+			if (la.kind == 31) {

 				Get();

 				mmod.IsGhost = true; 

 			} else {

@@ -617,15 +664,15 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				mmod.IsStatic = true; 

 			}

 		}

-		if (la.kind == 34) {

+		if (la.kind == 36) {

 			FieldDecl(mmod, mm);

-		} else if (la.kind == 64 || la.kind == 65 || la.kind == 66) {

+		} else if (la.kind == 66 || la.kind == 67 || la.kind == 68) {

 			FunctionDecl(mmod, out f);

 			mm.Add(f); 

 		} else if (StartOf(5)) {

 			MethodDecl(mmod, allowConstructors, out m);

 			mm.Add(m); 

-		} else SynErr(138);

+		} else SynErr(141);

 	}

 

 	void Attribute(ref Attributes attrs) {

@@ -648,7 +695,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken id; IToken idPrime; ids = new List<IToken>(); 

 		Ident(out id);

 		ids.Add(id); 

-		while (la.kind == 63) {

+		while (la.kind == 65) {

 			IdentOrDigitsSuffix(out id, out idPrime);

 			ids.Add(id);

 			if (idPrime != null) { ids.Add(idPrime); }

@@ -667,7 +714,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		x = Token.NoToken;

 		y = null;

 		

-		Expect(63);

+		Expect(65);

 		if (la.kind == 1) {

 			Get();

 			x = t; 

@@ -701,7 +748,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		} else if (la.kind == 11) {

 			Get();

 			x = t; 

-		} else SynErr(139);

+		} else SynErr(142);

 	}

 

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

@@ -709,29 +756,29 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken/*!*/ id;

 		TypeParameter.EqualitySupportValue eqSupport;

 		

-		Expect(42);

+		Expect(44);

 		NoUSIdent(out id);

 		eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

 		if (la.kind == 15) {

 			Get();

-			Expect(37);

+			Expect(39);

 			Expect(16);

 			eqSupport = TypeParameter.EqualitySupportValue.Required; 

 		}

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

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			NoUSIdent(out id);

 			eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

 			if (la.kind == 15) {

 				Get();

-				Expect(37);

+				Expect(39);

 				Expect(16);

 				eqSupport = TypeParameter.EqualitySupportValue.Required; 

 			}

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

 		}

-		Expect(43);

+		Expect(45);

 	}

 

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

@@ -739,8 +786,8 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		Attributes attrs = null;

 		IToken/*!*/ id;  Type/*!*/ ty;

 		

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

-		Expect(34);

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

+		Expect(36);

 		if (mmod.IsStatic) { SemErr(t, "fields cannot be declared 'static'"); }

 		

 		while (la.kind == 13) {

@@ -748,12 +795,12 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		}

 		FIdentType(out id, out ty);

 		mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs)); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			FIdentType(out id, out ty);

 			mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs)); 

 		}

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

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

 		Expect(8);

 	}

 

@@ -776,9 +823,9 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken bodyEnd = Token.NoToken;

 		IToken signatureEllipsis = null;

 		

-		if (la.kind == 64) {

+		if (la.kind == 66) {

 			Get();

-			if (la.kind == 44) {

+			if (la.kind == 46) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -788,22 +835,22 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

-			if (la.kind == 15 || la.kind == 42) {

-				if (la.kind == 42) {

+			if (la.kind == 15 || la.kind == 44) {

+				if (la.kind == 44) {

 					GenericParameters(typeArgs);

 				}

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

 				Expect(7);

 				Type(out returnType);

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

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

 				Get();

 				signatureEllipsis = t;

 				openParen = Token.NoToken; 

-			} else SynErr(142);

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

+			} else SynErr(145);

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

 			Get();

 			isPredicate = true; 

-			if (la.kind == 44) {

+			if (la.kind == 46) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -814,7 +861,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			}

 			NoUSIdent(out id);

 			if (StartOf(6)) {

-				if (la.kind == 42) {

+				if (la.kind == 44) {

 					GenericParameters(typeArgs);

 				}

 				if (la.kind == 15) {

@@ -824,12 +871,12 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 						SemErr(t, "predicates do not have an explicitly declared return type; it is always bool"); 

 					}

 				}

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

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

 				Get();

 				signatureEllipsis = t;

 				openParen = Token.NoToken; 

-			} else SynErr(143);

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

+			} else SynErr(146);

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

 			Get();

 			isCoPredicate = true; 

 			if (mmod.IsGhost) { SemErr(t, "copredicates cannot be declared 'ghost' (they are ghost by default)"); }

@@ -839,7 +886,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			}

 			NoUSIdent(out id);

 			if (StartOf(6)) {

-				if (la.kind == 42) {

+				if (la.kind == 44) {

 					GenericParameters(typeArgs);

 				}

 				if (la.kind == 15) {

@@ -849,12 +896,12 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 						SemErr(t, "copredicates do not have an explicitly declared return type; it is always bool"); 

 					}

 				}

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

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

 				Get();

 				signatureEllipsis = t;

 				openParen = Token.NoToken; 

-			} else SynErr(144);

-		} else SynErr(145);

+			} else SynErr(147);

+		} else SynErr(148);

 		decreases = isCoPredicate ? null : new List<Expression/*!*/>(); 

 		while (StartOf(7)) {

 			FunctionSpec(reqs, reads, ens, decreases);

@@ -905,21 +952,21 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

-		while (!(StartOf(8))) {SynErr(146); Get();}

-		if (la.kind == 44) {

+		while (!(StartOf(8))) {SynErr(149); Get();}

+		if (la.kind == 46) {

 			Get();

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

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

 			Get();

 			isLemma = true; 

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

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

 			Get();

 			isCoLemma = true; 

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

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

 			Get();

 			isCoLemma = true;

 			errors.Warning(t, "the 'comethod' keyword has been deprecated; it has been renamed to 'colemma'");

 			

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

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

 			Get();

 			if (allowConstructor) {

 			 isConstructor = true;

@@ -927,7 +974,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			 SemErr(t, "constructors are only allowed in classes");

 			}

 			

-		} else SynErr(147);

+		} else SynErr(150);

 		keywordToken = t; 

 		if (isLemma) {

 		 if (mmod.IsGhost) {

@@ -960,20 +1007,20 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		 }

 		}

 		

-		if (la.kind == 15 || la.kind == 42) {

-			if (la.kind == 42) {

+		if (la.kind == 15 || la.kind == 44) {

+			if (la.kind == 44) {

 				GenericParameters(typeArgs);

 			}

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

-			if (la.kind == 40) {

+			if (la.kind == 42) {

 				Get();

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

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

 			}

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

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

 			Get();

 			signatureEllipsis = t; openParen = Token.NoToken; 

-		} else SynErr(148);

+		} else SynErr(151);

 		while (StartOf(9)) {

 			MethodSpec(req, mod, ens, dec, ref decAttrs, ref modAttrs);

 		}

@@ -1029,7 +1076,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		if (StartOf(10)) {

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

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

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

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

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

@@ -1047,7 +1094,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		} else if (la.kind == 2) {

 			Get();

 			id = t; 

-		} else SynErr(149);

+		} else SynErr(152);

 		Expect(7);

 		Type(out ty);

 	}

@@ -1061,7 +1108,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		Contract.Ensures(Contract.ValueAtReturn(out id)!=null);

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

 		isGhost = false; 

-		if (la.kind == 29) {

+		if (la.kind == 31) {

 			Get();

 			if (allowGhostKeyword) { isGhost = true; } else { SemErr(t, "formal cannot be declared 'ghost' in this context"); } 

 		}

@@ -1119,7 +1166,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		Contract.Ensures(Contract.ValueAtReturn(out ty)!=null);

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

 		string name = null; id = Token.NoToken; ty = new BoolType()/*dummy*/; isGhost = false; 

-		if (la.kind == 29) {

+		if (la.kind == 31) {

 			Get();

 			isGhost = true; 

 		}

@@ -1141,7 +1188,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			id = t; name = id.val;

 			Expect(7);

 			Type(out ty);

-		} else SynErr(150);

+		} else SynErr(153);

 		if (name != null) {

 		 identName = name;

 		} else {

@@ -1156,30 +1203,30 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		List<Type> gt = null;

 		

 		switch (la.kind) {

-		case 54: {

+		case 56: {

 			Get();

 			tok = t; 

 			break;

 		}

-		case 55: {

+		case 57: {

 			Get();

 			tok = t;  ty = new NatType(); 

 			break;

 		}

-		case 56: {

+		case 58: {

 			Get();

 			tok = t;  ty = new IntType(); 

 			break;

 		}

-		case 57: {

+		case 59: {

 			Get();

 			tok = t;  ty = new RealType(); 

 			break;

 		}

-		case 58: {

+		case 60: {

 			Get();

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

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

 			if (gt.Count > 1) {

@@ -1189,10 +1236,10 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			

 			break;

 		}

-		case 59: {

+		case 61: {

 			Get();

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

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

 			if (gt.Count > 1) {

@@ -1202,10 +1249,10 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			

 			break;

 		}

-		case 60: {

+		case 62: {

 			Get();

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

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

 			if (gt.Count > 1) {

@@ -1215,10 +1262,10 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			

 			break;

 		}

-		case 61: {

+		case 63: {

 			Get();

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

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

 			if (gt.Count == 0) {

@@ -1238,7 +1285,7 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			if (StartOf(11)) {

 				Type(out ty);

 				gt.Add(ty); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					Type(out ty);

 					gt.Add(ty); 

@@ -1256,11 +1303,11 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 			

 			break;

 		}

-		case 1: case 5: case 62: {

+		case 1: case 5: case 64: {

 			ReferenceType(out tok, out ty);

 			break;

 		}

-		default: SynErr(151); break;

+		default: SynErr(154); break;

 		}

 		if (la.kind == 10) {

 			Type t2; 

@@ -1278,10 +1325,10 @@ bool CloseOptionalBrace(bool usesOptionalBrace) {
 		Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id;  Type/*!*/ ty;  bool isGhost; 

 		Expect(15);

 		openParen = t; 

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

+		if (la.kind == 1 || la.kind == 31) {

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

 			formals.Add(new Formal(id, id.val, ty, incoming, isGhost)); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

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

 				formals.Add(new Formal(id, id.val, ty, incoming, isGhost)); 

@@ -1296,7 +1343,7 @@ List<MaybeFreeExpression/*!*/>/*!*/ yieldReq, List<MaybeFreeExpression/*!*/>/*!*
 ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {

 		Expression/*!*/ e; FrameExpression/*!*/ fe; bool isFree = false; bool isYield = false; Attributes ensAttrs = null;

 		

-		while (!(StartOf(12))) {SynErr(152); Get();}

+		while (!(StartOf(12))) {SynErr(155); Get();}

 		if (la.kind == 11) {

 			Get();

 			while (IsAttribute()) {

@@ -1305,15 +1352,15 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			if (StartOf(13)) {

 				FrameExpression(out fe);

 				reads.Add(fe); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					FrameExpression(out fe);

 					reads.Add(fe); 

 				}

 			}

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

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

 			Expect(8);

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

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref modAttrs);

@@ -1321,27 +1368,27 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			if (StartOf(13)) {

 				FrameExpression(out fe);

 				mod.Add(fe); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					FrameExpression(out fe);

 					mod.Add(fe); 

 				}

 			}

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

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

 			Expect(8);

 		} else if (StartOf(14)) {

-			if (la.kind == 50) {

+			if (la.kind == 52) {

 				Get();

 				isFree = true; 

 			}

-			if (la.kind == 53) {

+			if (la.kind == 55) {

 				Get();

 				isYield = true; 

 			}

 			if (la.kind == 12) {

 				Get();

 				Expression(out e, false, true);

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

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

 				Expect(8);

 				if (isYield) {

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

@@ -1349,13 +1396,13 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 				req.Add(new MaybeFreeExpression(e, isFree));

 				}

 				

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

 				}

 				Expression(out e, false, true);

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

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

 				Expect(8);

 				if (isYield) {

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

@@ -1363,16 +1410,16 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 				ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs));

 				}

 				

-			} else SynErr(157);

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

+			} else SynErr(160);

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decrAttrs);

 			}

 			DecreasesList(decreases, false);

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

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

 			Expect(8);

-		} else SynErr(159);

+		} else SynErr(162);

 	}

 

 	void BlockStmt(out BlockStmt/*!*/ block, out IToken bodyStart, out IToken bodyEnd) {

@@ -1394,8 +1441,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Requires(cce.NonNullElements(req)); Contract.Requires(cce.NonNullElements(mod)); Contract.Requires(cce.NonNullElements(ens)); Contract.Requires(cce.NonNullElements(decreases));

 		Expression/*!*/ e;  FrameExpression/*!*/ fe;  bool isFree = false; Attributes ensAttrs = null;

 		

-		while (!(StartOf(16))) {SynErr(160); Get();}

-		if (la.kind == 49) {

+		while (!(StartOf(16))) {SynErr(163); Get();}

+		if (la.kind == 51) {

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref modAttrs);

@@ -1403,44 +1450,44 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(13)) {

 				FrameExpression(out fe);

 				mod.Add(fe); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					FrameExpression(out fe);

 					mod.Add(fe); 

 				}

 			}

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

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

 			Expect(8);

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

-			if (la.kind == 50) {

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

+			if (la.kind == 52) {

 				Get();

 				isFree = true; 

 			}

 			if (la.kind == 12) {

 				Get();

 				Expression(out e, false, true);

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

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

 				Expect(8);

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

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

 				}

 				Expression(out e, false, true);

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

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

 				Expect(8);

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

-			} else SynErr(164);

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

+			} else SynErr(167);

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decAttrs);

 			}

 			DecreasesList(decreases, true);

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

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

 			Expect(8);

-		} else SynErr(166);

+		} else SynErr(169);

 	}

 

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

@@ -1453,18 +1500,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(17)) {

 			Expression(out e, false, false);

 			feTok = e.tok; 

-			if (la.kind == 67) {

+			if (la.kind == 69) {

 				Get();

 				Ident(out id);

 				fieldName = id.val;  feTok = id; 

 			}

 			fe = new FrameExpression(feTok, e, fieldName); 

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

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

 			Get();

 			Ident(out id);

 			fieldName = id.val; 

 			fe = new FrameExpression(id, new ImplicitThisExpr(id), fieldName); 

-		} else SynErr(167);

+		} else SynErr(170);

 	}

 

 	void Expression(out Expression e, bool allowSemi, bool allowLambda) {

@@ -1490,7 +1537,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		 decreases.Add(e);

 		}

 		

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			PossiblyWildExpression(out e);

 			if (!allowWildcard && e is WildcardExpr) {

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

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

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

-		Expect(42);

+		Expect(44);

 		Type(out ty);

 		gt.Add(ty); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			Type(out ty);

 			gt.Add(ty); 

 		}

-		Expect(43);

+		Expect(45);

 	}

 

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

@@ -1521,13 +1568,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Type> gt;

 		List<IToken> path;

 		

-		if (la.kind == 62) {

+		if (la.kind == 64) {

 			Get();

 			tok = t;  ty = new ObjectType(); 

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

 			Get();

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

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

 			int dims = tok.val.Length == 5 ? 1 : int.Parse(tok.val.Substring(5));

@@ -1537,16 +1584,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Ident(out tok);

 			gt = new List<Type>();

 			path = new List<IToken>(); 

-			while (la.kind == 63) {

+			while (la.kind == 65) {

 				path.Add(tok); 

 				Get();

 				Ident(out tok);

 			}

-			if (la.kind == 42) {

+			if (la.kind == 44) {

 				GenericInstantiation(gt);

 			}

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

-		} else SynErr(168);

+		} else SynErr(171);

 	}

 

 	void FunctionSpec(List<Expression/*!*/>/*!*/ reqs, List<FrameExpression/*!*/>/*!*/ reads, List<Expression/*!*/>/*!*/ ens, List<Expression/*!*/> decreases) {

@@ -1555,10 +1602,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Requires(decreases == null || cce.NonNullElements(decreases));

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

 		if (la.kind == 12) {

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

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

 			Get();

 			Expression(out e, false, true);

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

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

 			Expect(8);

 			reqs.Add(e); 

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

@@ -1566,21 +1613,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(18)) {

 				PossiblyWildFrameExpression(out fe);

 				reads.Add(fe); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					PossiblyWildFrameExpression(out fe);

 					reads.Add(fe); 

 				}

 			}

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

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

 			Expect(8);

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

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

 			Get();

 			Expression(out e, false, true);

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

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

 			Expect(8);

 			ens.Add(e); 

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

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

 			Get();

 			if (decreases == null) {

 			 SemErr(t, "'decreases' clauses are meaningless for copredicates, so they are not allowed");

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

 			

 			DecreasesList(decreases, false);

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

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

 			Expect(8);

-		} else SynErr(174);

+		} else SynErr(177);

 	}

 

 	void FunctionBody(out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd) {

@@ -1609,7 +1656,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			fe = new FrameExpression(t, new WildcardExpr(t), null); 

 		} else if (StartOf(13)) {

 			FrameExpression(out fe);

-		} else SynErr(175);

+		} else SynErr(178);

 	}

 

 	void LambdaSpec(out Expression req, List<FrameExpression> reads) {

@@ -1641,7 +1688,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new WildcardExpr(t); 

 		} else if (StartOf(17)) {

 			Expression(out e, false, false);

-		} else SynErr(176);

+		} else SynErr(179);

 	}

 

 	void Stmt(List<Statement/*!*/>/*!*/ ss) {

@@ -1658,58 +1705,58 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken bodyStart, bodyEnd;

 		int breakCount;

 		

-		while (!(StartOf(19))) {SynErr(177); Get();}

+		while (!(StartOf(19))) {SynErr(180); Get();}

 		switch (la.kind) {

 		case 13: {

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

 			s = bs; 

 			break;

 		}

-		case 84: {

+		case 86: {

 			AssertStmt(out s);

 			break;

 		}

-		case 74: {

+		case 76: {

 			AssumeStmt(out s);

 			break;

 		}

-		case 85: {

+		case 87: {

 			PrintStmt(out s);

 			break;

 		}

-		case 1: case 2: case 3: case 4: case 15: case 33: case 56: case 57: case 114: case 115: case 116: case 117: case 118: case 119: {

+		case 1: case 2: case 3: case 4: case 15: case 35: case 58: case 59: case 116: case 117: case 118: case 119: case 120: case 121: {

 			UpdateStmt(out s);

 			break;

 		}

-		case 29: case 34: {

+		case 31: case 36: {

 			VarDeclStatement(out s);

 			break;

 		}

-		case 78: {

+		case 80: {

 			IfStmt(out s);

 			break;

 		}

-		case 81: {

+		case 83: {

 			WhileStmt(out s);

 			break;

 		}

-		case 83: {

+		case 85: {

 			MatchStmt(out s);

 			break;

 		}

-		case 86: case 87: {

+		case 88: case 89: {

 			ForallStmt(out s);

 			break;

 		}

-		case 89: {

+		case 91: {

 			CalcStmt(out s);

 			break;

 		}

-		case 88: {

+		case 90: {

 			ModifyStmt(out s);

 			break;

 		}

-		case 68: {

+		case 70: {

 			Get();

 			x = t; 

 			NoUSIdent(out id);

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

 			break;

 		}

-		case 69: {

+		case 71: {

 			Get();

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

 			if (la.kind == 1) {

 				NoUSIdent(out id);

 				label = id.val; 

-			} else if (la.kind == 8 || la.kind == 69) {

-				while (la.kind == 69) {

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

+				while (la.kind == 71) {

 					Get();

 					breakCount++; 

 				}

-			} else SynErr(178);

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

+			} else SynErr(181);

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

 			Expect(8);

 			s = label != null ? new BreakStmt(x, t, label) : new BreakStmt(x, t, breakCount); 

 			break;

 		}

-		case 53: case 72: {

+		case 55: case 74: {

 			ReturnStmt(out s);

 			break;

 		}

-		case 41: {

+		case 43: {

 			SkeletonStmt(out s);

 			break;

 		}

-		default: SynErr(180); break;

+		default: SynErr(183); break;

 		}

 	}

 

@@ -1752,17 +1799,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression e = dummyExpr; Attributes attrs = null;

 		IToken dotdotdot = null;

 		

-		Expect(84);

+		Expect(86);

 		x = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

 		if (StartOf(17)) {

 			Expression(out e, false, true);

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

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

 			Get();

 			dotdotdot = t; 

-		} else SynErr(181);

+		} else SynErr(184);

 		Expect(8);

 		if (dotdotdot != null) {

 		 s = new SkeletonStatement(new AssertStmt(x, t, new LiteralExpr(x, true), attrs), dotdotdot, null);

@@ -1777,17 +1824,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression e = dummyExpr; Attributes attrs = null;

 		IToken dotdotdot = null;

 		

-		Expect(74);

+		Expect(76);

 		x = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

 		if (StartOf(17)) {

 			Expression(out e, false, true);

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

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

 			Get();

 			dotdotdot = t; 

-		} else SynErr(182);

+		} else SynErr(185);

 		Expect(8);

 		if (dotdotdot != null) {

 		 s = new SkeletonStatement(new AssumeStmt(x, t, new LiteralExpr(x, true), attrs), dotdotdot, null);

@@ -1801,11 +1848,11 @@ 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(85);

+		Expect(87);

 		x = t; 

 		AttributeArg(out arg, false);

 		args.Add(arg); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			AttributeArg(out arg, false);

 			args.Add(arg); 

@@ -1832,38 +1879,38 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			Expect(8);

 			endTok = t; rhss.Add(new ExprRhs(e, attrs)); 

-		} else if (la.kind == 35 || la.kind == 71 || la.kind == 73) {

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

 			lhss.Add(e);  lhs0 = e; 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				Lhs(out e);

 				lhss.Add(e); 

 			}

-			if (la.kind == 71) {

+			if (la.kind == 73) {

 				Get();

 				x = t; 

 				Rhs(out r, lhs0);

 				rhss.Add(r); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					Rhs(out r, lhs0);

 					rhss.Add(r); 

 				}

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

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

 				Get();

 				x = t; 

-				if (la.kind == 74) {

+				if (la.kind == 76) {

 					Get();

 					suchThatAssume = t; 

 				}

 				Expression(out suchThat, false, true);

-			} else SynErr(183);

+			} else SynErr(186);

 			Expect(8);

 			endTok = t; 

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

 			Get();

 			SemErr(t, "invalid statement (did you forget the 'label' keyword?)"); 

-		} else SynErr(184);

+		} else SynErr(187);

 		if (suchThat != null) {

 		 s = new AssignSuchThatStmt(x, endTok, lhss, suchThat, suchThatAssume);

 		} else {

@@ -1887,18 +1934,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Attributes attrs = null;

 		IToken endTok;

 		

-		if (la.kind == 29) {

+		if (la.kind == 31) {

 			Get();

 			isGhost = true;  x = t; 

 		}

-		Expect(34);

+		Expect(36);

 		if (!isGhost) { x = t; } 

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

 		LocalIdentTypeOptional(out d, isGhost);

 		lhss.Add(d); d.Attributes = attrs; attrs = null; 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			while (la.kind == 13) {

 				Attribute(ref attrs);

@@ -1906,15 +1953,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			LocalIdentTypeOptional(out d, isGhost);

 			lhss.Add(d); d.Attributes = attrs; attrs = null; 

 		}

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

-			if (la.kind == 71) {

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

+			if (la.kind == 73) {

 				Get();

 				assignTok = t;

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

 				

 				Rhs(out r, lhs0);

 				rhss.Add(r); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					Rhs(out r, lhs0);

 					rhss.Add(r); 

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

 				Get();

 				assignTok = t; 

-				if (la.kind == 74) {

+				if (la.kind == 76) {

 					Get();

 					suchThatAssume = t; 

 				}

@@ -1962,7 +2009,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;

 		ifStmt = dummyStmt;  // to please the compiler

 		

-		Expect(78);

+		Expect(80);

 		x = t; 

 		if (IsAlternative()) {

 			AlternativeBlock(out alternatives, out endTok);

@@ -1976,15 +2023,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

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

 			endTok = thn.EndTok; 

-			if (la.kind == 79) {

+			if (la.kind == 81) {

 				Get();

-				if (la.kind == 78) {

+				if (la.kind == 80) {

 					IfStmt(out s);

 					els = s; endTok = s.EndTok; 

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

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

 					els = bs; endTok = bs.EndTok; 

-				} else SynErr(185);

+				} else SynErr(188);

 			}

 			if (guardEllipsis != null) {

 			 ifStmt = new SkeletonStatement(new IfStmt(x, endTok, guard, thn, els), guardEllipsis, null);

@@ -1992,7 +2039,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 ifStmt = new IfStmt(x, endTok, guard, thn, els);

 			}

 			

-		} else SynErr(186);

+		} else SynErr(189);

 	}

 

 	void WhileStmt(out Statement/*!*/ stmt) {

@@ -2008,7 +2055,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;

 		stmt = dummyStmt;  // to please the compiler

 		

-		Expect(81);

+		Expect(83);

 		x = t; 

 		if (IsLoopSpecOrAlternative()) {

 			LoopSpec(out invariants, out decreases, out mod, ref decAttrs, ref modAttrs);

@@ -2026,10 +2073,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (la.kind == 13) {

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

 				endTok = body.EndTok; 

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

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

 				Get();

 				bodyEllipsis = t; endTok = t; 

-			} else SynErr(187);

+			} else SynErr(190);

 			if (guardEllipsis != null || bodyEllipsis != null) {

 			 if (mod != null) {

 			   SemErr(mod[0].E.tok, "'modifies' clauses are not allowed on refining loops");

@@ -2045,7 +2092,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 stmt = new WhileStmt(x, endTok, guard, invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), body);

 			}

 			

-		} else SynErr(188);

+		} else SynErr(191);

 	}

 

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

@@ -2054,14 +2101,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>();

 		bool usesOptionalBrace = false;

 		

-		Expect(83);

+		Expect(85);

 		x = t; 

 		Expression(out e, true, true);

 		if (la.kind == 13) {

 			Get();

 			usesOptionalBrace = true; 

 		}

-		while (la.kind == 80) {

+		while (la.kind == 82) {

 			CaseStatement(out c);

 			cases.Add(c); 

 		}

@@ -2069,7 +2116,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expect(14);

 		} else if (StartOf(22)) {

 			if (usesOptionalBrace) { SemErr(t, "expecting close curly brace"); } 

-		} else SynErr(189);

+		} else SynErr(192);

 		s = new MatchStmt(x, t, e, cases, usesOptionalBrace); 

 	}

 

@@ -2087,15 +2134,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken bodyStart, bodyEnd;

 		IToken tok = Token.NoToken;

 		

-		if (la.kind == 86) {

+		if (la.kind == 88) {

 			Get();

 			x = t; tok = x; 

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

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

 			Get();

 			x = t;

 			errors.Warning(t, "the 'parallel' keyword has been deprecated; the comprehension statement now uses the keyword 'forall' (and the parentheses around the bound variables are now optional)");

 			

-		} else SynErr(190);

+		} else SynErr(193);

 		if (la.kind == 15) {

 			Get();

 			usesOptionalParen = true; 

@@ -2113,14 +2160,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expect(16);

 		} else if (StartOf(23)) {

 			if (usesOptionalParen) { SemErr(t, "expecting close parenthesis"); } 

-		} else SynErr(191);

-		while (la.kind == 50 || la.kind == 51) {

+		} else SynErr(194);

+		while (la.kind == 52 || la.kind == 53) {

 			isFree = false; 

-			if (la.kind == 50) {

+			if (la.kind == 52) {

 				Get();

 				isFree = true; 

 			}

-			Expect(51);

+			Expect(53);

 			Expression(out e, false, true);

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

 			Expect(8);

@@ -2154,7 +2201,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken opTok;

 		IToken danglingOperator = null;

 		

-		Expect(89);

+		Expect(91);

 		x = t; 

 		if (StartOf(24)) {

 			CalcOp(out opTok, out calcOp);

@@ -2207,7 +2254,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BlockStmt body = null;  IToken bodyStart;

 		IToken ellipsisToken = null;

 		

-		Expect(88);

+		Expect(90);

 		tok = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

@@ -2216,7 +2263,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(13)) {

 				FrameExpression(out fe);

 				mod.Add(fe); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					FrameExpression(out fe);

 					mod.Add(fe); 

@@ -2229,10 +2276,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (la.kind == 13) {

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

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

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

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

 			Get();

 			endTok = t; 

-		} else SynErr(193);

+		} else SynErr(196);

 		s = new ModifyStmt(tok, endTok, mod, attrs, body);

 		if (ellipsisToken != null) {

 		 s = new SkeletonStatement(s, ellipsisToken, null);

@@ -2246,17 +2293,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		AssignmentRhs r;

 		bool isYield = false;

 		

-		if (la.kind == 72) {

+		if (la.kind == 74) {

 			Get();

 			returnTok = t; 

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

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

 			Get();

 			returnTok = t; isYield = true; 

-		} else SynErr(194);

+		} else SynErr(197);

 		if (StartOf(26)) {

 			Rhs(out r, null);

 			rhss = new List<AssignmentRhs>(); rhss.Add(r); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				Rhs(out r, null);

 				rhss.Add(r); 

@@ -2276,22 +2323,22 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Expression> exprs = null;

 		IToken tok, dotdotdot, whereTok;

 		Expression e; 

-		Expect(41);

+		Expect(43);

 		dotdotdot = t; 

-		if (la.kind == 70) {

+		if (la.kind == 72) {

 			Get();

 			names = new List<IToken>(); exprs = new List<Expression>(); whereTok = t;

 			Ident(out tok);

 			names.Add(tok); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				Ident(out tok);

 				names.Add(tok); 

 			}

-			Expect(71);

+			Expect(73);

 			Expression(out e, false, true);

 			exprs.Add(e); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				Expression(out e, false, true);

 				exprs.Add(e); 

@@ -2315,21 +2362,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		r = dummyRhs;  // to please compiler

 		Attributes attrs = null;

 		

-		if (la.kind == 75) {

+		if (la.kind == 77) {

 			Get();

 			newToken = t; 

 			TypeAndToken(out x, out ty);

-			if (la.kind == 15 || la.kind == 63 || la.kind == 76) {

-				if (la.kind == 76) {

+			if (la.kind == 15 || la.kind == 65 || la.kind == 78) {

+				if (la.kind == 78) {

 					Get();

 					ee = new List<Expression>(); 

 					Expressions(ee);

-					Expect(77);

+					Expect(79);

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

 					

 				} else {

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

-					if (la.kind == 63) {

+					if (la.kind == 65) {

 						Get();

 						Ident(out x);

 					}

@@ -2354,7 +2401,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (StartOf(17)) {

 			Expression(out e, false, true);

 			r = new ExprRhs(e); 

-		} else SynErr(195);

+		} else SynErr(198);

 		while (la.kind == 13) {

 			Attribute(ref attrs);

 		}

@@ -2366,24 +2413,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		if (la.kind == 1) {

 			DottedIdentifiersAndFunction(out e, false, false);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

 			ApplySuffix(ref e);

 		} else if (StartOf(27)) {

 			ConstAtomExpression(out e, false, false);

 			Suffix(ref e);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

-		} else SynErr(196);

+		} else SynErr(199);

 	}

 

 	void Expressions(List<Expression/*!*/>/*!*/ args) {

 		Contract.Requires(cce.NonNullElements(args)); Expression/*!*/ e; 

 		Expression(out e, true, true);

 		args.Add(e); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			Expression(out e, true, true);

 			args.Add(e); 

@@ -2397,7 +2444,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Statement> body;

 		

 		Expect(13);

-		while (la.kind == 80) {

+		while (la.kind == 82) {

 			Get();

 			x = t; 

 			Expression(out e, true, false);

@@ -2425,7 +2472,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (StartOf(17)) {

 			Expression(out ee, true, true);

 			e = ee; 

-		} else SynErr(197);

+		} else SynErr(200);

 	}

 

 	void LoopSpec(out List<MaybeFreeExpression/*!*/> invariants, out List<Expression/*!*/> decreases, out List<FrameExpression/*!*/> mod, ref Attributes decAttrs, ref Attributes modAttrs) {

@@ -2436,22 +2483,22 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		mod = null;

 		

 		while (StartOf(28)) {

-			if (la.kind == 50 || la.kind == 82) {

+			if (la.kind == 52 || la.kind == 84) {

 				Invariant(out invariant);

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

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

 				Expect(8);

 				invariants.Add(invariant); 

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

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

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref decAttrs);

 				}

 				DecreasesList(decreases, true);

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

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

 				Expect(8);

 			} else {

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref modAttrs);

@@ -2460,13 +2507,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				if (StartOf(13)) {

 					FrameExpression(out fe);

 					mod.Add(fe); 

-					while (la.kind == 35) {

+					while (la.kind == 37) {

 						Get();

 						FrameExpression(out fe);

 						mod.Add(fe); 

 					}

 				}

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

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

 				Expect(8);

 			}

 		}

@@ -2474,12 +2521,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 == 50 || la.kind == 82)) {SynErr(203); Get();}

-		if (la.kind == 50) {

+		while (!(la.kind == 0 || la.kind == 52 || la.kind == 84)) {SynErr(206); Get();}

+		if (la.kind == 52) {

 			Get();

 			isFree = true; 

 		}

-		Expect(82);

+		Expect(84);

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

@@ -2494,14 +2541,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

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

 		

-		Expect(80);

+		Expect(82);

 		x = t; 

 		Ident(out id);

 		if (la.kind == 15) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

@@ -2523,7 +2570,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (StartOf(17)) {

 			Expression(out e, allowSemi, true);

 			arg = new Attributes.Argument(t, e); 

-		} else SynErr(204);

+		} else SynErr(207);

 	}

 

 	void QuantifierDomain(out List<BoundVar> bvars, out Attributes attrs, out Expression range) {

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

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			IdentTypeOptional(out bv);

 			bvars.Add(bv); 

@@ -2542,7 +2589,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

-		if (la.kind == 33) {

+		if (la.kind == 35) {

 			Get();

 			Expression(out range, true, true);

 		}

@@ -2554,73 +2601,73 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		x = null;

 		

 		switch (la.kind) {

-		case 37: {

+		case 39: {

 			Get();

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

-			if (la.kind == 90) {

+			if (la.kind == 92) {

 				Get();

-				Expect(76);

+				Expect(78);

 				Expression(out k, true, true);

-				Expect(77);

+				Expect(79);

 			}

 			break;

 		}

-		case 42: {

+		case 44: {

 			Get();

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

 			break;

 		}

-		case 43: {

+		case 45: {

 			Get();

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

 			break;

 		}

-		case 91: {

+		case 93: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Le; 

 			break;

 		}

-		case 92: {

+		case 94: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Ge; 

 			break;

 		}

-		case 93: {

+		case 95: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Neq; 

 			break;

 		}

-		case 94: {

+		case 96: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Neq; 

 			break;

 		}

-		case 95: {

+		case 97: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Le; 

 			break;

 		}

-		case 96: {

+		case 98: {

 			Get();

 			x = t;  binOp = BinaryExpr.Opcode.Ge; 

 			break;

 		}

-		case 97: case 98: {

+		case 99: case 100: {

 			EquivOp();

 			x = t;  binOp = BinaryExpr.Opcode.Iff; 

 			break;

 		}

-		case 99: case 100: {

+		case 101: case 102: {

 			ImpliesOp();

 			x = t;  binOp = BinaryExpr.Opcode.Imp; 

 			break;

 		}

-		case 101: case 102: {

+		case 103: case 104: {

 			ExpliesOp();

 			x = t;  binOp = BinaryExpr.Opcode.Exp; 

 			break;

 		}

-		default: SynErr(205); break;

+		default: SynErr(208); break;

 		}

 		if (k == null) {

 		 op = new Microsoft.Dafny.CalcStmt.BinaryCalcOp(binOp);

@@ -2639,7 +2686,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Token x = la;

 		IToken endTok = x;

 		

-		while (la.kind == 13 || la.kind == 89) {

+		while (la.kind == 13 || la.kind == 91) {

 			if (la.kind == 13) {

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

 				endTok = block.EndTok; subhints.Add(block); 

@@ -2653,33 +2700,33 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void EquivOp() {

-		if (la.kind == 97) {

+		if (la.kind == 99) {

 			Get();

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

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

 			Get();

-		} else SynErr(206);

+		} else SynErr(209);

 	}

 

 	void ImpliesOp() {

-		if (la.kind == 99) {

+		if (la.kind == 101) {

 			Get();

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

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

 			Get();

-		} else SynErr(207);

+		} else SynErr(210);

 	}

 

 	void ExpliesOp() {

-		if (la.kind == 101) {

+		if (la.kind == 103) {

 			Get();

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

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

 			Get();

-		} else SynErr(208);

+		} else SynErr(211);

 	}

 

 	void EquivExpression(out Expression e0, bool allowSemi, bool allowLambda) {

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

 		ImpliesExpliesExpression(out e0, allowSemi, allowLambda);

-		while (la.kind == 97 || la.kind == 98) {

+		while (la.kind == 99 || la.kind == 100) {

 			EquivOp();

 			x = t; 

 			ImpliesExpliesExpression(out e1, allowSemi, allowLambda);

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

 		LogicalExpression(out e0, allowSemi, allowLambda);

 		if (StartOf(29)) {

-			if (la.kind == 99 || la.kind == 100) {

+			if (la.kind == 101 || la.kind == 102) {

 				ImpliesOp();

 				x = t; 

 				ImpliesExpression(out e1, allowSemi, allowLambda);

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

 				LogicalExpression(out e1, allowSemi, allowLambda);

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

-				while (la.kind == 101 || la.kind == 102) {

+				while (la.kind == 103 || la.kind == 104) {

 					ExpliesOp();

 					x = t; 

 					LogicalExpression(out e1, allowSemi, allowLambda);

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

 		RelationalExpression(out e0, allowSemi, allowLambda);

 		if (StartOf(30)) {

-			if (la.kind == 103 || la.kind == 104) {

+			if (la.kind == 105 || la.kind == 106) {

 				AndOp();

 				x = t; 

 				RelationalExpression(out e1, allowSemi, allowLambda);

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

-				while (la.kind == 103 || la.kind == 104) {

+				while (la.kind == 105 || la.kind == 106) {

 					AndOp();

 					x = t; 

 					RelationalExpression(out e1, allowSemi, allowLambda);

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

 				RelationalExpression(out e1, allowSemi, allowLambda);

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

-				while (la.kind == 105 || la.kind == 106) {

+				while (la.kind == 107 || la.kind == 108) {

 					OrOp();

 					x = t; 

 					RelationalExpression(out e1, allowSemi, allowLambda);

@@ -2744,7 +2791,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void ImpliesExpression(out Expression e0, bool allowSemi, bool allowLambda) {

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

 		LogicalExpression(out e0, allowSemi, allowLambda);

-		if (la.kind == 99 || la.kind == 100) {

+		if (la.kind == 101 || la.kind == 102) {

 			ImpliesOp();

 			x = t; 

 			ImpliesExpression(out e1, allowSemi, allowLambda);

@@ -2854,25 +2901,25 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void AndOp() {

-		if (la.kind == 103) {

+		if (la.kind == 105) {

 			Get();

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

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

 			Get();

-		} else SynErr(209);

+		} else SynErr(212);

 	}

 

 	void OrOp() {

-		if (la.kind == 105) {

+		if (la.kind == 107) {

 			Get();

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

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

 			Get();

-		} else SynErr(210);

+		} else SynErr(213);

 	}

 

 	void Term(out Expression e0, bool allowSemi, bool allowLambda) {

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

 		Factor(out e0, allowSemi, allowLambda);

-		while (la.kind == 109 || la.kind == 110) {

+		while (la.kind == 111 || la.kind == 112) {

 			AddOp(out x, out op);

 			Factor(out e1, allowSemi, allowLambda);

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

@@ -2886,49 +2933,49 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		k = null;

 		

 		switch (la.kind) {

-		case 37: {

+		case 39: {

 			Get();

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

-			if (la.kind == 90) {

+			if (la.kind == 92) {

 				Get();

-				Expect(76);

+				Expect(78);

 				Expression(out k, true, true);

-				Expect(77);

+				Expect(79);

 			}

 			break;

 		}

-		case 42: {

+		case 44: {

 			Get();

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

 			break;

 		}

-		case 43: {

+		case 45: {

 			Get();

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

 			break;

 		}

-		case 91: {

+		case 93: {

 			Get();

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

 			break;

 		}

-		case 92: {

+		case 94: {

 			Get();

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

 			break;

 		}

-		case 93: {

+		case 95: {

 			Get();

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

-			if (la.kind == 90) {

+			if (la.kind == 92) {

 				Get();

-				Expect(76);

+				Expect(78);

 				Expression(out k, true, true);

-				Expect(77);

+				Expect(79);

 			}

 			break;

 		}

-		case 107: {

+		case 109: {

 			Get();

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

 			break;

@@ -2938,10 +2985,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			x = t;  op = BinaryExpr.Opcode.NotIn; 

 			break;

 		}

-		case 108: {

+		case 110: {

 			Get();

 			x = t;  y = Token.NoToken; 

-			if (la.kind == 108) {

+			if (la.kind == 110) {

 				Get();

 				y = t; 

 			}

@@ -2956,29 +3003,29 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			

 			break;

 		}

-		case 94: {

+		case 96: {

 			Get();

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

 			break;

 		}

-		case 95: {

+		case 97: {

 			Get();

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

 			break;

 		}

-		case 96: {

+		case 98: {

 			Get();

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

 			break;

 		}

-		default: SynErr(211); break;

+		default: SynErr(214); break;

 		}

 	}

 

 	void Factor(out Expression e0, bool allowSemi, bool allowLambda) {

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

 		UnaryExpression(out e0, allowSemi, allowLambda);

-		while (la.kind == 17 || la.kind == 111 || la.kind == 112) {

+		while (la.kind == 17 || la.kind == 113 || la.kind == 114) {

 			MulOp(out x, out op);

 			UnaryExpression(out e1, allowSemi, allowLambda);

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

@@ -2987,81 +3034,81 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 

 	void AddOp(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 == 109) {

+		if (la.kind == 111) {

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(212);

+		} else SynErr(215);

 	}

 

 	void UnaryExpression(out Expression e, bool allowSemi, bool allowLambda) {

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

 		switch (la.kind) {

-		case 110: {

+		case 112: {

 			Get();

 			x = t; 

 			UnaryExpression(out e, allowSemi, allowLambda);

 			e = new NegationExpression(x, e); 

 			break;

 		}

-		case 108: case 113: {

+		case 110: case 115: {

 			NegOp();

 			x = t; 

 			UnaryExpression(out e, allowSemi, allowLambda);

 			e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Not, e); 

 			break;

 		}

-		case 29: case 34: case 58: case 68: case 74: case 78: case 83: case 84: case 86: case 89: case 122: case 123: case 124: {

+		case 31: case 36: case 60: case 70: case 76: case 80: case 85: case 86: case 88: case 91: case 124: case 125: case 126: {

 			EndlessExpression(out e, allowSemi, allowLambda);

 			break;

 		}

 		case 1: {

 			DottedIdentifiersAndFunction(out e, allowSemi, allowLambda);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

 			ApplySuffix(ref e);

 			break;

 		}

-		case 13: case 76: {

+		case 13: case 78: {

 			DisplayExpr(out e);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 59: {

+		case 61: {

 			MultiSetExpr(out e);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 61: {

+		case 63: {

 			Get();

 			x = t; 

-			if (la.kind == 76) {

+			if (la.kind == 78) {

 				MapDisplayExpr(x, out e);

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

+				while (la.kind == 65 || la.kind == 78) {

 					Suffix(ref e);

 				}

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

 				MapComprehensionExpr(x, out e, allowSemi);

 			} else if (StartOf(32)) {

 				SemErr("map must be followed by literal in brackets or comprehension."); 

-			} else SynErr(213);

+			} else SynErr(216);

 			break;

 		}

-		case 2: case 3: case 4: case 15: case 33: case 56: case 57: case 114: case 115: case 116: case 117: case 118: case 119: {

+		case 2: case 3: case 4: case 15: case 35: case 58: case 59: case 116: case 117: case 118: case 119: case 120: case 121: {

 			ConstAtomExpression(out e, allowSemi, allowLambda);

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

+			while (la.kind == 65 || la.kind == 78) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		default: SynErr(214); break;

+		default: SynErr(217); break;

 		}

 	}

 

@@ -3070,21 +3117,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (la.kind == 17) {

 			Get();

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

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

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

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(215);

+		} else SynErr(218);

 	}

 

 	void NegOp() {

-		if (la.kind == 108) {

+		if (la.kind == 110) {

 			Get();

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

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

 			Get();

-		} else SynErr(216);

+		} else SynErr(219);

 	}

 

 	void EndlessExpression(out Expression e, bool allowSemi, bool allowLambda) {

@@ -3094,44 +3141,44 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;

 		

 		switch (la.kind) {

-		case 78: {

+		case 80: {

 			Get();

 			x = t; 

 			Expression(out e, true, true);

-			Expect(120);

+			Expect(122);

 			Expression(out e0, true, true);

-			Expect(79);

+			Expect(81);

 			Expression(out e1, allowSemi, allowLambda);

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

 			break;

 		}

-		case 83: {

+		case 85: {

 			MatchExpression(out e, allowSemi, allowLambda);

 			break;

 		}

-		case 86: case 122: case 123: case 124: {

+		case 88: case 124: case 125: case 126: {

 			QuantifierGuts(out e, allowSemi, allowLambda);

 			break;

 		}

-		case 58: {

+		case 60: {

 			ComprehensionExpr(out e, allowSemi, allowLambda);

 			break;

 		}

-		case 74: case 84: case 89: {

+		case 76: case 86: case 91: {

 			StmtInExpr(out s);

 			Expression(out e, allowSemi, allowLambda);

 			e = new StmtExpr(s.Tok, s, e); 

 			break;

 		}

-		case 29: case 34: {

+		case 31: case 36: {

 			LetExpr(out e, allowSemi, allowLambda);

 			break;

 		}

-		case 68: {

+		case 70: {

 			NamedExpr(out e, allowSemi, allowLambda);

 			break;

 		}

-		default: SynErr(217); break;

+		default: SynErr(220); break;

 		}

 	}

 

@@ -3144,20 +3191,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		Ident(out id);

 		idents.Add(id); 

-		while (la.kind == 63) {

+		while (la.kind == 65) {

 			IdentOrDigitsSuffix(out id, out idPrime);

 			idents.Add(id);

 			if (idPrime != null) { idents.Add(idPrime); id = idPrime; }

 			

 		}

-		if (la.kind == 15 || la.kind == 90) {

+		if (la.kind == 15 || la.kind == 92) {

 			args = new List<Expression>(); 

-			if (la.kind == 90) {

+			if (la.kind == 92) {

 				Get();

 				id.val = id.val + "#";  Expression k; 

-				Expect(76);

+				Expect(78);

 				Expression(out k, true, true);

-				Expect(77);

+				Expect(79);

 				args.Add(k); 

 			}

 			Expect(15);

@@ -3201,7 +3248,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Expression> multipleIndices = null;

 		bool func = false;

 		

-		if (la.kind == 63) {

+		if (la.kind == 65) {

 			IdentOrDigitsSuffix(out id, out x);

 			if (x != null) {

 			 // process id as a Suffix in its own right

@@ -3209,14 +3256,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 id = x;  // move to the next Suffix

 			}

 			

-			if (la.kind == 15 || la.kind == 90) {

+			if (la.kind == 15 || la.kind == 92) {

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

-				if (la.kind == 90) {

+				if (la.kind == 92) {

 					Get();

 					id.val = id.val + "#";  Expression k; 

-					Expect(76);

+					Expect(78);

 					Expression(out k, true, true);

-					Expect(77);

+					Expect(79);

 					args.Add(k); 

 				}

 				Expect(15);

@@ -3228,24 +3275,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				e = new FunctionCallExpr(id, id.val, e, openParen, args); 

 			}

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

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

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

 			Get();

 			x = t; 

 			if (StartOf(17)) {

 				Expression(out ee, true, true);

 				e0 = ee; 

-				if (la.kind == 121) {

+				if (la.kind == 123) {

 					Get();

 					anyDots = true; 

 					if (StartOf(17)) {

 						Expression(out ee, true, true);

 						e1 = ee; 

 					}

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

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

 					Get();

 					Expression(out ee, true, true);

 					e1 = ee; 

-				} else if (la.kind == 7 || la.kind == 77) {

+				} else if (la.kind == 7 || la.kind == 79) {

 					while (la.kind == 7) {

 						Get();

 						if (multipleLengths == null) {

@@ -3261,8 +3308,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 							

 						}

 					}

-				} else if (la.kind == 35 || la.kind == 77) {

-					while (la.kind == 35) {

+				} else if (la.kind == 37 || la.kind == 79) {

+					while (la.kind == 37) {

 						Get();

 						Expression(out ee, true, true);

 						if (multipleIndices == null) {

@@ -3272,15 +3319,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 						multipleIndices.Add(ee);

 						

 					}

-				} else SynErr(218);

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

+				} else SynErr(221);

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

 				Get();

 				anyDots = true; 

 				if (StartOf(17)) {

 					Expression(out ee, true, true);

 					e1 = ee; 

 				}

-			} else SynErr(219);

+			} else SynErr(222);

 			if (multipleIndices != null) {

 			 e = new MultiSelectExpr(x, e, multipleIndices);

 			 // make sure an array class with this dimensionality exists

@@ -3320,8 +3367,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 }

 			}

 			

-			Expect(77);

-		} else SynErr(220);

+			Expect(79);

+		} else SynErr(223);

 		ApplySuffix(ref e);

 	}

 

@@ -3350,15 +3397,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			e = new SetDisplayExpr(x, elements);

 			Expect(14);

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

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

 			Get();

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

 			if (StartOf(17)) {

 				Expressions(elements);

 			}

 			e = new SeqDisplayExpr(x, elements); 

-			Expect(77);

-		} else SynErr(221);

+			Expect(79);

+		} else SynErr(224);

 	}

 

 	void MultiSetExpr(out Expression e) {

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

 		e = dummyExpr;

 		

-		Expect(59);

+		Expect(61);

 		x = t; 

 		if (la.kind == 13) {

 			Get();

@@ -3384,7 +3431,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expect(16);

 		} else if (StartOf(32)) {

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

-		} else SynErr(222);

+		} else SynErr(225);

 	}

 

 	void MapDisplayExpr(IToken/*!*/ mapToken, out Expression e) {

@@ -3392,12 +3439,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<ExpressionPair/*!*/>/*!*/ elements= new List<ExpressionPair/*!*/>() ;

 		e = dummyExpr;

 		

-		Expect(76);

+		Expect(78);

 		if (StartOf(17)) {

 			MapLiteralExpressions(out elements);

 		}

 		e = new MapDisplayExpr(mapToken, elements);

-		Expect(77);

+		Expect(79);

 	}

 

 	void MapComprehensionExpr(IToken mapToken, out Expression e, bool allowSemi) {

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

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		if (la.kind == 33) {

+		if (la.kind == 35) {

 			Get();

 			Expression(out range, true, true);

 		}

@@ -3425,17 +3472,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;  Type toType = null;

 		

 		switch (la.kind) {

-		case 114: {

+		case 116: {

 			Get();

 			e = new LiteralExpr(t, false); 

 			break;

 		}

-		case 115: {

+		case 117: {

 			Get();

 			e = new LiteralExpr(t, true); 

 			break;

 		}

-		case 116: {

+		case 118: {

 			Get();

 			e = new LiteralExpr(t); 

 			break;

@@ -3450,12 +3497,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new LiteralExpr(t, d); 

 			break;

 		}

-		case 117: {

+		case 119: {

 			Get();

 			e = new ThisExpr(t); 

 			break;

 		}

-		case 118: {

+		case 120: {

 			Get();

 			x = t; 

 			Expect(15);

@@ -3464,7 +3511,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Fresh, e); 

 			break;

 		}

-		case 119: {

+		case 121: {

 			Get();

 			x = t; 

 			Expect(15);

@@ -3473,16 +3520,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new OldExpr(x, e); 

 			break;

 		}

-		case 33: {

+		case 35: {

 			Get();

 			x = t; 

 			Expression(out e, true, true);

 			e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Cardinality, e); 

-			Expect(33);

+			Expect(35);

 			break;

 		}

-		case 56: case 57: {

-			if (la.kind == 56) {

+		case 58: case 59: {

+			if (la.kind == 58) {

 				Get();

 				x = t; toType = new IntType(); 

 			} else {

@@ -3499,7 +3546,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			ParensExpression(out e, allowSemi, allowLambda);

 			break;

 		}

-		default: SynErr(223); break;

+		default: SynErr(226); break;

 		}

 	}

 

@@ -3524,7 +3571,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 n = BigInteger.Zero;

 			}

 			

-		} else SynErr(224);

+		} else SynErr(227);

 	}

 

 	void Dec(out Basetypes.BigDec d) {

@@ -3553,7 +3600,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(17)) {

 			OptTypedExpr(out ee, out tt, true);

 			args.Add(ee); types.Add(tt); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				OptTypedExpr(out ee, out tt, true);

 				args.Add(ee); types.Add(tt); 

@@ -3632,7 +3679,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 10) {

 			Get();

 			oneShot = true; 

-		} else SynErr(225);

+		} else SynErr(228);

 	}

 

 	void OptTypedExpr(out Expression e, out Type tt, bool allowSemi) {

@@ -3648,24 +3695,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ d, r;

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

 		Expression(out d, true, true);

-		Expect(71);

+		Expect(73);

 		Expression(out r, true, true);

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

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			Expression(out d, true, true);

-			Expect(71);

+			Expect(73);

 			Expression(out r, true, true);

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

 		}

 	}

 

 	void QSep() {

-		if (la.kind == 125) {

+		if (la.kind == 127) {

 			Get();

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

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

 			Get();

-		} else SynErr(226);

+		} else SynErr(229);

 	}

 

 	void MatchExpression(out Expression e, bool allowSemi, bool allowLambda) {

@@ -3673,14 +3720,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();

 		bool usesOptionalBrace = false;

 		

-		Expect(83);

+		Expect(85);

 		x = t; 

 		Expression(out e, allowSemi, true);

 		if (la.kind == 13) {

 			Get();

 			usesOptionalBrace = true; 

 		}

-		while (la.kind == 80) {

+		while (la.kind == 82) {

 			CaseExpression(out c, allowSemi, usesOptionalBrace || allowLambda);

 			cases.Add(c); 

 		}

@@ -3688,7 +3735,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expect(14);

 		} else if (StartOf(32)) {

 			if (usesOptionalBrace) { SemErr(t, "expecting close curly brace"); } 

-		} else SynErr(227);

+		} else SynErr(230);

 		e = new MatchExpr(x, e, cases, usesOptionalBrace); 

 	}

 

@@ -3700,13 +3747,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression range;

 		Expression/*!*/ body;

 		

-		if (la.kind == 86 || la.kind == 122) {

+		if (la.kind == 88 || la.kind == 124) {

 			Forall();

 			x = t;  univ = true; 

-		} else if (la.kind == 123 || la.kind == 124) {

+		} else if (la.kind == 125 || la.kind == 126) {

 			Exists();

 			x = t; 

-		} else SynErr(228);

+		} else SynErr(231);

 		QuantifierDomain(out bvars, out attrs, out range);

 		QSep();

 		Expression(out body, allowSemi, allowLambda);

@@ -3726,18 +3773,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression range;

 		Expression body = null;

 		

-		Expect(58);

+		Expect(60);

 		x = t; 

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			IdentTypeOptional(out bv);

 			bvars.Add(bv); 

 		}

-		Expect(33);

+		Expect(35);

 		Expression(out range, allowSemi, allowLambda);

-		if (la.kind == 125 || la.kind == 126) {

+		if (la.kind == 127 || la.kind == 128) {

 			QSep();

 			Expression(out body, allowSemi, allowLambda);

 		}

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

 	void StmtInExpr(out Statement s) {

 		s = dummyStmt; 

-		if (la.kind == 84) {

+		if (la.kind == 86) {

 			AssertStmt(out s);

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

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

 			AssumeStmt(out s);

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

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

 			CalcStmt(out s);

-		} else SynErr(229);

+		} else SynErr(232);

 	}

 

 	void LetExpr(out Expression e, bool allowSemi, bool allowLambda) {

@@ -3766,26 +3813,26 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		bool exact = true;

 		e = dummyExpr;

 		

-		if (la.kind == 29) {

+		if (la.kind == 31) {

 			Get();

 			isGhost = true;  x = t; 

 		}

-		Expect(34);

+		Expect(36);

 		if (!isGhost) { x = t; } 

 		CasePattern(out pat);

 		if (isGhost) { pat.Vars.Iter(bv => bv.IsGhost = true); }

 		letLHSs.Add(pat);

 		

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			CasePattern(out pat);

 			if (isGhost) { pat.Vars.Iter(bv => bv.IsGhost = true); }

 			letLHSs.Add(pat);

 			

 		}

-		if (la.kind == 71) {

+		if (la.kind == 73) {

 			Get();

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

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

 			Get();

 			exact = false;

 			foreach (var lhs in letLHSs) {

@@ -3794,10 +3841,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 }

 			}

 			

-		} else SynErr(230);

+		} else SynErr(233);

 		Expression(out e, false, true);

 		letRHSs.Add(e); 

-		while (la.kind == 35) {

+		while (la.kind == 37) {

 			Get();

 			Expression(out e, false, true);

 			letRHSs.Add(e); 

@@ -3812,7 +3859,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;

 		Expression expr;

 		

-		Expect(68);

+		Expect(70);

 		x = t; 

 		NoUSIdent(out d);

 		Expect(7);

@@ -3833,7 +3880,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (la.kind == 1) {

 				CasePattern(out pat);

 				arguments.Add(pat); 

-				while (la.kind == 35) {

+				while (la.kind == 37) {

 					Get();

 					CasePattern(out pat);

 					arguments.Add(pat); 

@@ -3845,7 +3892,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			IdentTypeOptional(out bv);

 			pat = new CasePattern(bv.tok, bv);

 			

-		} else SynErr(231);

+		} else SynErr(234);

 	}

 

 	void CaseExpression(out MatchCaseExpr c, bool allowSemi, bool allowLambda) {

@@ -3854,14 +3901,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

 		Expression/*!*/ body;

 		

-		Expect(80);

+		Expect(82);

 		x = t; 

 		Ident(out id);

 		if (la.kind == 15) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

@@ -3874,19 +3921,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void Forall() {

-		if (la.kind == 86) {

+		if (la.kind == 88) {

 			Get();

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

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

 			Get();

-		} else SynErr(232);

+		} else SynErr(235);

 	}

 

 	void Exists() {

-		if (la.kind == 123) {

+		if (la.kind == 125) {

 			Get();

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

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

 			Get();

-		} else SynErr(233);

+		} else SynErr(236);

 	}

 

 	void AttributeBody(ref Attributes attrs) {

@@ -3900,7 +3947,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(33)) {

 			AttributeArg(out aArg, true);

 			aArgs.Add(aArg); 

-			while (la.kind == 35) {

+			while (la.kind == 37) {

 				Get();

 				AttributeArg(out aArg, true);

 				aArgs.Add(aArg); 

@@ -3922,40 +3969,40 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

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

-		{T,T,T,T, T,x,x,x, T,x,x,T, T,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,T, T,T,T,x, x,x,T,x, x,T,x,x, T,T,T,T, T,T,T,T, T,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,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,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, T,T,x,T, x,x,x,x, T,T,T,T, T,x,T,x, T,x,T,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, 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,T,T,x, x,x,T,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, 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},

-		{T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, T,T,x,T, x,T,x,x, T,T,T,T, T,x,T,x, T,x,T,x, x,x,T,x, 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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,x,x, x},

-		{T,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, T,T,x,T, x,x,x,x, T,T,T,T, T,x,T,x, T,x,T,x, x,x,T,x, T,T,T,T, T,x,x,T, T,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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},

-		{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, 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,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,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,T,x,x, x,x,x,x, x,x,x,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,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,T,T,T, T,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,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,T,T, x,T,x,x, x,x,x,T, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,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,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,x, x,T,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,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x},

-		{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,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,T, T,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,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,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x},

-		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,T,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, T,T,T,T, x,T,x,x, x,x,x,T, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x},

-		{T,T,T,T, T,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,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,x, x,T,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,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x},

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

-		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,T,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, T,T,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x},

-		{x,T,T,T, T,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,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,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,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x},

-		{x,T,T,T, T,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,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,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,x,x,x, x,x,x,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,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,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,T, T,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,T,T,T, T,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,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, x,T,x,x, x,x,x,T, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x},

-		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,T,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, T,T,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,T, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x},

-		{x,x,T,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, 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, 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,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,T,T,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,x, x,x,x,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,x,x, x,x,x,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,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,T,T,T, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,T,T, x,T,x,x, x,T,T,T, x,x,x,x, x,T,T,T, T,T,x,x, T,T,x,x, x,x,x,T, x,x,x,T, T,T,x,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,T,T, T,T,T,T, T,T,x,x, x,T,T,x, x},

-		{x,T,T,T, T,x,T,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,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,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,T,T, T,T,T,T, x,x,T,T, T,x,x,x, x}

+		{T,T,T,T, T,x,x,x, T,x,x,T, T,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, x,T,T,T, T,x,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,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, 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, T,T,x,T, x,x,x,x, T,x,T,T, T,T,T,x, T,x,T,x, T,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,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,T, T,x,x,x, T,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,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},

+		{T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, T,T,x,T, x,T,x,x, T,x,T,T, T,T,T,x, T,x,T,x, T,x,x,x, T,x,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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, x,x,x},

+		{T,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, T,T,x,T, x,x,x,x, T,x,T,T, T,T,T,x, T,x,T,x, T,x,x,x, T,x,T,T, T,T,T,x, x,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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},

+		{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, 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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,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, 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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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, 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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,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,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,T,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, 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,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,x,x,T, 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, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x},

+		{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,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,T, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x},

+		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,T,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x},

+		{T,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,x,x,T, 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, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x},

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

+		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x},

+		{x,T,T,T, T,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,T, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,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,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x},

+		{x,T,T,T, T,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,T, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,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,x, x,x,x,x, x,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,x,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,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,T,T,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,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,T,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x},

+		{x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,x,T,x, x,x,x,x, T,T,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x},

+		{x,x,T,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, 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,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, 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,T, T,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,x, x,x,x,x, x,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T,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,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,T,T,T, T,T,T,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,T,T,T, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, T,T,x,T, x,x,x,T, T,T,x,x, x,x,x,T, T,T,T,T, x,x,T,T, x,x,x,x, x,T,x,x, x,T,T,T, x,T,T,T, T,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, x,x,x,T, T,x,x},

+		{x,T,T,T, T,x,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,T,T, T,T,x,T, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, T,x,x,x, x,T,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, T,T,T,T, T,T,x,x, T,T,T,x, x,x,x}

 

 	};

 } // end Parser

@@ -4009,211 +4056,214 @@ public class Errors {
 			case 26: s = "\"as\" expected"; break;

 			case 27: s = "\"default\" expected"; break;

 			case 28: s = "\"class\" expected"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-			case 86: s = "\"forall\" expected"; break;

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

-			case 88: s = "\"modify\" expected"; break;

-			case 89: s = "\"calc\" expected"; break;

-			case 90: s = "\"#\" expected"; break;

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

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

-			case 93: s = "\"!=\" expected"; break;

-			case 94: s = "\"\\u2260\" expected"; break;

-			case 95: s = "\"\\u2264\" expected"; break;

-			case 96: s = "\"\\u2265\" expected"; break;

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

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

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

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

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

-			case 102: s = "\"\\u21d0\" expected"; break;

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

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

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

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

-			case 107: s = "\"in\" expected"; break;

-			case 108: s = "\"!\" expected"; break;

-			case 109: s = "\"+\" expected"; break;

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

-			case 111: s = "\"/\" expected"; break;

-			case 112: s = "\"%\" expected"; break;

-			case 113: s = "\"\\u00ac\" expected"; break;

-			case 114: s = "\"false\" expected"; break;

-			case 115: s = "\"true\" expected"; break;

-			case 116: s = "\"null\" expected"; break;

-			case 117: s = "\"this\" expected"; break;

-			case 118: s = "\"fresh\" expected"; break;

-			case 119: s = "\"old\" expected"; break;

-			case 120: s = "\"then\" expected"; break;

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

-			case 122: s = "\"\\u2200\" expected"; break;

-			case 123: s = "\"exists\" expected"; break;

-			case 124: s = "\"\\u2203\" expected"; break;

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

-			case 126: s = "\"\\u2022\" expected"; break;

-			case 127: s = "??? expected"; break;

-			case 128: s = "this symbol not expected in SubModuleDecl"; break;

-			case 129: s = "invalid SubModuleDecl"; break;

-			case 130: s = "this symbol not expected in ClassDecl"; break;

-			case 131: s = "this symbol not expected in DatatypeDecl"; break;

-			case 132: s = "invalid DatatypeDecl"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+			case 88: s = "\"forall\" expected"; break;

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

+			case 90: s = "\"modify\" expected"; break;

+			case 91: s = "\"calc\" expected"; break;

+			case 92: s = "\"#\" expected"; break;

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

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

+			case 95: s = "\"!=\" expected"; break;

+			case 96: s = "\"\\u2260\" expected"; break;

+			case 97: s = "\"\\u2264\" expected"; break;

+			case 98: s = "\"\\u2265\" expected"; break;

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

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

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

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

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

+			case 104: s = "\"\\u21d0\" expected"; break;

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

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

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

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

+			case 109: s = "\"in\" expected"; break;

+			case 110: s = "\"!\" expected"; break;

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

+			case 112: s = "\"-\" expected"; break;

+			case 113: s = "\"/\" expected"; break;

+			case 114: s = "\"%\" expected"; break;

+			case 115: s = "\"\\u00ac\" expected"; break;

+			case 116: s = "\"false\" expected"; break;

+			case 117: s = "\"true\" expected"; break;

+			case 118: s = "\"null\" expected"; break;

+			case 119: s = "\"this\" expected"; break;

+			case 120: s = "\"fresh\" expected"; break;

+			case 121: s = "\"old\" expected"; break;

+			case 122: s = "\"then\" expected"; break;

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

+			case 124: s = "\"\\u2200\" expected"; break;

+			case 125: s = "\"exists\" expected"; break;

+			case 126: s = "\"\\u2203\" expected"; break;

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

+			case 128: s = "\"\\u2022\" expected"; break;

+			case 129: s = "??? expected"; break;

+			case 130: s = "this symbol not expected in SubModuleDecl"; break;

+			case 131: s = "invalid SubModuleDecl"; break;

+			case 132: s = "this symbol not expected in ClassDecl"; break;

 			case 133: s = "this symbol not expected in DatatypeDecl"; break;

-			case 134: s = "invalid OtherTypeDecl"; break;

-			case 135: s = "this symbol not expected in OtherTypeDecl"; break;

-			case 136: s = "this symbol not expected in IteratorDecl"; break;

-			case 137: s = "invalid IteratorDecl"; break;

-			case 138: s = "invalid ClassMemberDecl"; break;

-			case 139: s = "invalid IdentOrDigitsSuffix"; break;

-			case 140: s = "this symbol not expected in FieldDecl"; break;

-			case 141: s = "this symbol not expected in FieldDecl"; break;

-			case 142: s = "invalid FunctionDecl"; break;

-			case 143: s = "invalid FunctionDecl"; break;

-			case 144: s = "invalid FunctionDecl"; break;

+			case 134: s = "invalid DatatypeDecl"; break;

+			case 135: s = "this symbol not expected in DatatypeDecl"; break;

+			case 136: s = "invalid OtherTypeDecl"; break;

+			case 137: s = "this symbol not expected in OtherTypeDecl"; break;

+			case 138: s = "this symbol not expected in IteratorDecl"; break;

+			case 139: s = "invalid IteratorDecl"; break;

+			case 140: s = "this symbol not expected in TraitDecl"; break;

+			case 141: s = "invalid ClassMemberDecl"; break;

+			case 142: s = "invalid IdentOrDigitsSuffix"; break;

+			case 143: s = "this symbol not expected in FieldDecl"; break;

+			case 144: s = "this symbol not expected in FieldDecl"; break;

 			case 145: s = "invalid FunctionDecl"; break;

-			case 146: s = "this symbol not expected in MethodDecl"; break;

-			case 147: s = "invalid MethodDecl"; break;

-			case 148: s = "invalid MethodDecl"; break;

-			case 149: s = "invalid FIdentType"; break;

-			case 150: s = "invalid TypeIdentOptional"; break;

-			case 151: s = "invalid TypeAndToken"; break;

-			case 152: s = "this symbol not expected in IteratorSpec"; break;

-			case 153: s = "this symbol not expected in IteratorSpec"; break;

-			case 154: s = "this symbol not expected in IteratorSpec"; break;

+			case 146: s = "invalid FunctionDecl"; break;

+			case 147: s = "invalid FunctionDecl"; break;

+			case 148: s = "invalid FunctionDecl"; break;

+			case 149: s = "this symbol not expected in MethodDecl"; break;

+			case 150: s = "invalid MethodDecl"; break;

+			case 151: s = "invalid MethodDecl"; break;

+			case 152: s = "invalid FIdentType"; break;

+			case 153: s = "invalid TypeIdentOptional"; break;

+			case 154: s = "invalid TypeAndToken"; break;

 			case 155: s = "this symbol not expected in IteratorSpec"; break;

 			case 156: s = "this symbol not expected in IteratorSpec"; break;

-			case 157: s = "invalid IteratorSpec"; break;

+			case 157: s = "this symbol not expected in IteratorSpec"; break;

 			case 158: s = "this symbol not expected in IteratorSpec"; break;

-			case 159: s = "invalid IteratorSpec"; break;

-			case 160: s = "this symbol not expected in MethodSpec"; break;

-			case 161: s = "this symbol not expected in MethodSpec"; break;

-			case 162: s = "this symbol not expected in MethodSpec"; break;

+			case 159: s = "this symbol not expected in IteratorSpec"; break;

+			case 160: s = "invalid IteratorSpec"; break;

+			case 161: s = "this symbol not expected in IteratorSpec"; break;

+			case 162: s = "invalid IteratorSpec"; break;

 			case 163: s = "this symbol not expected in MethodSpec"; break;

-			case 164: s = "invalid MethodSpec"; break;

+			case 164: s = "this symbol not expected in MethodSpec"; break;

 			case 165: s = "this symbol not expected in MethodSpec"; break;

-			case 166: s = "invalid MethodSpec"; break;

-			case 167: s = "invalid FrameExpression"; break;

-			case 168: s = "invalid ReferenceType"; break;

-			case 169: s = "this symbol not expected in FunctionSpec"; break;

-			case 170: s = "this symbol not expected in FunctionSpec"; break;

-			case 171: s = "this symbol not expected in FunctionSpec"; break;

+			case 166: s = "this symbol not expected in MethodSpec"; break;

+			case 167: s = "invalid MethodSpec"; break;

+			case 168: s = "this symbol not expected in MethodSpec"; break;

+			case 169: s = "invalid MethodSpec"; break;

+			case 170: s = "invalid FrameExpression"; break;

+			case 171: s = "invalid ReferenceType"; break;

 			case 172: s = "this symbol not expected in FunctionSpec"; break;

 			case 173: s = "this symbol not expected in FunctionSpec"; break;

-			case 174: s = "invalid FunctionSpec"; break;

-			case 175: s = "invalid PossiblyWildFrameExpression"; break;

-			case 176: s = "invalid PossiblyWildExpression"; break;

-			case 177: s = "this symbol not expected in OneStmt"; break;

-			case 178: s = "invalid OneStmt"; break;

-			case 179: s = "this symbol not expected in OneStmt"; break;

-			case 180: s = "invalid OneStmt"; break;

-			case 181: s = "invalid AssertStmt"; break;

-			case 182: s = "invalid AssumeStmt"; break;

-			case 183: s = "invalid UpdateStmt"; break;

-			case 184: s = "invalid UpdateStmt"; break;

-			case 185: s = "invalid IfStmt"; break;

-			case 186: s = "invalid IfStmt"; break;

-			case 187: s = "invalid WhileStmt"; break;

-			case 188: s = "invalid WhileStmt"; break;

-			case 189: s = "invalid MatchStmt"; break;

-			case 190: s = "invalid ForallStmt"; break;

-			case 191: s = "invalid ForallStmt"; break;

-			case 192: s = "this symbol not expected in ModifyStmt"; break;

-			case 193: s = "invalid ModifyStmt"; break;

-			case 194: s = "invalid ReturnStmt"; break;

-			case 195: s = "invalid Rhs"; break;

-			case 196: s = "invalid Lhs"; break;

-			case 197: s = "invalid Guard"; break;

-			case 198: s = "this symbol not expected in LoopSpec"; break;

-			case 199: s = "this symbol not expected in LoopSpec"; break;

-			case 200: s = "this symbol not expected in LoopSpec"; break;

+			case 174: s = "this symbol not expected in FunctionSpec"; break;

+			case 175: s = "this symbol not expected in FunctionSpec"; break;

+			case 176: s = "this symbol not expected in FunctionSpec"; break;

+			case 177: s = "invalid FunctionSpec"; break;

+			case 178: s = "invalid PossiblyWildFrameExpression"; break;

+			case 179: s = "invalid PossiblyWildExpression"; break;

+			case 180: s = "this symbol not expected in OneStmt"; break;

+			case 181: s = "invalid OneStmt"; break;

+			case 182: s = "this symbol not expected in OneStmt"; break;

+			case 183: s = "invalid OneStmt"; break;

+			case 184: s = "invalid AssertStmt"; break;

+			case 185: s = "invalid AssumeStmt"; break;

+			case 186: s = "invalid UpdateStmt"; break;

+			case 187: s = "invalid UpdateStmt"; break;

+			case 188: s = "invalid IfStmt"; break;

+			case 189: s = "invalid IfStmt"; break;

+			case 190: s = "invalid WhileStmt"; break;

+			case 191: s = "invalid WhileStmt"; break;

+			case 192: s = "invalid MatchStmt"; break;

+			case 193: s = "invalid ForallStmt"; break;

+			case 194: s = "invalid ForallStmt"; break;

+			case 195: s = "this symbol not expected in ModifyStmt"; break;

+			case 196: s = "invalid ModifyStmt"; break;

+			case 197: s = "invalid ReturnStmt"; break;

+			case 198: s = "invalid Rhs"; break;

+			case 199: s = "invalid Lhs"; break;

+			case 200: s = "invalid Guard"; break;

 			case 201: s = "this symbol not expected in LoopSpec"; break;

 			case 202: s = "this symbol not expected in LoopSpec"; break;

-			case 203: s = "this symbol not expected in Invariant"; break;

-			case 204: s = "invalid AttributeArg"; break;

-			case 205: s = "invalid CalcOp"; break;

-			case 206: s = "invalid EquivOp"; break;

-			case 207: s = "invalid ImpliesOp"; break;

-			case 208: s = "invalid ExpliesOp"; break;

-			case 209: s = "invalid AndOp"; break;

-			case 210: s = "invalid OrOp"; break;

-			case 211: s = "invalid RelOp"; break;

-			case 212: s = "invalid AddOp"; break;

-			case 213: s = "invalid UnaryExpression"; break;

-			case 214: s = "invalid UnaryExpression"; break;

-			case 215: s = "invalid MulOp"; break;

-			case 216: s = "invalid NegOp"; break;

-			case 217: s = "invalid EndlessExpression"; break;

-			case 218: s = "invalid Suffix"; break;

-			case 219: s = "invalid Suffix"; break;

-			case 220: s = "invalid Suffix"; break;

-			case 221: s = "invalid DisplayExpr"; break;

-			case 222: s = "invalid MultiSetExpr"; break;

-			case 223: s = "invalid ConstAtomExpression"; break;

-			case 224: s = "invalid Nat"; break;

-			case 225: s = "invalid LambdaArrow"; break;

-			case 226: s = "invalid QSep"; break;

-			case 227: s = "invalid MatchExpression"; break;

-			case 228: s = "invalid QuantifierGuts"; break;

-			case 229: s = "invalid StmtInExpr"; break;

-			case 230: s = "invalid LetExpr"; break;

-			case 231: s = "invalid CasePattern"; break;

-			case 232: s = "invalid Forall"; break;

-			case 233: s = "invalid Exists"; break;

+			case 203: s = "this symbol not expected in LoopSpec"; break;

+			case 204: s = "this symbol not expected in LoopSpec"; break;

+			case 205: s = "this symbol not expected in LoopSpec"; break;

+			case 206: s = "this symbol not expected in Invariant"; break;

+			case 207: s = "invalid AttributeArg"; break;

+			case 208: s = "invalid CalcOp"; break;

+			case 209: s = "invalid EquivOp"; break;

+			case 210: s = "invalid ImpliesOp"; break;

+			case 211: s = "invalid ExpliesOp"; break;

+			case 212: s = "invalid AndOp"; break;

+			case 213: s = "invalid OrOp"; break;

+			case 214: s = "invalid RelOp"; break;

+			case 215: s = "invalid AddOp"; break;

+			case 216: s = "invalid UnaryExpression"; break;

+			case 217: s = "invalid UnaryExpression"; break;

+			case 218: s = "invalid MulOp"; break;

+			case 219: s = "invalid NegOp"; break;

+			case 220: s = "invalid EndlessExpression"; break;

+			case 221: s = "invalid Suffix"; break;

+			case 222: s = "invalid Suffix"; break;

+			case 223: s = "invalid Suffix"; break;

+			case 224: s = "invalid DisplayExpr"; break;

+			case 225: s = "invalid MultiSetExpr"; break;

+			case 226: s = "invalid ConstAtomExpression"; break;

+			case 227: s = "invalid Nat"; break;

+			case 228: s = "invalid LambdaArrow"; break;

+			case 229: s = "invalid QSep"; break;

+			case 230: s = "invalid MatchExpression"; break;

+			case 231: s = "invalid QuantifierGuts"; break;

+			case 232: s = "invalid StmtInExpr"; break;

+			case 233: s = "invalid LetExpr"; break;

+			case 234: s = "invalid CasePattern"; break;

+			case 235: s = "invalid Forall"; break;

+			case 236: s = "invalid Exists"; break;

 

 			default: s = "error " + n; break;

 		}