Dafny: removed support for the old keyword "unlimited" (all functions are limited)

author: Unknown <leino@LEINO6.redmond.corp.microsoft.com> 2012-06-11 14:24:51 -0700
committer: Unknown <leino@LEINO6.redmond.corp.microsoft.com> 2012-06-11 14:24:51 -0700
commit: d5606621b8146a258557c4824405c8331e4c8691 (patch)
tree: d7051a448c55367fe24e63a95c4d4950ca6b54b1
parent: 28f11d51299ba82f7cfbdc284a4ed43158619ac8 (diff)
11 files changed, 669 insertions, 689 deletions
diff --git a/Dafny/Dafny.atg b/Dafny/Dafny.atg
index 56eeb5b6..02685fd1 100644
--- a/Dafny/Dafny.atg
+++ b/Dafny/Dafny.atg
@@ -24,7 +24,6 @@ static int anonymousIds = 0;
 struct MemberModifiers {
   public bool IsGhost;
   public bool IsStatic;
-  public bool IsUnlimited;
 }
 // helper routine for parsing call statements
 ///<summary>
@@ -226,7 +225,6 @@ ClassMemberDecl<.List<MemberDecl/*!*/>/*!*/ mm, bool isAlreadyGhost, bool allowC
   .)
   { "ghost"                                (. mmod.IsGhost = true; .)
   | "static"                               (. mmod.IsStatic = true; .)
-  | "unlimited"                            (. mmod.IsUnlimited = true; .)
   }
   ( FieldDecl<mmod, mm>
   | FunctionDecl<mmod, out f>                   (. mm.Add(f); .)
@@ -281,8 +279,7 @@ FieldDecl<.MemberModifiers mmod, List<MemberDecl/*!*/>/*!*/ mm.>
   .)
   SYNC
   "var"
-  (. if (mmod.IsUnlimited) { SemErr(t, "fields cannot be declared 'unlimited'"); }
-     if (mmod.IsStatic) { SemErr(t, "fields cannot be declared 'static'"); }
+  (. if (mmod.IsStatic) { SemErr(t, "fields cannot be declared 'static'"); }
   .)
   { Attribute<ref attrs> }
   IdentType<out id, out ty>                         (. mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs)); .)
@@ -396,8 +393,7 @@ MethodDecl<MemberModifiers mmod, bool allowConstructor, out Method/*!*/ m>
                                        }
                                     .)
   )
-  (. if (mmod.IsUnlimited) { SemErr(t, "methods cannot be declared 'unlimited'"); }
-     if (isConstructor) {
+  (. if (isConstructor) {
        if (mmod.IsGhost) {
          SemErr(t, "constructors cannot be declared 'ghost'");
        }
@@ -596,10 +592,10 @@ FunctionDecl<MemberModifiers mmod, out Function/*!*/ f>
   [ FunctionBody<out body, out bodyStart, out bodyEnd>
   ]
   (. if (isPredicate) {
-        f = new Predicate(id, id.val, mmod.IsStatic, !isFunctionMethod, mmod.IsUnlimited, typeArgs, openParen, formals,
+        f = new Predicate(id, id.val, mmod.IsStatic, !isFunctionMethod, typeArgs, openParen, formals,
                           reqs, reads, ens, new Specification<Expression>(decreases, null), body, false, attrs, signatureOmitted);
      } else {
-        f = new Function(id, id.val, mmod.IsStatic, !isFunctionMethod, mmod.IsUnlimited, typeArgs, openParen, formals, returnType,
+        f = new Function(id, id.val, mmod.IsStatic, !isFunctionMethod, typeArgs, openParen, formals, returnType,
                          reqs, reads, ens, new Specification<Expression>(decreases, null), body, attrs, signatureOmitted);
      }
      f.BodyStartTok = bodyStart;
diff --git a/Dafny/DafnyAst.cs b/Dafny/DafnyAst.cs
index 0a842025..fd58835c 100644
--- a/Dafny/DafnyAst.cs
+++ b/Dafny/DafnyAst.cs
@@ -1172,7 +1172,6 @@ namespace Microsoft.Dafny {
 
   public class Function : MemberDecl, TypeParameter.ParentType {
     public readonly bool IsGhost;  // functions are "ghost" by default; a non-ghost function is called a "function method"
-    public readonly bool IsUnlimited;
     public bool IsRecursive;  // filled in during resolution
     public readonly List<TypeParameter/*!*/>/*!*/ TypeArgs;
     public readonly IToken OpenParen;  // can be null (for predicates), if there are no formals
@@ -1195,7 +1194,7 @@ namespace Microsoft.Dafny {
       Contract.Invariant(Decreases != null);
     }
 
-    public Function(IToken tok, string name, bool isStatic, bool isGhost, bool isUnlimited,
+    public Function(IToken tok, string name, bool isStatic, bool isGhost,
                     List<TypeParameter> typeArgs, IToken openParen, List<Formal> formals, Type resultType,
                     List<Expression> req, List<FrameExpression> reads, List<Expression> ens, Specification<Expression> decreases,
                     Expression body, Attributes attributes, bool signatureOmitted)
@@ -1211,7 +1210,6 @@ namespace Microsoft.Dafny {
       Contract.Requires(cce.NonNullElements(ens));
       Contract.Requires(decreases != null);
       this.IsGhost = isGhost;
-      this.IsUnlimited = isUnlimited;
       this.TypeArgs = typeArgs;
       this.OpenParen = openParen;
       this.Formals = formals;
@@ -1228,11 +1226,11 @@ namespace Microsoft.Dafny {
   public class Predicate : Function
   {
     public readonly bool BodyIsExtended;  // says that this predicate definition is a refinement extension of a predicate definition is a refining module
-    public Predicate(IToken tok, string name, bool isStatic, bool isGhost, bool isUnlimited,
+    public Predicate(IToken tok, string name, bool isStatic, bool isGhost,
                      List<TypeParameter> typeArgs, IToken openParen, List<Formal> formals,
                      List<Expression> req, List<FrameExpression> reads, List<Expression> ens, Specification<Expression> decreases,
                      Expression body, bool bodyIsExtended, Attributes attributes, bool signatureOmitted)
-      : base(tok, name, isStatic, isGhost, isUnlimited, typeArgs, openParen, formals, new BoolType(), req, reads, ens, decreases, body, attributes, signatureOmitted) {
+      : base(tok, name, isStatic, isGhost, typeArgs, openParen, formals, new BoolType(), req, reads, ens, decreases, body, attributes, signatureOmitted) {
       Contract.Requires(!bodyIsExtended || body != null);
       BodyIsExtended = bodyIsExtended;
     }
diff --git a/Dafny/Parser.cs b/Dafny/Parser.cs
index 4634c87a..f3ac7f54 100644
--- a/Dafny/Parser.cs
+++ b/Dafny/Parser.cs
@@ -21,7 +21,7 @@ public class Parser {
 	public const int _colon = 5;
 	public const int _lbrace = 6;
 	public const int _rbrace = 7;
-	public const int maxT = 108;
+	public const int maxT = 107;
 
 	const bool T = true;
 	const bool x = false;
@@ -44,7 +44,6 @@ static int anonymousIds = 0;
 struct MemberModifiers {
   public bool IsGhost;
   public bool IsStatic;
-  public bool IsUnlimited;
 }
 // helper routine for parsing call statements
 ///<summary>
@@ -231,10 +230,10 @@ bool IsAttribute() {
 					if (la.kind == 12) {
 						ClassDecl(module, out c);
 						module.TopLevelDecls.Add(c); 
-					} else if (la.kind == 15 || la.kind == 16) {
+					} else if (la.kind == 14 || la.kind == 15) {
 						DatatypeDecl(module, out dt);
 						module.TopLevelDecls.Add(dt); 
-					} else if (la.kind == 22) {
+					} else if (la.kind == 21) {
 						ArbitraryTypeDecl(module, out at);
 						module.TopLevelDecls.Add(at); 
 					} else {
@@ -249,17 +248,17 @@ bool IsAttribute() {
 				if (isGhost) { SemErr(t, "a class is not allowed to be declared as 'ghost'"); } 
 				ClassDecl(defaultModule, out c);
 				defaultModule.TopLevelDecls.Add(c); 
-			} else if (la.kind == 15 || la.kind == 16) {
+			} else if (la.kind == 14 || la.kind == 15) {
 				if (isGhost) { SemErr(t, "a datatype/codatatype is not allowed to be declared as 'ghost'"); } 
 				DatatypeDecl(defaultModule, out dt);
 				defaultModule.TopLevelDecls.Add(dt); 
-			} else if (la.kind == 22) {
+			} else if (la.kind == 21) {
 				if (isGhost) { SemErr(t, "a type is not allowed to be declared as 'ghost'"); } 
 				ArbitraryTypeDecl(defaultModule, out at);
 				defaultModule.TopLevelDecls.Add(at); 
 			} else if (StartOf(3)) {
 				ClassMemberDecl(membersDefaultClass, isGhost, false);
-			} else SynErr(109);
+			} else SynErr(108);
 		}
 		if (defaultModuleCreatedHere) {
 		 defaultModule.TopLevelDecls.Add(new DefaultClassDecl(defaultModule, membersDefaultClass));
@@ -294,7 +293,7 @@ bool IsAttribute() {
 		IToken/*!*/ id; 
 		Ident(out id);
 		ids.Add(id.val); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			Ident(out id);
 			ids.Add(id.val); 
@@ -310,13 +309,13 @@ bool IsAttribute() {
 		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();
 		IToken bodyStart;
 		
-		while (!(la.kind == 0 || la.kind == 12)) {SynErr(110); Get();}
+		while (!(la.kind == 0 || la.kind == 12)) {SynErr(109); Get();}
 		Expect(12);
 		while (la.kind == 6) {
 			Attribute(ref attrs);
 		}
 		Ident(out id);
-		if (la.kind == 23) {
+		if (la.kind == 22) {
 			GenericParameters(typeArgs);
 		}
 		Expect(6);
@@ -341,29 +340,29 @@ bool IsAttribute() {
 		IToken bodyStart = Token.NoToken;  // dummy assignment
 		bool co = false;
 		
-		while (!(la.kind == 0 || la.kind == 15 || la.kind == 16)) {SynErr(111); Get();}
-		if (la.kind == 15) {
+		while (!(la.kind == 0 || la.kind == 14 || la.kind == 15)) {SynErr(110); Get();}
+		if (la.kind == 14) {
 			Get();
-		} else if (la.kind == 16) {
+		} else if (la.kind == 15) {
 			Get();
 			co = true; 
-		} else SynErr(112);
+		} else SynErr(111);
 		while (la.kind == 6) {
 			Attribute(ref attrs);
 		}
 		Ident(out id);
-		if (la.kind == 23) {
+		if (la.kind == 22) {
 			GenericParameters(typeArgs);
 		}
-		Expect(17);
+		Expect(16);
 		bodyStart = t; 
 		DatatypeMemberDecl(ctors);
-		while (la.kind == 18) {
+		while (la.kind == 17) {
 			Get();
 			DatatypeMemberDecl(ctors);
 		}
-		while (!(la.kind == 0 || la.kind == 19)) {SynErr(113); Get();}
-		Expect(19);
+		while (!(la.kind == 0 || la.kind == 18)) {SynErr(112); Get();}
+		Expect(18);
 		if (co) {
 		 dt = new CoDatatypeDecl(id, id.val, module, typeArgs, ctors, attrs);
 		} else {
@@ -378,14 +377,14 @@ bool IsAttribute() {
 		IToken/*!*/ id;
 		Attributes attrs = null;
 		
-		Expect(22);
+		Expect(21);
 		while (la.kind == 6) {
 			Attribute(ref attrs);
 		}
 		Ident(out id);
 		at = new ArbitraryTypeDecl(id, id.val, module, attrs); 
-		while (!(la.kind == 0 || la.kind == 19)) {SynErr(114); Get();}
-		Expect(19);
+		while (!(la.kind == 0 || la.kind == 18)) {SynErr(113); Get();}
+		Expect(18);
 	}
 
 	void ClassMemberDecl(List<MemberDecl/*!*/>/*!*/ mm, bool isAlreadyGhost, bool allowConstructors) {
@@ -395,41 +394,38 @@ bool IsAttribute() {
 		MemberModifiers mmod = new MemberModifiers();
 		mmod.IsGhost = isAlreadyGhost;
 		
-		while (la.kind == 8 || la.kind == 13 || la.kind == 14) {
+		while (la.kind == 8 || la.kind == 13) {
 			if (la.kind == 8) {
 				Get();
 				mmod.IsGhost = true; 
-			} else if (la.kind == 13) {
-				Get();
-				mmod.IsStatic = true; 
 			} else {
 				Get();
-				mmod.IsUnlimited = true; 
+				mmod.IsStatic = true; 
 			}
 		}
-		if (la.kind == 20) {
+		if (la.kind == 19) {
 			FieldDecl(mmod, mm);
-		} else if (la.kind == 44 || la.kind == 45) {
+		} else if (la.kind == 43 || la.kind == 44) {
 			FunctionDecl(mmod, out f);
 			mm.Add(f); 
-		} else if (la.kind == 25 || la.kind == 26) {
+		} else if (la.kind == 24 || la.kind == 25) {
 			MethodDecl(mmod, allowConstructors, out m);
 			mm.Add(m); 
-		} else SynErr(115);
+		} else SynErr(114);
 	}
 
 	void GenericParameters(List<TypeParameter/*!*/>/*!*/ typeArgs) {
 		Contract.Requires(cce.NonNullElements(typeArgs));
 		IToken/*!*/ id; 
-		Expect(23);
+		Expect(22);
 		Ident(out id);
 		typeArgs.Add(new TypeParameter(id, id.val)); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			Ident(out id);
 			typeArgs.Add(new TypeParameter(id, id.val)); 
 		}
-		Expect(24);
+		Expect(23);
 	}
 
 	void FieldDecl(MemberModifiers mmod, List<MemberDecl/*!*/>/*!*/ mm) {
@@ -437,9 +433,8 @@ bool IsAttribute() {
 		Attributes attrs = null;
 		IToken/*!*/ id;  Type/*!*/ ty;
 		
-		while (!(la.kind == 0 || la.kind == 20)) {SynErr(116); Get();}
-		Expect(20);
-		if (mmod.IsUnlimited) { SemErr(t, "fields cannot be declared 'unlimited'"); }
+		while (!(la.kind == 0 || la.kind == 19)) {SynErr(115); Get();}
+		Expect(19);
 		if (mmod.IsStatic) { SemErr(t, "fields cannot be declared 'static'"); }
 		
 		while (la.kind == 6) {
@@ -447,13 +442,13 @@ bool IsAttribute() {
 		}
 		IdentType(out id, out ty);
 		mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs)); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			IdentType(out id, out ty);
 			mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs)); 
 		}
-		while (!(la.kind == 0 || la.kind == 19)) {SynErr(117); Get();}
-		Expect(19);
+		while (!(la.kind == 0 || la.kind == 18)) {SynErr(116); Get();}
+		Expect(18);
 	}
 
 	void FunctionDecl(MemberModifiers mmod, out Function/*!*/ f) {
@@ -475,9 +470,9 @@ bool IsAttribute() {
 		IToken bodyEnd = Token.NoToken;
 		bool signatureOmitted = false;
 		
-		if (la.kind == 44) {
+		if (la.kind == 43) {
 			Get();
-			if (la.kind == 25) {
+			if (la.kind == 24) {
 				Get();
 				isFunctionMethod = true; 
 			}
@@ -487,22 +482,22 @@ bool IsAttribute() {
 				Attribute(ref attrs);
 			}
 			Ident(out id);
-			if (la.kind == 23 || la.kind == 34) {
-				if (la.kind == 23) {
+			if (la.kind == 22 || la.kind == 33) {
+				if (la.kind == 22) {
 					GenericParameters(typeArgs);
 				}
 				Formals(true, isFunctionMethod, formals, out openParen);
 				Expect(5);
 				Type(out returnType);
-			} else if (la.kind == 28) {
+			} else if (la.kind == 27) {
 				Get();
 				signatureOmitted = true;
 				openParen = Token.NoToken; 
-			} else SynErr(118);
-		} else if (la.kind == 45) {
+			} else SynErr(117);
+		} else if (la.kind == 44) {
 			Get();
 			isPredicate = true; 
-			if (la.kind == 25) {
+			if (la.kind == 24) {
 				Get();
 				isFunctionMethod = true; 
 			}
@@ -513,22 +508,22 @@ bool IsAttribute() {
 			}
 			Ident(out id);
 			if (StartOf(4)) {
-				if (la.kind == 23) {
+				if (la.kind == 22) {
 					GenericParameters(typeArgs);
 				}
-				if (la.kind == 34) {
+				if (la.kind == 33) {
 					Formals(true, isFunctionMethod, formals, out openParen);
 					if (la.kind == 5) {
 						Get();
 						SemErr(t, "predicates do not have an explicitly declared return type; it is always bool"); 
 					}
 				}
-			} else if (la.kind == 28) {
+			} else if (la.kind == 27) {
 				Get();
 				signatureOmitted = true;
 				openParen = Token.NoToken; 
-			} else SynErr(119);
-		} else SynErr(120);
+			} else SynErr(118);
+		} else SynErr(119);
 		while (StartOf(5)) {
 			FunctionSpec(reqs, reads, ens, decreases);
 		}
@@ -536,10 +531,10 @@ bool IsAttribute() {
 			FunctionBody(out body, out bodyStart, out bodyEnd);
 		}
 		if (isPredicate) {
-		  f = new Predicate(id, id.val, mmod.IsStatic, !isFunctionMethod, mmod.IsUnlimited, typeArgs, openParen, formals,
+		  f = new Predicate(id, id.val, mmod.IsStatic, !isFunctionMethod, typeArgs, openParen, formals,
 		                    reqs, reads, ens, new Specification<Expression>(decreases, null), body, false, attrs, signatureOmitted);
 		} else {
-		  f = new Function(id, id.val, mmod.IsStatic, !isFunctionMethod, mmod.IsUnlimited, typeArgs, openParen, formals, returnType,
+		  f = new Function(id, id.val, mmod.IsStatic, !isFunctionMethod, typeArgs, openParen, formals, returnType,
 		                   reqs, reads, ens, new Specification<Expression>(decreases, null), body, attrs, signatureOmitted);
 		}
 		f.BodyStartTok = bodyStart;
@@ -567,10 +562,10 @@ bool IsAttribute() {
 		IToken bodyStart = Token.NoToken;
 		IToken bodyEnd = Token.NoToken;
 		
-		while (!(la.kind == 0 || la.kind == 25 || la.kind == 26)) {SynErr(121); Get();}
-		if (la.kind == 25) {
+		while (!(la.kind == 0 || la.kind == 24 || la.kind == 25)) {SynErr(120); Get();}
+		if (la.kind == 24) {
 			Get();
-		} else if (la.kind == 26) {
+		} else if (la.kind == 25) {
 			Get();
 			if (allowConstructor) {
 			 isConstructor = true;
@@ -578,8 +573,7 @@ bool IsAttribute() {
 			 SemErr(t, "constructors are only allowed in classes");
 			}
 			
-		} else SynErr(122);
-		if (mmod.IsUnlimited) { SemErr(t, "methods cannot be declared 'unlimited'"); }
+		} else SynErr(121);
 		if (isConstructor) {
 		 if (mmod.IsGhost) {
 		   SemErr(t, "constructors cannot be declared 'ghost'");
@@ -593,20 +587,20 @@ bool IsAttribute() {
 			Attribute(ref attrs);
 		}
 		Ident(out id);
-		if (la.kind == 23 || la.kind == 34) {
-			if (la.kind == 23) {
+		if (la.kind == 22 || la.kind == 33) {
+			if (la.kind == 22) {
 				GenericParameters(typeArgs);
 			}
 			Formals(true, !mmod.IsGhost, ins, out openParen);
-			if (la.kind == 27) {
+			if (la.kind == 26) {
 				Get();
 				if (isConstructor) { SemErr(t, "constructors cannot have out-parameters"); } 
 				Formals(false, !mmod.IsGhost, outs, out openParen);
 			}
-		} else if (la.kind == 28) {
+		} else if (la.kind == 27) {
 			Get();
 			signatureOmitted = true; openParen = Token.NoToken; 
-		} else SynErr(123);
+		} else SynErr(122);
 		while (StartOf(6)) {
 			MethodSpec(req, mod, ens, dec, ref decAttrs, ref modAttrs);
 		}
@@ -635,7 +629,7 @@ bool IsAttribute() {
 			Attribute(ref attrs);
 		}
 		Ident(out id);
-		if (la.kind == 34) {
+		if (la.kind == 33) {
 			FormalsOptionalIds(formals);
 		}
 		ctors.Add(new DatatypeCtor(id, id.val, formals, attrs)); 
@@ -643,17 +637,17 @@ bool IsAttribute() {
 
 	void FormalsOptionalIds(List<Formal/*!*/>/*!*/ formals) {
 		Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id;  Type/*!*/ ty;  string/*!*/ name;  bool isGhost; 
-		Expect(34);
+		Expect(33);
 		if (StartOf(7)) {
 			TypeIdentOptional(out id, out name, out ty, out isGhost);
 			formals.Add(new Formal(id, name, ty, true, isGhost)); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				TypeIdentOptional(out id, out name, out ty, out isGhost);
 				formals.Add(new Formal(id, name, ty, true, isGhost)); 
 			}
 		}
-		Expect(35);
+		Expect(34);
 	}
 
 	void IdentType(out IToken/*!*/ id, out Type/*!*/ ty) {
@@ -737,22 +731,22 @@ bool IsAttribute() {
 		List<Type/*!*/>/*!*/ gt;
 		
 		switch (la.kind) {
-		case 36: {
+		case 35: {
 			Get();
 			tok = t; 
 			break;
 		}
-		case 37: {
+		case 36: {
 			Get();
 			tok = t;  ty = new NatType(); 
 			break;
 		}
-		case 38: {
+		case 37: {
 			Get();
 			tok = t;  ty = new IntType(); 
 			break;
 		}
-		case 39: {
+		case 38: {
 			Get();
 			tok = t;  gt = new List<Type/*!*/>(); 
 			GenericInstantiation(gt);
@@ -763,7 +757,7 @@ bool IsAttribute() {
 			
 			break;
 		}
-		case 40: {
+		case 39: {
 			Get();
 			tok = t;  gt = new List<Type/*!*/>(); 
 			GenericInstantiation(gt);
@@ -774,7 +768,7 @@ bool IsAttribute() {
 			
 			break;
 		}
-		case 41: {
+		case 40: {
 			Get();
 			tok = t;  gt = new List<Type/*!*/>(); 
 			GenericInstantiation(gt);
@@ -785,7 +779,7 @@ bool IsAttribute() {
 			
 			break;
 		}
-		case 42: {
+		case 41: {
 			Get();
 			tok = t;  gt = new List<Type/*!*/>(); 
 			GenericInstantiation(gt);
@@ -796,28 +790,28 @@ bool IsAttribute() {
 			
 			break;
 		}
-		case 1: case 3: case 43: {
+		case 1: case 3: case 42: {
 			ReferenceType(out tok, out ty);
 			break;
 		}
-		default: SynErr(124); break;
+		default: SynErr(123); break;
 		}
 	}
 
 	void Formals(bool incoming, bool allowGhostKeyword, List<Formal/*!*/>/*!*/ formals, out IToken openParen) {
 		Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id;  Type/*!*/ ty;  bool isGhost; 
-		Expect(34);
+		Expect(33);
 		openParen = t; 
 		if (la.kind == 1 || la.kind == 8) {
 			GIdentType(allowGhostKeyword, out id, out ty, out isGhost);
 			formals.Add(new Formal(id, id.val, ty, incoming, isGhost)); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				GIdentType(allowGhostKeyword, out id, out ty, out isGhost);
 				formals.Add(new Formal(id, id.val, ty, incoming, isGhost)); 
 			}
 		}
-		Expect(35);
+		Expect(34);
 	}
 
 	void MethodSpec(List<MaybeFreeExpression/*!*/>/*!*/ req, List<FrameExpression/*!*/>/*!*/ mod, List<MaybeFreeExpression/*!*/>/*!*/ ens,
@@ -825,8 +819,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(8))) {SynErr(125); Get();}
-		if (la.kind == 29) {
+		while (!(StartOf(8))) {SynErr(124); Get();}
+		if (la.kind == 28) {
 			Get();
 			while (IsAttribute()) {
 				Attribute(ref modAttrs);
@@ -834,44 +828,44 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(9)) {
 				FrameExpression(out fe);
 				mod.Add(fe); 
-				while (la.kind == 21) {
+				while (la.kind == 20) {
 					Get();
 					FrameExpression(out fe);
 					mod.Add(fe); 
 				}
 			}
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(126); Get();}
-			Expect(19);
-		} else if (la.kind == 30 || la.kind == 31 || la.kind == 32) {
-			if (la.kind == 30) {
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(125); Get();}
+			Expect(18);
+		} else if (la.kind == 29 || la.kind == 30 || la.kind == 31) {
+			if (la.kind == 29) {
 				Get();
 				isFree = true; 
 			}
-			if (la.kind == 31) {
+			if (la.kind == 30) {
 				Get();
 				Expression(out e);
-				while (!(la.kind == 0 || la.kind == 19)) {SynErr(127); Get();}
-				Expect(19);
+				while (!(la.kind == 0 || la.kind == 18)) {SynErr(126); Get();}
+				Expect(18);
 				req.Add(new MaybeFreeExpression(e, isFree)); 
-			} else if (la.kind == 32) {
+			} else if (la.kind == 31) {
 				Get();
 				while (IsAttribute()) {
 					Attribute(ref ensAttrs);
 				}
 				Expression(out e);
-				while (!(la.kind == 0 || la.kind == 19)) {SynErr(128); Get();}
-				Expect(19);
+				while (!(la.kind == 0 || la.kind == 18)) {SynErr(127); Get();}
+				Expect(18);
 				ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs)); 
-			} else SynErr(129);
-		} else if (la.kind == 33) {
+			} else SynErr(128);
+		} else if (la.kind == 32) {
 			Get();
 			while (IsAttribute()) {
 				Attribute(ref decAttrs);
 			}
 			DecreasesList(decreases, false);
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(130); Get();}
-			Expect(19);
-		} else SynErr(131);
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(129); Get();}
+			Expect(18);
+		} else SynErr(130);
 	}
 
 	void BlockStmt(out BlockStmt/*!*/ block, out IToken bodyStart, out IToken bodyEnd) {
@@ -891,7 +885,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void FrameExpression(out FrameExpression/*!*/ fe) {
 		Contract.Ensures(Contract.ValueAtReturn(out fe) != null); Expression/*!*/ e;  IToken/*!*/ id;  string fieldName = null; 
 		Expression(out e);
-		if (la.kind == 48) {
+		if (la.kind == 47) {
 			Get();
 			Ident(out id);
 			fieldName = id.val; 
@@ -912,7 +906,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		 decreases.Add(e);
 		}
 		
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			PossiblyWildExpression(out e);
 			if (!allowWildcard && e is WildcardExpr) {
@@ -926,15 +920,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 
 	void GenericInstantiation(List<Type/*!*/>/*!*/ gt) {
 		Contract.Requires(cce.NonNullElements(gt)); Type/*!*/ ty; 
-		Expect(23);
+		Expect(22);
 		Type(out ty);
 		gt.Add(ty); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			Type(out ty);
 			gt.Add(ty); 
 		}
-		Expect(24);
+		Expect(23);
 	}
 
 	void ReferenceType(out IToken/*!*/ tok, out Type/*!*/ ty) {
@@ -942,7 +936,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		tok = Token.NoToken;  ty = new BoolType();  /*keep compiler happy*/
 		List<Type/*!*/>/*!*/ gt;
 		
-		if (la.kind == 43) {
+		if (la.kind == 42) {
 			Get();
 			tok = t;  ty = new ObjectType(); 
 		} else if (la.kind == 3) {
@@ -961,48 +955,48 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 1) {
 			Ident(out tok);
 			gt = new List<Type/*!*/>(); 
-			if (la.kind == 23) {
+			if (la.kind == 22) {
 				GenericInstantiation(gt);
 			}
 			ty = new UserDefinedType(tok, tok.val, gt); 
-		} else SynErr(132);
+		} else SynErr(131);
 	}
 
 	void FunctionSpec(List<Expression/*!*/>/*!*/ reqs, List<FrameExpression/*!*/>/*!*/ reads, List<Expression/*!*/>/*!*/ ens, List<Expression/*!*/>/*!*/ decreases) {
 		Contract.Requires(cce.NonNullElements(reqs)); Contract.Requires(cce.NonNullElements(reads)); Contract.Requires(cce.NonNullElements(decreases));
 		Expression/*!*/ e;  FrameExpression/*!*/ fe; 
-		if (la.kind == 31) {
-			while (!(la.kind == 0 || la.kind == 31)) {SynErr(133); Get();}
+		if (la.kind == 30) {
+			while (!(la.kind == 0 || la.kind == 30)) {SynErr(132); Get();}
 			Get();
 			Expression(out e);
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(134); Get();}
-			Expect(19);
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(133); Get();}
+			Expect(18);
 			reqs.Add(e); 
-		} else if (la.kind == 46) {
+		} else if (la.kind == 45) {
 			Get();
 			if (StartOf(11)) {
 				PossiblyWildFrameExpression(out fe);
 				reads.Add(fe); 
-				while (la.kind == 21) {
+				while (la.kind == 20) {
 					Get();
 					PossiblyWildFrameExpression(out fe);
 					reads.Add(fe); 
 				}
 			}
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(135); Get();}
-			Expect(19);
-		} else if (la.kind == 32) {
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(134); Get();}
+			Expect(18);
+		} else if (la.kind == 31) {
 			Get();
 			Expression(out e);
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(136); Get();}
-			Expect(19);
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(135); Get();}
+			Expect(18);
 			ens.Add(e); 
-		} else if (la.kind == 33) {
+		} else if (la.kind == 32) {
 			Get();
 			DecreasesList(decreases, false);
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(137); Get();}
-			Expect(19);
-		} else SynErr(138);
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(136); Get();}
+			Expect(18);
+		} else SynErr(137);
 	}
 
 	void FunctionBody(out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd) {
@@ -1016,23 +1010,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 
 	void PossiblyWildFrameExpression(out FrameExpression/*!*/ fe) {
 		Contract.Ensures(Contract.ValueAtReturn(out fe) != null); fe = dummyFrameExpr; 
-		if (la.kind == 47) {
+		if (la.kind == 46) {
 			Get();
 			fe = new FrameExpression(new WildcardExpr(t), null); 
 		} else if (StartOf(9)) {
 			FrameExpression(out fe);
-		} else SynErr(139);
+		} else SynErr(138);
 	}
 
 	void PossiblyWildExpression(out Expression/*!*/ e) {
 		Contract.Ensures(Contract.ValueAtReturn(out e)!=null);
 		e = dummyExpr; 
-		if (la.kind == 47) {
+		if (la.kind == 46) {
 			Get();
 			e = new WildcardExpr(t); 
 		} else if (StartOf(9)) {
 			Expression(out e);
-		} else SynErr(140);
+		} else SynErr(139);
 	}
 
 	void Stmt(List<Statement/*!*/>/*!*/ ss) {
@@ -1049,50 +1043,50 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken bodyStart, bodyEnd;
 		int breakCount;
 		
-		while (!(StartOf(12))) {SynErr(141); Get();}
+		while (!(StartOf(12))) {SynErr(140); Get();}
 		switch (la.kind) {
 		case 6: {
 			BlockStmt(out bs, out bodyStart, out bodyEnd);
 			s = bs; 
 			break;
 		}
-		case 66: {
+		case 65: {
 			AssertStmt(out s);
 			break;
 		}
-		case 67: {
+		case 66: {
 			AssumeStmt(out s);
 			break;
 		}
-		case 68: {
+		case 67: {
 			PrintStmt(out s);
 			break;
 		}
-		case 1: case 2: case 18: case 34: case 93: case 94: case 95: case 96: case 97: case 98: case 99: {
+		case 1: case 2: case 17: case 33: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {
 			UpdateStmt(out s);
 			break;
 		}
-		case 8: case 20: {
+		case 8: case 19: {
 			VarDeclStatement(out s);
 			break;
 		}
-		case 59: {
+		case 58: {
 			IfStmt(out s);
 			break;
 		}
-		case 63: {
+		case 62: {
 			WhileStmt(out s);
 			break;
 		}
-		case 65: {
+		case 64: {
 			MatchStmt(out s);
 			break;
 		}
-		case 69: {
+		case 68: {
 			ParallelStmt(out s);
 			break;
 		}
-		case 49: {
+		case 48: {
 			Get();
 			x = t; 
 			Ident(out id);
@@ -1101,34 +1095,34 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			s.Labels = new LList<Label>(new Label(x, id.val), s.Labels); 
 			break;
 		}
-		case 50: {
+		case 49: {
 			Get();
 			x = t; breakCount = 1; label = null; 
 			if (la.kind == 1) {
 				Ident(out id);
 				label = id.val; 
-			} else if (la.kind == 19 || la.kind == 50) {
-				while (la.kind == 50) {
+			} else if (la.kind == 18 || la.kind == 49) {
+				while (la.kind == 49) {
 					Get();
 					breakCount++; 
 				}
-			} else SynErr(142);
-			while (!(la.kind == 0 || la.kind == 19)) {SynErr(143); Get();}
-			Expect(19);
+			} else SynErr(141);
+			while (!(la.kind == 0 || la.kind == 18)) {SynErr(142); Get();}
+			Expect(18);
 			s = label != null ? new BreakStmt(x, label) : new BreakStmt(x, breakCount); 
 			break;
 		}
-		case 51: {
+		case 50: {
 			ReturnStmt(out s);
 			break;
 		}
-		case 28: {
+		case 27: {
 			Get();
 			s = new SkeletonStatement(t); 
-			Expect(19);
+			Expect(18);
 			break;
 		}
-		default: SynErr(144); break;
+		default: SynErr(143); break;
 		}
 	}
 
@@ -1136,17 +1130,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;
 		Expression/*!*/ e = null; Attributes attrs = null;
 		
-		Expect(66);
+		Expect(65);
 		x = t; s = null;
 		while (IsAttribute()) {
 			Attribute(ref attrs);
 		}
 		if (StartOf(9)) {
 			Expression(out e);
-		} else if (la.kind == 28) {
+		} else if (la.kind == 27) {
 			Get();
-		} else SynErr(145);
-		Expect(19);
+		} else SynErr(144);
+		Expect(18);
 		if (e == null) {
 		 s = new SkeletonStatement(new AssertStmt(x, new LiteralExpr(x, true), attrs), true, false);
 		} else {
@@ -1157,10 +1151,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 
 	void AssumeStmt(out Statement/*!*/ s) {
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;  Expression/*!*/ e; 
-		Expect(67);
+		Expect(66);
 		x = t; 
 		Expression(out e);
-		Expect(19);
+		Expect(18);
 		s = new AssumeStmt(x, e); 
 	}
 
@@ -1168,16 +1162,16 @@ 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(68);
+		Expect(67);
 		x = t; 
 		AttributeArg(out arg);
 		args.Add(arg); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			AttributeArg(out arg);
 			args.Add(arg); 
 		}
-		Expect(19);
+		Expect(18);
 		s = new PrintStmt(x, args); 
 	}
 
@@ -1192,39 +1186,39 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		
 		Lhs(out e);
 		x = e.tok; 
-		if (la.kind == 6 || la.kind == 19) {
+		if (la.kind == 6 || la.kind == 18) {
 			while (la.kind == 6) {
 				Attribute(ref attrs);
 			}
-			Expect(19);
+			Expect(18);
 			rhss.Add(new ExprRhs(e, attrs)); 
-		} else if (la.kind == 21 || la.kind == 52 || la.kind == 53) {
+		} else if (la.kind == 20 || la.kind == 51 || la.kind == 52) {
 			lhss.Add(e);  lhs0 = e; 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				Lhs(out e);
 				lhss.Add(e); 
 			}
-			if (la.kind == 52) {
+			if (la.kind == 51) {
 				Get();
 				x = t; 
 				Rhs(out r, lhs0);
 				rhss.Add(r); 
-				while (la.kind == 21) {
+				while (la.kind == 20) {
 					Get();
 					Rhs(out r, lhs0);
 					rhss.Add(r); 
 				}
-			} else if (la.kind == 53) {
+			} else if (la.kind == 52) {
 				Get();
 				x = t; 
 				Expression(out suchThat);
-			} else SynErr(146);
-			Expect(19);
+			} else SynErr(145);
+			Expect(18);
 		} else if (la.kind == 5) {
 			Get();
 			SemErr(t, "invalid statement (did you forget the 'label' keyword?)"); 
-		} else SynErr(147);
+		} else SynErr(146);
 		if (suchThat != null) {
 		 s = new AssignSuchThatStmt(x, lhss, suchThat);
 		} else {
@@ -1245,17 +1239,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Get();
 			isGhost = true;  x = t; 
 		}
-		Expect(20);
+		Expect(19);
 		if (!isGhost) { x = t; } 
 		LocalIdentTypeOptional(out d, isGhost);
 		lhss.Add(d); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			LocalIdentTypeOptional(out d, isGhost);
 			lhss.Add(d); 
 		}
-		if (la.kind == 52 || la.kind == 53) {
-			if (la.kind == 52) {
+		if (la.kind == 51 || la.kind == 52) {
+			if (la.kind == 51) {
 				Get();
 				assignTok = t;
 				lhs0 = new IdentifierExpr(lhss[0].Tok, lhss[0].Name);
@@ -1263,7 +1257,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				
 				Rhs(out r, lhs0);
 				rhss.Add(r); 
-				while (la.kind == 21) {
+				while (la.kind == 20) {
 					Get();
 					Rhs(out r, lhs0);
 					rhss.Add(r); 
@@ -1274,7 +1268,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expression(out suchThat);
 			}
 		}
-		Expect(19);
+		Expect(18);
 		ConcreteUpdateStatement update;
 		if (suchThat != null) {
 		 var ies = new List<Expression>();
@@ -1306,25 +1300,25 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;
 		ifStmt = dummyStmt;  // to please the compiler
 		
-		Expect(59);
+		Expect(58);
 		x = t; 
-		if (la.kind == 28 || la.kind == 34) {
-			if (la.kind == 34) {
+		if (la.kind == 27 || la.kind == 33) {
+			if (la.kind == 33) {
 				Guard(out guard);
 			} else {
 				Get();
 				guardOmitted = true; 
 			}
 			BlockStmt(out thn, out bodyStart, out bodyEnd);
-			if (la.kind == 60) {
+			if (la.kind == 59) {
 				Get();
-				if (la.kind == 59) {
+				if (la.kind == 58) {
 					IfStmt(out s);
 					els = s; 
 				} else if (la.kind == 6) {
 					BlockStmt(out bs, out bodyStart, out bodyEnd);
 					els = bs; 
-				} else SynErr(148);
+				} else SynErr(147);
 			}
 			if (guardOmitted) {
 			 ifStmt = new SkeletonStatement(new IfStmt(x, guard, thn, els), true, false);
@@ -1335,7 +1329,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 6) {
 			AlternativeBlock(out alternatives);
 			ifStmt = new AlternativeStmt(x, alternatives); 
-		} else SynErr(149);
+		} else SynErr(148);
 	}
 
 	void WhileStmt(out Statement/*!*/ stmt) {
@@ -1351,10 +1345,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<GuardedAlternative> alternatives;
 		stmt = dummyStmt;  // to please the compiler
 		
-		Expect(63);
+		Expect(62);
 		x = t; 
-		if (la.kind == 28 || la.kind == 34) {
-			if (la.kind == 34) {
+		if (la.kind == 27 || la.kind == 33) {
+			if (la.kind == 33) {
 				Guard(out guard);
 				Contract.Assume(guard == null || cce.Owner.None(guard)); 
 			} else {
@@ -1364,10 +1358,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			LoopSpec(out invariants, out decreases, out mod, ref decAttrs, ref modAttrs);
 			if (la.kind == 6) {
 				BlockStmt(out body, out bodyStart, out bodyEnd);
-			} else if (la.kind == 28) {
+			} else if (la.kind == 27) {
 				Get();
 				bodyOmitted = true; 
-			} else SynErr(150);
+			} else SynErr(149);
 			if (guardOmitted || bodyOmitted) {
 			 if (decreases.Count != 0) {
 			   SemErr(decreases[0].tok, "'decreases' clauses are not allowed on refining loops");
@@ -1388,18 +1382,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			LoopSpec(out invariants, out decreases, out mod, ref decAttrs, ref modAttrs);
 			AlternativeBlock(out alternatives);
 			stmt = new AlternativeLoopStmt(x, invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), alternatives); 
-		} else SynErr(151);
+		} else SynErr(150);
 	}
 
 	void MatchStmt(out Statement/*!*/ s) {
 		Contract.Ensures(Contract.ValueAtReturn(out s) != null);
 		Token x;  Expression/*!*/ e;  MatchCaseStmt/*!*/ c;
 		List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>(); 
-		Expect(65);
+		Expect(64);
 		x = t; 
 		Expression(out e);
 		Expect(6);
-		while (la.kind == 61) {
+		while (la.kind == 60) {
 			CaseStatement(out c);
 			cases.Add(c); 
 		}
@@ -1419,9 +1413,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BlockStmt/*!*/ block;
 		IToken bodyStart, bodyEnd;
 		
-		Expect(69);
+		Expect(68);
 		x = t; 
-		Expect(34);
+		Expect(33);
 		if (la.kind == 1) {
 			List<BoundVar/*!*/> bvarsX;  Attributes attrsX;  Expression rangeX; 
 			QuantifierDomain(out bvarsX, out attrsX, out rangeX);
@@ -1431,16 +1425,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (bvars == null) { bvars = new List<BoundVar>(); }
 		if (range == null) { range = new LiteralExpr(x, true); }
 		
-		Expect(35);
-		while (la.kind == 30 || la.kind == 32) {
+		Expect(34);
+		while (la.kind == 29 || la.kind == 31) {
 			isFree = false; 
-			if (la.kind == 30) {
+			if (la.kind == 29) {
 				Get();
 				isFree = true; 
 			}
-			Expect(32);
+			Expect(31);
 			Expression(out e);
-			Expect(19);
+			Expect(18);
 			ens.Add(new MaybeFreeExpression(e, isFree)); 
 		}
 		BlockStmt(out block, out bodyStart, out bodyEnd);
@@ -1452,18 +1446,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<AssignmentRhs> rhss = null;
 		AssignmentRhs r;
 		
-		Expect(51);
+		Expect(50);
 		returnTok = t; 
 		if (StartOf(14)) {
 			Rhs(out r, null);
 			rhss = new List<AssignmentRhs>(); rhss.Add(r); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				Rhs(out r, null);
 				rhss.Add(r); 
 			}
 		}
-		Expect(19);
+		Expect(18);
 		s = new ReturnStmt(returnTok, rhss); 
 	}
 
@@ -1476,27 +1470,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		r = null;  // to please compiler
 		Attributes attrs = null;
 		
-		if (la.kind == 54) {
+		if (la.kind == 53) {
 			Get();
 			newToken = t; 
 			TypeAndToken(out x, out ty);
-			if (la.kind == 55 || la.kind == 57) {
-				if (la.kind == 55) {
+			if (la.kind == 54 || la.kind == 56) {
+				if (la.kind == 54) {
 					Get();
 					ee = new List<Expression>(); 
 					Expressions(ee);
-					Expect(56);
+					Expect(55);
 					UserDefinedType tmp = theBuiltIns.ArrayType(x, ee.Count, new IntType(), true);
 					
 				} else {
 					Get();
 					Ident(out x);
-					Expect(34);
+					Expect(33);
 					args = new List<Expression/*!*/>(); 
 					if (StartOf(9)) {
 						Expressions(args);
 					}
-					Expect(35);
+					Expect(34);
 					initCall = new CallStmt(x, new List<Expression>(),
 					                       receiverForInitCall, x.val, args); 
 				}
@@ -1507,18 +1501,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 r = new TypeRhs(newToken, ty, initCall);
 			}
 			
-		} else if (la.kind == 58) {
+		} else if (la.kind == 57) {
 			Get();
 			x = t; 
 			Expression(out e);
 			r = new ExprRhs(new UnaryExpr(x, UnaryExpr.Opcode.SetChoose, e)); 
-		} else if (la.kind == 47) {
+		} else if (la.kind == 46) {
 			Get();
 			r = new HavocRhs(t); 
 		} else if (StartOf(9)) {
 			Expression(out e);
 			r = new ExprRhs(e); 
-		} else SynErr(152);
+		} else SynErr(151);
 		while (la.kind == 6) {
 			Attribute(ref attrs);
 		}
@@ -1530,23 +1524,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		
 		if (la.kind == 1) {
 			DottedIdentifiersAndFunction(out e);
-			while (la.kind == 55 || la.kind == 57) {
+			while (la.kind == 54 || la.kind == 56) {
 				Suffix(ref e);
 			}
 		} else if (StartOf(15)) {
 			ConstAtomExpression(out e);
 			Suffix(ref e);
-			while (la.kind == 55 || la.kind == 57) {
+			while (la.kind == 54 || la.kind == 56) {
 				Suffix(ref e);
 			}
-		} else SynErr(153);
+		} else SynErr(152);
 	}
 
 	void Expressions(List<Expression/*!*/>/*!*/ args) {
 		Contract.Requires(cce.NonNullElements(args)); Expression/*!*/ e; 
 		Expression(out e);
 		args.Add(e); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			Expression(out e);
 			args.Add(e); 
@@ -1555,15 +1549,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 
 	void Guard(out Expression e) {
 		Expression/*!*/ ee;  e = null; 
-		Expect(34);
-		if (la.kind == 47) {
+		Expect(33);
+		if (la.kind == 46) {
 			Get();
 			e = null; 
 		} else if (StartOf(9)) {
 			Expression(out ee);
 			e = ee; 
-		} else SynErr(154);
-		Expect(35);
+		} else SynErr(153);
+		Expect(34);
 	}
 
 	void AlternativeBlock(out List<GuardedAlternative> alternatives) {
@@ -1573,11 +1567,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Statement> body;
 		
 		Expect(6);
-		while (la.kind == 61) {
+		while (la.kind == 60) {
 			Get();
 			x = t; 
 			Expression(out e);
-			Expect(62);
+			Expect(61);
 			body = new List<Statement>(); 
 			while (StartOf(10)) {
 				Stmt(body);
@@ -1595,22 +1589,22 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		mod = null;
 		
 		while (StartOf(16)) {
-			if (la.kind == 30 || la.kind == 64) {
+			if (la.kind == 29 || la.kind == 63) {
 				Invariant(out invariant);
-				while (!(la.kind == 0 || la.kind == 19)) {SynErr(155); Get();}
-				Expect(19);
+				while (!(la.kind == 0 || la.kind == 18)) {SynErr(154); Get();}
+				Expect(18);
 				invariants.Add(invariant); 
-			} else if (la.kind == 33) {
-				while (!(la.kind == 0 || la.kind == 33)) {SynErr(156); Get();}
+			} else if (la.kind == 32) {
+				while (!(la.kind == 0 || la.kind == 32)) {SynErr(155); Get();}
 				Get();
 				while (IsAttribute()) {
 					Attribute(ref decAttrs);
 				}
 				DecreasesList(decreases, true);
-				while (!(la.kind == 0 || la.kind == 19)) {SynErr(157); Get();}
-				Expect(19);
+				while (!(la.kind == 0 || la.kind == 18)) {SynErr(156); Get();}
+				Expect(18);
 			} else {
-				while (!(la.kind == 0 || la.kind == 29)) {SynErr(158); Get();}
+				while (!(la.kind == 0 || la.kind == 28)) {SynErr(157); Get();}
 				Get();
 				while (IsAttribute()) {
 					Attribute(ref modAttrs);
@@ -1619,26 +1613,26 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				if (StartOf(9)) {
 					FrameExpression(out fe);
 					mod.Add(fe); 
-					while (la.kind == 21) {
+					while (la.kind == 20) {
 						Get();
 						FrameExpression(out fe);
 						mod.Add(fe); 
 					}
 				}
-				while (!(la.kind == 0 || la.kind == 19)) {SynErr(159); Get();}
-				Expect(19);
+				while (!(la.kind == 0 || la.kind == 18)) {SynErr(158); Get();}
+				Expect(18);
 			}
 		}
 	}
 
 	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 == 30 || la.kind == 64)) {SynErr(160); Get();}
-		if (la.kind == 30) {
+		while (!(la.kind == 0 || la.kind == 29 || la.kind == 63)) {SynErr(159); Get();}
+		if (la.kind == 29) {
 			Get();
 			isFree = true; 
 		}
-		Expect(64);
+		Expect(63);
 		while (IsAttribute()) {
 			Attribute(ref attrs);
 		}
@@ -1653,21 +1647,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;
 		List<Statement/*!*/> body = new List<Statement/*!*/>();
 		
-		Expect(61);
+		Expect(60);
 		x = t; 
 		Ident(out id);
-		if (la.kind == 34) {
+		if (la.kind == 33) {
 			Get();
 			IdentTypeOptional(out bv);
 			arguments.Add(bv); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				IdentTypeOptional(out bv);
 				arguments.Add(bv); 
 			}
-			Expect(35);
+			Expect(34);
 		}
-		Expect(62);
+		Expect(61);
 		while (StartOf(10)) {
 			Stmt(body);
 		}
@@ -1682,7 +1676,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (StartOf(9)) {
 			Expression(out e);
 			arg = new Attributes.Argument(t, e); 
-		} else SynErr(161);
+		} else SynErr(160);
 	}
 
 	void QuantifierDomain(out List<BoundVar/*!*/> bvars, out Attributes attrs, out Expression range) {
@@ -1693,7 +1687,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		
 		IdentTypeOptional(out bv);
 		bvars.Add(bv); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			IdentTypeOptional(out bv);
 			bvars.Add(bv); 
@@ -1701,7 +1695,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		while (la.kind == 6) {
 			Attribute(ref attrs);
 		}
-		if (la.kind == 18) {
+		if (la.kind == 17) {
 			Get();
 			Expression(out range);
 		}
@@ -1710,7 +1704,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void EquivExpression(out Expression/*!*/ e0) {
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 
 		ImpliesExpression(out e0);
-		while (la.kind == 70 || la.kind == 71) {
+		while (la.kind == 69 || la.kind == 70) {
 			EquivOp();
 			x = t; 
 			ImpliesExpression(out e1);
@@ -1721,7 +1715,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	void ImpliesExpression(out Expression/*!*/ e0) {
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 
 		LogicalExpression(out e0);
-		if (la.kind == 72 || la.kind == 73) {
+		if (la.kind == 71 || la.kind == 72) {
 			ImpliesOp();
 			x = t; 
 			ImpliesExpression(out e1);
@@ -1730,23 +1724,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}
 
 	void EquivOp() {
-		if (la.kind == 70) {
+		if (la.kind == 69) {
 			Get();
-		} else if (la.kind == 71) {
+		} else if (la.kind == 70) {
 			Get();
-		} else SynErr(162);
+		} else SynErr(161);
 	}
 
 	void LogicalExpression(out Expression/*!*/ e0) {
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; 
 		RelationalExpression(out e0);
 		if (StartOf(17)) {
-			if (la.kind == 74 || la.kind == 75) {
+			if (la.kind == 73 || la.kind == 74) {
 				AndOp();
 				x = t; 
 				RelationalExpression(out e1);
 				e0 = new BinaryExpr(x, BinaryExpr.Opcode.And, e0, e1); 
-				while (la.kind == 74 || la.kind == 75) {
+				while (la.kind == 73 || la.kind == 74) {
 					AndOp();
 					x = t; 
 					RelationalExpression(out e1);
@@ -1757,7 +1751,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				x = t; 
 				RelationalExpression(out e1);
 				e0 = new BinaryExpr(x, BinaryExpr.Opcode.Or, e0, e1); 
-				while (la.kind == 76 || la.kind == 77) {
+				while (la.kind == 75 || la.kind == 76) {
 					OrOp();
 					x = t; 
 					RelationalExpression(out e1);
@@ -1768,11 +1762,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}
 
 	void ImpliesOp() {
-		if (la.kind == 72) {
+		if (la.kind == 71) {
 			Get();
-		} else if (la.kind == 73) {
+		} else if (la.kind == 72) {
 			Get();
-		} else SynErr(163);
+		} else SynErr(162);
 	}
 
 	void RelationalExpression(out Expression/*!*/ e) {
@@ -1866,25 +1860,25 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}
 
 	void AndOp() {
-		if (la.kind == 74) {
+		if (la.kind == 73) {
 			Get();
-		} else if (la.kind == 75) {
+		} else if (la.kind == 74) {
 			Get();
-		} else SynErr(164);
+		} else SynErr(163);
 	}
 
 	void OrOp() {
-		if (la.kind == 76) {
+		if (la.kind == 75) {
 			Get();
-		} else if (la.kind == 77) {
+		} else if (la.kind == 76) {
 			Get();
-		} else SynErr(165);
+		} else SynErr(164);
 	}
 
 	void Term(out Expression/*!*/ e0) {
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; 
 		Factor(out e0);
-		while (la.kind == 88 || la.kind == 89) {
+		while (la.kind == 87 || la.kind == 88) {
 			AddOp(out x, out op);
 			Factor(out e1);
 			e0 = new BinaryExpr(x, op, e0, e1); 
@@ -1897,50 +1891,50 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken y;
 		
 		switch (la.kind) {
-		case 78: {
+		case 77: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Eq; 
 			break;
 		}
-		case 23: {
+		case 22: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Lt; 
 			break;
 		}
-		case 24: {
+		case 23: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Gt; 
 			break;
 		}
-		case 79: {
+		case 78: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Le; 
 			break;
 		}
-		case 80: {
+		case 79: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Ge; 
 			break;
 		}
-		case 81: {
+		case 80: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Neq; 
 			break;
 		}
-		case 82: {
+		case 81: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Disjoint; 
 			break;
 		}
-		case 83: {
+		case 82: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.In; 
 			break;
 		}
-		case 84: {
+		case 83: {
 			Get();
 			x = t;  y = Token.NoToken; 
-			if (la.kind == 83) {
+			if (la.kind == 82) {
 				Get();
 				y = t; 
 			}
@@ -1955,29 +1949,29 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			
 			break;
 		}
-		case 85: {
+		case 84: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Neq; 
 			break;
 		}
-		case 86: {
+		case 85: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Le; 
 			break;
 		}
-		case 87: {
+		case 86: {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Ge; 
 			break;
 		}
-		default: SynErr(166); break;
+		default: SynErr(165); break;
 		}
 	}
 
 	void Factor(out Expression/*!*/ e0) {
 		Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; 
 		UnaryExpression(out e0);
-		while (la.kind == 47 || la.kind == 90 || la.kind == 91) {
+		while (la.kind == 46 || la.kind == 89 || la.kind == 90) {
 			MulOp(out x, out op);
 			UnaryExpression(out e1);
 			e0 = new BinaryExpr(x, op, e0, e1); 
@@ -1986,86 +1980,86 @@ 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 == 88) {
+		if (la.kind == 87) {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Add; 
-		} else if (la.kind == 89) {
+		} else if (la.kind == 88) {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Sub; 
-		} else SynErr(167);
+		} else SynErr(166);
 	}
 
 	void UnaryExpression(out Expression/*!*/ e) {
 		Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x;  e = dummyExpr; 
 		switch (la.kind) {
-		case 89: {
+		case 88: {
 			Get();
 			x = t; 
 			UnaryExpression(out e);
 			e = new BinaryExpr(x, BinaryExpr.Opcode.Sub, new LiteralExpr(x, 0), e); 
 			break;
 		}
-		case 84: case 92: {
+		case 83: case 91: {
 			NegOp();
 			x = t; 
 			UnaryExpression(out e);
 			e = new UnaryExpr(x, UnaryExpr.Opcode.Not, e); 
 			break;
 		}
-		case 20: case 39: case 59: case 65: case 66: case 67: case 102: case 103: case 104: case 105: {
+		case 19: case 38: case 58: case 64: case 65: case 66: case 101: case 102: case 103: case 104: {
 			EndlessExpression(out e);
 			break;
 		}
 		case 1: {
 			DottedIdentifiersAndFunction(out e);
-			while (la.kind == 55 || la.kind == 57) {
+			while (la.kind == 54 || la.kind == 56) {
 				Suffix(ref e);
 			}
 			break;
 		}
-		case 6: case 55: {
+		case 6: case 54: {
 			DisplayExpr(out e);
 			break;
 		}
-		case 40: {
+		case 39: {
 			MultiSetExpr(out e);
 			break;
 		}
-		case 42: {
+		case 41: {
 			MapExpr(out e);
 			break;
 		}
-		case 2: case 18: case 34: case 93: case 94: case 95: case 96: case 97: case 98: case 99: {
+		case 2: case 17: case 33: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {
 			ConstAtomExpression(out e);
-			while (la.kind == 55 || la.kind == 57) {
+			while (la.kind == 54 || la.kind == 56) {
 				Suffix(ref e);
 			}
 			break;
 		}
-		default: SynErr(168); break;
+		default: SynErr(167); break;
 		}
 	}
 
 	void MulOp(out IToken/*!*/ x, out BinaryExpr.Opcode op) {
 		Contract.Ensures(Contract.ValueAtReturn(out x) != null); x = Token.NoToken;  op = BinaryExpr.Opcode.Add/*(dummy)*/; 
-		if (la.kind == 47) {
+		if (la.kind == 46) {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Mul; 
-		} else if (la.kind == 90) {
+		} else if (la.kind == 89) {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Div; 
-		} else if (la.kind == 91) {
+		} else if (la.kind == 90) {
 			Get();
 			x = t;  op = BinaryExpr.Opcode.Mod; 
-		} else SynErr(169);
+		} else SynErr(168);
 	}
 
 	void NegOp() {
-		if (la.kind == 84) {
+		if (la.kind == 83) {
 			Get();
-		} else if (la.kind == 92) {
+		} else if (la.kind == 91) {
 			Get();
-		} else SynErr(170);
+		} else SynErr(169);
 	}
 
 	void EndlessExpression(out Expression e) {
@@ -2076,73 +2070,73 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<BoundVar> letVars;  List<Expression> letRHSs;
 		
 		switch (la.kind) {
-		case 59: {
+		case 58: {
 			Get();
 			x = t; 
 			Expression(out e);
-			Expect(100);
+			Expect(99);
 			Expression(out e0);
-			Expect(60);
+			Expect(59);
 			Expression(out e1);
 			e = new ITEExpr(x, e, e0, e1); 
 			break;
 		}
-		case 65: {
+		case 64: {
 			MatchExpression(out e);
 			break;
 		}
-		case 102: case 103: case 104: case 105: {
+		case 101: case 102: case 103: case 104: {
 			QuantifierGuts(out e);
 			break;
 		}
-		case 39: {
+		case 38: {
 			ComprehensionExpr(out e);
 			break;
 		}
-		case 66: {
+		case 65: {
 			Get();
 			x = t; 
 			Expression(out e0);
-			Expect(19);
+			Expect(18);
 			Expression(out e1);
 			e = new AssertExpr(x, e0, e1); 
 			break;
 		}
-		case 67: {
+		case 66: {
 			Get();
 			x = t; 
 			Expression(out e0);
-			Expect(19);
+			Expect(18);
 			Expression(out e1);
 			e = new AssumeExpr(x, e0, e1); 
 			break;
 		}
-		case 20: {
+		case 19: {
 			Get();
 			x = t;
 			letVars = new List<BoundVar>();
 			letRHSs = new List<Expression>(); 
 			IdentTypeOptional(out d);
 			letVars.Add(d); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				IdentTypeOptional(out d);
 				letVars.Add(d); 
 			}
-			Expect(52);
+			Expect(51);
 			Expression(out e);
 			letRHSs.Add(e); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				Expression(out e);
 				letRHSs.Add(e); 
 			}
-			Expect(19);
+			Expect(18);
 			Expression(out e);
 			e = new LetExpr(x, letVars, letRHSs, e); 
 			break;
 		}
-		default: SynErr(171); break;
+		default: SynErr(170); break;
 		}
 	}
 
@@ -2153,18 +2147,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		
 		Ident(out id);
 		idents.Add(id); 
-		while (la.kind == 57) {
+		while (la.kind == 56) {
 			Get();
 			Ident(out id);
 			idents.Add(id); 
 		}
-		if (la.kind == 34) {
+		if (la.kind == 33) {
 			Get();
 			openParen = t;  args = new List<Expression>(); 
 			if (StartOf(9)) {
 				Expressions(args);
 			}
-			Expect(35);
+			Expect(34);
 		}
 		e = new IdentifierSequence(idents, openParen, args); 
 	}
@@ -2175,38 +2169,38 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Expression> multipleIndices = null;
 		bool func = false;
 		
-		if (la.kind == 57) {
+		if (la.kind == 56) {
 			Get();
 			Ident(out id);
-			if (la.kind == 34) {
+			if (la.kind == 33) {
 				Get();
 				IToken openParen = t;  args = new List<Expression/*!*/>();  func = true; 
 				if (StartOf(9)) {
 					Expressions(args);
 				}
-				Expect(35);
+				Expect(34);
 				e = new FunctionCallExpr(id, id.val, e, openParen, args); 
 			}
 			if (!func) { e = new ExprDotName(id, e, id.val); } 
-		} else if (la.kind == 55) {
+		} else if (la.kind == 54) {
 			Get();
 			x = t; 
 			if (StartOf(9)) {
 				Expression(out ee);
 				e0 = ee; 
-				if (la.kind == 101) {
+				if (la.kind == 100) {
 					Get();
 					anyDots = true; 
 					if (StartOf(9)) {
 						Expression(out ee);
 						e1 = ee; 
 					}
-				} else if (la.kind == 52) {
+				} else if (la.kind == 51) {
 					Get();
 					Expression(out ee);
 					e1 = ee; 
-				} else if (la.kind == 21 || la.kind == 56) {
-					while (la.kind == 21) {
+				} else if (la.kind == 20 || la.kind == 55) {
+					while (la.kind == 20) {
 						Get();
 						Expression(out ee);
 						if (multipleIndices == null) {
@@ -2216,15 +2210,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 						multipleIndices.Add(ee);
 						
 					}
-				} else SynErr(172);
-			} else if (la.kind == 101) {
+				} else SynErr(171);
+			} else if (la.kind == 100) {
 				Get();
 				anyDots = true; 
 				if (StartOf(9)) {
 					Expression(out ee);
 					e1 = ee; 
 				}
-			} else SynErr(173);
+			} else SynErr(172);
 			if (multipleIndices != null) {
 			 e = new MultiSelectExpr(x, e, multipleIndices);
 			 // make sure an array class with this dimensionality exists
@@ -2247,8 +2241,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 }
 			}
 			
-			Expect(56);
-		} else SynErr(174);
+			Expect(55);
+		} else SynErr(173);
 	}
 
 	void DisplayExpr(out Expression e) {
@@ -2264,15 +2258,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}
 			e = new SetDisplayExpr(x, elements);
 			Expect(7);
-		} else if (la.kind == 55) {
+		} else if (la.kind == 54) {
 			Get();
 			x = t;  elements = new List<Expression/*!*/>(); 
 			if (StartOf(9)) {
 				Expressions(elements);
 			}
 			e = new SeqDisplayExpr(x, elements); 
-			Expect(56);
-		} else SynErr(175);
+			Expect(55);
+		} else SynErr(174);
 	}
 
 	void MultiSetExpr(out Expression e) {
@@ -2280,7 +2274,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken/*!*/ x = null;  List<Expression/*!*/>/*!*/ elements;
 		e = dummyExpr;
 		
-		Expect(40);
+		Expect(39);
 		x = t; 
 		if (la.kind == 6) {
 			Get();
@@ -2290,15 +2284,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}
 			e = new MultiSetDisplayExpr(x, elements);
 			Expect(7);
-		} else if (la.kind == 34) {
+		} else if (la.kind == 33) {
 			Get();
 			x = t;  elements = new List<Expression/*!*/>(); 
 			Expression(out e);
 			e = new MultiSetFormingExpr(x, e); 
-			Expect(35);
+			Expect(34);
 		} else if (StartOf(19)) {
 			SemErr("multiset must be followed by multiset literal or expression to coerce in parentheses."); 
-		} else SynErr(176);
+		} else SynErr(175);
 	}
 
 	void MapExpr(out Expression e) {
@@ -2307,16 +2301,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<ExpressionPair/*!*/>/*!*/ elements;
 		e = dummyExpr;
 		
-		Expect(42);
+		Expect(41);
 		x = t; 
-		if (la.kind == 55) {
+		if (la.kind == 54) {
 			Get();
 			elements = new List<ExpressionPair/*!*/>(); 
 			if (StartOf(9)) {
 				MapLiteralExpressions(out elements);
 			}
 			e = new MapDisplayExpr(x, elements);
-			Expect(56);
+			Expect(55);
 		} else if (la.kind == 1) {
 			BoundVar/*!*/ bv;
 			List<BoundVar/*!*/> bvars = new List<BoundVar/*!*/>();
@@ -2325,14 +2319,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			
 			IdentTypeOptional(out bv);
 			bvars.Add(bv); 
-			Expect(18);
+			Expect(17);
 			Expression(out range);
 			QSep();
 			Expression(out body);
 			e = new MapComprehension(x, bvars, range, body); 
 		} else if (StartOf(19)) {
 			SemErr("map must be followed by literal in brackets or comprehension."); 
-		} else SynErr(177);
+		} else SynErr(176);
 	}
 
 	void ConstAtomExpression(out Expression/*!*/ e) {
@@ -2341,17 +2335,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;
 		
 		switch (la.kind) {
-		case 93: {
+		case 92: {
 			Get();
 			e = new LiteralExpr(t, false); 
 			break;
 		}
-		case 94: {
+		case 93: {
 			Get();
 			e = new LiteralExpr(t, true); 
 			break;
 		}
-		case 95: {
+		case 94: {
 			Get();
 			e = new LiteralExpr(t); 
 			break;
@@ -2361,55 +2355,55 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new LiteralExpr(t, n); 
 			break;
 		}
-		case 96: {
+		case 95: {
 			Get();
 			e = new ThisExpr(t); 
 			break;
 		}
-		case 97: {
+		case 96: {
 			Get();
 			x = t; 
-			Expect(34);
+			Expect(33);
 			Expression(out e);
-			Expect(35);
+			Expect(34);
 			e = new FreshExpr(x, e); 
 			break;
 		}
-		case 98: {
+		case 97: {
 			Get();
 			x = t; 
-			Expect(34);
+			Expect(33);
 			Expression(out e);
-			Expect(35);
+			Expect(34);
 			e = new AllocatedExpr(x, e); 
 			break;
 		}
-		case 99: {
+		case 98: {
 			Get();
 			x = t; 
-			Expect(34);
+			Expect(33);
 			Expression(out e);
-			Expect(35);
+			Expect(34);
 			e = new OldExpr(x, e); 
 			break;
 		}
-		case 18: {
+		case 17: {
 			Get();
 			x = t; 
 			Expression(out e);
 			e = new UnaryExpr(x, UnaryExpr.Opcode.SeqLength, e); 
-			Expect(18);
+			Expect(17);
 			break;
 		}
-		case 34: {
+		case 33: {
 			Get();
 			x = t; 
 			Expression(out e);
 			e = new ParensExpression(x, e); 
-			Expect(35);
+			Expect(34);
 			break;
 		}
-		default: SynErr(178); break;
+		default: SynErr(177); break;
 		}
 	}
 
@@ -2428,34 +2422,34 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ d, r;
 		elements = new List<ExpressionPair/*!*/>(); 
 		Expression(out d);
-		Expect(52);
+		Expect(51);
 		Expression(out r);
 		elements.Add(new ExpressionPair(d,r)); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			Expression(out d);
-			Expect(52);
+			Expect(51);
 			Expression(out r);
 			elements.Add(new ExpressionPair(d,r)); 
 		}
 	}
 
 	void QSep() {
-		if (la.kind == 106) {
+		if (la.kind == 105) {
 			Get();
-		} else if (la.kind == 107) {
+		} else if (la.kind == 106) {
 			Get();
-		} else SynErr(179);
+		} else SynErr(178);
 	}
 
 	void MatchExpression(out Expression/*!*/ e) {
 		Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x;  MatchCaseExpr/*!*/ c;
 		List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();
 		
-		Expect(65);
+		Expect(64);
 		x = t; 
 		Expression(out e);
-		while (la.kind == 61) {
+		while (la.kind == 60) {
 			CaseExpression(out c);
 			cases.Add(c); 
 		}
@@ -2470,13 +2464,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression range;
 		Expression/*!*/ body;
 		
-		if (la.kind == 102 || la.kind == 103) {
+		if (la.kind == 101 || la.kind == 102) {
 			Forall();
 			x = t;  univ = true; 
-		} else if (la.kind == 104 || la.kind == 105) {
+		} else if (la.kind == 103 || la.kind == 104) {
 			Exists();
 			x = t; 
-		} else SynErr(180);
+		} else SynErr(179);
 		QuantifierDomain(out bvars, out attrs, out range);
 		QSep();
 		Expression(out body);
@@ -2496,18 +2490,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression/*!*/ range;
 		Expression body = null;
 		
-		Expect(39);
+		Expect(38);
 		x = t; 
 		IdentTypeOptional(out bv);
 		bvars.Add(bv); 
-		while (la.kind == 21) {
+		while (la.kind == 20) {
 			Get();
 			IdentTypeOptional(out bv);
 			bvars.Add(bv); 
 		}
-		Expect(18);
+		Expect(17);
 		Expression(out range);
-		if (la.kind == 106 || la.kind == 107) {
+		if (la.kind == 105 || la.kind == 106) {
 			QSep();
 			Expression(out body);
 		}
@@ -2522,39 +2516,39 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;
 		Expression/*!*/ body;
 		
-		Expect(61);
+		Expect(60);
 		x = t; 
 		Ident(out id);
-		if (la.kind == 34) {
+		if (la.kind == 33) {
 			Get();
 			IdentTypeOptional(out bv);
 			arguments.Add(bv); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				IdentTypeOptional(out bv);
 				arguments.Add(bv); 
 			}
-			Expect(35);
+			Expect(34);
 		}
-		Expect(62);
+		Expect(61);
 		Expression(out body);
 		c = new MatchCaseExpr(x, id.val, arguments, body); 
 	}
 
 	void Forall() {
-		if (la.kind == 102) {
+		if (la.kind == 101) {
 			Get();
-		} else if (la.kind == 103) {
+		} else if (la.kind == 102) {
 			Get();
-		} else SynErr(181);
+		} else SynErr(180);
 	}
 
 	void Exists() {
-		if (la.kind == 104) {
+		if (la.kind == 103) {
 			Get();
-		} else if (la.kind == 105) {
+		} else if (la.kind == 104) {
 			Get();
-		} else SynErr(182);
+		} else SynErr(181);
 	}
 
 	void AttributeBody(ref Attributes attrs) {
@@ -2568,7 +2562,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(20)) {
 			AttributeArg(out aArg);
 			aArgs.Add(aArg); 
-			while (la.kind == 21) {
+			while (la.kind == 20) {
 				Get();
 				AttributeArg(out aArg);
 				aArgs.Add(aArg); 
@@ -2590,27 +2584,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}
 
 	static readonly bool[,]/*!*/ set = {
-		{T,T,T,x, x,x,T,x, T,x,x,x, T,x,x,T, T,x,T,T, T,x,x,x, x,T,T,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, x,x,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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, T,x,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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, T,x,x,x, x,T,T,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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},
-		{T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,T, x,T,T,x, x,x,x,T, T,T,T,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,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,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
-		{x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,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,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
-		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,T, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,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,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
-		{T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,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,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,T, x,x,x,x, x,x,T,T, x,x,T,T, x,x,x,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,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
-		{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
-		{x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,x,x, T,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,T,T, x,x},
-		{x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,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,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x}
+		{T,T,T,x, x,x,T,x, T,x,x,x, T,x,T,T, x,T,T,T, x,x,x,x, T,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,x, x,x,T,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
+		{x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, x,x,x,T, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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, T,x,x,x, T,T,T,T, x,x,x,T, x,T,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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, T,x,x,x, x,T,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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},
+		{T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, x,x,x,T, x,T,T,x, T,T,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,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, T,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, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
+		{x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
+		{T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
+		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,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, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
+		{x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,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, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
+		{x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,T,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,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, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
+		{T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,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, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
+		{x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,T,x, x,x,x,x, x,T,T,x, x,T,T,x, x,x,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, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
+		{x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
+		{x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
+		{x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,x,x,T, x,x,x,T, T,T,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,T,x, x},
+		{x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,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, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x}
 
 	};
 } // end Parser
@@ -2649,175 +2643,174 @@ public class Errors {
 			case 11: s = "\"imports\" expected"; break;
 			case 12: s = "\"class\" expected"; break;
 			case 13: s = "\"static\" expected"; break;
-			case 14: s = "\"unlimited\" expected"; break;
-			case 15: s = "\"datatype\" expected"; break;
-			case 16: s = "\"codatatype\" expected"; break;
-			case 17: s = "\"=\" expected"; break;
-			case 18: s = "\"|\" expected"; break;
-			case 19: s = "\";\" expected"; break;
-			case 20: s = "\"var\" expected"; break;
-			case 21: s = "\",\" expected"; break;
-			case 22: s = "\"type\" expected"; break;
-			case 23: s = "\"<\" expected"; break;
-			case 24: s = "\">\" expected"; break;
-			case 25: s = "\"method\" expected"; break;
-			case 26: s = "\"constructor\" expected"; break;
-			case 27: s = "\"returns\" expected"; break;
-			case 28: s = "\"...\" expected"; break;
-			case 29: s = "\"modifies\" expected"; break;
-			case 30: s = "\"free\" expected"; break;
-			case 31: s = "\"requires\" expected"; break;
-			case 32: s = "\"ensures\" expected"; break;
-			case 33: s = "\"decreases\" expected"; break;
-			case 34: s = "\"(\" expected"; break;
-			case 35: s = "\")\" expected"; break;
-			case 36: s = "\"bool\" expected"; break;
-			case 37: s = "\"nat\" expected"; break;
-			case 38: s = "\"int\" expected"; break;
-			case 39: s = "\"set\" expected"; break;
-			case 40: s = "\"multiset\" expected"; break;
-			case 41: s = "\"seq\" expected"; break;
-			case 42: s = "\"map\" expected"; break;
-			case 43: s = "\"object\" expected"; break;
-			case 44: s = "\"function\" expected"; break;
-			case 45: s = "\"predicate\" expected"; break;
-			case 46: s = "\"reads\" expected"; break;
-			case 47: s = "\"*\" expected"; break;
-			case 48: s = "\"`\" expected"; break;
-			case 49: s = "\"label\" expected"; break;
-			case 50: s = "\"break\" expected"; break;
-			case 51: s = "\"return\" expected"; break;
-			case 52: s = "\":=\" expected"; break;
-			case 53: s = "\":|\" expected"; break;
-			case 54: s = "\"new\" expected"; break;
-			case 55: s = "\"[\" expected"; break;
-			case 56: s = "\"]\" expected"; break;
-			case 57: s = "\".\" expected"; break;
-			case 58: s = "\"choose\" expected"; break;
-			case 59: s = "\"if\" expected"; break;
-			case 60: s = "\"else\" expected"; break;
-			case 61: s = "\"case\" expected"; break;
-			case 62: s = "\"=>\" expected"; break;
-			case 63: s = "\"while\" expected"; break;
-			case 64: s = "\"invariant\" expected"; break;
-			case 65: s = "\"match\" expected"; break;
-			case 66: s = "\"assert\" expected"; break;
-			case 67: s = "\"assume\" expected"; break;
-			case 68: s = "\"print\" expected"; break;
-			case 69: s = "\"parallel\" expected"; break;
-			case 70: s = "\"<==>\" expected"; break;
-			case 71: s = "\"\\u21d4\" expected"; break;
-			case 72: s = "\"==>\" expected"; break;
-			case 73: s = "\"\\u21d2\" expected"; break;
-			case 74: s = "\"&&\" expected"; break;
-			case 75: s = "\"\\u2227\" expected"; break;
-			case 76: s = "\"||\" expected"; break;
-			case 77: s = "\"\\u2228\" expected"; break;
-			case 78: s = "\"==\" expected"; break;
-			case 79: s = "\"<=\" expected"; break;
-			case 80: s = "\">=\" expected"; break;
-			case 81: s = "\"!=\" expected"; break;
-			case 82: s = "\"!!\" expected"; break;
-			case 83: s = "\"in\" expected"; break;
-			case 84: s = "\"!\" expected"; break;
-			case 85: s = "\"\\u2260\" expected"; break;
-			case 86: s = "\"\\u2264\" expected"; break;
-			case 87: s = "\"\\u2265\" expected"; break;
-			case 88: s = "\"+\" expected"; break;
-			case 89: s = "\"-\" expected"; break;
-			case 90: s = "\"/\" expected"; break;
-			case 91: s = "\"%\" expected"; break;
-			case 92: s = "\"\\u00ac\" expected"; break;
-			case 93: s = "\"false\" expected"; break;
-			case 94: s = "\"true\" expected"; break;
-			case 95: s = "\"null\" expected"; break;
-			case 96: s = "\"this\" expected"; break;
-			case 97: s = "\"fresh\" expected"; break;
-			case 98: s = "\"allocated\" expected"; break;
-			case 99: s = "\"old\" expected"; break;
-			case 100: s = "\"then\" expected"; break;
-			case 101: s = "\"..\" expected"; break;
-			case 102: s = "\"forall\" expected"; break;
-			case 103: s = "\"\\u2200\" expected"; break;
-			case 104: s = "\"exists\" expected"; break;
-			case 105: s = "\"\\u2203\" expected"; break;
-			case 106: s = "\"::\" expected"; break;
-			case 107: s = "\"\\u2022\" expected"; break;
-			case 108: s = "??? expected"; break;
-			case 109: s = "invalid Dafny"; break;
-			case 110: s = "this symbol not expected in ClassDecl"; break;
-			case 111: s = "this symbol not expected in DatatypeDecl"; break;
-			case 112: s = "invalid DatatypeDecl"; break;
-			case 113: s = "this symbol not expected in DatatypeDecl"; break;
-			case 114: s = "this symbol not expected in ArbitraryTypeDecl"; break;
-			case 115: s = "invalid ClassMemberDecl"; break;
+			case 14: s = "\"datatype\" expected"; break;
+			case 15: s = "\"codatatype\" expected"; break;
+			case 16: s = "\"=\" expected"; break;
+			case 17: s = "\"|\" expected"; break;
+			case 18: s = "\";\" expected"; break;
+			case 19: s = "\"var\" expected"; break;
+			case 20: s = "\",\" expected"; break;
+			case 21: s = "\"type\" expected"; break;
+			case 22: s = "\"<\" expected"; break;
+			case 23: s = "\">\" expected"; break;
+			case 24: s = "\"method\" expected"; break;
+			case 25: s = "\"constructor\" expected"; break;
+			case 26: s = "\"returns\" expected"; break;
+			case 27: s = "\"...\" expected"; break;
+			case 28: s = "\"modifies\" expected"; break;
+			case 29: s = "\"free\" expected"; break;
+			case 30: s = "\"requires\" expected"; break;
+			case 31: s = "\"ensures\" expected"; break;
+			case 32: s = "\"decreases\" expected"; break;
+			case 33: s = "\"(\" expected"; break;
+			case 34: s = "\")\" expected"; break;
+			case 35: s = "\"bool\" expected"; break;
+			case 36: s = "\"nat\" expected"; break;
+			case 37: s = "\"int\" expected"; break;
+			case 38: s = "\"set\" expected"; break;
+			case 39: s = "\"multiset\" expected"; break;
+			case 40: s = "\"seq\" expected"; break;
+			case 41: s = "\"map\" expected"; break;
+			case 42: s = "\"object\" expected"; break;
+			case 43: s = "\"function\" expected"; break;
+			case 44: s = "\"predicate\" expected"; break;
+			case 45: s = "\"reads\" expected"; break;
+			case 46: s = "\"*\" expected"; break;
+			case 47: s = "\"`\" expected"; break;
+			case 48: s = "\"label\" expected"; break;
+			case 49: s = "\"break\" expected"; break;
+			case 50: s = "\"return\" expected"; break;
+			case 51: s = "\":=\" expected"; break;
+			case 52: s = "\":|\" expected"; break;
+			case 53: s = "\"new\" expected"; break;
+			case 54: s = "\"[\" expected"; break;
+			case 55: s = "\"]\" expected"; break;
+			case 56: s = "\".\" expected"; break;
+			case 57: s = "\"choose\" expected"; break;
+			case 58: s = "\"if\" expected"; break;
+			case 59: s = "\"else\" expected"; break;
+			case 60: s = "\"case\" expected"; break;
+			case 61: s = "\"=>\" expected"; break;
+			case 62: s = "\"while\" expected"; break;
+			case 63: s = "\"invariant\" expected"; break;
+			case 64: s = "\"match\" expected"; break;
+			case 65: s = "\"assert\" expected"; break;
+			case 66: s = "\"assume\" expected"; break;
+			case 67: s = "\"print\" expected"; break;
+			case 68: s = "\"parallel\" expected"; break;
+			case 69: s = "\"<==>\" expected"; break;
+			case 70: s = "\"\\u21d4\" expected"; break;
+			case 71: s = "\"==>\" expected"; break;
+			case 72: s = "\"\\u21d2\" expected"; break;
+			case 73: s = "\"&&\" expected"; break;
+			case 74: s = "\"\\u2227\" expected"; break;
+			case 75: s = "\"||\" expected"; break;
+			case 76: s = "\"\\u2228\" expected"; break;
+			case 77: s = "\"==\" expected"; break;
+			case 78: s = "\"<=\" expected"; break;
+			case 79: s = "\">=\" expected"; break;
+			case 80: s = "\"!=\" expected"; break;
+			case 81: s = "\"!!\" expected"; break;
+			case 82: s = "\"in\" expected"; break;
+			case 83: s = "\"!\" expected"; break;
+			case 84: s = "\"\\u2260\" expected"; break;
+			case 85: s = "\"\\u2264\" expected"; break;
+			case 86: s = "\"\\u2265\" expected"; break;
+			case 87: s = "\"+\" expected"; break;
+			case 88: s = "\"-\" expected"; break;
+			case 89: s = "\"/\" expected"; break;
+			case 90: s = "\"%\" expected"; break;
+			case 91: s = "\"\\u00ac\" expected"; break;
+			case 92: s = "\"false\" expected"; break;
+			case 93: s = "\"true\" expected"; break;
+			case 94: s = "\"null\" expected"; break;
+			case 95: s = "\"this\" expected"; break;
+			case 96: s = "\"fresh\" expected"; break;
+			case 97: s = "\"allocated\" expected"; break;
+			case 98: s = "\"old\" expected"; break;
+			case 99: s = "\"then\" expected"; break;
+			case 100: s = "\"..\" expected"; break;
+			case 101: s = "\"forall\" expected"; break;
+			case 102: s = "\"\\u2200\" expected"; break;
+			case 103: s = "\"exists\" expected"; break;
+			case 104: s = "\"\\u2203\" expected"; break;
+			case 105: s = "\"::\" expected"; break;
+			case 106: s = "\"\\u2022\" expected"; break;
+			case 107: s = "??? expected"; break;
+			case 108: s = "invalid Dafny"; break;
+			case 109: s = "this symbol not expected in ClassDecl"; break;
+			case 110: s = "this symbol not expected in DatatypeDecl"; break;
+			case 111: s = "invalid DatatypeDecl"; break;
+			case 112: s = "this symbol not expected in DatatypeDecl"; break;
+			case 113: s = "this symbol not expected in ArbitraryTypeDecl"; break;
+			case 114: s = "invalid ClassMemberDecl"; break;
+			case 115: s = "this symbol not expected in FieldDecl"; break;
 			case 116: s = "this symbol not expected in FieldDecl"; break;
-			case 117: s = "this symbol not expected in FieldDecl"; break;
+			case 117: s = "invalid FunctionDecl"; break;
 			case 118: s = "invalid FunctionDecl"; break;
 			case 119: s = "invalid FunctionDecl"; break;
-			case 120: s = "invalid FunctionDecl"; break;
-			case 121: s = "this symbol not expected in MethodDecl"; break;
+			case 120: s = "this symbol not expected in MethodDecl"; break;
+			case 121: s = "invalid MethodDecl"; break;
 			case 122: s = "invalid MethodDecl"; break;
-			case 123: s = "invalid MethodDecl"; break;
-			case 124: s = "invalid TypeAndToken"; break;
+			case 123: s = "invalid TypeAndToken"; break;
+			case 124: s = "this symbol not expected in MethodSpec"; break;
 			case 125: s = "this symbol not expected in MethodSpec"; break;
 			case 126: s = "this symbol not expected in MethodSpec"; break;
 			case 127: s = "this symbol not expected in MethodSpec"; break;
-			case 128: s = "this symbol not expected in MethodSpec"; break;
-			case 129: s = "invalid MethodSpec"; break;
-			case 130: s = "this symbol not expected in MethodSpec"; break;
-			case 131: s = "invalid MethodSpec"; break;
-			case 132: s = "invalid ReferenceType"; break;
+			case 128: s = "invalid MethodSpec"; break;
+			case 129: s = "this symbol not expected in MethodSpec"; break;
+			case 130: s = "invalid MethodSpec"; break;
+			case 131: s = "invalid ReferenceType"; break;
+			case 132: s = "this symbol not expected in FunctionSpec"; break;
 			case 133: s = "this symbol not expected in FunctionSpec"; break;
 			case 134: s = "this symbol not expected in FunctionSpec"; break;
 			case 135: s = "this symbol not expected in FunctionSpec"; break;
 			case 136: s = "this symbol not expected in FunctionSpec"; break;
-			case 137: s = "this symbol not expected in FunctionSpec"; break;
-			case 138: s = "invalid FunctionSpec"; break;
-			case 139: s = "invalid PossiblyWildFrameExpression"; break;
-			case 140: s = "invalid PossiblyWildExpression"; break;
-			case 141: s = "this symbol not expected in OneStmt"; break;
-			case 142: s = "invalid OneStmt"; break;
-			case 143: s = "this symbol not expected in OneStmt"; break;
-			case 144: s = "invalid OneStmt"; break;
-			case 145: s = "invalid AssertStmt"; break;
+			case 137: s = "invalid FunctionSpec"; break;
+			case 138: s = "invalid PossiblyWildFrameExpression"; break;
+			case 139: s = "invalid PossiblyWildExpression"; break;
+			case 140: s = "this symbol not expected in OneStmt"; break;
+			case 141: s = "invalid OneStmt"; break;
+			case 142: s = "this symbol not expected in OneStmt"; break;
+			case 143: s = "invalid OneStmt"; break;
+			case 144: s = "invalid AssertStmt"; break;
+			case 145: s = "invalid UpdateStmt"; break;
 			case 146: s = "invalid UpdateStmt"; break;
-			case 147: s = "invalid UpdateStmt"; break;
+			case 147: s = "invalid IfStmt"; break;
 			case 148: s = "invalid IfStmt"; break;
-			case 149: s = "invalid IfStmt"; break;
+			case 149: s = "invalid WhileStmt"; break;
 			case 150: s = "invalid WhileStmt"; break;
-			case 151: s = "invalid WhileStmt"; break;
-			case 152: s = "invalid Rhs"; break;
-			case 153: s = "invalid Lhs"; break;
-			case 154: s = "invalid Guard"; break;
+			case 151: s = "invalid Rhs"; break;
+			case 152: s = "invalid Lhs"; break;
+			case 153: s = "invalid Guard"; break;
+			case 154: s = "this symbol not expected in LoopSpec"; break;
 			case 155: s = "this symbol not expected in LoopSpec"; break;
 			case 156: s = "this symbol not expected in LoopSpec"; break;
 			case 157: s = "this symbol not expected in LoopSpec"; break;
 			case 158: s = "this symbol not expected in LoopSpec"; break;
-			case 159: s = "this symbol not expected in LoopSpec"; break;
-			case 160: s = "this symbol not expected in Invariant"; break;
-			case 161: s = "invalid AttributeArg"; break;
-			case 162: s = "invalid EquivOp"; break;
-			case 163: s = "invalid ImpliesOp"; break;
-			case 164: s = "invalid AndOp"; break;
-			case 165: s = "invalid OrOp"; break;
-			case 166: s = "invalid RelOp"; break;
-			case 167: s = "invalid AddOp"; break;
-			case 168: s = "invalid UnaryExpression"; break;
-			case 169: s = "invalid MulOp"; break;
-			case 170: s = "invalid NegOp"; break;
-			case 171: s = "invalid EndlessExpression"; break;
+			case 159: s = "this symbol not expected in Invariant"; break;
+			case 160: s = "invalid AttributeArg"; break;
+			case 161: s = "invalid EquivOp"; break;
+			case 162: s = "invalid ImpliesOp"; break;
+			case 163: s = "invalid AndOp"; break;
+			case 164: s = "invalid OrOp"; break;
+			case 165: s = "invalid RelOp"; break;
+			case 166: s = "invalid AddOp"; break;
+			case 167: s = "invalid UnaryExpression"; break;
+			case 168: s = "invalid MulOp"; break;
+			case 169: s = "invalid NegOp"; break;
+			case 170: s = "invalid EndlessExpression"; break;
+			case 171: s = "invalid Suffix"; break;
 			case 172: s = "invalid Suffix"; break;
 			case 173: s = "invalid Suffix"; break;
-			case 174: s = "invalid Suffix"; break;
-			case 175: s = "invalid DisplayExpr"; break;
-			case 176: s = "invalid MultiSetExpr"; break;
-			case 177: s = "invalid MapExpr"; break;
-			case 178: s = "invalid ConstAtomExpression"; break;
-			case 179: s = "invalid QSep"; break;
-			case 180: s = "invalid QuantifierGuts"; break;
-			case 181: s = "invalid Forall"; break;
-			case 182: s = "invalid Exists"; break;
+			case 174: s = "invalid DisplayExpr"; break;
+			case 175: s = "invalid MultiSetExpr"; break;
+			case 176: s = "invalid MapExpr"; break;
+			case 177: s = "invalid ConstAtomExpression"; break;
+			case 178: s = "invalid QSep"; break;
+			case 179: s = "invalid QuantifierGuts"; break;
+			case 180: s = "invalid Forall"; break;
+			case 181: s = "invalid Exists"; break;
 
 			default: s = "error " + n; break;
 		}
diff --git a/Dafny/Printer.cs b/Dafny/Printer.cs
index e7cfbf27..e58a39de 100644
--- a/Dafny/Printer.cs
+++ b/Dafny/Printer.cs
@@ -222,7 +222,6 @@ namespace Microsoft.Dafny {
       var isPredicate = f is Predicate;
       Indent(indent);
       string k = isPredicate ? "predicate" : "function";
-      if (f.IsUnlimited) { k = "unlimited " + k; }
       if (f.IsStatic) { k = "static " + k; }
       if (!f.IsGhost) { k += " method"; }
       PrintClassMethodHelper(k, f.Attributes, f.Name, f.TypeArgs);
diff --git a/Dafny/RefinementTransformer.cs b/Dafny/RefinementTransformer.cs
index e73d9762..ed9628dc 100644
--- a/Dafny/RefinementTransformer.cs
+++ b/Dafny/RefinementTransformer.cs
@@ -560,10 +560,10 @@ namespace Microsoft.Dafny {
       }
 
       if (f is Predicate) {
-        return new Predicate(tok, f.Name, f.IsStatic, isGhost, f.IsUnlimited, tps, f.OpenParen, formals,
+        return new Predicate(tok, f.Name, f.IsStatic, isGhost, tps, f.OpenParen, formals,
           req, reads, ens, decreases, body, moreBody != null, null, false);
       } else {
-        return new Function(tok, f.Name, f.IsStatic, isGhost, f.IsUnlimited, tps, f.OpenParen, formals, CloneType(f.ResultType),
+        return new Function(tok, f.Name, f.IsStatic, isGhost, tps, f.OpenParen, formals, CloneType(f.ResultType),
           req, reads, ens, decreases, body, null, false);
       }
     }
@@ -638,9 +638,6 @@ namespace Microsoft.Dafny {
               if (prevFunction.IsStatic != f.IsStatic) {
                 reporter.Error(f, "a function in a refining module cannot be changed from static to non-static or vice versa: {0}", f.Name);
               }
-              if (prevFunction.IsUnlimited != f.IsUnlimited) {
-                reporter.Error(f, "a function in a refining module cannot be changed from unlimited to limited or vice versa: {0}", f.Name);
-              }
               if (!prevFunction.IsGhost && f.IsGhost) {
                 reporter.Error(f, "a function method cannot be changed into a (ghost) function in a refining module: {0}", f.Name);
               } else if (prevFunction.IsGhost && !f.IsGhost && prevFunction.Body != null) {
diff --git a/Dafny/Scanner.cs b/Dafny/Scanner.cs
index 0c91c68c..2f9ac694 100644
--- a/Dafny/Scanner.cs
+++ b/Dafny/Scanner.cs
@@ -211,8 +211,8 @@ public class UTF8Buffer: Buffer {
 public class Scanner {
 	const char EOL = '\n';
 	const int eofSym = 0; /* pdt */
-	const int maxT = 108;
-	const int noSym = 108;
+	const int maxT = 107;
+	const int noSym = 107;
 
 
 	[ContractInvariantMethod]
@@ -494,56 +494,55 @@ public class Scanner {
 			case "imports": t.kind = 11; break;
 			case "class": t.kind = 12; break;
 			case "static": t.kind = 13; break;
-			case "unlimited": t.kind = 14; break;
-			case "datatype": t.kind = 15; break;
-			case "codatatype": t.kind = 16; break;
-			case "var": t.kind = 20; break;
-			case "type": t.kind = 22; break;
-			case "method": t.kind = 25; break;
-			case "constructor": t.kind = 26; break;
-			case "returns": t.kind = 27; break;
-			case "modifies": t.kind = 29; break;
-			case "free": t.kind = 30; break;
-			case "requires": t.kind = 31; break;
-			case "ensures": t.kind = 32; break;
-			case "decreases": t.kind = 33; break;
-			case "bool": t.kind = 36; break;
-			case "nat": t.kind = 37; break;
-			case "int": t.kind = 38; break;
-			case "set": t.kind = 39; break;
-			case "multiset": t.kind = 40; break;
-			case "seq": t.kind = 41; break;
-			case "map": t.kind = 42; break;
-			case "object": t.kind = 43; break;
-			case "function": t.kind = 44; break;
-			case "predicate": t.kind = 45; break;
-			case "reads": t.kind = 46; break;
-			case "label": t.kind = 49; break;
-			case "break": t.kind = 50; break;
-			case "return": t.kind = 51; break;
-			case "new": t.kind = 54; break;
-			case "choose": t.kind = 58; break;
-			case "if": t.kind = 59; break;
-			case "else": t.kind = 60; break;
-			case "case": t.kind = 61; break;
-			case "while": t.kind = 63; break;
-			case "invariant": t.kind = 64; break;
-			case "match": t.kind = 65; break;
-			case "assert": t.kind = 66; break;
-			case "assume": t.kind = 67; break;
-			case "print": t.kind = 68; break;
-			case "parallel": t.kind = 69; break;
-			case "in": t.kind = 83; break;
-			case "false": t.kind = 93; break;
-			case "true": t.kind = 94; break;
-			case "null": t.kind = 95; break;
-			case "this": t.kind = 96; break;
-			case "fresh": t.kind = 97; break;
-			case "allocated": t.kind = 98; break;
-			case "old": t.kind = 99; break;
-			case "then": t.kind = 100; break;
-			case "forall": t.kind = 102; break;
-			case "exists": t.kind = 104; break;
+			case "datatype": t.kind = 14; break;
+			case "codatatype": t.kind = 15; break;
+			case "var": t.kind = 19; break;
+			case "type": t.kind = 21; break;
+			case "method": t.kind = 24; break;
+			case "constructor": t.kind = 25; break;
+			case "returns": t.kind = 26; break;
+			case "modifies": t.kind = 28; break;
+			case "free": t.kind = 29; break;
+			case "requires": t.kind = 30; break;
+			case "ensures": t.kind = 31; break;
+			case "decreases": t.kind = 32; break;
+			case "bool": t.kind = 35; break;
+			case "nat": t.kind = 36; break;
+			case "int": t.kind = 37; break;
+			case "set": t.kind = 38; break;
+			case "multiset": t.kind = 39; break;
+			case "seq": t.kind = 40; break;
+			case "map": t.kind = 41; break;
+			case "object": t.kind = 42; break;
+			case "function": t.kind = 43; break;
+			case "predicate": t.kind = 44; break;
+			case "reads": t.kind = 45; break;
+			case "label": t.kind = 48; break;
+			case "break": t.kind = 49; break;
+			case "return": t.kind = 50; break;
+			case "new": t.kind = 53; break;
+			case "choose": t.kind = 57; break;
+			case "if": t.kind = 58; break;
+			case "else": t.kind = 59; break;
+			case "case": t.kind = 60; break;
+			case "while": t.kind = 62; break;
+			case "invariant": t.kind = 63; break;
+			case "match": t.kind = 64; break;
+			case "assert": t.kind = 65; break;
+			case "assume": t.kind = 66; break;
+			case "print": t.kind = 67; break;
+			case "parallel": t.kind = 68; break;
+			case "in": t.kind = 82; break;
+			case "false": t.kind = 92; break;
+			case "true": t.kind = 93; break;
+			case "null": t.kind = 94; break;
+			case "this": t.kind = 95; break;
+			case "fresh": t.kind = 96; break;
+			case "allocated": t.kind = 97; break;
+			case "old": t.kind = 98; break;
+			case "then": t.kind = 99; break;
+			case "forall": t.kind = 101; break;
+			case "exists": t.kind = 103; break;
 			default: break;
 		}
 	}
@@ -649,81 +648,81 @@ public class Scanner {
 				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 18;}
 				else {t.kind = 3; break;}
 			case 19:
-				{t.kind = 19; break;}
+				{t.kind = 18; break;}
 			case 20:
-				{t.kind = 21; break;}
+				{t.kind = 20; break;}
 			case 21:
-				{t.kind = 28; break;}
+				{t.kind = 27; break;}
 			case 22:
-				{t.kind = 34; break;}
+				{t.kind = 33; break;}
 			case 23:
-				{t.kind = 35; break;}
+				{t.kind = 34; break;}
 			case 24:
-				{t.kind = 47; break;}
+				{t.kind = 46; break;}
 			case 25:
-				{t.kind = 48; break;}
+				{t.kind = 47; break;}
 			case 26:
-				{t.kind = 52; break;}
+				{t.kind = 51; break;}
 			case 27:
-				{t.kind = 53; break;}
+				{t.kind = 52; break;}
 			case 28:
-				{t.kind = 55; break;}
+				{t.kind = 54; break;}
 			case 29:
-				{t.kind = 56; break;}
+				{t.kind = 55; break;}
 			case 30:
-				{t.kind = 62; break;}
+				{t.kind = 61; break;}
 			case 31:
 				if (ch == '>') {AddCh(); goto case 32;}
 				else {goto case 0;}
 			case 32:
-				{t.kind = 70; break;}
+				{t.kind = 69; break;}
 			case 33:
-				{t.kind = 71; break;}
+				{t.kind = 70; break;}
 			case 34:
-				{t.kind = 72; break;}
+				{t.kind = 71; break;}
 			case 35:
-				{t.kind = 73; break;}
+				{t.kind = 72; break;}
 			case 36:
 				if (ch == '&') {AddCh(); goto case 37;}
 				else {goto case 0;}
 			case 37:
-				{t.kind = 74; break;}
+				{t.kind = 73; break;}
 			case 38:
-				{t.kind = 75; break;}
+				{t.kind = 74; break;}
 			case 39:
-				{t.kind = 76; break;}
+				{t.kind = 75; break;}
 			case 40:
-				{t.kind = 77; break;}
+				{t.kind = 76; break;}
 			case 41:
-				{t.kind = 80; break;}
+				{t.kind = 79; break;}
 			case 42:
-				{t.kind = 81; break;}
+				{t.kind = 80; break;}
 			case 43:
-				{t.kind = 82; break;}
+				{t.kind = 81; break;}
 			case 44:
-				{t.kind = 85; break;}
+				{t.kind = 84; break;}
 			case 45:
-				{t.kind = 86; break;}
+				{t.kind = 85; break;}
 			case 46:
-				{t.kind = 87; break;}
+				{t.kind = 86; break;}
 			case 47:
-				{t.kind = 88; break;}
+				{t.kind = 87; break;}
 			case 48:
-				{t.kind = 89; break;}
+				{t.kind = 88; break;}
 			case 49:
-				{t.kind = 90; break;}
+				{t.kind = 89; break;}
 			case 50:
-				{t.kind = 91; break;}
+				{t.kind = 90; break;}
 			case 51:
-				{t.kind = 92; break;}
+				{t.kind = 91; break;}
 			case 52:
-				{t.kind = 103; break;}
+				{t.kind = 102; break;}
 			case 53:
-				{t.kind = 105; break;}
+				{t.kind = 104; break;}
 			case 54:
-				{t.kind = 106; break;}
+				{t.kind = 105; break;}
 			case 55:
-				{t.kind = 107; break;}
+				{t.kind = 106; break;}
 			case 56:
 				recEnd = pos; recKind = 5;
 				if (ch == '=') {AddCh(); goto case 26;}
@@ -731,43 +730,43 @@ public class Scanner {
 				else if (ch == ':') {AddCh(); goto case 54;}
 				else {t.kind = 5; break;}
 			case 57:
-				recEnd = pos; recKind = 17;
+				recEnd = pos; recKind = 16;
 				if (ch == '>') {AddCh(); goto case 30;}
 				else if (ch == '=') {AddCh(); goto case 63;}
-				else {t.kind = 17; break;}
+				else {t.kind = 16; break;}
 			case 58:
-				recEnd = pos; recKind = 18;
+				recEnd = pos; recKind = 17;
 				if (ch == '|') {AddCh(); goto case 39;}
-				else {t.kind = 18; break;}
+				else {t.kind = 17; break;}
 			case 59:
-				recEnd = pos; recKind = 23;
+				recEnd = pos; recKind = 22;
 				if (ch == '=') {AddCh(); goto case 64;}
-				else {t.kind = 23; break;}
+				else {t.kind = 22; break;}
 			case 60:
-				recEnd = pos; recKind = 24;
+				recEnd = pos; recKind = 23;
 				if (ch == '=') {AddCh(); goto case 41;}
-				else {t.kind = 24; break;}
+				else {t.kind = 23; break;}
 			case 61:
-				recEnd = pos; recKind = 57;
+				recEnd = pos; recKind = 56;
 				if (ch == '.') {AddCh(); goto case 65;}
-				else {t.kind = 57; break;}
+				else {t.kind = 56; break;}
 			case 62:
-				recEnd = pos; recKind = 84;
+				recEnd = pos; recKind = 83;
 				if (ch == '=') {AddCh(); goto case 42;}
 				else if (ch == '!') {AddCh(); goto case 43;}
-				else {t.kind = 84; break;}
+				else {t.kind = 83; break;}
 			case 63:
-				recEnd = pos; recKind = 78;
+				recEnd = pos; recKind = 77;
 				if (ch == '>') {AddCh(); goto case 34;}
-				else {t.kind = 78; break;}
+				else {t.kind = 77; break;}
 			case 64:
-				recEnd = pos; recKind = 79;
+				recEnd = pos; recKind = 78;
 				if (ch == '=') {AddCh(); goto case 31;}
-				else {t.kind = 79; break;}
+				else {t.kind = 78; break;}
 			case 65:
-				recEnd = pos; recKind = 101;
+				recEnd = pos; recKind = 100;
 				if (ch == '.') {AddCh(); goto case 21;}
-				else {t.kind = 101; break;}
+				else {t.kind = 100; break;}
 
 		}
 		t.val = new String(tval, 0, tlen);
diff --git a/Dafny/Translator.cs b/Dafny/Translator.cs
index 58c367b8..07583edd 100644
--- a/Dafny/Translator.cs
+++ b/Dafny/Translator.cs
@@ -574,7 +574,7 @@ namespace Microsoft.Dafny {
         } else if (member is Function) {
           Function f = (Function)member;
           AddFunction(f);
-          if (f.IsRecursive && !f.IsUnlimited) {
+          if (f.IsRecursive) {
             AddLimitedAxioms(f, 2);
             AddLimitedAxioms(f, 1);
           }
@@ -586,7 +586,7 @@ namespace Microsoft.Dafny {
             } else {
               AddFunctionAxiom(f, body, f.Ens, null, layerOffset);
             }
-            if (!f.IsRecursive || f.IsUnlimited) { break; }
+            if (!f.IsRecursive) { break; }
           }
           AddFrameAxiom(f);
           AddWellformednessCheck(f);
@@ -716,7 +716,7 @@ namespace Microsoft.Dafny {
     Bpl.Axiom/*!*/ FunctionAxiom(Function/*!*/ f, FunctionAxiomVisibility visibility, Expression body, List<Expression/*!*/>/*!*/ ens, Specialization specialization, int layerOffset) {
       Contract.Requires(f != null);
       Contract.Requires(ens != null);
-      Contract.Requires(layerOffset == 0 || (layerOffset == 1 && f.IsRecursive && !f.IsUnlimited));
+      Contract.Requires(layerOffset == 0 || (layerOffset == 1 && f.IsRecursive));
       Contract.Requires(predef != null);
       Contract.Requires(f.EnclosingClass != null);
 
@@ -895,7 +895,7 @@ namespace Microsoft.Dafny {
 
     void AddLimitedAxioms(Function f, int fromLayer) {
       Contract.Requires(f != null);
-      Contract.Requires(f.IsRecursive && !f.IsUnlimited);
+      Contract.Requires(f.IsRecursive);
       Contract.Requires(fromLayer == 1 || fromLayer == 2);
       Contract.Requires(sink != null && predef != null);
       // With fromLayer==1, generate:
@@ -1380,7 +1380,7 @@ namespace Microsoft.Dafny {
     ///        F(h0,formals) == F(h1,formals)
     ///      );
     ///
-    /// If the function is a recursive, non-unlimited function, then the same axiom is also produced for "F#limited" instead of "F".
+    /// If the function is a recursive function, then the same axiom is also produced for "F#limited" instead of "F".
     /// </summary>
     void AddFrameAxiom(Function f)
     {
@@ -1459,7 +1459,7 @@ namespace Microsoft.Dafny {
           Bpl.Expr.Imp(Bpl.Expr.And(wellFormed, heapSucc),
           Bpl.Expr.Imp(q0, eq)));
         sink.TopLevelDeclarations.Add(new Bpl.Axiom(f.tok, ax, axiomComment));
-        if (axiomComment != null && f.IsRecursive && !f.IsUnlimited) {
+        if (axiomComment != null && f.IsRecursive) {
           fn = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, FunctionName(f, 0), TrType(f.ResultType)));
           axiomComment = null;  // the comment goes only with the first frame axiom
         } else {
@@ -2933,7 +2933,7 @@ namespace Microsoft.Dafny {
       Bpl.Function func = new Bpl.Function(f.tok, f.FullName, typeParams, args, res);
       sink.TopLevelDeclarations.Add(func);
 
-      if (f.IsRecursive && !f.IsUnlimited) {
+      if (f.IsRecursive) {
         sink.TopLevelDeclarations.Add(new Bpl.Function(f.tok, FunctionName(f, 0), args, res));
         sink.TopLevelDeclarations.Add(new Bpl.Function(f.tok, FunctionName(f, 2), args, res));
       }
@@ -5535,12 +5535,12 @@ namespace Microsoft.Dafny {
 
         } else if (expr is FunctionCallExpr) {
           FunctionCallExpr e = (FunctionCallExpr)expr;
-          int offsetToUse = e.Function.IsRecursive && !e.Function.IsUnlimited ? this.layerOffset : 0;
-          if (e.Function.IsRecursive && !e.Function.IsUnlimited) {
+          int offsetToUse = e.Function.IsRecursive ? this.layerOffset : 0;
+          if (e.Function.IsRecursive) {
             Statistics_CustomLayerFunctionCount++;
           }
           string nm = FunctionName(e.Function, 1 + offsetToUse);
-          if (this.applyLimited_CurrentFunction != null && e.Function.IsRecursive && !e.Function.IsUnlimited) {
+          if (this.applyLimited_CurrentFunction != null && e.Function.IsRecursive) {
             ModuleDecl module = cce.NonNull(e.Function.EnclosingClass).Module;
             if (module == cce.NonNull(applyLimited_CurrentFunction.EnclosingClass).Module) {
               if (module.CallGraph.GetSCCRepresentative(e.Function) == module.CallGraph.GetSCCRepresentative(applyLimited_CurrentFunction)) {
diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index f16b09b5..05f06b41 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -30,7 +30,7 @@
 ]\\)*" . font-lock-comment-face)
 
    `(,(dafny-regexp-opt '(
-        "class" "datatype" "codatatype" "type" "function" "predicate" "ghost" "var" "method" "constructor" "unlimited"
+        "class" "datatype" "codatatype" "type" "function" "predicate" "ghost" "var" "method" "constructor"
         "module" "imports" "static" "refines"
         "returns" "requires" "ensures" "modifies" "reads" "free"
         "invariant" "decreases"
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
index 635115fb..4244e817 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
@@ -19,7 +19,7 @@ namespace Demo
         this.MarkReservedWords(  // NOTE: these keywords must also appear once more below
           "class", "ghost", "static", "var", "method", "constructor", "datatype", "codatatype", "type",
           "assert", "assume", "new", "this", "object", "refines",
-          "unlimited", "module", "imports",
+          "module", "imports",
           "if", "then", "else", "while", "invariant",
           "break", "label", "return", "parallel", "havoc", "print",
           "returns", "requires", "ensures", "modifies", "reads", "decreases",
@@ -275,7 +275,6 @@ namespace Demo
           | "this"
           | "object"
           | "refines"
-          | "unlimited"
           | "module"
           | "imports"
           | "if"
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index 48faa5ec..d621b1a9 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -288,7 +288,6 @@ namespace DafnyLanguage
                 case "this":
                 case "true":
                 case "type":
-                case "unlimited":
                 case "var":
                 case "while":
                 #endregion
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 4126d2f2..051d60f4 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -6,7 +6,7 @@
 
 \lstdefinelanguage{dafny}{
   morekeywords={class,datatype,codatatype,type,bool,nat,int,object,set,multiset,seq,array,array2,array3,%
-      function,predicate,unlimited,
+      function,predicate,
       ghost,var,static,refines,
       method,constructor,returns,module,imports,in,
       requires,modifies,ensures,reads,decreases,free,
author	Unknown <leino@LEINO6.redmond.corp.microsoft.com>	2012-06-11 14:24:51 -0700
committer	Unknown <leino@LEINO6.redmond.corp.microsoft.com>	2012-06-11 14:24:51 -0700
commit	d5606621b8146a258557c4824405c8331e4c8691 (patch)
tree	d7051a448c55367fe24e63a95c4d4950ca6b54b1
parent	28f11d51299ba82f7cfbdc284a4ed43158619ac8 (diff)