Add support for hexidecimal numbers.

5 files changed, 1083 insertions, 1011 deletions

diff --git a/Source/Dafny/Dafny.atg b/Source/Dafny/Dafny.atg
index 71dec0d7..2b40e0b2 100644
--- a/Source/Dafny/Dafny.atg
+++ b/Source/Dafny/Dafny.atg
@@ -122,6 +122,7 @@ CHARACTERS
   letter = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".

   digit = "0123456789".

   posDigit = "123456789".

+  hexdigit = "0123456789ABCDEFabcdef".

   special = "'_?\\".

   glyph = "`~!@#$%^&*()-_=+[{]}|;:',<.>/?\\".

   cr        = '\r'.

@@ -149,6 +150,7 @@ TOKENS
         |  'a' 'r' 'r' 'a' 'y' idcharMinusPosDigit {idchar}

         |  'a' 'r' 'r' 'a' 'y' posDigit {idchar} nondigit {idchar}.

   digits = digit {digit}.

+  hexdigits = '0' 'x' hexdigit {hexdigit}.

   arrayToken = 'a' 'r' 'r' 'a' 'y' [posDigit {digit}].

   string = quote {nonquote} quote.

   colon = ':'.

@@ -2086,14 +2088,24 @@ WildIdent<out IToken/*!*/ x, bool allowWildcardId>
   .

 

 Nat<out BigInteger n>

-=

-  digits

-  (. try {

-       n = BigInteger.Parse(t.val);

-     } catch (System.FormatException) {

-       SemErr("incorrectly formatted number");

-       n = BigInteger.Zero;

-     }

-  .)

+= (. n = BigInteger.Zero; .)

+  (digits

+    (. try {

+         n = BigInteger.Parse(t.val);

+       } catch (System.FormatException) {

+         SemErr("incorrectly formatted number");

+         n = BigInteger.Zero;

+       }

+    .)

+   |hexdigits 

+    (. try {

+         // note: leading 0 required when parsing positive hex numbers

+         n = BigInteger.Parse("0" + t.val.Substring(2), System.Globalization.NumberStyles.HexNumber);

+       } catch (System.FormatException) {

+         SemErr("incorrectly formatted number");

+         n = BigInteger.Zero;

+       }

+    .)

+   )

   .

 END Dafny.

diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index daf3763c..315ad1b7 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -16,15 +16,16 @@ public class Parser {
 	public const int _EOF = 0;

 	public const int _ident = 1;

 	public const int _digits = 2;

-	public const int _arrayToken = 3;

-	public const int _string = 4;

-	public const int _colon = 5;

-	public const int _lbrace = 6;

-	public const int _rbrace = 7;

-	public const int _openparen = 8;

-	public const int _star = 9;

-	public const int _notIn = 10;

-	public const int maxT = 119;

+	public const int _hexdigits = 3;

+	public const int _arrayToken = 4;

+	public const int _string = 5;

+	public const int _colon = 6;

+	public const int _lbrace = 7;

+	public const int _rbrace = 8;

+	public const int _openparen = 9;

+	public const int _star = 10;

+	public const int _notIn = 11;

+	public const int maxT = 120;

 

 	const bool T = true;

 	const bool x = false;

@@ -222,32 +223,32 @@ bool IsParenStar() {
 		

 		while (StartOf(1)) {

 			switch (la.kind) {

-			case 11: case 12: case 14: {

+			case 12: case 13: case 15: {

 				SubModuleDecl(defaultModule, out submodule);

 				defaultModule.TopLevelDecls.Add(submodule); 

 				break;

 			}

-			case 21: {

+			case 22: {

 				ClassDecl(defaultModule, out c);

 				defaultModule.TopLevelDecls.Add(c); 

 				break;

 			}

-			case 24: case 25: {

+			case 25: case 26: {

 				DatatypeDecl(defaultModule, out dt);

 				defaultModule.TopLevelDecls.Add(dt); 

 				break;

 			}

-			case 29: {

+			case 30: {

 				ArbitraryTypeDecl(defaultModule, out at);

 				defaultModule.TopLevelDecls.Add(at); 

 				break;

 			}

-			case 32: {

+			case 33: {

 				IteratorDecl(defaultModule, out iter);

 				defaultModule.TopLevelDecls.Add(iter); 

 				break;

 			}

-			case 22: case 23: case 27: case 38: case 39: case 40: case 56: case 57: case 58: {

+			case 23: case 24: case 28: case 39: case 40: case 41: case 57: case 58: case 59: {

 				ClassMemberDecl(membersDefaultClass, false);

 				break;

 			}

@@ -279,84 +280,84 @@ bool IsParenStar() {
 		bool isAbstract = false;

 		bool opened = false;

 		

-		if (la.kind == 11 || la.kind == 12) {

-			if (la.kind == 11) {

+		if (la.kind == 12 || la.kind == 13) {

+			if (la.kind == 12) {

 				Get();

 				isAbstract = true; 

 			}

-			Expect(12);

-			while (la.kind == 6) {

+			Expect(13);

+			while (la.kind == 7) {

 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

-			if (la.kind == 13) {

+			if (la.kind == 14) {

 				Get();

 				QualifiedName(out idRefined);

 			}

 			module = new ModuleDefinition(id, id.val, isAbstract, false, idRefined == null ? null : idRefined, attrs, false); 

-			Expect(6);

+			Expect(7);

 			module.BodyStartTok = t; 

 			while (StartOf(1)) {

 				switch (la.kind) {

-				case 11: case 12: case 14: {

+				case 12: case 13: case 15: {

 					SubModuleDecl(module, out sm);

 					module.TopLevelDecls.Add(sm); 

 					break;

 				}

-				case 21: {

+				case 22: {

 					ClassDecl(module, out c);

 					module.TopLevelDecls.Add(c); 

 					break;

 				}

-				case 24: case 25: {

+				case 25: case 26: {

 					DatatypeDecl(module, out dt);

 					module.TopLevelDecls.Add(dt); 

 					break;

 				}

-				case 29: {

+				case 30: {

 					ArbitraryTypeDecl(module, out at);

 					module.TopLevelDecls.Add(at); 

 					break;

 				}

-				case 32: {

+				case 33: {

 					IteratorDecl(module, out iter);

 					module.TopLevelDecls.Add(iter); 

 					break;

 				}

-				case 22: case 23: case 27: case 38: case 39: case 40: case 56: case 57: case 58: {

+				case 23: case 24: case 28: case 39: case 40: case 41: case 57: case 58: case 59: {

 					ClassMemberDecl(namedModuleDefaultClassMembers, false);

 					break;

 				}

 				}

 			}

-			Expect(7);

+			Expect(8);

 			module.BodyEndTok = t;

 			module.TopLevelDecls.Add(new DefaultClassDecl(module, namedModuleDefaultClassMembers));

 			submodule = new LiteralModuleDecl(module, parent); 

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

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

 			Get();

-			if (la.kind == 15) {

+			if (la.kind == 16) {

 				Get();

 				opened = true;

 			}

 			NoUSIdent(out id);

-			if (la.kind == 16 || la.kind == 17) {

-				if (la.kind == 16) {

+			if (la.kind == 17 || la.kind == 18) {

+				if (la.kind == 17) {

 					Get();

 					QualifiedName(out idPath);

 					submodule = new AliasModuleDecl(idPath, id, parent, opened); 

 				} else {

 					Get();

 					QualifiedName(out idPath);

-					if (la.kind == 18) {

+					if (la.kind == 19) {

 						Get();

 						QualifiedName(out idAssignment);

 					}

 					submodule = new ModuleFacadeDecl(idPath, id, parent, idAssignment, opened); 

 				}

 			}

-			if (la.kind == 19) {

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

+			if (la.kind == 20) {

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

 				Get();

 			}

 			if (submodule == null) {

@@ -365,7 +366,7 @@ bool IsParenStar() {
 			 submodule = new AliasModuleDecl(idPath, id, parent, opened);

 			}

 			

-		} else SynErr(121);

+		} else SynErr(122);

 	}

 

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

@@ -377,21 +378,21 @@ bool IsParenStar() {
 		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

 		IToken bodyStart;

 		

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

-		Expect(21);

-		while (la.kind == 6) {

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

+		Expect(22);

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 36) {

+		if (la.kind == 37) {

 			GenericParameters(typeArgs);

 		}

-		Expect(6);

+		Expect(7);

 		bodyStart = t; 

 		while (StartOf(2)) {

 			ClassMemberDecl(members, true);

 		}

-		Expect(7);

+		Expect(8);

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

 		c.BodyStartTok = bodyStart;

 		c.BodyEndTok = t;

@@ -408,29 +409,29 @@ bool IsParenStar() {
 		IToken bodyStart = Token.NoToken;  // dummy assignment

 		bool co = false;

 		

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

-		if (la.kind == 24) {

+		while (!(la.kind == 0 || la.kind == 25 || la.kind == 26)) {SynErr(124); Get();}

+		if (la.kind == 25) {

 			Get();

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

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

 			Get();

 			co = true; 

-		} else SynErr(124);

-		while (la.kind == 6) {

+		} else SynErr(125);

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 36) {

+		if (la.kind == 37) {

 			GenericParameters(typeArgs);

 		}

-		Expect(16);

+		Expect(17);

 		bodyStart = t; 

 		DatatypeMemberDecl(ctors);

-		while (la.kind == 26) {

+		while (la.kind == 27) {

 			Get();

 			DatatypeMemberDecl(ctors);

 		}

-		if (la.kind == 19) {

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

+		if (la.kind == 20) {

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

 			Get();

 		}

 		if (co) {

@@ -448,20 +449,20 @@ bool IsParenStar() {
 		Attributes attrs = null;

 		var eqSupport = TypeParameter.EqualitySupportValue.Unspecified;

 		

-		Expect(29);

-		while (la.kind == 6) {

+		Expect(30);

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 8) {

+		if (la.kind == 9) {

 			Get();

-			Expect(30);

 			Expect(31);

+			Expect(32);

 			eqSupport = TypeParameter.EqualitySupportValue.Required; 

 		}

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

-		if (la.kind == 19) {

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

+		if (la.kind == 20) {

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

 			Get();

 		}

 	}

@@ -490,19 +491,19 @@ bool IsParenStar() {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

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

-		Expect(32);

-		while (la.kind == 6) {

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

+		Expect(33);

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 8 || la.kind == 36) {

-			if (la.kind == 36) {

+		if (la.kind == 9 || la.kind == 37) {

+			if (la.kind == 37) {

 				GenericParameters(typeArgs);

 			}

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

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

-				if (la.kind == 33) {

+			if (la.kind == 34 || la.kind == 35) {

+				if (la.kind == 34) {

 					Get();

 				} else {

 					Get();

@@ -510,14 +511,14 @@ bool IsParenStar() {
 				}

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

 			}

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

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

 			Get();

 			signatureOmitted = true; openParen = Token.NoToken; 

-		} else SynErr(128);

+		} else SynErr(129);

 		while (StartOf(3)) {

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

 		}

-		if (la.kind == 6) {

+		if (la.kind == 7) {

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

 		}

 		iter = new IteratorDecl(id, id.val, module, typeArgs, ins, outs,

@@ -537,8 +538,8 @@ bool IsParenStar() {
 		Function/*!*/ f;

 		MemberModifiers mmod = new MemberModifiers();

 		

-		while (la.kind == 22 || la.kind == 23) {

-			if (la.kind == 22) {

+		while (la.kind == 23 || la.kind == 24) {

+			if (la.kind == 23) {

 				Get();

 				mmod.IsGhost = true; 

 			} else {

@@ -546,21 +547,21 @@ bool IsParenStar() {
 				mmod.IsStatic = true; 

 			}

 		}

-		if (la.kind == 27) {

+		if (la.kind == 28) {

 			FieldDecl(mmod, mm);

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

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

 			FunctionDecl(mmod, out f);

 			mm.Add(f); 

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

+		} else if (la.kind == 39 || la.kind == 40 || la.kind == 41) {

 			MethodDecl(mmod, allowConstructors, out m);

 			mm.Add(m); 

-		} else SynErr(129);

+		} else SynErr(130);

 	}

 

 	void Attribute(ref Attributes attrs) {

-		Expect(6);

-		AttributeBody(ref attrs);

 		Expect(7);

+		AttributeBody(ref attrs);

+		Expect(8);

 	}

 

 	void NoUSIdent(out IToken/*!*/ x) {

@@ -577,7 +578,7 @@ bool IsParenStar() {
 		IToken id; ids = new List<IToken>(); 

 		Ident(out id);

 		ids.Add(id); 

-		while (la.kind == 20) {

+		while (la.kind == 21) {

 			Get();

 			IdentOrDigits(out id);

 			ids.Add(id); 

@@ -598,7 +599,7 @@ bool IsParenStar() {
 		} else if (la.kind == 2) {

 			Get();

 			x = t; 

-		} else SynErr(130);

+		} else SynErr(131);

 	}

 

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

@@ -606,29 +607,29 @@ bool IsParenStar() {
 		IToken/*!*/ id;

 		TypeParameter.EqualitySupportValue eqSupport;

 		

-		Expect(36);

+		Expect(37);

 		NoUSIdent(out id);

 		eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

-		if (la.kind == 8) {

+		if (la.kind == 9) {

 			Get();

-			Expect(30);

 			Expect(31);

+			Expect(32);

 			eqSupport = TypeParameter.EqualitySupportValue.Required; 

 		}

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

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			NoUSIdent(out id);

 			eqSupport = TypeParameter.EqualitySupportValue.Unspecified; 

-			if (la.kind == 8) {

+			if (la.kind == 9) {

 				Get();

-				Expect(30);

 				Expect(31);

+				Expect(32);

 				eqSupport = TypeParameter.EqualitySupportValue.Required; 

 			}

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

 		}

-		Expect(37);

+		Expect(38);

 	}

 

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

@@ -636,22 +637,22 @@ bool IsParenStar() {
 		Attributes attrs = null;

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

 		

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

-		Expect(27);

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

+		Expect(28);

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

 		

-		while (la.kind == 6) {

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		FIdentType(out id, out ty);

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

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			FIdentType(out id, out ty);

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

 		}

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

-		Expect(19);

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

+		Expect(20);

 	}

 

 	void FunctionDecl(MemberModifiers mmod, out Function/*!*/ f) {

@@ -673,90 +674,90 @@ bool IsParenStar() {
 		IToken bodyEnd = Token.NoToken;

 		bool signatureOmitted = false;

 		

-		if (la.kind == 56) {

+		if (la.kind == 57) {

 			Get();

-			if (la.kind == 38) {

+			if (la.kind == 39) {

 				Get();

 				isFunctionMethod = true; 

 			}

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

 			

-			while (la.kind == 6) {

+			while (la.kind == 7) {

 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

-			if (la.kind == 8 || la.kind == 36) {

-				if (la.kind == 36) {

+			if (la.kind == 9 || la.kind == 37) {

+				if (la.kind == 37) {

 					GenericParameters(typeArgs);

 				}

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

-				Expect(5);

+				Expect(6);

 				Type(out returnType);

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

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

 				Get();

 				signatureOmitted = true;

 				openParen = Token.NoToken; 

-			} else SynErr(133);

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

+			} else SynErr(134);

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

 			Get();

 			isPredicate = true; 

-			if (la.kind == 38) {

+			if (la.kind == 39) {

 				Get();

 				isFunctionMethod = true; 

 			}

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

 			

-			while (la.kind == 6) {

+			while (la.kind == 7) {

 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

 			if (StartOf(4)) {

-				if (la.kind == 36) {

+				if (la.kind == 37) {

 					GenericParameters(typeArgs);

 				}

-				if (la.kind == 8) {

+				if (la.kind == 9) {

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

-					if (la.kind == 5) {

+					if (la.kind == 6) {

 						Get();

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

 					}

 				}

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

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

 				Get();

 				signatureOmitted = true;

 				openParen = Token.NoToken; 

-			} else SynErr(134);

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

+			} else SynErr(135);

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

 			Get();

 			isCoPredicate = true; 

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

 			

-			while (la.kind == 6) {

+			while (la.kind == 7) {

 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

 			if (StartOf(4)) {

-				if (la.kind == 36) {

+				if (la.kind == 37) {

 					GenericParameters(typeArgs);

 				}

-				if (la.kind == 8) {

+				if (la.kind == 9) {

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

-					if (la.kind == 5) {

+					if (la.kind == 6) {

 						Get();

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

 					}

 				}

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

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

 				Get();

 				signatureOmitted = true;

 				openParen = Token.NoToken; 

-			} else SynErr(135);

-		} else SynErr(136);

+			} else SynErr(136);

+		} else SynErr(137);

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

 		while (StartOf(5)) {

 			FunctionSpec(reqs, reads, ens, decreases);

 		}

-		if (la.kind == 6) {

+		if (la.kind == 7) {

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

 		}

 		if (isPredicate) {

@@ -796,13 +797,13 @@ bool IsParenStar() {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

-		while (!(StartOf(6))) {SynErr(137); Get();}

-		if (la.kind == 38) {

+		while (!(StartOf(6))) {SynErr(138); Get();}

+		if (la.kind == 39) {

 			Get();

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

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

 			Get();

 			isCoMethod = true; 

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

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

 			Get();

 			if (allowConstructor) {

 			 isConstructor = true;

@@ -810,7 +811,7 @@ bool IsParenStar() {
 			 SemErr(t, "constructors are only allowed in classes");

 			}

 			

-		} else SynErr(138);

+		} else SynErr(139);

 		keywordToken = t; 

 		if (isConstructor) {

 		 if (mmod.IsGhost) {

@@ -825,7 +826,7 @@ bool IsParenStar() {
 		 }

 		}

 		

-		while (la.kind == 6) {

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		if (la.kind == 1) {

@@ -839,24 +840,24 @@ bool IsParenStar() {
 		 }

 		}

 		

-		if (la.kind == 8 || la.kind == 36) {

-			if (la.kind == 36) {

+		if (la.kind == 9 || la.kind == 37) {

+			if (la.kind == 37) {

 				GenericParameters(typeArgs);

 			}

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

-			if (la.kind == 34) {

+			if (la.kind == 35) {

 				Get();

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

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

 			}

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

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

 			Get();

 			signatureOmitted = true; openParen = Token.NoToken; 

-		} else SynErr(139);

+		} else SynErr(140);

 		while (StartOf(7)) {

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

 		}

-		if (la.kind == 6) {

+		if (la.kind == 7) {

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

 		}

 		if (isConstructor) {

@@ -880,11 +881,11 @@ bool IsParenStar() {
 		IToken/*!*/ id;

 		List<Formal/*!*/> formals = new List<Formal/*!*/>();

 		

-		while (la.kind == 6) {

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		if (la.kind == 8) {

+		if (la.kind == 9) {

 			FormalsOptionalIds(formals);

 		}

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

@@ -892,17 +893,17 @@ bool IsParenStar() {
 

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

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

-		Expect(8);

+		Expect(9);

 		if (StartOf(8)) {

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

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

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

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

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

 			}

 		}

-		Expect(31);

+		Expect(32);

 	}

 

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

@@ -914,8 +915,8 @@ bool IsParenStar() {
 		} else if (la.kind == 2) {

 			Get();

 			id = t; 

-		} else SynErr(140);

-		Expect(5);

+		} else SynErr(141);

+		Expect(6);

 		Type(out ty);

 	}

 

@@ -923,7 +924,7 @@ bool IsParenStar() {
 		Contract.Ensures(Contract.ValueAtReturn(out id)!=null);

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

 		isGhost = false; 

-		if (la.kind == 22) {

+		if (la.kind == 23) {

 			Get();

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

 		}

@@ -933,7 +934,7 @@ bool IsParenStar() {
 	void IdentType(out IToken/*!*/ id, out Type/*!*/ ty, bool allowWildcardId) {

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

 		WildIdent(out id, allowWildcardId);

-		Expect(5);

+		Expect(6);

 		Type(out ty);

 	}

 

@@ -960,7 +961,7 @@ bool IsParenStar() {
 		IToken/*!*/ id;  Type/*!*/ ty;  Type optType = null;

 		

 		WildIdent(out id, true);

-		if (la.kind == 5) {

+		if (la.kind == 6) {

 			Get();

 			Type(out ty);

 			optType = ty; 

@@ -972,7 +973,7 @@ bool IsParenStar() {
 		Contract.Ensures(Contract.ValueAtReturn(out var)!=null); IToken/*!*/ id;  Type/*!*/ ty;  Type optType = null;

 		

 		WildIdent(out id, true);

-		if (la.kind == 5) {

+		if (la.kind == 6) {

 			Get();

 			Type(out ty);

 			optType = ty; 

@@ -985,13 +986,13 @@ bool IsParenStar() {
 		Contract.Ensures(Contract.ValueAtReturn(out ty)!=null);

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

 		string name = null; id = Token.NoToken; ty = null; isGhost = false; 

-		if (la.kind == 22) {

+		if (la.kind == 23) {

 			Get();

 			isGhost = true; 

 		}

 		if (StartOf(9)) {

 			TypeAndToken(out id, out ty);

-			if (la.kind == 5) {

+			if (la.kind == 6) {

 				Get();

 				UserDefinedType udt = ty as UserDefinedType;

 				if (udt != null && udt.TypeArgs.Count == 0) {

@@ -1005,9 +1006,9 @@ bool IsParenStar() {
 		} else if (la.kind == 2) {

 			Get();

 			id = t; name = id.val;

-			Expect(5);

+			Expect(6);

 			Type(out ty);

-		} else SynErr(141);

+		} else SynErr(142);

 		if (name != null) {

 		 identName = name;

 		} else {

@@ -1021,22 +1022,22 @@ bool IsParenStar() {
 		List<Type/*!*/>/*!*/ gt;

 		

 		switch (la.kind) {

-		case 48: {

+		case 49: {

 			Get();

 			tok = t; 

 			break;

 		}

-		case 49: {

+		case 50: {

 			Get();

 			tok = t;  ty = new NatType(); 

 			break;

 		}

-		case 50: {

+		case 51: {

 			Get();

 			tok = t;  ty = new IntType(); 

 			break;

 		}

-		case 51: {

+		case 52: {

 			Get();

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

 			GenericInstantiation(gt);

@@ -1047,7 +1048,7 @@ bool IsParenStar() {
 			

 			break;

 		}

-		case 52: {

+		case 53: {

 			Get();

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

 			GenericInstantiation(gt);

@@ -1058,7 +1059,7 @@ bool IsParenStar() {
 			

 			break;

 		}

-		case 53: {

+		case 54: {

 			Get();

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

 			GenericInstantiation(gt);

@@ -1069,7 +1070,7 @@ bool IsParenStar() {
 			

 			break;

 		}

-		case 54: {

+		case 55: {

 			Get();

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

 			GenericInstantiation(gt);

@@ -1080,28 +1081,28 @@ bool IsParenStar() {
 			

 			break;

 		}

-		case 1: case 3: case 55: {

+		case 1: case 4: case 56: {

 			ReferenceType(out tok, out ty);

 			break;

 		}

-		default: SynErr(142); break;

+		default: SynErr(143); 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(8);

+		Expect(9);

 		openParen = t; 

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

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

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

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

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

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

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

 			}

 		}

-		Expect(31);

+		Expect(32);

 	}

 

 	void IteratorSpec(List<FrameExpression/*!*/>/*!*/ reads, List<FrameExpression/*!*/>/*!*/ mod, List<Expression/*!*/> decreases,

@@ -1110,8 +1111,8 @@ List<MaybeFreeExpression/*!*/>/*!*/ yieldReq, List<MaybeFreeExpression/*!*/>/*!*
 ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {

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

 		

-		while (!(StartOf(10))) {SynErr(143); Get();}

-		if (la.kind == 46) {

+		while (!(StartOf(10))) {SynErr(144); Get();}

+		if (la.kind == 47) {

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref readsAttrs);

@@ -1119,15 +1120,15 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			if (StartOf(11)) {

 				FrameExpression(out fe);

 				reads.Add(fe); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					FrameExpression(out fe);

 					reads.Add(fe); 

 				}

 			}

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

-			Expect(19);

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

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

+			Expect(20);

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref modAttrs);

@@ -1135,70 +1136,70 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			if (StartOf(11)) {

 				FrameExpression(out fe);

 				mod.Add(fe); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					FrameExpression(out fe);

 					mod.Add(fe); 

 				}

 			}

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

-			Expect(19);

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

+			Expect(20);

 		} else if (StartOf(12)) {

-			if (la.kind == 42) {

+			if (la.kind == 43) {

 				Get();

 				isFree = true; 

 			}

-			if (la.kind == 47) {

+			if (la.kind == 48) {

 				Get();

 				isYield = true; 

 			}

-			if (la.kind == 43) {

+			if (la.kind == 44) {

 				Get();

 				Expression(out e);

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

-				Expect(19);

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

+				Expect(20);

 				if (isYield) {

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

 				} else {

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

 				}

 				

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

 				}

 				Expression(out e);

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

-				Expect(19);

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

+				Expect(20);

 				if (isYield) {

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

 				} else {

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

 				}

 				

-			} else SynErr(148);

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

+			} else SynErr(149);

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decrAttrs);

 			}

 			DecreasesList(decreases, false);

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

-			Expect(19);

-		} else SynErr(150);

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

+			Expect(20);

+		} else SynErr(151);

 	}

 

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

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

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

 		

-		Expect(6);

+		Expect(7);

 		bodyStart = t; 

 		while (StartOf(13)) {

 			Stmt(body);

 		}

-		Expect(7);

+		Expect(8);

 		bodyEnd = t;

 		block = new BlockStmt(bodyStart, body); 

 	}

@@ -1208,8 +1209,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(14))) {SynErr(151); Get();}

-		if (la.kind == 41) {

+		while (!(StartOf(14))) {SynErr(152); Get();}

+		if (la.kind == 42) {

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref modAttrs);

@@ -1217,44 +1218,44 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(11)) {

 				FrameExpression(out fe);

 				mod.Add(fe); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					FrameExpression(out fe);

 					mod.Add(fe); 

 				}

 			}

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

-			Expect(19);

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

-			if (la.kind == 42) {

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

+			Expect(20);

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

+			if (la.kind == 43) {

 				Get();

 				isFree = true; 

 			}

-			if (la.kind == 43) {

+			if (la.kind == 44) {

 				Get();

 				Expression(out e);

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

-				Expect(19);

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

+				Expect(20);

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

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

 				}

 				Expression(out e);

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

-				Expect(19);

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

+				Expect(20);

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

-			} else SynErr(155);

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

+			} else SynErr(156);

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decAttrs);

 			}

 			DecreasesList(decreases, true);

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

-			Expect(19);

-		} else SynErr(157);

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

+			Expect(20);

+		} else SynErr(158);

 	}

 

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

@@ -1267,18 +1268,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(15)) {

 			Expression(out e);

 			feTok = e.tok; 

-			if (la.kind == 59) {

+			if (la.kind == 60) {

 				Get();

 				Ident(out id);

 				fieldName = id.val;  feTok = id; 

 			}

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

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

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

 			Get();

 			Ident(out id);

 			fieldName = id.val; 

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

-		} else SynErr(158);

+		} else SynErr(159);

 	}

 

 	void Expression(out Expression/*!*/ e) {

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

 		}

 		

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			PossiblyWildExpression(out e);

 			if (!allowWildcard && e is WildcardExpr) {

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

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

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

-		Expect(36);

+		Expect(37);

 		Type(out ty);

 		gt.Add(ty); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			Type(out ty);

 			gt.Add(ty); 

 		}

-		Expect(37);

+		Expect(38);

 	}

 

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

@@ -1325,10 +1326,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Type/*!*/>/*!*/ gt;

 		List<IToken> path;

 		

-		if (la.kind == 55) {

+		if (la.kind == 56) {

 			Get();

 			tok = t;  ty = new ObjectType(); 

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

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

 			Get();

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

 			GenericInstantiation(gt);

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

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

 			path = new List<IToken>(); 

-			while (la.kind == 20) {

+			while (la.kind == 21) {

 				path.Add(tok); 

 				Get();

 				Ident(out tok);

 			}

-			if (la.kind == 36) {

+			if (la.kind == 37) {

 				GenericInstantiation(gt);

 			}

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

-		} else SynErr(159);

+		} else SynErr(160);

 	}

 

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

@@ -1362,33 +1363,33 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Contract.Requires(cce.NonNullElements(reads));

 		Contract.Requires(decreases == null || cce.NonNullElements(decreases));

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

-		if (la.kind == 43) {

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

+		if (la.kind == 44) {

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

 			Get();

 			Expression(out e);

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

-			Expect(19);

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

+			Expect(20);

 			reqs.Add(e); 

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

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

 			Get();

 			if (StartOf(16)) {

 				PossiblyWildFrameExpression(out fe);

 				reads.Add(fe); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					PossiblyWildFrameExpression(out fe);

 					reads.Add(fe); 

 				}

 			}

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

-			Expect(19);

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

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

+			Expect(20);

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

 			Get();

 			Expression(out e);

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

-			Expect(19);

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

+			Expect(20);

 			ens.Add(e); 

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

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

 			Get();

 			if (decreases == null) {

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

@@ -1396,39 +1397,39 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			}

 			

 			DecreasesList(decreases, false);

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

-			Expect(19);

-		} else SynErr(165);

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

+			Expect(20);

+		} else SynErr(166);

 	}

 

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

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

-		Expect(6);

+		Expect(7);

 		bodyStart = t; 

 		Expression(out e);

-		Expect(7);

+		Expect(8);

 		bodyEnd = t; 

 	}

 

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

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

-		if (la.kind == 9) {

+		if (la.kind == 10) {

 			Get();

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

 		} else if (StartOf(11)) {

 			FrameExpression(out fe);

-		} else SynErr(166);

+		} else SynErr(167);

 	}

 

 	void PossiblyWildExpression(out Expression/*!*/ e) {

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

 		e = dummyExpr; 

-		if (la.kind == 9) {

+		if (la.kind == 10) {

 			Get();

 			e = new WildcardExpr(t); 

 		} else if (StartOf(15)) {

 			Expression(out e);

-		} else SynErr(167);

+		} else SynErr(168);

 	}

 

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

@@ -1445,89 +1446,89 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken bodyStart, bodyEnd;

 		int breakCount;

 		

-		while (!(StartOf(17))) {SynErr(168); Get();}

+		while (!(StartOf(17))) {SynErr(169); Get();}

 		switch (la.kind) {

-		case 6: {

+		case 7: {

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

 			s = bs; 

 			break;

 		}

-		case 77: {

+		case 78: {

 			AssertStmt(out s);

 			break;

 		}

-		case 66: {

+		case 67: {

 			AssumeStmt(out s);

 			break;

 		}

-		case 78: {

+		case 79: {

 			PrintStmt(out s);

 			break;

 		}

-		case 1: case 2: case 8: case 26: case 106: case 107: case 108: case 109: case 110: case 111: {

+		case 1: case 2: case 3: case 9: case 27: case 107: case 108: case 109: case 110: case 111: case 112: {

 			UpdateStmt(out s);

 			break;

 		}

-		case 22: case 27: {

+		case 23: case 28: {

 			VarDeclStatement(out s);

 			break;

 		}

-		case 70: {

+		case 71: {

 			IfStmt(out s);

 			break;

 		}

-		case 74: {

+		case 75: {

 			WhileStmt(out s);

 			break;

 		}

-		case 76: {

+		case 77: {

 			MatchStmt(out s);

 			break;

 		}

-		case 79: case 80: {

+		case 80: case 81: {

 			ForallStmt(out s);

 			break;

 		}

-		case 81: {

+		case 82: {

 			CalcStmt(out s);

 			break;

 		}

-		case 60: {

+		case 61: {

 			Get();

 			x = t; 

 			NoUSIdent(out id);

-			Expect(5);

+			Expect(6);

 			OneStmt(out s);

 			s.Labels = new LList<Label>(new Label(x, id.val), s.Labels); 

 			break;

 		}

-		case 61: {

+		case 62: {

 			Get();

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

 			if (la.kind == 1) {

 				NoUSIdent(out id);

 				label = id.val; 

-			} else if (la.kind == 19 || la.kind == 61) {

-				while (la.kind == 61) {

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

+				while (la.kind == 62) {

 					Get();

 					breakCount++; 

 				}

-			} else SynErr(169);

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

-			Expect(19);

+			} else SynErr(170);

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

+			Expect(20);

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

 			break;

 		}

-		case 47: case 64: {

+		case 48: case 65: {

 			ReturnStmt(out s);

 			break;

 		}

-		case 35: {

+		case 36: {

 			SkeletonStmt(out s);

-			Expect(19);

+			Expect(20);

 			break;

 		}

-		default: SynErr(171); break;

+		default: SynErr(172); break;

 		}

 	}

 

@@ -1535,17 +1536,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(77);

+		Expect(78);

 		x = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

 		if (StartOf(15)) {

 			Expression(out e);

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

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

 			Get();

-		} else SynErr(172);

-		Expect(19);

+		} else SynErr(173);

+		Expect(20);

 		if (e == null) {

 		 s = new SkeletonStatement(new AssertStmt(x, new LiteralExpr(x, true), attrs), true, false);

 		} else {

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

 		Expression e = null; Attributes attrs = null;

 		

-		Expect(66);

+		Expect(67);

 		x = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

 		if (StartOf(15)) {

 			Expression(out e);

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

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

 			Get();

-		} else SynErr(173);

+		} else SynErr(174);

 		if (e == null) {

 		 s = new SkeletonStatement(new AssumeStmt(x, new LiteralExpr(x, true), attrs), true, false);

 		} else {

 		 s = new AssumeStmt(x, e, attrs);

 		}

 		

-		Expect(19);

+		Expect(20);

 	}

 

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

 		Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;  Attributes.Argument/*!*/ arg;

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

 		

-		Expect(78);

+		Expect(79);

 		x = t; 

 		AttributeArg(out arg);

 		args.Add(arg); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			AttributeArg(out arg);

 			args.Add(arg); 

 		}

-		Expect(19);

+		Expect(20);

 		s = new PrintStmt(x, args); 

 	}

 

@@ -1606,43 +1607,43 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		Lhs(out e);

 		x = e.tok; 

-		if (la.kind == 6 || la.kind == 19) {

-			while (la.kind == 6) {

+		if (la.kind == 7 || la.kind == 20) {

+			while (la.kind == 7) {

 				Attribute(ref attrs);

 			}

-			Expect(19);

+			Expect(20);

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

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

+		} else if (la.kind == 29 || la.kind == 64 || la.kind == 66) {

 			lhss.Add(e);  lhs0 = e; 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				Lhs(out e);

 				lhss.Add(e); 

 			}

-			if (la.kind == 63) {

+			if (la.kind == 64) {

 				Get();

 				x = t; 

 				Rhs(out r, lhs0);

 				rhss.Add(r); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					Rhs(out r, lhs0);

 					rhss.Add(r); 

 				}

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

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

 				Get();

 				x = t; 

-				if (la.kind == 66) {

+				if (la.kind == 67) {

 					Get();

 					suchThatAssume = t; 

 				}

 				Expression(out suchThat);

-			} else SynErr(174);

-			Expect(19);

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

+			} else SynErr(175);

+			Expect(20);

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

 			Get();

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

-		} else SynErr(175);

+		} else SynErr(176);

 		if (suchThat != null) {

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

 		} else {

@@ -1664,21 +1665,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken suchThatAssume = null;

 		Expression suchThat = null;

 		

-		if (la.kind == 22) {

+		if (la.kind == 23) {

 			Get();

 			isGhost = true;  x = t; 

 		}

-		Expect(27);

+		Expect(28);

 		if (!isGhost) { x = t; } 

 		LocalIdentTypeOptional(out d, isGhost);

 		lhss.Add(d); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			LocalIdentTypeOptional(out d, isGhost);

 			lhss.Add(d); 

 		}

-		if (la.kind == 63 || la.kind == 65) {

-			if (la.kind == 63) {

+		if (la.kind == 64 || la.kind == 66) {

+			if (la.kind == 64) {

 				Get();

 				assignTok = t;

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

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

 				Rhs(out r, lhs0);

 				rhss.Add(r); 

-				while (la.kind == 28) {

+				while (la.kind == 29) {

 					Get();

 					Rhs(out r, lhs0);

 					rhss.Add(r); 

@@ -1694,14 +1695,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			} else {

 				Get();

 				assignTok = t; 

-				if (la.kind == 66) {

+				if (la.kind == 67) {

 					Get();

 					suchThatAssume = t; 

 				}

 				Expression(out suchThat);

 			}

 		}

-		Expect(19);

+		Expect(20);

 		ConcreteUpdateStatement update;

 		if (suchThat != null) {

 		 var ies = new List<Expression>();

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

 		ifStmt = dummyStmt;  // to please the compiler

 		

-		Expect(70);

+		Expect(71);

 		x = t; 

 		if (IsAlternative()) {

 			AlternativeBlock(out alternatives);

@@ -1746,15 +1747,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				guardOmitted = true; 

 			}

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

-			if (la.kind == 71) {

+			if (la.kind == 72) {

 				Get();

-				if (la.kind == 70) {

+				if (la.kind == 71) {

 					IfStmt(out s);

 					els = s; 

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

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

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

 					els = bs; 

-				} else SynErr(176);

+				} else SynErr(177);

 			}

 			if (guardOmitted) {

 			 ifStmt = new SkeletonStatement(new IfStmt(x, guard, thn, els), true, false);

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

 			}

 			

-		} else SynErr(177);

+		} else SynErr(178);

 	}

 

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

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

 		stmt = dummyStmt;  // to please the compiler

 		

-		Expect(74);

+		Expect(75);

 		x = t; 

 		if (IsLoopSpecOrAlternative()) {

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

@@ -1793,12 +1794,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				guardOmitted = true; 

 			}

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

-			if (la.kind == 6) {

+			if (la.kind == 7) {

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

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

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

 				Get();

 				bodyOmitted = true; 

-			} else SynErr(178);

+			} else SynErr(179);

 			if (guardOmitted || bodyOmitted) {

 			 if (mod != null) {

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

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

 			}

 			

-		} else SynErr(179);

+		} else SynErr(180);

 	}

 

 	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(76);

+		Expect(77);

 		x = t; 

 		Expression(out e);

-		Expect(6);

-		while (la.kind == 72) {

+		Expect(7);

+		while (la.kind == 73) {

 			CaseStatement(out c);

 			cases.Add(c); 

 		}

-		Expect(7);

+		Expect(8);

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

 	}

 

@@ -1846,16 +1847,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BlockStmt/*!*/ block;

 		IToken bodyStart, bodyEnd;

 		

-		if (la.kind == 79) {

+		if (la.kind == 80) {

 			Get();

 			x = t; 

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

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

 			Get();

 			x = t;

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

 			

-		} else SynErr(180);

-		if (la.kind == 8) {

+		} else SynErr(181);

+		if (la.kind == 9) {

 			Get();

 			usesOptionalParen = true; 

 		}

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

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

 		

-		if (la.kind == 31) {

+		if (la.kind == 32) {

 			Get();

 			if (!usesOptionalParen) { SemErr(t, "found but didn't expect a close parenthesis"); } 

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

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

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

-		} else SynErr(181);

-		while (la.kind == 42 || la.kind == 44) {

+		} else SynErr(182);

+		while (la.kind == 43 || la.kind == 45) {

 			isFree = false; 

-			if (la.kind == 42) {

+			if (la.kind == 43) {

 				Get();

 				isFree = true; 

 			}

-			Expect(44);

+			Expect(45);

 			Expression(out e);

-			Expect(19);

+			Expect(20);

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

 		}

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

@@ -1902,7 +1903,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BlockStmt/*!*/ h;

 		IToken opTok;

 		

-		Expect(81);

+		Expect(82);

 		x = t; 

 		if (StartOf(20)) {

 			CalcOp(out opTok, out calcOp);

@@ -1913,11 +1914,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			resOp = calcOp; 

 			

 		}

-		Expect(6);

+		Expect(7);

 		if (StartOf(15)) {

 			Expression(out e);

 			lines.Add(e); stepOp = calcOp; 

-			Expect(19);

+			Expect(20);

 			while (StartOf(21)) {

 				if (StartOf(20)) {

 					CalcOp(out opTok, out op);

@@ -1935,10 +1936,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				hints.Add(h); 

 				Expression(out e);

 				lines.Add(e); stepOp = calcOp; 

-				Expect(19);

+				Expect(20);

 			}

 		}

-		Expect(7);

+		Expect(8);

 		s = new CalcStmt(x, calcOp, lines, hints, stepOps, resOp); 

 	}

 

@@ -1948,23 +1949,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		AssignmentRhs r;

 		bool isYield = false;

 		

-		if (la.kind == 64) {

+		if (la.kind == 65) {

 			Get();

 			returnTok = t; 

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

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

 			Get();

 			returnTok = t; isYield = true; 

-		} else SynErr(182);

+		} else SynErr(183);

 		if (StartOf(22)) {

 			Rhs(out r, null);

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

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				Rhs(out r, null);

 				rhss.Add(r); 

 			}

 		}

-		Expect(19);

+		Expect(20);

 		if (isYield) {

 		 s = new YieldStmt(returnTok, rhss);

 		} else {

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

 		IToken tok, dotdotdot, whereTok;

 		Expression e; 

-		Expect(35);

+		Expect(36);

 		dotdotdot = t; 

-		if (la.kind == 62) {

+		if (la.kind == 63) {

 			Get();

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

 			Ident(out tok);

 			names.Add(tok); 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				Ident(out tok);

 				names.Add(tok); 

 			}

-			Expect(63);

+			Expect(64);

 			Expression(out e);

 			exprs.Add(e); 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				Expression(out e);

 				exprs.Add(e); 

@@ -2016,29 +2017,29 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		r = dummyRhs;  // to please compiler

 		Attributes attrs = null;

 		

-		if (la.kind == 67) {

+		if (la.kind == 68) {

 			Get();

 			newToken = t; 

 			TypeAndToken(out x, out ty);

-			if (la.kind == 8 || la.kind == 20 || la.kind == 68) {

-				if (la.kind == 68) {

+			if (la.kind == 9 || la.kind == 21 || la.kind == 69) {

+				if (la.kind == 69) {

 					Get();

 					ee = new List<Expression>(); 

 					Expressions(ee);

-					Expect(69);

+					Expect(70);

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

 					

 				} else {

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

-					if (la.kind == 20) {

+					if (la.kind == 21) {

 						Get();

 						Ident(out x);

 					}

-					Expect(8);

+					Expect(9);

 					if (StartOf(15)) {

 						Expressions(args);

 					}

-					Expect(31);

+					Expect(32);

 				}

 			}

 			if (ee != null) {

@@ -2049,14 +2050,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			 r = new TypeRhs(newToken, ty);

 			}

 			

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

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

 			Get();

 			r = new HavocRhs(t); 

 		} else if (StartOf(15)) {

 			Expression(out e);

 			r = new ExprRhs(e); 

-		} else SynErr(183);

-		while (la.kind == 6) {

+		} else SynErr(184);

+		while (la.kind == 7) {

 			Attribute(ref attrs);

 		}

 		r.Attributes = attrs; 

@@ -2067,23 +2068,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		if (la.kind == 1) {

 			DottedIdentifiersAndFunction(out e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

 		} else if (StartOf(23)) {

 			ConstAtomExpression(out e);

 			Suffix(ref e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

-		} else SynErr(184);

+		} else SynErr(185);

 	}

 

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

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

 		Expression(out e);

 		args.Add(e); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			Expression(out e);

 			args.Add(e); 

@@ -2096,35 +2097,35 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression e;

 		List<Statement> body;

 		

-		Expect(6);

-		while (la.kind == 72) {

+		Expect(7);

+		while (la.kind == 73) {

 			Get();

 			x = t; 

 			Expression(out e);

-			Expect(73);

+			Expect(74);

 			body = new List<Statement>(); 

 			while (StartOf(13)) {

 				Stmt(body);

 			}

 			alternatives.Add(new GuardedAlternative(x, e, body)); 

 		}

-		Expect(7);

+		Expect(8);

 	}

 

 	void Guard(out Expression e) {

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

-		if (la.kind == 9) {

+		if (la.kind == 10) {

 			Get();

 			e = null; 

 		} else if (IsParenStar()) {

-			Expect(8);

 			Expect(9);

-			Expect(31);

+			Expect(10);

+			Expect(32);

 			e = null; 

 		} else if (StartOf(15)) {

 			Expression(out ee);

 			e = ee; 

-		} else SynErr(185);

+		} else SynErr(186);

 	}

 

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

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

 		

 		while (StartOf(24)) {

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

+			if (la.kind == 43 || la.kind == 76) {

 				Invariant(out invariant);

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

-				Expect(19);

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

+				Expect(20);

 				invariants.Add(invariant); 

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

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

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref decAttrs);

 				}

 				DecreasesList(decreases, true);

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

-				Expect(19);

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

+				Expect(20);

 			} else {

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref modAttrs);

@@ -2159,26 +2160,26 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				if (StartOf(11)) {

 					FrameExpression(out fe);

 					mod.Add(fe); 

-					while (la.kind == 28) {

+					while (la.kind == 29) {

 						Get();

 						FrameExpression(out fe);

 						mod.Add(fe); 

 					}

 				}

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

-				Expect(19);

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

+				Expect(20);

 			}

 		}

 	}

 

 	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 == 42 || la.kind == 75)) {SynErr(191); Get();}

-		if (la.kind == 42) {

+		while (!(la.kind == 0 || la.kind == 43 || la.kind == 76)) {SynErr(192); Get();}

+		if (la.kind == 43) {

 			Get();

 			isFree = true; 

 		}

-		Expect(75);

+		Expect(76);

 		while (IsAttribute()) {

 			Attribute(ref attrs);

 		}

@@ -2193,21 +2194,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

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

 		

-		Expect(72);

+		Expect(73);

 		x = t; 

 		Ident(out id);

-		if (la.kind == 8) {

+		if (la.kind == 9) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

 			}

-			Expect(31);

+			Expect(32);

 		}

-		Expect(73);

+		Expect(74);

 		while (StartOf(13)) {

 			Stmt(body);

 		}

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

 	void AttributeArg(out Attributes.Argument/*!*/ arg) {

 		Contract.Ensures(Contract.ValueAtReturn(out arg) != null); Expression/*!*/ e;  arg = dummyAttrArg; 

-		if (la.kind == 4) {

+		if (la.kind == 5) {

 			Get();

 			arg = new Attributes.Argument(t, t.val.Substring(1, t.val.Length-2)); 

 		} else if (StartOf(15)) {

 			Expression(out e);

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

-		} else SynErr(192);

+		} else SynErr(193);

 	}

 

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

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

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			IdentTypeOptional(out bv);

 			bvars.Add(bv); 

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

 			Attribute(ref attrs);

 		}

-		if (la.kind == 26) {

+		if (la.kind == 27) {

 			Get();

 			Expression(out range);

 		}

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

 		

 		switch (la.kind) {

-		case 30: {

+		case 31: {

 			Get();

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

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

-				Expect(68);

-				Expression(out k);

 				Expect(69);

+				Expression(out k);

+				Expect(70);

 			}

 			break;

 		}

-		case 36: {

+		case 37: {

 			Get();

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

 			break;

 		}

-		case 37: {

+		case 38: {

 			Get();

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

 			break;

 		}

-		case 83: {

+		case 84: {

 			Get();

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

 			break;

 		}

-		case 84: {

+		case 85: {

 			Get();

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

 			break;

 		}

-		case 85: {

+		case 86: {

 			Get();

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

 			break;

 		}

-		case 86: {

+		case 87: {

 			Get();

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

 			break;

 		}

-		case 87: {

+		case 88: {

 			Get();

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

 			break;

 		}

-		case 88: {

+		case 89: {

 			Get();

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

 			break;

 		}

-		case 89: case 90: {

+		case 90: case 91: {

 			EquivOp();

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

 			break;

 		}

-		case 91: case 92: {

+		case 92: case 93: {

 			ImpliesOp();

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

 			break;

 		}

-		case 93: case 94: {

+		case 94: case 95: {

 			ExpliesOp();

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

 			break;

 		}

-		default: SynErr(193); break;

+		default: SynErr(194); break;

 		}

 		if (k == null) {

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

@@ -2337,8 +2338,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Statement/*!*/ calc;

 		Token x = la;

 		

-		while (la.kind == 6 || la.kind == 81) {

-			if (la.kind == 6) {

+		while (la.kind == 7 || la.kind == 82) {

+			if (la.kind == 7) {

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

 				subhints.Add(block); 

 			} else {

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

 

 	void EquivOp() {

-		if (la.kind == 89) {

+		if (la.kind == 90) {

 			Get();

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

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

 			Get();

-		} else SynErr(194);

+		} else SynErr(195);

 	}

 

 	void ImpliesOp() {

-		if (la.kind == 91) {

+		if (la.kind == 92) {

 			Get();

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

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

 			Get();

-		} else SynErr(195);

+		} else SynErr(196);

 	}

 

 	void ExpliesOp() {

-		if (la.kind == 93) {

+		if (la.kind == 94) {

 			Get();

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

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

 			Get();

-		} else SynErr(196);

+		} else SynErr(197);

 	}

 

 	void EquivExpression(out Expression/*!*/ e0) {

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

 		ImpliesExpliesExpression(out e0);

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

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

 			EquivOp();

 			x = t; 

 			ImpliesExpliesExpression(out e1);

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

 		LogicalExpression(out e0);

 		if (StartOf(25)) {

-			if (la.kind == 91 || la.kind == 92) {

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

 				ImpliesOp();

 				x = t; 

 				ImpliesExpression(out e1);

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

 				LogicalExpression(out e1);

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

-				while (la.kind == 93 || la.kind == 94) {

+				while (la.kind == 94 || la.kind == 95) {

 					ExpliesOp();

 					x = t; 

 					LogicalExpression(out e1);

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

 		RelationalExpression(out e0);

 		if (StartOf(26)) {

-			if (la.kind == 95 || la.kind == 96) {

+			if (la.kind == 96 || la.kind == 97) {

 				AndOp();

 				x = t; 

 				RelationalExpression(out e1);

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

-				while (la.kind == 95 || la.kind == 96) {

+				while (la.kind == 96 || la.kind == 97) {

 					AndOp();

 					x = t; 

 					RelationalExpression(out e1);

@@ -2429,7 +2430,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 == 97 || la.kind == 98) {

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

 					OrOp();

 					x = t; 

 					RelationalExpression(out e1);

@@ -2442,7 +2443,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 == 91 || la.kind == 92) {

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

 			ImpliesOp();

 			x = t; 

 			ImpliesExpression(out e1);

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

 

 	void AndOp() {

-		if (la.kind == 95) {

+		if (la.kind == 96) {

 			Get();

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

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

 			Get();

-		} else SynErr(197);

+		} else SynErr(198);

 	}

 

 	void OrOp() {

-		if (la.kind == 97) {

+		if (la.kind == 98) {

 			Get();

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

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

 			Get();

-		} else SynErr(198);

+		} else SynErr(199);

 	}

 

 	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 == 101 || la.kind == 102) {

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

 			AddOp(out x, out op);

 			Factor(out e1);

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

@@ -2584,62 +2585,62 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		k = null;

 		

 		switch (la.kind) {

-		case 30: {

+		case 31: {

 			Get();

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

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

-				Expect(68);

-				Expression(out k);

 				Expect(69);

+				Expression(out k);

+				Expect(70);

 			}

 			break;

 		}

-		case 36: {

+		case 37: {

 			Get();

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

 			break;

 		}

-		case 37: {

+		case 38: {

 			Get();

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

 			break;

 		}

-		case 83: {

+		case 84: {

 			Get();

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

 			break;

 		}

-		case 84: {

+		case 85: {

 			Get();

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

 			break;

 		}

-		case 85: {

+		case 86: {

 			Get();

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

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

-				Expect(68);

-				Expression(out k);

 				Expect(69);

+				Expression(out k);

+				Expect(70);

 			}

 			break;

 		}

-		case 99: {

+		case 100: {

 			Get();

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

 			break;

 		}

-		case 10: {

+		case 11: {

 			Get();

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

 			break;

 		}

-		case 100: {

+		case 101: {

 			Get();

 			x = t;  y = Token.NoToken; 

-			if (la.kind == 100) {

+			if (la.kind == 101) {

 				Get();

 				y = t; 

 			}

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

 			break;

 		}

-		case 86: {

+		case 87: {

 			Get();

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

 			break;

 		}

-		case 87: {

+		case 88: {

 			Get();

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

 			break;

 		}

-		case 88: {

+		case 89: {

 			Get();

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

 			break;

 		}

-		default: SynErr(199); break;

+		default: SynErr(200); 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 == 9 || la.kind == 103 || la.kind == 104) {

+		while (la.kind == 10 || la.kind == 104 || la.kind == 105) {

 			MulOp(out x, out op);

 			UnaryExpression(out e1);

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

@@ -2685,103 +2686,103 @@ 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 == 101) {

+		if (la.kind == 102) {

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(200);

+		} else SynErr(201);

 	}

 

 	void UnaryExpression(out Expression/*!*/ e) {

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

 		switch (la.kind) {

-		case 102: {

+		case 103: {

 			Get();

 			x = t; 

 			UnaryExpression(out e);

 			e = new BinaryExpr(x, BinaryExpr.Opcode.Sub, new LiteralExpr(x, 0), e); 

 			break;

 		}

-		case 100: case 105: {

+		case 101: case 106: {

 			NegOp();

 			x = t; 

 			UnaryExpression(out e);

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

 			break;

 		}

-		case 27: case 51: case 60: case 66: case 70: case 76: case 77: case 79: case 81: case 114: case 115: case 116: {

+		case 28: case 52: case 61: case 67: case 71: case 77: case 78: case 80: case 82: case 115: case 116: case 117: {

 			EndlessExpression(out e);

 			break;

 		}

 		case 1: {

 			DottedIdentifiersAndFunction(out e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 6: case 68: {

+		case 7: case 69: {

 			DisplayExpr(out e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 52: {

+		case 53: {

 			MultiSetExpr(out e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		case 54: {

+		case 55: {

 			Get();

 			x = t; 

-			if (la.kind == 68) {

+			if (la.kind == 69) {

 				MapDisplayExpr(x, out e);

-				while (la.kind == 20 || la.kind == 68) {

+				while (la.kind == 21 || la.kind == 69) {

 					Suffix(ref e);

 				}

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

 				MapComprehensionExpr(x, out e);

 			} else if (StartOf(28)) {

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

-			} else SynErr(201);

+			} else SynErr(202);

 			break;

 		}

-		case 2: case 8: case 26: case 106: case 107: case 108: case 109: case 110: case 111: {

+		case 2: case 3: case 9: case 27: case 107: case 108: case 109: case 110: case 111: case 112: {

 			ConstAtomExpression(out e);

-			while (la.kind == 20 || la.kind == 68) {

+			while (la.kind == 21 || la.kind == 69) {

 				Suffix(ref e);

 			}

 			break;

 		}

-		default: SynErr(202); break;

+		default: SynErr(203); 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 == 9) {

+		if (la.kind == 10) {

 			Get();

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

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

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

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(203);

+		} else SynErr(204);

 	}

 

 	void NegOp() {

-		if (la.kind == 100) {

+		if (la.kind == 101) {

 			Get();

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

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

 			Get();

-		} else SynErr(204);

+		} else SynErr(205);

 	}

 

 	void EndlessExpression(out Expression e) {

@@ -2791,62 +2792,62 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;

 		

 		switch (la.kind) {

-		case 70: {

+		case 71: {

 			Get();

 			x = t; 

 			Expression(out e);

-			Expect(112);

+			Expect(113);

 			Expression(out e0);

-			Expect(71);

+			Expect(72);

 			Expression(out e1);

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

 			break;

 		}

-		case 76: {

+		case 77: {

 			MatchExpression(out e);

 			break;

 		}

-		case 79: case 114: case 115: case 116: {

+		case 80: case 115: case 116: case 117: {

 			QuantifierGuts(out e);

 			break;

 		}

-		case 51: {

+		case 52: {

 			ComprehensionExpr(out e);

 			break;

 		}

-		case 77: {

+		case 78: {

 			Get();

 			x = t; 

 			Expression(out e0);

-			Expect(19);

+			Expect(20);

 			Expression(out e1);

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

 			break;

 		}

-		case 66: {

+		case 67: {

 			Get();

 			x = t; 

 			Expression(out e0);

-			Expect(19);

+			Expect(20);

 			Expression(out e1);

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

 			break;

 		}

-		case 81: {

+		case 82: {

 			CalcStmt(out s);

 			Expression(out e1);

 			e = new CalcExpr(s.Tok, (CalcStmt)s, e1); 

 			break;

 		}

-		case 27: {

+		case 28: {

 			LetExpr(out e);

 			break;

 		}

-		case 60: {

+		case 61: {

 			NamedExpr(out e);

 			break;

 		}

-		default: SynErr(205); break;

+		default: SynErr(206); break;

 		}

 	}

 

@@ -2857,27 +2858,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		

 		Ident(out id);

 		idents.Add(id); 

-		while (la.kind == 20) {

+		while (la.kind == 21) {

 			Get();

 			IdentOrDigits(out id);

 			idents.Add(id); 

 		}

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

+		if (la.kind == 9 || la.kind == 83) {

 			args = new List<Expression>(); 

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

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

-				Expect(68);

-				Expression(out k);

 				Expect(69);

+				Expression(out k);

+				Expect(70);

 				args.Add(k); 

 			}

-			Expect(8);

+			Expect(9);

 			openParen = t; 

 			if (StartOf(15)) {

 				Expressions(args);

 			}

-			Expect(31);

+			Expect(32);

 		}

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

 	}

@@ -2888,47 +2889,47 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Expression> multipleIndices = null;

 		bool func = false;

 		

-		if (la.kind == 20) {

+		if (la.kind == 21) {

 			Get();

 			IdentOrDigits(out id);

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

+			if (la.kind == 9 || la.kind == 83) {

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

-				if (la.kind == 82) {

+				if (la.kind == 83) {

 					Get();

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

-					Expect(68);

-					Expression(out k);

 					Expect(69);

+					Expression(out k);

+					Expect(70);

 					args.Add(k); 

 				}

-				Expect(8);

+				Expect(9);

 				IToken openParen = t; 

 				if (StartOf(15)) {

 					Expressions(args);

 				}

-				Expect(31);

+				Expect(32);

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

 			}

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

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

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

 			Get();

 			x = t; 

 			if (StartOf(15)) {

 				Expression(out ee);

 				e0 = ee; 

-				if (la.kind == 113) {

+				if (la.kind == 114) {

 					Get();

 					anyDots = true; 

 					if (StartOf(15)) {

 						Expression(out ee);

 						e1 = ee; 

 					}

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

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

 					Get();

 					Expression(out ee);

 					e1 = ee; 

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

-					while (la.kind == 28) {

+				} else if (la.kind == 29 || la.kind == 70) {

+					while (la.kind == 29) {

 						Get();

 						Expression(out ee);

 						if (multipleIndices == null) {

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

 						

 					}

-				} else SynErr(206);

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

+				} else SynErr(207);

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

 				Get();

 				anyDots = true; 

 				if (StartOf(15)) {

 					Expression(out ee);

 					e1 = ee; 

 				}

-			} else SynErr(207);

+			} else SynErr(208);

 			if (multipleIndices != null) {

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

 			 // make sure an array class with this dimensionality exists

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

 			}

 			

-			Expect(69);

-		} else SynErr(208);

+			Expect(70);

+		} else SynErr(209);

 	}

 

 	void DisplayExpr(out Expression e) {

@@ -2978,23 +2979,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken/*!*/ x = null;  List<Expression/*!*/>/*!*/ elements;

 		e = dummyExpr;

 		

-		if (la.kind == 6) {

+		if (la.kind == 7) {

 			Get();

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

 			if (StartOf(15)) {

 				Expressions(elements);

 			}

 			e = new SetDisplayExpr(x, elements);

-			Expect(7);

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

+			Expect(8);

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

 			Get();

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

 			if (StartOf(15)) {

 				Expressions(elements);

 			}

 			e = new SeqDisplayExpr(x, elements); 

-			Expect(69);

-		} else SynErr(209);

+			Expect(70);

+		} else SynErr(210);

 	}

 

 	void MultiSetExpr(out Expression e) {

@@ -3002,25 +3003,25 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken/*!*/ x = null;  List<Expression/*!*/>/*!*/ elements;

 		e = dummyExpr;

 		

-		Expect(52);

+		Expect(53);

 		x = t; 

-		if (la.kind == 6) {

+		if (la.kind == 7) {

 			Get();

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

 			if (StartOf(15)) {

 				Expressions(elements);

 			}

 			e = new MultiSetDisplayExpr(x, elements);

-			Expect(7);

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

+			Expect(8);

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

 			Get();

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

 			Expression(out e);

 			e = new MultiSetFormingExpr(x, e); 

-			Expect(31);

+			Expect(32);

 		} else if (StartOf(29)) {

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

-		} else SynErr(210);

+		} else SynErr(211);

 	}

 

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

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

 		e = dummyExpr;

 		

-		Expect(68);

+		Expect(69);

 		if (StartOf(15)) {

 			MapLiteralExpressions(out elements);

 		}

 		e = new MapDisplayExpr(mapToken, elements);

-		Expect(69);

+		Expect(70);

 	}

 

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

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

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		if (la.kind == 26) {

+		if (la.kind == 27) {

 			Get();

 			Expression(out range);

 		}

@@ -3061,112 +3062,125 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;

 		

 		switch (la.kind) {

-		case 106: {

+		case 107: {

 			Get();

 			e = new LiteralExpr(t, false); 

 			break;

 		}

-		case 107: {

+		case 108: {

 			Get();

 			e = new LiteralExpr(t, true); 

 			break;

 		}

-		case 108: {

+		case 109: {

 			Get();

 			e = new LiteralExpr(t); 

 			break;

 		}

-		case 2: {

+		case 2: case 3: {

 			Nat(out n);

 			e = new LiteralExpr(t, n); 

 			break;

 		}

-		case 109: {

+		case 110: {

 			Get();

 			e = new ThisExpr(t); 

 			break;

 		}

-		case 110: {

+		case 111: {

 			Get();

 			x = t; 

-			Expect(8);

+			Expect(9);

 			Expression(out e);

-			Expect(31);

+			Expect(32);

 			e = new FreshExpr(x, e); 

 			break;

 		}

-		case 111: {

+		case 112: {

 			Get();

 			x = t; 

-			Expect(8);

+			Expect(9);

 			Expression(out e);

-			Expect(31);

+			Expect(32);

 			e = new OldExpr(x, e); 

 			break;

 		}

-		case 26: {

+		case 27: {

 			Get();

 			x = t; 

 			Expression(out e);

 			e = new UnaryExpr(x, UnaryExpr.Opcode.SeqLength, e); 

-			Expect(26);

+			Expect(27);

 			break;

 		}

-		case 8: {

+		case 9: {

 			Get();

 			x = t; 

 			Expression(out e);

 			e = new ParensExpression(x, e); 

-			Expect(31);

+			Expect(32);

 			break;

 		}

-		default: SynErr(211); break;

+		default: SynErr(212); break;

 		}

 	}

 

 	void Nat(out BigInteger n) {

-		Expect(2);

-		try {

-		 n = BigInteger.Parse(t.val);

-		} catch (System.FormatException) {

-		 SemErr("incorrectly formatted number");

-		 n = BigInteger.Zero;

-		}

-		

+		n = BigInteger.Zero; 

+		if (la.kind == 2) {

+			Get();

+			try {

+			 n = BigInteger.Parse(t.val);

+			} catch (System.FormatException) {

+			 SemErr("incorrectly formatted number");

+			 n = BigInteger.Zero;

+			}

+			

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

+			Get();

+			try {

+			 // note: leading 0 required when parsing positive hex numbers

+			 n = BigInteger.Parse("0" + t.val.Substring(2), System.Globalization.NumberStyles.HexNumber);

+			} catch (System.FormatException) {

+			 SemErr("incorrectly formatted number");

+			 n = BigInteger.Zero;

+			}

+			

+		} else SynErr(213);

 	}

 

 	void MapLiteralExpressions(out List<ExpressionPair> elements) {

 		Expression/*!*/ d, r;

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

 		Expression(out d);

-		Expect(63);

+		Expect(64);

 		Expression(out r);

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

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			Expression(out d);

-			Expect(63);

+			Expect(64);

 			Expression(out r);

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

 		}

 	}

 

 	void QSep() {

-		if (la.kind == 117) {

+		if (la.kind == 118) {

 			Get();

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

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

 			Get();

-		} else SynErr(212);

+		} else SynErr(214);

 	}

 

 	void MatchExpression(out Expression/*!*/ e) {

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

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

 		

-		Expect(76);

+		Expect(77);

 		x = t; 

 		Expression(out e);

-		while (la.kind == 72) {

+		while (la.kind == 73) {

 			CaseExpression(out c);

 			cases.Add(c); 

 		}

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

 		Expression/*!*/ body;

 		

-		if (la.kind == 79 || la.kind == 114) {

+		if (la.kind == 80 || la.kind == 115) {

 			Forall();

 			x = t;  univ = true; 

-		} else if (la.kind == 115 || la.kind == 116) {

+		} else if (la.kind == 116 || la.kind == 117) {

 			Exists();

 			x = t; 

-		} else SynErr(213);

+		} else SynErr(215);

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

 		QSep();

 		Expression(out body);

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

 		Expression body = null;

 		

-		Expect(51);

+		Expect(52);

 		x = t; 

 		IdentTypeOptional(out bv);

 		bvars.Add(bv); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			IdentTypeOptional(out bv);

 			bvars.Add(bv); 

 		}

-		Expect(26);

+		Expect(27);

 		Expression(out range);

-		if (la.kind == 117 || la.kind == 118) {

+		if (la.kind == 118 || la.kind == 119) {

 			QSep();

 			Expression(out body);

 		}

@@ -3234,31 +3248,31 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<BoundVar> letVars;  List<Expression> letRHSs;

 		bool exact = true;

 		

-		Expect(27);

+		Expect(28);

 		x = t;

 		letVars = new List<BoundVar>();

 		letRHSs = new List<Expression>(); 

 		IdentTypeOptional(out d);

 		letVars.Add(d); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			IdentTypeOptional(out d);

 			letVars.Add(d); 

 		}

-		if (la.kind == 63) {

+		if (la.kind == 64) {

 			Get();

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

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

 			Get();

 			exact = false; 

-		} else SynErr(214);

+		} else SynErr(216);

 		Expression(out e);

 		letRHSs.Add(e); 

-		while (la.kind == 28) {

+		while (la.kind == 29) {

 			Get();

 			Expression(out e);

 			letRHSs.Add(e); 

 		}

-		Expect(19);

+		Expect(20);

 		Expression(out e);

 		e = new LetExpr(x, letVars, letRHSs, e, exact); 

 	}

@@ -3268,10 +3282,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		e = dummyExpr;

 		Expression expr;

 		

-		Expect(60);

+		Expect(61);

 		x = t; 

 		NoUSIdent(out d);

-		Expect(5);

+		Expect(6);

 		Expression(out e);

 		expr = e;

 		e = new NamedExpr(x, d.val, expr); 

@@ -3283,39 +3297,39 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		BoundVar/*!*/ bv;

 		Expression/*!*/ body;

 		

-		Expect(72);

+		Expect(73);

 		x = t; 

 		Ident(out id);

-		if (la.kind == 8) {

+		if (la.kind == 9) {

 			Get();

 			IdentTypeOptional(out bv);

 			arguments.Add(bv); 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				IdentTypeOptional(out bv);

 				arguments.Add(bv); 

 			}

-			Expect(31);

+			Expect(32);

 		}

-		Expect(73);

+		Expect(74);

 		Expression(out body);

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

 	}

 

 	void Forall() {

-		if (la.kind == 79) {

+		if (la.kind == 80) {

 			Get();

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

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

 			Get();

-		} else SynErr(215);

+		} else SynErr(217);

 	}

 

 	void Exists() {

-		if (la.kind == 115) {

+		if (la.kind == 116) {

 			Get();

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

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

 			Get();

-		} else SynErr(216);

+		} else SynErr(218);

 	}

 

 	void AttributeBody(ref Attributes attrs) {

@@ -3323,13 +3337,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<Attributes.Argument/*!*/> aArgs = new List<Attributes.Argument/*!*/>();

 		Attributes.Argument/*!*/ aArg;

 		

-		Expect(5);

+		Expect(6);

 		Expect(1);

 		aName = t.val; 

 		if (StartOf(30)) {

 			AttributeArg(out aArg);

 			aArgs.Add(aArg); 

-			while (la.kind == 28) {

+			while (la.kind == 29) {

 				Get();

 				AttributeArg(out aArg);

 				aArgs.Add(aArg); 

@@ -3351,37 +3365,37 @@ 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, x,x,x,x, x,x,x,T, x,T,T,x, T,T,T,T, x,x,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,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,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,T, T,x,T,x, x,x,x,x, x,T,T,T, T,T,x,T, x,T,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, 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,T,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 	};

 } // end Parser

@@ -3409,220 +3423,222 @@ public class Errors {
 			case 0: s = "EOF expected"; break;

 			case 1: s = "ident expected"; break;

 			case 2: s = "digits expected"; break;

-			case 3: s = "arrayToken expected"; break;

-			case 4: s = "string expected"; break;

-			case 5: s = "colon expected"; break;

-			case 6: s = "lbrace expected"; break;

-			case 7: s = "rbrace expected"; break;

-			case 8: s = "openparen expected"; break;

-			case 9: s = "star expected"; break;

-			case 10: s = "notIn expected"; break;

-			case 11: s = "\"abstract\" expected"; break;

-			case 12: s = "\"module\" expected"; break;

-			case 13: s = "\"refines\" expected"; break;

-			case 14: s = "\"import\" expected"; break;

-			case 15: s = "\"opened\" expected"; break;

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

-			case 17: s = "\"as\" expected"; break;

-			case 18: s = "\"default\" expected"; break;

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

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

-			case 21: s = "\"class\" expected"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-			case 126: s = "this symbol not expected in ArbitraryTypeDecl"; break;

-			case 127: s = "this symbol not expected in IteratorDecl"; break;

-			case 128: s = "invalid IteratorDecl"; break;

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

-			case 130: s = "invalid IdentOrDigits"; break;

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

+			case 3: s = "hexdigits expected"; break;

+			case 4: s = "arrayToken expected"; break;

+			case 5: s = "string expected"; break;

+			case 6: s = "colon expected"; break;

+			case 7: s = "lbrace expected"; break;

+			case 8: s = "rbrace expected"; break;

+			case 9: s = "openparen expected"; break;

+			case 10: s = "star expected"; break;

+			case 11: s = "notIn expected"; break;

+			case 12: s = "\"abstract\" expected"; break;

+			case 13: s = "\"module\" expected"; break;

+			case 14: s = "\"refines\" expected"; break;

+			case 15: s = "\"import\" expected"; break;

+			case 16: s = "\"opened\" expected"; break;

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

+			case 18: s = "\"as\" expected"; break;

+			case 19: s = "\"default\" expected"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+			case 100: s = "\"in\" expected"; break;

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

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

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

+			case 104: s = "\"/\" expected"; break;

+			case 105: s = "\"%\" expected"; break;

+			case 106: s = "\"\\u00ac\" expected"; break;

+			case 107: s = "\"false\" expected"; break;

+			case 108: s = "\"true\" expected"; break;

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

+			case 110: s = "\"this\" expected"; break;

+			case 111: s = "\"fresh\" expected"; break;

+			case 112: s = "\"old\" expected"; break;

+			case 113: s = "\"then\" expected"; break;

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

+			case 115: s = "\"\\u2200\" expected"; break;

+			case 116: s = "\"exists\" expected"; break;

+			case 117: s = "\"\\u2203\" expected"; break;

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

+			case 119: s = "\"\\u2022\" expected"; break;

+			case 120: s = "??? expected"; break;

+			case 121: s = "this symbol not expected in SubModuleDecl"; break;

+			case 122: s = "invalid SubModuleDecl"; break;

+			case 123: s = "this symbol not expected in ClassDecl"; break;

+			case 124: s = "this symbol not expected in DatatypeDecl"; break;

+			case 125: s = "invalid DatatypeDecl"; break;

+			case 126: s = "this symbol not expected in DatatypeDecl"; break;

+			case 127: s = "this symbol not expected in ArbitraryTypeDecl"; break;

+			case 128: s = "this symbol not expected in IteratorDecl"; break;

+			case 129: s = "invalid IteratorDecl"; break;

+			case 130: s = "invalid ClassMemberDecl"; break;

+			case 131: s = "invalid IdentOrDigits"; break;

 			case 132: s = "this symbol not expected in FieldDecl"; break;

-			case 133: s = "invalid FunctionDecl"; break;

+			case 133: s = "this symbol not expected in FieldDecl"; break;

 			case 134: s = "invalid FunctionDecl"; break;

 			case 135: s = "invalid FunctionDecl"; break;

 			case 136: s = "invalid FunctionDecl"; break;

-			case 137: s = "this symbol not expected in MethodDecl"; break;

-			case 138: s = "invalid MethodDecl"; break;

+			case 137: s = "invalid FunctionDecl"; break;

+			case 138: s = "this symbol not expected in MethodDecl"; break;

 			case 139: s = "invalid MethodDecl"; break;

-			case 140: s = "invalid FIdentType"; break;

-			case 141: s = "invalid TypeIdentOptional"; break;

-			case 142: s = "invalid TypeAndToken"; break;

-			case 143: s = "this symbol not expected in IteratorSpec"; break;

+			case 140: s = "invalid MethodDecl"; break;

+			case 141: s = "invalid FIdentType"; break;

+			case 142: s = "invalid TypeIdentOptional"; break;

+			case 143: s = "invalid TypeAndToken"; break;

 			case 144: s = "this symbol not expected in IteratorSpec"; break;

 			case 145: s = "this symbol not expected in IteratorSpec"; break;

 			case 146: s = "this symbol not expected in IteratorSpec"; break;

 			case 147: s = "this symbol not expected in IteratorSpec"; break;

-			case 148: s = "invalid IteratorSpec"; break;

-			case 149: s = "this symbol not expected in IteratorSpec"; break;

-			case 150: s = "invalid IteratorSpec"; break;

-			case 151: s = "this symbol not expected in MethodSpec"; break;

+			case 148: s = "this symbol not expected in IteratorSpec"; break;

+			case 149: s = "invalid IteratorSpec"; break;

+			case 150: s = "this symbol not expected in IteratorSpec"; break;

+			case 151: s = "invalid IteratorSpec"; break;

 			case 152: s = "this symbol not expected in MethodSpec"; break;

 			case 153: s = "this symbol not expected in MethodSpec"; break;

 			case 154: s = "this symbol not expected in MethodSpec"; break;

-			case 155: s = "invalid MethodSpec"; break;

-			case 156: s = "this symbol not expected in MethodSpec"; break;

-			case 157: s = "invalid MethodSpec"; break;

-			case 158: s = "invalid FrameExpression"; break;

-			case 159: s = "invalid ReferenceType"; break;

-			case 160: s = "this symbol not expected in FunctionSpec"; break;

+			case 155: s = "this symbol not expected in MethodSpec"; break;

+			case 156: s = "invalid MethodSpec"; break;

+			case 157: s = "this symbol not expected in MethodSpec"; break;

+			case 158: s = "invalid MethodSpec"; break;

+			case 159: s = "invalid FrameExpression"; break;

+			case 160: s = "invalid ReferenceType"; break;

 			case 161: s = "this symbol not expected in FunctionSpec"; break;

 			case 162: s = "this symbol not expected in FunctionSpec"; break;

 			case 163: s = "this symbol not expected in FunctionSpec"; break;

 			case 164: s = "this symbol not expected in FunctionSpec"; break;

-			case 165: s = "invalid FunctionSpec"; break;

-			case 166: s = "invalid PossiblyWildFrameExpression"; break;

-			case 167: s = "invalid PossiblyWildExpression"; break;

-			case 168: s = "this symbol not expected in OneStmt"; break;

-			case 169: s = "invalid OneStmt"; break;

-			case 170: s = "this symbol not expected in OneStmt"; break;

-			case 171: s = "invalid OneStmt"; break;

-			case 172: s = "invalid AssertStmt"; break;

-			case 173: s = "invalid AssumeStmt"; break;

-			case 174: s = "invalid UpdateStmt"; break;

+			case 165: s = "this symbol not expected in FunctionSpec"; break;

+			case 166: s = "invalid FunctionSpec"; break;

+			case 167: s = "invalid PossiblyWildFrameExpression"; break;

+			case 168: s = "invalid PossiblyWildExpression"; break;

+			case 169: s = "this symbol not expected in OneStmt"; break;

+			case 170: s = "invalid OneStmt"; break;

+			case 171: s = "this symbol not expected in OneStmt"; break;

+			case 172: s = "invalid OneStmt"; break;

+			case 173: s = "invalid AssertStmt"; break;

+			case 174: s = "invalid AssumeStmt"; break;

 			case 175: s = "invalid UpdateStmt"; break;

-			case 176: s = "invalid IfStmt"; break;

+			case 176: s = "invalid UpdateStmt"; break;

 			case 177: s = "invalid IfStmt"; break;

-			case 178: s = "invalid WhileStmt"; break;

+			case 178: s = "invalid IfStmt"; break;

 			case 179: s = "invalid WhileStmt"; break;

-			case 180: s = "invalid ForallStmt"; break;

+			case 180: s = "invalid WhileStmt"; break;

 			case 181: s = "invalid ForallStmt"; break;

-			case 182: s = "invalid ReturnStmt"; break;

-			case 183: s = "invalid Rhs"; break;

-			case 184: s = "invalid Lhs"; break;

-			case 185: s = "invalid Guard"; break;

-			case 186: s = "this symbol not expected in LoopSpec"; break;

+			case 182: s = "invalid ForallStmt"; break;

+			case 183: s = "invalid ReturnStmt"; break;

+			case 184: s = "invalid Rhs"; break;

+			case 185: s = "invalid Lhs"; break;

+			case 186: s = "invalid Guard"; break;

 			case 187: s = "this symbol not expected in LoopSpec"; break;

 			case 188: s = "this symbol not expected in LoopSpec"; break;

 			case 189: s = "this symbol not expected in LoopSpec"; break;

 			case 190: s = "this symbol not expected in LoopSpec"; break;

-			case 191: s = "this symbol not expected in Invariant"; break;

-			case 192: s = "invalid AttributeArg"; break;

-			case 193: s = "invalid CalcOp"; break;

-			case 194: s = "invalid EquivOp"; break;

-			case 195: s = "invalid ImpliesOp"; break;

-			case 196: s = "invalid ExpliesOp"; break;

-			case 197: s = "invalid AndOp"; break;

-			case 198: s = "invalid OrOp"; break;

-			case 199: s = "invalid RelOp"; break;

-			case 200: s = "invalid AddOp"; break;

-			case 201: s = "invalid UnaryExpression"; break;

+			case 191: s = "this symbol not expected in LoopSpec"; break;

+			case 192: s = "this symbol not expected in Invariant"; break;

+			case 193: s = "invalid AttributeArg"; break;

+			case 194: s = "invalid CalcOp"; break;

+			case 195: s = "invalid EquivOp"; break;

+			case 196: s = "invalid ImpliesOp"; break;

+			case 197: s = "invalid ExpliesOp"; break;

+			case 198: s = "invalid AndOp"; break;

+			case 199: s = "invalid OrOp"; break;

+			case 200: s = "invalid RelOp"; break;

+			case 201: s = "invalid AddOp"; break;

 			case 202: s = "invalid UnaryExpression"; break;

-			case 203: s = "invalid MulOp"; break;

-			case 204: s = "invalid NegOp"; break;

-			case 205: s = "invalid EndlessExpression"; break;

-			case 206: s = "invalid Suffix"; break;

+			case 203: s = "invalid UnaryExpression"; break;

+			case 204: s = "invalid MulOp"; break;

+			case 205: s = "invalid NegOp"; break;

+			case 206: s = "invalid EndlessExpression"; break;

 			case 207: s = "invalid Suffix"; break;

 			case 208: s = "invalid Suffix"; break;

-			case 209: s = "invalid DisplayExpr"; break;

-			case 210: s = "invalid MultiSetExpr"; break;

-			case 211: s = "invalid ConstAtomExpression"; break;

-			case 212: s = "invalid QSep"; break;

-			case 213: s = "invalid QuantifierGuts"; break;

-			case 214: s = "invalid LetExpr"; break;

-			case 215: s = "invalid Forall"; break;

-			case 216: s = "invalid Exists"; break;

+			case 209: s = "invalid Suffix"; break;

+			case 210: s = "invalid DisplayExpr"; break;

+			case 211: s = "invalid MultiSetExpr"; break;

+			case 212: s = "invalid ConstAtomExpression"; break;

+			case 213: s = "invalid Nat"; break;

+			case 214: s = "invalid QSep"; break;

+			case 215: s = "invalid QuantifierGuts"; break;

+			case 216: s = "invalid LetExpr"; break;

+			case 217: s = "invalid Forall"; break;

+			case 218: s = "invalid Exists"; break;

 

 			default: s = "error " + n; break;

 		}

diff --git a/Source/Dafny/Scanner.cs b/Source/Dafny/Scanner.cs
index 25aa084a..75ca57bb 100644
--- a/Source/Dafny/Scanner.cs
+++ b/Source/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 = 119;

-	const int noSym = 119;

+	const int maxT = 120;

+	const int noSym = 120;

 

 

 	[ContractInvariantMethod]

@@ -255,44 +255,45 @@ public class Scanner {
 		for (int i = 92; i <= 92; ++i) start[i] = 1;

 		for (int i = 95; i <= 95; ++i) start[i] = 1;

 		for (int i = 98; i <= 122; ++i) start[i] = 1;

-		for (int i = 48; i <= 57; ++i) start[i] = 7;

-		for (int i = 34; i <= 34; ++i) start[i] = 8;

-		start[97] = 17; 

-		start[58] = 59; 

-		start[123] = 10; 

-		start[125] = 11; 

-		start[40] = 12; 

-		start[42] = 13; 

-		start[33] = 60; 

-		start[61] = 61; 

-		start[59] = 24; 

-		start[46] = 62; 

-		start[124] = 63; 

-		start[44] = 25; 

-		start[41] = 26; 

-		start[60] = 64; 

-		start[62] = 65; 

-		start[96] = 28; 

-		start[91] = 31; 

-		start[93] = 32; 

-		start[35] = 34; 

-		start[8800] = 37; 

-		start[8804] = 38; 

-		start[8805] = 39; 

-		start[8660] = 41; 

-		start[8658] = 43; 

-		start[8656] = 44; 

-		start[38] = 45; 

-		start[8743] = 47; 

-		start[8744] = 49; 

-		start[43] = 50; 

-		start[45] = 51; 

-		start[47] = 52; 

-		start[37] = 53; 

-		start[172] = 54; 

-		start[8704] = 55; 

-		start[8707] = 56; 

-		start[8226] = 58; 

+		for (int i = 49; i <= 57; ++i) start[i] = 7;

+		for (int i = 34; i <= 34; ++i) start[i] = 10;

+		start[97] = 19; 

+		start[48] = 20; 

+		start[58] = 62; 

+		start[123] = 12; 

+		start[125] = 13; 

+		start[40] = 14; 

+		start[42] = 15; 

+		start[33] = 63; 

+		start[61] = 64; 

+		start[59] = 27; 

+		start[46] = 65; 

+		start[124] = 66; 

+		start[44] = 28; 

+		start[41] = 29; 

+		start[60] = 67; 

+		start[62] = 68; 

+		start[96] = 31; 

+		start[91] = 34; 

+		start[93] = 35; 

+		start[35] = 37; 

+		start[8800] = 40; 

+		start[8804] = 41; 

+		start[8805] = 42; 

+		start[8660] = 44; 

+		start[8658] = 46; 

+		start[8656] = 47; 

+		start[38] = 48; 

+		start[8743] = 50; 

+		start[8744] = 52; 

+		start[43] = 53; 

+		start[45] = 54; 

+		start[47] = 55; 

+		start[37] = 56; 

+		start[172] = 57; 

+		start[8704] = 58; 

+		start[8707] = 59; 

+		start[8226] = 61; 

 		start[Buffer.EOF] = -1;

 

 	}

@@ -490,70 +491,70 @@ public class Scanner {
 

 	void CheckLiteral() {

 		switch (t.val) {

-			case "abstract": t.kind = 11; break;

-			case "module": t.kind = 12; break;

-			case "refines": t.kind = 13; break;

-			case "import": t.kind = 14; break;

-			case "opened": t.kind = 15; break;

-			case "as": t.kind = 17; break;

-			case "default": t.kind = 18; break;

-			case "class": t.kind = 21; break;

-			case "ghost": t.kind = 22; break;

-			case "static": t.kind = 23; break;

-			case "datatype": t.kind = 24; break;

-			case "codatatype": t.kind = 25; break;

-			case "var": t.kind = 27; break;

-			case "type": t.kind = 29; break;

-			case "iterator": t.kind = 32; break;

-			case "yields": t.kind = 33; break;

-			case "returns": t.kind = 34; break;

-			case "method": t.kind = 38; break;

-			case "comethod": t.kind = 39; break;

-			case "constructor": t.kind = 40; break;

-			case "modifies": t.kind = 41; break;

-			case "free": t.kind = 42; break;

-			case "requires": t.kind = 43; break;

-			case "ensures": t.kind = 44; break;

-			case "decreases": t.kind = 45; break;

-			case "reads": t.kind = 46; break;

-			case "yield": t.kind = 47; break;

-			case "bool": t.kind = 48; break;

-			case "nat": t.kind = 49; break;

-			case "int": t.kind = 50; break;

-			case "set": t.kind = 51; break;

-			case "multiset": t.kind = 52; break;

-			case "seq": t.kind = 53; break;

-			case "map": t.kind = 54; break;

-			case "object": t.kind = 55; break;

-			case "function": t.kind = 56; break;

-			case "predicate": t.kind = 57; break;

-			case "copredicate": t.kind = 58; break;

-			case "label": t.kind = 60; break;

-			case "break": t.kind = 61; break;

-			case "where": t.kind = 62; break;

-			case "return": t.kind = 64; break;

-			case "assume": t.kind = 66; break;

-			case "new": t.kind = 67; break;

-			case "if": t.kind = 70; break;

-			case "else": t.kind = 71; break;

-			case "case": t.kind = 72; break;

-			case "while": t.kind = 74; break;

-			case "invariant": t.kind = 75; break;

-			case "match": t.kind = 76; break;

-			case "assert": t.kind = 77; break;

-			case "print": t.kind = 78; break;

-			case "forall": t.kind = 79; break;

-			case "parallel": t.kind = 80; break;

-			case "calc": t.kind = 81; break;

-			case "in": t.kind = 99; break;

-			case "false": t.kind = 106; break;

-			case "true": t.kind = 107; break;

-			case "null": t.kind = 108; break;

-			case "this": t.kind = 109; break;

-			case "fresh": t.kind = 110; break;

-			case "old": t.kind = 111; break;

-			case "then": t.kind = 112; break;

-			case "exists": t.kind = 115; break;

+			case "abstract": t.kind = 12; break;

+			case "module": t.kind = 13; break;

+			case "refines": t.kind = 14; break;

+			case "import": t.kind = 15; break;

+			case "opened": t.kind = 16; break;

+			case "as": t.kind = 18; break;

+			case "default": t.kind = 19; break;

+			case "class": t.kind = 22; break;

+			case "ghost": t.kind = 23; break;

+			case "static": t.kind = 24; break;

+			case "datatype": t.kind = 25; break;

+			case "codatatype": t.kind = 26; break;

+			case "var": t.kind = 28; break;

+			case "type": t.kind = 30; break;

+			case "iterator": t.kind = 33; break;

+			case "yields": t.kind = 34; break;

+			case "returns": t.kind = 35; break;

+			case "method": t.kind = 39; break;

+			case "comethod": t.kind = 40; break;

+			case "constructor": t.kind = 41; break;

+			case "modifies": t.kind = 42; break;

+			case "free": t.kind = 43; break;

+			case "requires": t.kind = 44; break;

+			case "ensures": t.kind = 45; break;

+			case "decreases": t.kind = 46; break;

+			case "reads": t.kind = 47; break;

+			case "yield": t.kind = 48; break;

+			case "bool": t.kind = 49; break;

+			case "nat": t.kind = 50; break;

+			case "int": t.kind = 51; break;

+			case "set": t.kind = 52; break;

+			case "multiset": t.kind = 53; break;

+			case "seq": t.kind = 54; break;

+			case "map": t.kind = 55; break;

+			case "object": t.kind = 56; break;

+			case "function": t.kind = 57; break;

+			case "predicate": t.kind = 58; break;

+			case "copredicate": t.kind = 59; break;

+			case "label": t.kind = 61; break;

+			case "break": t.kind = 62; break;

+			case "where": t.kind = 63; break;

+			case "return": t.kind = 65; break;

+			case "assume": t.kind = 67; break;

+			case "new": t.kind = 68; break;

+			case "if": t.kind = 71; break;

+			case "else": t.kind = 72; break;

+			case "case": t.kind = 73; break;

+			case "while": t.kind = 75; break;

+			case "invariant": t.kind = 76; break;

+			case "match": t.kind = 77; break;

+			case "assert": t.kind = 78; break;

+			case "print": t.kind = 79; break;

+			case "forall": t.kind = 80; break;

+			case "parallel": t.kind = 81; break;

+			case "calc": t.kind = 82; break;

+			case "in": t.kind = 100; break;

+			case "false": t.kind = 107; break;

+			case "true": t.kind = 108; break;

+			case "null": t.kind = 109; break;

+			case "this": t.kind = 110; break;

+			case "fresh": t.kind = 111; break;

+			case "old": t.kind = 112; break;

+			case "then": t.kind = 113; break;

+			case "exists": t.kind = 116; break;

 			default: break;

 		}

 	}

@@ -616,183 +617,195 @@ public class Scanner {
 				if (ch >= '0' && ch <= '9') {AddCh(); goto case 7;}

 				else {t.kind = 2; break;}

 			case 8:

-				if (ch == '"') {AddCh(); goto case 9;}

-				else if (ch >= ' ' && ch <= '!' || ch >= '#' && ch <= '~') {AddCh(); goto case 8;}

+				if (ch >= '0' && ch <= '9' || ch >= 'A' && ch <= 'F' || ch >= 'a' && ch <= 'f') {AddCh(); goto case 9;}

 				else {goto case 0;}

 			case 9:

-				{t.kind = 4; break;}

+				recEnd = pos; recKind = 3;

+				if (ch >= '0' && ch <= '9' || ch >= 'A' && ch <= 'F' || ch >= 'a' && ch <= 'f') {AddCh(); goto case 9;}

+				else {t.kind = 3; break;}

 			case 10:

-				{t.kind = 6; break;}

+				if (ch == '"') {AddCh(); goto case 11;}

+				else if (ch >= ' ' && ch <= '!' || ch >= '#' && ch <= '~') {AddCh(); goto case 10;}

+				else {goto case 0;}

 			case 11:

-				{t.kind = 7; break;}

+				{t.kind = 5; break;}

 			case 12:

-				{t.kind = 8; break;}

+				{t.kind = 7; break;}

 			case 13:

-				{t.kind = 9; break;}

+				{t.kind = 8; break;}

 			case 14:

-				if (ch == 'n') {AddCh(); goto case 15;}

-				else {goto case 0;}

+				{t.kind = 9; break;}

 			case 15:

-				if (ch <= '&' || ch >= '(' && ch <= '/' || ch >= ':' && ch <= '>' || ch == '@' || ch == '[' || ch >= ']' && ch <= '^' || ch == '`' || ch >= '{' && ch <= 65535) {apx++; AddCh(); goto case 16;}

-				else {goto case 0;}

+				{t.kind = 10; break;}

 			case 16:

+				if (ch == 'n') {AddCh(); goto case 17;}

+				else {goto case 0;}

+			case 17:

+				if (ch <= '&' || ch >= '(' && ch <= '/' || ch >= ':' && ch <= '>' || ch == '@' || ch == '[' || ch >= ']' && ch <= '^' || ch == '`' || ch >= '{' && ch <= 65535) {apx++; AddCh(); goto case 18;}

+				else {goto case 0;}

+			case 18:

 				{

 					tlen -= apx;

 					SetScannerBehindT();

-					t.kind = 10; break;}

-			case 17:

+					t.kind = 11; break;}

+			case 19:

 				recEnd = pos; recKind = 1;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'q' || ch >= 's' && ch <= 'z') {AddCh(); goto case 2;}

-				else if (ch == 'r') {AddCh(); goto case 19;}

+				else if (ch == 'r') {AddCh(); goto case 22;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

-			case 18:

+			case 20:

+				recEnd = pos; recKind = 2;

+				if (ch >= '0' && ch <= '9') {AddCh(); goto case 7;}

+				else if (ch == 'x') {AddCh(); goto case 8;}

+				else {t.kind = 2; break;}

+			case 21:

 				recEnd = pos; recKind = 1;

-				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 18;}

+				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 21;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

-			case 19:

+			case 22:

 				recEnd = pos; recKind = 1;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'q' || ch >= 's' && ch <= 'z') {AddCh(); goto case 3;}

-				else if (ch == 'r') {AddCh(); goto case 20;}

+				else if (ch == 'r') {AddCh(); goto case 23;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

-			case 20:

+			case 23:

 				recEnd = pos; recKind = 1;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'b' && ch <= 'z') {AddCh(); goto case 4;}

-				else if (ch == 'a') {AddCh(); goto case 21;}

+				else if (ch == 'a') {AddCh(); goto case 24;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

-			case 21:

+			case 24:

 				recEnd = pos; recKind = 1;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'x' || ch == 'z') {AddCh(); goto case 5;}

-				else if (ch == 'y') {AddCh(); goto case 22;}

+				else if (ch == 'y') {AddCh(); goto case 25;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

-			case 22:

-				recEnd = pos; recKind = 3;

-				if (ch == 39 || ch == '0' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 6;}

-				else if (ch >= '1' && ch <= '9') {AddCh(); goto case 23;}

-				else {t.kind = 3; break;}

-			case 23:

-				recEnd = pos; recKind = 3;

-				if (ch == 39 || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 18;}

-				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 23;}

-				else {t.kind = 3; break;}

-			case 24:

-				{t.kind = 19; break;}

 			case 25:

-				{t.kind = 28; break;}

+				recEnd = pos; recKind = 4;

+				if (ch == 39 || ch == '0' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 6;}

+				else if (ch >= '1' && ch <= '9') {AddCh(); goto case 26;}

+				else {t.kind = 4; break;}

 			case 26:

-				{t.kind = 31; break;}

+				recEnd = pos; recKind = 4;

+				if (ch == 39 || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == 92 || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 21;}

+				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 26;}

+				else {t.kind = 4; break;}

 			case 27:

-				{t.kind = 35; break;}

+				{t.kind = 20; break;}

 			case 28:

-				{t.kind = 59; break;}

+				{t.kind = 29; break;}

 			case 29:

-				{t.kind = 63; break;}

+				{t.kind = 32; break;}

 			case 30:

-				{t.kind = 65; break;}

+				{t.kind = 36; break;}

 			case 31:

-				{t.kind = 68; break;}

+				{t.kind = 60; break;}

 			case 32:

-				{t.kind = 69; break;}

+				{t.kind = 64; break;}

 			case 33:

-				{t.kind = 73; break;}

+				{t.kind = 66; break;}

 			case 34:

-				{t.kind = 82; break;}

+				{t.kind = 69; break;}

 			case 35:

-				{t.kind = 84; break;}

+				{t.kind = 70; break;}

 			case 36:

-				{t.kind = 85; break;}

+				{t.kind = 74; break;}

 			case 37:

-				{t.kind = 86; break;}

+				{t.kind = 83; break;}

 			case 38:

-				{t.kind = 87; break;}

+				{t.kind = 85; break;}

 			case 39:

-				{t.kind = 88; break;}

+				{t.kind = 86; break;}

 			case 40:

-				{t.kind = 89; break;}

+				{t.kind = 87; break;}

 			case 41:

-				{t.kind = 90; break;}

+				{t.kind = 88; break;}

 			case 42:

-				{t.kind = 91; break;}

+				{t.kind = 89; break;}

 			case 43:

-				{t.kind = 92; break;}

+				{t.kind = 90; break;}

 			case 44:

-				{t.kind = 94; break;}

+				{t.kind = 91; break;}

 			case 45:

-				if (ch == '&') {AddCh(); goto case 46;}

-				else {goto case 0;}

+				{t.kind = 92; break;}

 			case 46:

-				{t.kind = 95; break;}

+				{t.kind = 93; break;}

 			case 47:

-				{t.kind = 96; break;}

+				{t.kind = 95; break;}

 			case 48:

-				{t.kind = 97; break;}

+				if (ch == '&') {AddCh(); goto case 49;}

+				else {goto case 0;}

 			case 49:

-				{t.kind = 98; break;}

+				{t.kind = 96; break;}

 			case 50:

-				{t.kind = 101; break;}

+				{t.kind = 97; break;}

 			case 51:

-				{t.kind = 102; break;}

+				{t.kind = 98; break;}

 			case 52:

-				{t.kind = 103; break;}

+				{t.kind = 99; break;}

 			case 53:

-				{t.kind = 104; break;}

+				{t.kind = 102; break;}

 			case 54:

-				{t.kind = 105; break;}

+				{t.kind = 103; break;}

 			case 55:

-				{t.kind = 114; break;}

+				{t.kind = 104; break;}

 			case 56:

-				{t.kind = 116; break;}

+				{t.kind = 105; break;}

 			case 57:

-				{t.kind = 117; break;}

+				{t.kind = 106; break;}

 			case 58:

-				{t.kind = 118; break;}

+				{t.kind = 115; break;}

 			case 59:

-				recEnd = pos; recKind = 5;

-				if (ch == '=') {AddCh(); goto case 29;}

-				else if (ch == '|') {AddCh(); goto case 30;}

-				else if (ch == ':') {AddCh(); goto case 57;}

-				else {t.kind = 5; break;}

+				{t.kind = 117; break;}

 			case 60:

-				recEnd = pos; recKind = 100;

-				if (ch == 'i') {AddCh(); goto case 14;}

-				else if (ch == '=') {AddCh(); goto case 36;}

-				else {t.kind = 100; break;}

+				{t.kind = 118; break;}

 			case 61:

-				recEnd = pos; recKind = 16;

-				if (ch == '=') {AddCh(); goto case 66;}

-				else if (ch == '>') {AddCh(); goto case 33;}

-				else {t.kind = 16; break;}

+				{t.kind = 119; break;}

 			case 62:

-				recEnd = pos; recKind = 20;

-				if (ch == '.') {AddCh(); goto case 67;}

-				else {t.kind = 20; break;}

+				recEnd = pos; recKind = 6;

+				if (ch == '=') {AddCh(); goto case 32;}

+				else if (ch == '|') {AddCh(); goto case 33;}

+				else if (ch == ':') {AddCh(); goto case 60;}

+				else {t.kind = 6; break;}

 			case 63:

-				recEnd = pos; recKind = 26;

-				if (ch == '|') {AddCh(); goto case 48;}

-				else {t.kind = 26; break;}

+				recEnd = pos; recKind = 101;

+				if (ch == 'i') {AddCh(); goto case 16;}

+				else if (ch == '=') {AddCh(); goto case 39;}

+				else {t.kind = 101; break;}

 			case 64:

-				recEnd = pos; recKind = 36;

-				if (ch == '=') {AddCh(); goto case 68;}

-				else {t.kind = 36; break;}

+				recEnd = pos; recKind = 17;

+				if (ch == '=') {AddCh(); goto case 69;}

+				else if (ch == '>') {AddCh(); goto case 36;}

+				else {t.kind = 17; break;}

 			case 65:

-				recEnd = pos; recKind = 37;

-				if (ch == '=') {AddCh(); goto case 35;}

-				else {t.kind = 37; break;}

+				recEnd = pos; recKind = 21;

+				if (ch == '.') {AddCh(); goto case 70;}

+				else {t.kind = 21; break;}

 			case 66:

-				recEnd = pos; recKind = 30;

-				if (ch == '>') {AddCh(); goto case 42;}

-				else {t.kind = 30; break;}

+				recEnd = pos; recKind = 27;

+				if (ch == '|') {AddCh(); goto case 51;}

+				else {t.kind = 27; break;}

 			case 67:

-				recEnd = pos; recKind = 113;

-				if (ch == '.') {AddCh(); goto case 27;}

-				else {t.kind = 113; break;}

+				recEnd = pos; recKind = 37;

+				if (ch == '=') {AddCh(); goto case 71;}

+				else {t.kind = 37; break;}

 			case 68:

-				recEnd = pos; recKind = 83;

-				if (ch == '=') {AddCh(); goto case 69;}

-				else {t.kind = 83; break;}

+				recEnd = pos; recKind = 38;

+				if (ch == '=') {AddCh(); goto case 38;}

+				else {t.kind = 38; break;}

 			case 69:

-				recEnd = pos; recKind = 93;

-				if (ch == '>') {AddCh(); goto case 40;}

-				else {t.kind = 93; break;}

+				recEnd = pos; recKind = 31;

+				if (ch == '>') {AddCh(); goto case 45;}

+				else {t.kind = 31; break;}

+			case 70:

+				recEnd = pos; recKind = 114;

+				if (ch == '.') {AddCh(); goto case 30;}

+				else {t.kind = 114; break;}

+			case 71:

+				recEnd = pos; recKind = 84;

+				if (ch == '=') {AddCh(); goto case 72;}

+				else {t.kind = 84; break;}

+			case 72:

+				recEnd = pos; recKind = 94;

+				if (ch == '>') {AddCh(); goto case 43;}

+				else {t.kind = 94; break;}

 

 		}

 		t.val = new String(tval, 0, tlen);

diff --git a/Test/dafny0/Answer b/Test/dafny0/Answer
index 38b7c120..7d3ecc55 100644
--- a/Test/dafny0/Answer
+++ b/Test/dafny0/Answer
@@ -738,7 +738,7 @@ Basics.dfy(235,10): Error: when left-hand sides 0 and 1 refer to the same locati
 Execution trace:

     (0,0): anon0

 

-Dafny program verifier finished with 57 verified, 11 errors

+Dafny program verifier finished with 59 verified, 11 errors

 

 -------------------- ControlStructures.dfy --------------------

 ControlStructures.dfy(5,3): Error: missing case in case statement: Purple

diff --git a/Test/dafny0/Basics.dfy b/Test/dafny0/Basics.dfy
index f6e2d895..cdeae046 100644
--- a/Test/dafny0/Basics.dfy
+++ b/Test/dafny0/Basics.dfy
@@ -376,3 +376,34 @@ module SetCardinality {
                    |s + t|;

   }

 }

+

+

+// -------------------- hex support ----------------------------------

+

+method HexTest()

+{

+	var first16lower := [ 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf ];

+	var first16upper := [ 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF ];

+	assert forall i :: 0 <= i < |first16lower| ==> first16lower[i] == i;

+	assert forall i :: 0 <= i < |first16upper| ==> first16upper[i] == i;

+

+	var randomHex := [ 0xCF4458F2, 0x9A5C5BAF, 0x26A6ABD6, 0x00EB3933, 0x9123D2CF, 0xBE040001, 0x5AD038FA, 0xC75597A6, 0x7CF821A7, 0xCDEFB617, 0x4889D968, 0xB05F896A,

+					   0x75B18DB2, 0xCAD773B0, 0xD8845EF8, 0x8EFA513D, 0x8EBAD321, 0x9C405DDE, 0x0EA9DF16, 0xCD48236A, 0x8A6892CF, 0x99BF0779, 0xEA52E108, 0x0379BF46, 

+					   0x610D0339, 0xDB433BC7, 0xE94C026E, 0xFC18735C, 0x6A5FBDB3, 0xFDA622F9, 0x6204DB79, 0x52050F94, 0x5ABDD3FD, 0x7F1CFCDF, 0xEC7C907F, 0xFA41A43D, 

+					   0x02FBF254, 0x9E76751A, 0xF753002C, 0x9635D361, 0xBA2C14E6, 0x415CA2FB, 0xA478EF6C, 0x7F80D7EC, 0xB4DD8598, 0x06C4ED20, 0xBFC9F800, 0x69F9675D, 

+					   0x730D85E7, 0x30152491, 0x0226b79d, 0x6c7f895c, 0x4f466fa2, 0x2e470749, 0xacacf22e, 0x455ab875, 0xa0927dc7, 0xe27c93d7, 0x4f134daf, 0xd2c6c190, 

+					   0xc95f056e, 0x45547ddf, 0x6a5c2767, 0xadc55905, 0xc5d6217d, 0x4ae4453e, 0xbe11d3d9, 0x339b8b14, 0xe68f7571, 0xf528199d, 0x0e640ee0, 0x9f716143, 

+					   0x1520b76f, 0x7bfe38e9, 0x8c289b71, 0x677ff535, 0x0bb94f4e, 0xfb417c00, 0xa1cac03a, 0x5e3cdaf2, 0x7616f734, 0xb55744fb, 0x27642f2b, 0xa161c47e, 

+					   0xbfcd3fff, 0xa62df579, 0x3ea317b0, 0xc87063bf, 0x0038c98d, 0x95a5e874, 0x76d824f6, 0x18687e3e, 0x4be6d02a, 0x2c2cc14c, 0x6e91d56b, 0x76e2bb30, 

+					   0xcd85f1cc, 0x6219d3ae, 0xbe59d8d4, 0xd8C6FAF7 ];

+	var randomDec := [ 3477362930, 2589744047, 648457174, 15415603, 2435044047, 3187933185, 1523595514, 3344275366, 2096636327, 3455038999, 1216993640, 2959051114, 

+					   1974570418, 3403117488, 3632553720, 2398769469, 2394608417, 2621464030, 246013718, 3444056938, 2322109135, 2579433337, 3931300104, 58310470, 

+					   1628242745, 3678616519, 3914072686, 4229460828, 1784659379, 4255523577, 1644485497, 1376063380, 1522390013, 2132606175, 3967586431, 4198605885, 

+					   50066004, 2658563354, 4149411884, 2520109921, 3123451110, 1096590075, 2759389036, 2139150316, 3034416536, 113569056, 3217684480, 1777952605, 

+					   1930266087, 806691985, 36091805, 1820297564, 1330016162, 776406857, 2897015342, 1163573365, 2693955015, 3799815127, 1326665135, 3536241040,

+					   3378447726, 1163165151, 1784424295, 2915391749, 3319144829, 1256473918, 3188839385, 865831700, 3868161393, 4113045917, 241438432, 2675007811,

+					   354465647, 2080258281, 2351471473, 1736439093, 196693838, 4215372800, 2714419258, 1581046514, 1981216564, 3042395387, 660877099, 2707539070,

+					   3217899519, 2788029817, 1050875824, 3362808767,  3721613, 2510678132, 1993876726, 409501246, 1273417770, 741130572, 1855051115, 1994570544,

+					   3448107468, 1645859758, 3193559252, 3636919031 ];

+	assert forall i :: 0 <= i < |randomHex| ==> randomHex[i] == randomDec[i];

+}
\ No newline at end of file