multiple changes...

- fix for requirement inheritance in refinement.
- minimimally viable implementation of exclusive refinement feature.

9 files changed, 768 insertions, 615 deletions

diff --git a/Source/Dafny/Cloner.cs b/Source/Dafny/Cloner.cs
index e313ffac..6e64c7ec 100644
--- a/Source/Dafny/Cloner.cs
+++ b/Source/Dafny/Cloner.cs
@@ -17,12 +17,15 @@ namespace Microsoft.Dafny
       if (m is DefaultModuleDecl) {

         nw = new DefaultModuleDecl();

       } else {

-        nw = new ModuleDefinition(Tok(m.tok), name, m.IsAbstract, m.IsFacade, m.RefinementBaseName, m.Module, CloneAttributes(m.Attributes), true);

+        nw = new ModuleDefinition(Tok(m.tok), name, m.IsAbstract, m.IsFacade, m.IsExclusiveRefinement, m.RefinementBaseName, m.Module, CloneAttributes(m.Attributes), true);

       }

       foreach (var d in m.TopLevelDecls) {

         nw.TopLevelDecls.Add(CloneDeclaration(d, nw));

       }

-      nw.RefinementBase = m.RefinementBase;

+      if (null != m.RefinementBase) {

+          nw.RefinementBase = m.RefinementBase;

+      }

+      nw.ClonedFrom = m;

       nw.Height = m.Height;

       return nw;

     }

@@ -33,7 +36,7 @@ namespace Microsoft.Dafny
 

       if (d is OpaqueTypeDecl) {

         var dd = (OpaqueTypeDecl)d;

-        return new OpaqueTypeDecl(Tok(dd.tok), dd.Name, m, dd.EqualitySupport, dd.TypeArgs.ConvertAll(CloneTypeParam), CloneAttributes(dd.Attributes));

+        return new OpaqueTypeDecl(Tok(dd.tok), dd.Name, m, dd.EqualitySupport, dd.TypeArgs.ConvertAll(CloneTypeParam), CloneAttributes(dd.Attributes), d);

       } else if (d is TypeSynonymDecl) {

         var dd = (TypeSynonymDecl)d;

         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);

@@ -138,7 +141,7 @@ namespace Microsoft.Dafny
     }

 

     public TypeParameter CloneTypeParam(TypeParameter tp) {

-      return new TypeParameter(Tok(tp.tok), tp.Name, tp.EqualitySupport);

+      return new TypeParameter(Tok(tp.tok), tp.Name, tp.EqualitySupport, tp);

     }

 

     public MemberDecl CloneMember(MemberDecl member) {

diff --git a/Source/Dafny/Dafny.atg b/Source/Dafny/Dafny.atg
index 5d4a4321..7b51fb5e 100644
--- a/Source/Dafny/Dafny.atg
+++ b/Source/Dafny/Dafny.atg
@@ -542,6 +542,7 @@ SubModuleDecl<ModuleDefinition parent, out ModuleDecl submodule>
      ModuleDecl sm;

      submodule = null; // appease compiler

      bool isAbstract = false;

+     bool isExclusively = false;

      bool opened = false;

   .)

   ( [ "abstract"  (. isAbstract = true; .) ]

@@ -549,7 +550,9 @@ SubModuleDecl<ModuleDefinition parent, out ModuleDecl submodule>
     { Attribute<ref attrs> }

     NoUSIdent<out id>

 

-      [ "refines" QualifiedModuleName<out idRefined> ] (. module = new ModuleDefinition(id, id.val, isAbstract, false, idRefined == null ? null : idRefined, parent, attrs, false); .)

+      [ "exclusively" "refines" QualifiedModuleName<out idRefined> (. isExclusively = true; .)  

+      | "refines" QualifiedModuleName<out idRefined> (. isExclusively = false; .) ] 

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

        "{"                                             (. module.BodyStartTok = t; .)

         { SubModuleDecl<module, out sm>                (. module.TopLevelDecls.Add(sm); .)

         | ClassDecl<module, out c>                     (. module.TopLevelDecls.Add(c); .)

diff --git a/Source/Dafny/DafnyAst.cs b/Source/Dafny/DafnyAst.cs
index 712cb00a..134fb4c1 100644
--- a/Source/Dafny/DafnyAst.cs
+++ b/Source/Dafny/DafnyAst.cs
@@ -86,7 +86,7 @@ namespace Microsoft.Dafny {
 

   public class BuiltIns

   {

-    public readonly ModuleDefinition SystemModule = new ModuleDefinition(Token.NoToken, "_System", false, false, null, null, null, true);

+    public readonly ModuleDefinition SystemModule = new ModuleDefinition(Token.NoToken, "_System", false, false, /*isExclusiveRefinement:*/ false, null, null, null, true);

     readonly Dictionary<int, ClassDecl> arrayTypeDecls = new Dictionary<int, ClassDecl>();

     readonly Dictionary<int, ArrowTypeDecl> arrowTypeDecls = new Dictionary<int, ArrowTypeDecl>();

     readonly Dictionary<int, TupleTypeDecl> tupleTypeDecls = new Dictionary<int, TupleTypeDecl>();

@@ -1486,6 +1486,8 @@ namespace Microsoft.Dafny {
     IToken INamedRegion.BodyEndTok { get { return BodyEndTok; } }

     string INamedRegion.Name { get { return Name; } }

     string compileName;

+    private readonly Declaration clonedFrom;

+

     public virtual string CompileName {

       get {

         if (compileName == null) {

@@ -1496,12 +1498,19 @@ namespace Microsoft.Dafny {
     }

     public Attributes Attributes;  // readonly, except during class merging in the refinement transformations

 

-    public Declaration(IToken tok, string name, Attributes attributes) {

+    public Declaration(IToken tok, string name, Attributes attributes, Declaration clonedFrom) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

       this.tok = tok;

       this.Name = name;

       this.Attributes = attributes;

+      this.clonedFrom = clonedFrom;

+    }

+

+    public Declaration ClonedFrom { 

+      get {

+        return this.clonedFrom;

+      } 

     }

 

     [Pure]

@@ -1513,12 +1522,10 @@ namespace Microsoft.Dafny {
     internal FreshIdGenerator IdGenerator = new FreshIdGenerator();

   }

 

-  public class OpaqueType_AsParameter : TypeParameter

-  {

+  public class OpaqueType_AsParameter : TypeParameter {

     public readonly List<TypeParameter> TypeArgs;

     public OpaqueType_AsParameter(IToken tok, string name, EqualitySupportValue equalitySupport, List<TypeParameter> typeArgs)

-      : base(tok, name, equalitySupport)

-    {

+      : base(tok, name, equalitySupport) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

       Contract.Requires(typeArgs != null);

@@ -1566,8 +1573,8 @@ namespace Microsoft.Dafny {
     }

     public int PositionalIndex; // which type parameter this is (ie. in C<S, T, U>, S is 0, T is 1 and U is 2).

 

-    public TypeParameter(IToken tok, string name, EqualitySupportValue equalitySupport = EqualitySupportValue.Unspecified)

-      : base(tok, name, null) {

+    public TypeParameter(IToken tok, string name, EqualitySupportValue equalitySupport = EqualitySupportValue.Unspecified, Declaration clonedFrom = null)

+      : base(tok, name, null, clonedFrom) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

       EqualitySupport = equalitySupport;

@@ -1642,7 +1649,7 @@ namespace Microsoft.Dafny {
   }

 

   public class ModuleSignature {

-

+    private ModuleDefinition exclusiveRefinement = null;

     public readonly Dictionary<string, TopLevelDecl> TopLevels = new Dictionary<string, TopLevelDecl>();

     public readonly Dictionary<string, Tuple<DatatypeCtor, bool>> Ctors = new Dictionary<string, Tuple<DatatypeCtor, bool>>();

     public readonly Dictionary<string, MemberDecl> StaticMembers = new Dictionary<string, MemberDecl>();

@@ -1663,6 +1670,25 @@ namespace Microsoft.Dafny {
         return false;

       }

     }

+

+    public ModuleDefinition ExclusiveRefinement {

+      get {

+        if (null == exclusiveRefinement) {

+          return ModuleDef == null ? null : ModuleDef.ExclusiveRefinement;          

+        } else {

+          return exclusiveRefinement;

+        }

+      }

+

+      set {

+        if (null == ExclusiveRefinement) {

+          exclusiveRefinement = null;

+        } else {

+          throw new InvalidOperationException("An exclusive refinement relationship cannot be amended.");

+        }

+      }

+    }

+

   }

 

   public class ModuleDefinition : INamedRegion

@@ -1678,22 +1704,64 @@ namespace Microsoft.Dafny {
     public readonly Attributes Attributes;

     public readonly List<IToken> RefinementBaseName;  // null if no refinement base

     public ModuleDecl RefinementBaseRoot; // filled in early during resolution, corresponds to RefinementBaseName[0]

-    public ModuleDefinition RefinementBase;  // filled in during resolution (null if no refinement base)

+

     public List<Include> Includes;

 

     public readonly List<TopLevelDecl> TopLevelDecls = new List<TopLevelDecl>();  // filled in by the parser; readonly after that

     public readonly Graph<ICallable> CallGraph = new Graph<ICallable>();  // filled in during resolution

     public int Height;  // height in the topological sorting of modules; filled in during resolution

     public readonly bool IsAbstract;

+    public readonly bool IsExclusiveRefinement;

     public readonly bool IsFacade; // True iff this module represents a module facade (that is, an abstract interface)

     private readonly bool IsBuiltinName; // true if this is something like _System that shouldn't have it's name mangled.

+

+    private ModuleDefinition exclusiveRefinement;

+

+    public ModuleDefinition ExclusiveRefinement {

+      get { return exclusiveRefinement; }

+      set {

+        if (null == exclusiveRefinement) {

+          if (!value.IsExclusiveRefinement) {

+            throw new ArgumentException(

+              string.Format("Exclusive refinement of {0} with 'new' module {0} is disallowed.",

+              Name,

+              value.Name));

+          }

+          // todo: validate state of `value`.

+          exclusiveRefinement = value;

+        } else {

+          throw new InvalidOperationException(string.Format("Exclusive refinement of {0} has already been established {1}; cannot reestabilish as {2}.", Name, exclusiveRefinement.Name, value.Name));

+        }

+      }

+    }

+

+    public int ExclusiveRefinementCount { get; set; }

+

+    private ModuleDefinition refinementBase; // filled in during resolution via RefinementBase property (null if no refinement base yet or at all).

+

+    public ModuleDefinition RefinementBase {

+        get {

+           return refinementBase;

+        }

+

+        set {

+          // the refinementBase member may only be changed once.

+          if (null != refinementBase) {

+              throw new InvalidOperationException(string.Format("This module ({0}) already has a refinement base ({1}).", Name, refinementBase.Name));

+          }

+          refinementBase = value;

+        }

+    }

+

+    public ModuleDefinition ClonedFrom { get; set; }

+

     [ContractInvariantMethod]

     void ObjectInvariant() {

       Contract.Invariant(cce.NonNullElements(TopLevelDecls));

       Contract.Invariant(CallGraph != null);

     }

 

-    public ModuleDefinition(IToken tok, string name, bool isAbstract, bool isFacade, List<IToken> refinementBase, ModuleDefinition parent, Attributes attributes, bool isBuiltinName)

+    public ModuleDefinition(IToken tok, string name, bool isAbstract, bool isFacade, bool isExclusiveRefinement, List<IToken> refinementBase, ModuleDefinition parent, Attributes attributes, bool isBuiltinName, Parser parser = null)

     {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

@@ -1704,8 +1772,9 @@ namespace Microsoft.Dafny {
       RefinementBaseName = refinementBase;

       IsAbstract = isAbstract;

       IsFacade = isFacade;

+      IsExclusiveRefinement = isExclusiveRefinement;

       RefinementBaseRoot = null;

-      RefinementBase = null;

+      this.refinementBase = null;

       Includes = new List<Include>();

       IsBuiltinName = isBuiltinName;

     }

@@ -1844,7 +1913,9 @@ namespace Microsoft.Dafny {
   }

 

   public class DefaultModuleDecl : ModuleDefinition {

-    public DefaultModuleDecl() : base(Token.NoToken, "_module", false, false, null, null, null, true) {

+      public DefaultModuleDecl()

+          : base(Token.NoToken, "_module", false, false, /*isExclusiveRefinement:*/ false, null, null, null, true)

+      {

     }

     public override bool IsDefaultModule {

       get {

@@ -1862,8 +1933,8 @@ namespace Microsoft.Dafny {
       Contract.Invariant(cce.NonNullElements(TypeArgs));

     }

 

-    public TopLevelDecl(IToken tok, string name, ModuleDefinition module, List<TypeParameter> typeArgs, Attributes attributes)

-      : base(tok, name, attributes) {

+    public TopLevelDecl(IToken tok, string name, ModuleDefinition module, List<TypeParameter> typeArgs, Attributes attributes, Declaration clonedFrom = null)

+      : base(tok, name, attributes, clonedFrom) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

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

@@ -2116,7 +2187,7 @@ namespace Microsoft.Dafny {
     public List<DatatypeDestructor> Destructors = new List<DatatypeDestructor>();  // contents filled in during resolution; includes both implicit (not mentionable in source) and explicit destructors

 

     public DatatypeCtor(IToken tok, string name, [Captured] List<Formal> formals, Attributes attributes)

-      : base(tok, name, attributes) {

+      : base(tok, name, attributes, null) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

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

@@ -2326,7 +2397,7 @@ namespace Microsoft.Dafny {
     public TopLevelDecl EnclosingClass;  // filled in during resolution

     public MemberDecl RefinementBase;  // filled in during the pre-resolution refinement transformation; null if the member is new here

     public MemberDecl(IToken tok, string name, bool hasStaticKeyword, bool isGhost, Attributes attributes)

-      : base(tok, name, attributes) {

+      : base(tok, name, attributes, null) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

       HasStaticKeyword = hasStaticKeyword;

@@ -2463,8 +2534,8 @@ namespace Microsoft.Dafny {
       Contract.Invariant(TheType != null && Name == TheType.Name);

     }

 

-    public OpaqueTypeDecl(IToken tok, string name, ModuleDefinition module, TypeParameter.EqualitySupportValue equalitySupport, List<TypeParameter> typeArgs, Attributes attributes)

-      : base(tok, name, module, typeArgs, attributes) {

+    public OpaqueTypeDecl(IToken tok, string name, ModuleDefinition module, TypeParameter.EqualitySupportValue equalitySupport, List<TypeParameter> typeArgs, Attributes attributes, Declaration clonedFrom = null)

+      : base(tok, name, module, typeArgs, attributes, clonedFrom) {

       Contract.Requires(tok != null);

       Contract.Requires(name != null);

       Contract.Requires(module != null);

@@ -3063,7 +3134,7 @@ namespace Microsoft.Dafny {
       prefixPredCall.TypeArgumentSubstitutions = new Dictionary<TypeParameter, Type>();

       var old_to_new = new Dictionary<TypeParameter, TypeParameter>();

       for (int i = 0; i < this.TypeArgs.Count; i++) {

-	 old_to_new[this.TypeArgs[i]] = this.PrefixPredicate.TypeArgs[i];

+   old_to_new[this.TypeArgs[i]] = this.PrefixPredicate.TypeArgs[i];

       }

       foreach (var p in fexp.TypeArgumentSubstitutions) {

         prefixPredCall.TypeArgumentSubstitutions[old_to_new[p.Key]] = p.Value;

@@ -5578,8 +5649,8 @@ namespace Microsoft.Dafny {
       Contract.Invariant(cce.NonNullElements(Arguments));

       Contract.Invariant(cce.NonNullElements(InferredTypeArgs));

       Contract.Invariant(

-	Ctor == null ||

-	InferredTypeArgs.Count == Ctor.EnclosingDatatype.TypeArgs.Count);

+  Ctor == null ||

+  InferredTypeArgs.Count == Ctor.EnclosingDatatype.TypeArgs.Count);

     }

 

     public DatatypeValue(IToken tok, string datatypeName, string memberName, [Captured] List<Expression> arguments)

@@ -6009,10 +6080,10 @@ namespace Microsoft.Dafny {
         Function == null || TypeArgumentSubstitutions == null ||

         Contract.ForAll(

           Function.TypeArgs,

-        	  a => TypeArgumentSubstitutions.ContainsKey(a)) &&

+            a => TypeArgumentSubstitutions.ContainsKey(a)) &&

         Contract.ForAll(

           TypeArgumentSubstitutions.Keys,

-        	  a => Function.TypeArgs.Contains(a) || Function.EnclosingClass.TypeArgs.Contains(a)));

+            a => Function.TypeArgs.Contains(a) || Function.EnclosingClass.TypeArgs.Contains(a)));

     }

 

     public Function Function;  // filled in by resolution

diff --git a/Source/Dafny/Makefile b/Source/Dafny/Makefile
index 4c01c780..e8c0f5e0 100644
--- a/Source/Dafny/Makefile
+++ b/Source/Dafny/Makefile
@@ -4,8 +4,8 @@
 # from http://boogiepartners.codeplex.com/. Update the FRAME_DIR variable to

 # point to whatever directory you install that into.

 # ###############################################################################

-COCO_EXE_DIR = ..\..\..\boogiepartners\CocoRdownload

-FRAME_DIR = ..\..\..\boogiepartners\CocoR\Modified

+COCO_EXE_DIR = ..\..\..\boogie-partners\CocoRdownload

+FRAME_DIR = ..\..\..\boogie-partners\CocoR\Modified

 COCO = $(COCO_EXE_DIR)\Coco.exe

 

 # "all" depends on 2 files, really (Parser.cs and Scanner.cs), but they

diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index c4047819..a90e650a 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -72,10 +72,10 @@ public class Parser {
 	public const int _star = 56;

 	public const int _notIn = 57;

 	public const int _ellipsis = 58;

-	public const int maxT = 137;

+	public const int maxT = 138;

 

-	const bool T = true;

-	const bool x = false;

+	const bool _T = true;

+	const bool _x = false;

 	const int minErrDist = 2;

 

 	public Scanner/*!*/ scanner;

@@ -540,42 +540,42 @@ bool IsType(ref IToken pt) {
 		}

 		while (StartOf(1)) {

 			switch (la.kind) {

-			case 60: case 61: case 63: {

+			case 60: case 61: case 64: {

 				SubModuleDecl(defaultModule, out submodule);

 				defaultModule.TopLevelDecls.Add(submodule); 

 				break;

 			}

-			case 68: {

+			case 69: {

 				ClassDecl(defaultModule, out c);

 				defaultModule.TopLevelDecls.Add(c); 

 				break;

 			}

-			case 74: case 75: {

+			case 75: case 76: {

 				DatatypeDecl(defaultModule, out dt);

 				defaultModule.TopLevelDecls.Add(dt); 

 				break;

 			}

-			case 77: {

+			case 78: {

 				NewtypeDecl(defaultModule, out td);

 				defaultModule.TopLevelDecls.Add(td); 

 				break;

 			}

-			case 78: {

+			case 79: {

 				OtherTypeDecl(defaultModule, out td);

 				defaultModule.TopLevelDecls.Add(td); 

 				break;

 			}

-			case 79: {

+			case 80: {

 				IteratorDecl(defaultModule, out iter);

 				defaultModule.TopLevelDecls.Add(iter); 

 				break;

 			}

-			case 70: {

+			case 71: {

 				TraitDecl(defaultModule, out trait);

 				defaultModule.TopLevelDecls.Add(trait); 

 				break;

 			}

-			case 37: case 38: case 39: case 40: case 41: case 71: case 72: case 73: case 76: case 82: case 83: case 84: case 85: {

+			case 37: case 38: case 39: case 40: case 41: case 72: case 73: case 74: case 77: case 83: case 84: case 85: case 86: {

 				ClassMemberDecl(membersDefaultClass, false, !DafnyOptions.O.AllowGlobals);

 				break;

 			}

@@ -606,6 +606,7 @@ bool IsType(ref IToken pt) {
 		ModuleDecl sm;

 		submodule = null; // appease compiler

 		bool isAbstract = false;

+		bool isExclusively = false;

 		bool opened = false;

 		

 		if (la.kind == 60 || la.kind == 61) {

@@ -618,51 +619,59 @@ bool IsType(ref IToken pt) {
 				Attribute(ref attrs);

 			}

 			NoUSIdent(out id);

-			if (la.kind == 62) {

-				Get();

-				QualifiedModuleName(out idRefined);

+			if (la.kind == 62 || la.kind == 63) {

+				if (la.kind == 62) {

+					Get();

+					Expect(63);

+					QualifiedModuleName(out idRefined);

+					isExclusively = true; 

+				} else {

+					Get();

+					QualifiedModuleName(out idRefined);

+					isExclusively = false; 

+				}

 			}

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

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

 			Expect(45);

 			module.BodyStartTok = t; 

 			while (StartOf(1)) {

 				switch (la.kind) {

-				case 60: case 61: case 63: {

+				case 60: case 61: case 64: {

 					SubModuleDecl(module, out sm);

 					module.TopLevelDecls.Add(sm); 

 					break;

 				}

-				case 68: {

+				case 69: {

 					ClassDecl(module, out c);

 					module.TopLevelDecls.Add(c); 

 					break;

 				}

-				case 70: {

+				case 71: {

 					TraitDecl(module, out trait);

 					module.TopLevelDecls.Add(trait); 

 					break;

 				}

-				case 74: case 75: {

+				case 75: case 76: {

 					DatatypeDecl(module, out dt);

 					module.TopLevelDecls.Add(dt); 

 					break;

 				}

-				case 77: {

+				case 78: {

 					NewtypeDecl(module, out td);

 					module.TopLevelDecls.Add(td); 

 					break;

 				}

-				case 78: {

+				case 79: {

 					OtherTypeDecl(module, out td);

 					module.TopLevelDecls.Add(td); 

 					break;

 				}

-				case 79: {

+				case 80: {

 					IteratorDecl(module, out iter);

 					module.TopLevelDecls.Add(iter); 

 					break;

 				}

-				case 37: case 38: case 39: case 40: case 41: case 71: case 72: case 73: case 76: case 82: case 83: case 84: case 85: {

+				case 37: case 38: case 39: case 40: case 41: case 72: case 73: case 74: case 77: case 83: case 84: case 85: case 86: {

 					ClassMemberDecl(namedModuleDefaultClassMembers, false, !DafnyOptions.O.AllowGlobals);

 					break;

 				}

@@ -672,22 +681,22 @@ bool IsType(ref IToken pt) {
 			module.BodyEndTok = t;

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

 			submodule = new LiteralModuleDecl(module, parent); 

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

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

 			Get();

-			if (la.kind == 64) {

+			if (la.kind == 65) {

 				Get();

 				opened = true;

 			}

 			NoUSIdent(out id);

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

-				if (la.kind == 65) {

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

+				if (la.kind == 66) {

 					Get();

 					QualifiedModuleName(out idPath);

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

 				} else {

 					Get();

 					QualifiedModuleName(out idPath);

-					if (la.kind == 67) {

+					if (la.kind == 68) {

 						Get();

 						QualifiedModuleName(out idAssignment);

 					}

@@ -695,7 +704,7 @@ bool IsType(ref IToken pt) {
 				}

 			}

 			if (la.kind == 27) {

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

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

 				Get();

 				errors.Warning(t, "the semi-colon that used to terminate a sub-module declaration has been deprecated; in the new syntax, just leave off the semi-colon"); 

 			}

@@ -705,7 +714,7 @@ bool IsType(ref IToken pt) {
 			 submodule = new AliasModuleDecl(idPath, id, parent, opened);

 			}

 			

-		} else SynErr(139);

+		} else SynErr(140);

 	}

 

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

@@ -719,8 +728,8 @@ bool IsType(ref IToken pt) {
 		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

 		IToken bodyStart;

 		

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

-		Expect(68);

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

+		Expect(69);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -728,7 +737,7 @@ bool IsType(ref IToken pt) {
 		if (la.kind == 51) {

 			GenericParameters(typeArgs);

 		}

-		if (la.kind == 69) {

+		if (la.kind == 70) {

 			Get();

 			Type(out trait);

 			traits.Add(trait); 

@@ -760,13 +769,13 @@ bool IsType(ref IToken pt) {
 		IToken bodyStart = Token.NoToken;  // dummy assignment

 		bool co = false;

 		

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

-		if (la.kind == 74) {

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

+		if (la.kind == 75) {

 			Get();

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

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

 			Get();

 			co = true; 

-		} else SynErr(142);

+		} else SynErr(143);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -774,7 +783,7 @@ bool IsType(ref IToken pt) {
 		if (la.kind == 51) {

 			GenericParameters(typeArgs);

 		}

-		Expect(65);

+		Expect(66);

 		bodyStart = t; 

 		DatatypeMemberDecl(ctors);

 		while (la.kind == 23) {

@@ -782,7 +791,7 @@ bool IsType(ref IToken pt) {
 			DatatypeMemberDecl(ctors);

 		}

 		if (la.kind == 27) {

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

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

 			Get();

 			errors.Warning(t, "the semi-colon that used to terminate a (co)datatype declaration has been deprecated; in the new syntax, just leave off the semi-colon"); 

 		}

@@ -803,12 +812,12 @@ bool IsType(ref IToken pt) {
 		Type baseType = null;

 		Expression wh;

 		

-		Expect(77);

+		Expect(78);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

 		NoUSIdent(out id);

-		Expect(65);

+		Expect(66);

 		if (IsIdentColonOrBar()) {

 			NoUSIdent(out bvId);

 			if (la.kind == 21) {

@@ -822,7 +831,7 @@ bool IsType(ref IToken pt) {
 		} else if (StartOf(3)) {

 			Type(out baseType);

 			td = new NewtypeDecl(theVerifyThisFile ? id : new IncludeToken(id), id.val, module, baseType, attrs); 

-		} else SynErr(144);

+		} else SynErr(145);

 	}

 

 	void OtherTypeDecl(ModuleDefinition module, out TopLevelDecl td) {

@@ -833,7 +842,7 @@ bool IsType(ref IToken pt) {
 		td = null;

 		Type ty;

 		

-		Expect(78);

+		Expect(79);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -850,18 +859,18 @@ bool IsType(ref IToken pt) {
 			if (la.kind == 51) {

 				GenericParameters(typeArgs);

 			}

-			if (la.kind == 65) {

+			if (la.kind == 66) {

 				Get();

 				Type(out ty);

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

 			}

-		} else SynErr(145);

+		} else SynErr(146);

 		if (td == null) {

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

 		}

 		

 		if (la.kind == 27) {

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

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

 			Get();

 			errors.Warning(t, "the semi-colon that used to terminate an opaque-type declaration has been deprecated; in the new syntax, just leave off the semi-colon"); 

 		}

@@ -890,8 +899,8 @@ bool IsType(ref IToken pt) {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

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

-		Expect(79);

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

+		Expect(80);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -901,8 +910,8 @@ bool IsType(ref IToken pt) {
 				GenericParameters(typeArgs);

 			}

 			Formals(true, true, ins);

-			if (la.kind == 80 || la.kind == 81) {

-				if (la.kind == 80) {

+			if (la.kind == 81 || la.kind == 82) {

+				if (la.kind == 81) {

 					Get();

 				} else {

 					Get();

@@ -913,7 +922,7 @@ bool IsType(ref IToken pt) {
 		} else if (la.kind == 58) {

 			Get();

 			signatureEllipsis = t; 

-		} else SynErr(148);

+		} else SynErr(149);

 		while (StartOf(5)) {

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

 		}

@@ -940,8 +949,8 @@ bool IsType(ref IToken pt) {
 		List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();

 		IToken bodyStart;

 		

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

-		Expect(70);

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

+		Expect(71);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -968,11 +977,11 @@ bool IsType(ref IToken pt) {
 		MemberModifiers mmod = new MemberModifiers();

 		IToken staticToken = null, protectedToken = null;

 		

-		while (la.kind == 71 || la.kind == 72 || la.kind == 73) {

-			if (la.kind == 71) {

+		while (la.kind == 72 || la.kind == 73 || la.kind == 74) {

+			if (la.kind == 72) {

 				Get();

 				mmod.IsGhost = true; 

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

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

 				Get();

 				mmod.IsStatic = true; staticToken = t; 

 			} else {

@@ -980,7 +989,7 @@ bool IsType(ref IToken pt) {
 				mmod.IsProtected = true; protectedToken = t; 

 			}

 		}

-		if (la.kind == 76) {

+		if (la.kind == 77) {

 			if (moduleLevelDecl) {

 			 SemErr(la, "fields are not allowed to be declared at the module level; instead, wrap the field in a 'class' declaration");

 			 mmod.IsStatic = false;

@@ -1008,7 +1017,7 @@ bool IsType(ref IToken pt) {
 			

 			MethodDecl(mmod, allowConstructors, out m);

 			mm.Add(m); 

-		} else SynErr(150);

+		} else SynErr(151);

 	}

 

 	void Attribute(ref Attributes attrs) {

@@ -1093,8 +1102,8 @@ bool IsType(ref IToken pt) {
 		Attributes attrs = null;

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

 		

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

-		Expect(76);

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

+		Expect(77);

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

 		

 		while (la.kind == 45) {

@@ -1131,7 +1140,7 @@ bool IsType(ref IToken pt) {
 		

 		if (la.kind == 37) {

 			Get();

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -1151,11 +1160,11 @@ bool IsType(ref IToken pt) {
 			} else if (la.kind == 58) {

 				Get();

 				signatureEllipsis = t; 

-			} else SynErr(152);

+			} else SynErr(153);

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

 			Get();

 			isPredicate = true; 

-			if (la.kind == 82) {

+			if (la.kind == 83) {

 				Get();

 				isFunctionMethod = true; 

 			}

@@ -1182,7 +1191,7 @@ bool IsType(ref IToken pt) {
 			} else if (la.kind == 58) {

 				Get();

 				signatureEllipsis = t; 

-			} else SynErr(153);

+			} else SynErr(154);

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

 			Get();

 			Expect(38);

@@ -1205,7 +1214,7 @@ bool IsType(ref IToken pt) {
 			} else if (la.kind == 58) {

 				Get();

 				signatureEllipsis = t; 

-			} else SynErr(154);

+			} else SynErr(155);

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

 			Get();

 			isCoPredicate = true; 

@@ -1227,8 +1236,8 @@ bool IsType(ref IToken pt) {
 			} else if (la.kind == 58) {

 				Get();

 				signatureEllipsis = t; 

-			} else SynErr(155);

-		} else SynErr(156);

+			} else SynErr(156);

+		} else SynErr(157);

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

 		while (StartOf(9)) {

 			FunctionSpec(reqs, reads, ens, decreases);

@@ -1287,9 +1296,9 @@ bool IsType(ref IToken pt) {
 		IToken bodyStart = Token.NoToken;

 		IToken bodyEnd = Token.NoToken;

 		

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

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

 		switch (la.kind) {

-		case 82: {

+		case 83: {

 			Get();

 			break;

 		}

@@ -1298,12 +1307,12 @@ bool IsType(ref IToken pt) {
 			isLemma = true; 

 			break;

 		}

-		case 83: {

+		case 84: {

 			Get();

 			isCoLemma = true; 

 			break;

 		}

-		case 84: {

+		case 85: {

 			Get();

 			isCoLemma = true;

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

@@ -1316,7 +1325,7 @@ bool IsType(ref IToken pt) {
 			isIndLemma = true; 

 			break;

 		}

-		case 85: {

+		case 86: {

 			Get();

 			if (allowConstructor) {

 			 isConstructor = true;

@@ -1326,7 +1335,7 @@ bool IsType(ref IToken pt) {
 			

 			break;

 		}

-		default: SynErr(158); break;

+		default: SynErr(159); break;

 		}

 		keywordToken = t; 

 		if (isLemma) {

@@ -1369,7 +1378,7 @@ bool IsType(ref IToken pt) {
 				GenericParameters(typeArgs);

 			}

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

-			if (la.kind == 81) {

+			if (la.kind == 82) {

 				Get();

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

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

@@ -1377,7 +1386,7 @@ bool IsType(ref IToken pt) {
 		} else if (la.kind == 58) {

 			Get();

 			signatureEllipsis = t; 

-		} else SynErr(159);

+		} else SynErr(160);

 		while (StartOf(11)) {

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

 		}

@@ -1450,14 +1459,14 @@ bool IsType(ref IToken pt) {
 		} else if (la.kind == 2) {

 			Get();

 			id = t; 

-		} else SynErr(160);

+		} else SynErr(161);

 		Expect(21);

 		Type(out ty);

 	}

 

 	void OldSemi() {

 		if (la.kind == 27) {

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

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

 			Get();

 		}

 	}

@@ -1480,7 +1489,7 @@ bool IsType(ref IToken pt) {
 		Contract.Ensures(Contract.ValueAtReturn(out id)!=null);

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

 		isGhost = false; 

-		if (la.kind == 71) {

+		if (la.kind == 72) {

 			Get();

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

 		}

@@ -1532,7 +1541,7 @@ bool IsType(ref IToken pt) {
 		Contract.Ensures(Contract.ValueAtReturn(out ty)!=null);

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

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

-		if (la.kind == 71) {

+		if (la.kind == 72) {

 			Get();

 			isGhost = true; 

 		}

@@ -1554,7 +1563,7 @@ bool IsType(ref IToken pt) {
 			id = t; name = id.val;

 			Expect(21);

 			Type(out ty);

-		} else SynErr(162);

+		} else SynErr(163);

 		if (name != null) {

 		 identName = name;

 		} else {

@@ -1742,7 +1751,7 @@ bool IsType(ref IToken pt) {
 			ty = new UserDefinedType(e.tok, e); 

 			break;

 		}

-		default: SynErr(163); break;

+		default: SynErr(164); break;

 		}

 		if (la.kind == 29) {

 			Type t2; 

@@ -1763,7 +1772,7 @@ bool IsType(ref IToken pt) {
 	void Formals(bool incoming, bool allowGhostKeyword, List<Formal> formals) {

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

 		Expect(49);

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

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

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

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

 			while (la.kind == 22) {

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

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

 		

-		while (!(StartOf(13))) {SynErr(164); Get();}

+		while (!(StartOf(13))) {SynErr(165); Get();}

 		if (la.kind == 43) {

 			Get();

 			while (IsAttribute()) {

@@ -1809,13 +1818,13 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			}

 			OldSemi();

 		} else if (StartOf(14)) {

-			if (la.kind == 86) {

+			if (la.kind == 87) {

 				Get();

 				isFree = true;

 				errors.Warning(t, "the 'free' keyword is soon to be deprecated");

 				

 			}

-			if (la.kind == 88) {

+			if (la.kind == 89) {

 				Get();

 				isYield = true; 

 			}

@@ -1829,7 +1838,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 				 req.Add(new MaybeFreeExpression(e, isFree));

 				}

 				

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

@@ -1842,7 +1851,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 				 ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs));

 				}

 				

-			} else SynErr(165);

+			} else SynErr(166);

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

 			Get();

 			while (IsAttribute()) {

@@ -1850,7 +1859,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
 			}

 			DecreasesList(decreases, false, false);

 			OldSemi();

-		} else SynErr(166);

+		} else SynErr(167);

 	}

 

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

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

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

 		

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

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

 		if (la.kind == 42) {

 			Get();

 			while (IsAttribute()) {

@@ -1886,8 +1895,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				mod.Add(fe); 

 			}

 			OldSemi();

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

-			if (la.kind == 86) {

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

+			if (la.kind == 87) {

 				Get();

 				isFree = true;

 				errors.Warning(t, "the 'free' keyword is soon to be deprecated");

@@ -1898,7 +1907,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expression(out e, false, false);

 				OldSemi();

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

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

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

 				Get();

 				while (IsAttribute()) {

 					Attribute(ref ensAttrs);

@@ -1906,7 +1915,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expression(out e, false, false);

 				OldSemi();

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

-			} else SynErr(168);

+			} else SynErr(169);

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

 			Get();

 			while (IsAttribute()) {

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

 			DecreasesList(decreases, true, false);

 			OldSemi();

-		} else SynErr(169);

+		} else SynErr(170);

 	}

 

 	void FrameExpression(out FrameExpression fe, bool allowSemi, bool allowLambda) {

@@ -1927,18 +1936,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (StartOf(7)) {

 			Expression(out e, allowSemi, allowLambda);

 			feTok = e.tok; 

-			if (la.kind == 89) {

+			if (la.kind == 90) {

 				Get();

 				Ident(out id);

 				fieldName = id.val;  feTok = id; 

 			}

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

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

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

 			Get();

 			Ident(out id);

 			fieldName = id.val; 

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

-		} else SynErr(170);

+		} else SynErr(171);

 	}

 

 	void DecreasesList(List<Expression> decreases, bool allowWildcard, bool allowLambda) {

@@ -1993,7 +2002,7 @@ 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; 

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

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

 		if (la.kind == 44) {

 			Get();

 			Expression(out e, false, false);

@@ -2009,7 +2018,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				reads.Add(fe); 

 			}

 			OldSemi();

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

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

 			Get();

 			Expression(out e, false, false);

 			OldSemi();

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

 			DecreasesList(decreases, false, false);

 			OldSemi();

-		} else SynErr(172);

+		} else SynErr(173);

 	}

 

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

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

 		} else if (StartOf(18)) {

 			FrameExpression(out fe, allowSemi, false);

-		} else SynErr(173);

+		} else SynErr(174);

 	}

 

 	void PossiblyWildExpression(out Expression e, bool allowLambda) {

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

 		} else if (StartOf(7)) {

 			Expression(out e, false, allowLambda);

-		} else SynErr(174);

+		} else SynErr(175);

 	}

 

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

@@ -2070,14 +2079,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken bodyStart, bodyEnd;

 		int breakCount;

 		

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

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

 		switch (la.kind) {

 		case 45: {

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

 			s = bs; 

 			break;

 		}

-		case 100: {

+		case 101: {

 			AssertStmt(out s);

 			break;

 		}

@@ -2085,31 +2094,31 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			AssumeStmt(out s);

 			break;

 		}

-		case 101: {

+		case 102: {

 			PrintStmt(out s);

 			break;

 		}

-		case 1: case 2: case 3: case 4: case 8: case 10: case 19: case 20: case 23: case 49: case 130: case 131: case 132: case 133: case 134: case 135: {

+		case 1: case 2: case 3: case 4: case 8: case 10: case 19: case 20: case 23: case 49: case 131: case 132: case 133: case 134: case 135: case 136: {

 			UpdateStmt(out s);

 			break;

 		}

-		case 71: case 76: {

+		case 72: case 77: {

 			VarDeclStatement(out s);

 			break;

 		}

-		case 97: {

+		case 98: {

 			IfStmt(out s);

 			break;

 		}

-		case 98: {

+		case 99: {

 			WhileStmt(out s);

 			break;

 		}

-		case 99: {

+		case 100: {

 			MatchStmt(out s);

 			break;

 		}

-		case 102: case 103: {

+		case 103: case 104: {

 			ForallStmt(out s);

 			break;

 		}

@@ -2117,11 +2126,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			CalcStmt(out s);

 			break;

 		}

-		case 104: {

+		case 105: {

 			ModifyStmt(out s);

 			break;

 		}

-		case 90: {

+		case 91: {

 			Get();

 			x = t; 

 			NoUSIdent(out id);

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

 			break;

 		}

-		case 91: {

+		case 92: {

 			Get();

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

 			if (la.kind == 1) {

 				NoUSIdent(out id);

 				label = id.val; 

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

-				while (la.kind == 91) {

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

+				while (la.kind == 92) {

 					Get();

 					breakCount++; 

 				}

-			} else SynErr(176);

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

+			} else SynErr(177);

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

 			Expect(27);

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

 			break;

 		}

-		case 88: case 94: {

+		case 89: case 95: {

 			ReturnStmt(out s);

 			break;

 		}

@@ -2155,7 +2164,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			SkeletonStmt(out s);

 			break;

 		}

-		default: SynErr(178); break;

+		default: SynErr(179); break;

 		}

 	}

 

@@ -2164,7 +2173,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression e = dummyExpr; Attributes attrs = null;

 		IToken dotdotdot = null;

 		

-		Expect(100);

+		Expect(101);

 		x = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

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

 			Get();

 			dotdotdot = t; 

-		} else SynErr(179);

+		} else SynErr(180);

 		Expect(27);

 		if (dotdotdot != null) {

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

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

 			Get();

 			dotdotdot = t; 

-		} else SynErr(180);

+		} else SynErr(181);

 		Expect(27);

 		if (dotdotdot != null) {

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

@@ -2214,7 +2223,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		IToken x;  Expression e;

 		var args = new List<Expression>();

 		

-		Expect(101);

+		Expect(102);

 		x = t; 

 		Expression(out e, false, true);

 		args.Add(e); 

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

 			Expect(27);

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

-		} else if (la.kind == 22 || la.kind == 93 || la.kind == 95) {

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

 			lhss.Add(e); 

 			while (la.kind == 22) {

 				Get();

 				Lhs(out e);

 				lhss.Add(e); 

 			}

-			if (la.kind == 93) {

+			if (la.kind == 94) {

 				Get();

 				x = t; 

 				Rhs(out r);

@@ -2261,7 +2270,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					Rhs(out r);

 					rhss.Add(r); 

 				}

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

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

 				Get();

 				x = t; 

 				if (la.kind == _assume) {

@@ -2269,13 +2278,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					suchThatAssume = t; 

 				}

 				Expression(out suchThat, false, true);

-			} else SynErr(181);

+			} else SynErr(182);

 			Expect(27);

 			endTok = t; 

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

 			Get();

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

-		} else SynErr(182);

+		} else SynErr(183);

 		if (suchThat != null) {

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

 		} else {

@@ -2299,11 +2308,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Attributes attrs = null;

 		IToken endTok;

 		

-		if (la.kind == 71) {

+		if (la.kind == 72) {

 			Get();

 			isGhost = true;  x = t; 

 		}

-		Expect(76);

+		Expect(77);

 		if (!isGhost) { x = t; } 

 		while (la.kind == 45) {

 			Attribute(ref attrs);

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

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

 		}

-		if (la.kind == 45 || la.kind == 93 || la.kind == 95) {

-			if (la.kind == 93) {

+		if (la.kind == 45 || la.kind == 94 || la.kind == 96) {

+			if (la.kind == 94) {

 				Get();

 				assignTok = t; 

 				Rhs(out r);

@@ -2333,7 +2342,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				while (la.kind == 45) {

 					Attribute(ref attrs);

 				}

-				Expect(95);

+				Expect(96);

 				assignTok = t; 

 				if (la.kind == _assume) {

 					Expect(30);

@@ -2342,7 +2351,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expression(out suchThat, false, true);

 			}

 		}

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

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

 		Expect(27);

 		endTok = t; 

 		ConcreteUpdateStatement update;

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

 		ifStmt = dummyStmt;  // to please the compiler

 		

-		Expect(97);

+		Expect(98);

 		x = t; 

 		if (IsAlternative()) {

 			AlternativeBlock(out alternatives, out endTok);

@@ -2392,13 +2401,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			endTok = thn.EndTok; 

 			if (la.kind == 34) {

 				Get();

-				if (la.kind == 97) {

+				if (la.kind == 98) {

 					IfStmt(out s);

 					els = s; endTok = s.EndTok; 

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

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

 					els = bs; endTok = bs.EndTok; 

-				} else SynErr(184);

+				} else SynErr(185);

 			}

 			if (guardEllipsis != null) {

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

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

 			}

 			

-		} else SynErr(185);

+		} else SynErr(186);

 	}

 

 	void WhileStmt(out Statement stmt) {

@@ -2425,7 +2434,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		stmt = dummyStmt;  // to please the compiler

 		bool isDirtyLoop = true;

 		

-		Expect(98);

+		Expect(99);

 		x = t; 

 		if (IsLoopSpec() || IsAlternative()) {

 			while (StartOf(22)) {

@@ -2451,7 +2460,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Expect(58);

 				bodyEllipsis = t; endTok = t; isDirtyLoop = false; 

 			} else if (StartOf(23)) {

-			} else SynErr(186);

+			} else SynErr(187);

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

 			 if (mod != null) {

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

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

 			}

 			

-		} else SynErr(187);

+		} else SynErr(188);

 	}

 

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

@@ -2478,7 +2487,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>();

 		bool usesOptionalBrace = false;

 		

-		Expect(99);

+		Expect(100);

 		x = t; 

 		Expression(out e, true, true);

 		if (la.kind == _lbrace) {

@@ -2494,7 +2503,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				CaseStatement(out c);

 				cases.Add(c); 

 			}

-		} else SynErr(188);

+		} else SynErr(189);

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

 	}

 

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

 		IToken tok = Token.NoToken;

 		

-		if (la.kind == 102) {

+		if (la.kind == 103) {

 			Get();

 			x = t; tok = x; 

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

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

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

+		} else SynErr(190);

 		if (la.kind == _openparen) {

 			Expect(49);

 			if (la.kind == 1) {

@@ -2530,19 +2539,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (la.kind == _ident) {

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

 			}

-		} else SynErr(190);

+		} else SynErr(191);

 		if (bvars == null) { bvars = new List<BoundVar>(); }

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

 		

-		while (la.kind == 86 || la.kind == 87) {

+		while (la.kind == 87 || la.kind == 88) {

 			isFree = false; 

-			if (la.kind == 86) {

+			if (la.kind == 87) {

 				Get();

 				isFree = true;

 				errors.Warning(t, "the 'free' keyword is soon to be deprecated");

 				

 			}

-			Expect(87);

+			Expect(88);

 			Expression(out e, false, true);

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

 			OldSemi();

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

 					CalcStmt(out subCalc);

 					hintEnd = subCalc.EndTok; subhints.Add(subCalc); 

-				} else SynErr(191);

+				} else SynErr(192);

 			}

 			var h = new BlockStmt(hintStart, hintEnd, subhints); // if the hint is empty, hintStart is the first token of the next line, but it doesn't matter because the block statement is just used as a container

 			hints.Add(h);

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

 		IToken ellipsisToken = null;

 		

-		Expect(104);

+		Expect(105);

 		tok = t; 

 		while (IsAttribute()) {

 			Attribute(ref attrs);

@@ -2662,14 +2671,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 58) {

 			Get();

 			ellipsisToken = t; 

-		} else SynErr(192);

+		} else SynErr(193);

 		if (la.kind == 45) {

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

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

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

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

 			Get();

 			endTok = t; 

-		} else SynErr(194);

+		} else SynErr(195);

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

 		if (ellipsisToken != null) {

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

@@ -2683,13 +2692,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		AssignmentRhs r;

 		bool isYield = false;

 		

-		if (la.kind == 94) {

+		if (la.kind == 95) {

 			Get();

 			returnTok = t; 

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

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

 			Get();

 			returnTok = t; isYield = true; 

-		} else SynErr(195);

+		} else SynErr(196);

 		if (StartOf(26)) {

 			Rhs(out r);

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

@@ -2715,7 +2724,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Expression e; 

 		Expect(58);

 		dotdotdot = t; 

-		if (la.kind == 92) {

+		if (la.kind == 93) {

 			Get();

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

 			Ident(out tok);

@@ -2725,7 +2734,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				Ident(out tok);

 				names.Add(tok); 

 			}

-			Expect(93);

+			Expect(94);

 			Expression(out e, false, true);

 			exprs.Add(e); 

 			while (la.kind == 22) {

@@ -2752,7 +2761,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		r = dummyRhs;  // to please compiler

 		Attributes attrs = null;

 		

-		if (la.kind == 96) {

+		if (la.kind == 97) {

 			Get();

 			newToken = t; 

 			TypeAndToken(out x, out ty);

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

 			Expression(out e, false, true);

 			r = new ExprRhs(e); 

-		} else SynErr(196);

+		} else SynErr(197);

 		while (la.kind == 45) {

 			Attribute(ref attrs);

 		}

@@ -2808,7 +2817,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			while (la.kind == 26 || la.kind == 47 || la.kind == 49) {

 				Suffix(ref e);

 			}

-		} else SynErr(197);

+		} else SynErr(198);

 	}

 

 	void Expressions(List<Expression> args) {

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

 			Expression(out ee, true, true);

 			e = ee; 

-		} else SynErr(198);

+		} else SynErr(199);

 	}

 

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

 		Expression e; FrameExpression fe;

 		bool isFree = false; Attributes attrs = null;

 		

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

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

-			if (la.kind == 86) {

+		if (la.kind == 36 || la.kind == 87) {

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

+			if (la.kind == 87) {

 				Get();

 				isFree = true; errors.Warning(t, "the 'free' keyword is soon to be deprecated"); 

 			}

@@ -2878,7 +2887,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			invariants.Add(new MaybeFreeExpression(e, isFree, attrs)); 

 			OldSemi();

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

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

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

 			Get();

 			while (IsAttribute()) {

 				Attribute(ref decAttrs);

@@ -2886,7 +2895,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			DecreasesList(decreases, true, true);

 			OldSemi();

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

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

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

 			Get();

 			mod = mod ?? new List<FrameExpression>(); 

 			while (IsAttribute()) {

@@ -2900,7 +2909,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				mod.Add(fe); 

 			}

 			OldSemi();

-		} else SynErr(202);

+		} else SynErr(203);

 	}

 

 	void CaseStatement(out MatchCaseStmt/*!*/ c) {

@@ -2937,12 +2946,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				arguments.Add(pat); 

 			}

 			Expect(50);

-		} else SynErr(203);

+		} else SynErr(204);

 		Expect(28);

-		while (!(StartOf(28))) {SynErr(204); Get();}

+		while (!(StartOf(28))) {SynErr(205); Get();}

 		while (IsNotEndOfCase()) {

 			Stmt(body);

-			while (!(StartOf(28))) {SynErr(205); Get();}

+			while (!(StartOf(28))) {SynErr(206); Get();}

 		}

 		c = new MatchCaseStmt(x, name, arguments, body); 

 	}

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

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

 			

-		} else SynErr(206);

+		} else SynErr(207);

 		if (pat == null) {

 		 pat = new CasePattern(t, "_ParseError", new List<CasePattern>());

 		}

@@ -3028,7 +3037,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		case 53: {

 			Get();

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

-			if (la.kind == 105) {

+			if (la.kind == 106) {

 				Get();

 				Expect(47);

 				Expression(out k, true, true);

@@ -3046,12 +3055,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			x = t;  binOp = BinaryExpr.Opcode.Gt; 

 			break;

 		}

-		case 106: {

+		case 107: {

 			Get();

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

 			break;

 		}

-		case 107: {

+		case 108: {

 			Get();

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

 			break;

@@ -3066,32 +3075,32 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			x = t;  binOp = BinaryExpr.Opcode.Neq; 

 			break;

 		}

-		case 108: {

+		case 109: {

 			Get();

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

 			break;

 		}

-		case 109: {

+		case 110: {

 			Get();

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

 			break;

 		}

-		case 110: case 111: {

+		case 111: case 112: {

 			EquivOp();

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

 			break;

 		}

-		case 112: case 113: {

+		case 113: case 114: {

 			ImpliesOp();

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

 			break;

 		}

-		case 114: case 115: {

+		case 115: case 116: {

 			ExpliesOp();

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

 			break;

 		}

-		default: SynErr(207); break;

+		default: SynErr(208); break;

 		}

 		if (k == null) {

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

@@ -3102,67 +3111,67 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 	}

 

 	void EquivOp() {

-		if (la.kind == 110) {

+		if (la.kind == 111) {

 			Get();

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

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

 			Get();

-		} else SynErr(208);

+		} else SynErr(209);

 	}

 

 	void ImpliesOp() {

-		if (la.kind == 112) {

+		if (la.kind == 113) {

 			Get();

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

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

 			Get();

-		} else SynErr(209);

+		} else SynErr(210);

 	}

 

 	void ExpliesOp() {

-		if (la.kind == 114) {

+		if (la.kind == 115) {

 			Get();

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

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

 			Get();

-		} else SynErr(210);

+		} else SynErr(211);

 	}

 

 	void AndOp() {

-		if (la.kind == 116) {

+		if (la.kind == 117) {

 			Get();

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

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

 			Get();

-		} else SynErr(211);

+		} else SynErr(212);

 	}

 

 	void OrOp() {

-		if (la.kind == 118) {

+		if (la.kind == 119) {

 			Get();

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

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

 			Get();

-		} else SynErr(212);

+		} else SynErr(213);

 	}

 

 	void NegOp() {

-		if (la.kind == 120) {

+		if (la.kind == 121) {

 			Get();

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

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

 			Get();

-		} else SynErr(213);

+		} else SynErr(214);

 	}

 

 	void Forall() {

-		if (la.kind == 102) {

+		if (la.kind == 103) {

 			Get();

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

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

 			Get();

-		} else SynErr(214);

+		} else SynErr(215);

 	}

 

 	void Exists() {

-		if (la.kind == 123) {

+		if (la.kind == 124) {

 			Get();

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

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

 			Get();

-		} else SynErr(215);

+		} else SynErr(216);

 	}

 

 	void QSep() {

@@ -3170,7 +3179,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Get();

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

 			Get();

-		} else SynErr(216);

+		} else SynErr(217);

 	}

 

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

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

 		LogicalExpression(out e0, allowSemi, allowLambda);

 		if (IsImpliesOp() || IsExpliesOp()) {

-			if (la.kind == 112 || la.kind == 113) {

+			if (la.kind == 113 || la.kind == 114) {

 				ImpliesOp();

 				x = t; 

 				ImpliesExpression(out e1, allowSemi, allowLambda);

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

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

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

 				ExpliesOp();

 				x = t; 

 				LogicalExpression(out e1, allowSemi, allowLambda);

@@ -3204,7 +3213,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					LogicalExpression(out e1, allowSemi, allowLambda);

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

 				}

-			} else SynErr(217);

+			} else SynErr(218);

 		}

 	}

 

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

 		RelationalExpression(out e0, allowSemi, allowLambda);

 		if (IsAndOp() || IsOrOp()) {

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

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

 				AndOp();

 				x = t; 

 				RelationalExpression(out e1, allowSemi, allowLambda);

@@ -3223,7 +3232,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					RelationalExpression(out e1, allowSemi, allowLambda);

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

 				}

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

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

 				OrOp();

 				x = t; 

 				RelationalExpression(out e1, allowSemi, allowLambda);

@@ -3234,7 +3243,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 					RelationalExpression(out e1, allowSemi, allowLambda);

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

 				}

-			} else SynErr(218);

+			} else SynErr(219);

 		}

 	}

 

@@ -3370,7 +3379,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		case 53: {

 			Get();

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

-			if (la.kind == 105) {

+			if (la.kind == 106) {

 				Get();

 				Expect(47);

 				Expression(out k, true, true);

@@ -3388,12 +3397,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			x = t;  op = BinaryExpr.Opcode.Gt; 

 			break;

 		}

-		case 106: {

+		case 107: {

 			Get();

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

 			break;

 		}

-		case 107: {

+		case 108: {

 			Get();

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

 			break;

@@ -3401,7 +3410,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		case 54: {

 			Get();

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

-			if (la.kind == 105) {

+			if (la.kind == 106) {

 				Get();

 				Expect(47);

 				Expression(out k, true, true);

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

 			break;

 		}

-		case 125: {

+		case 126: {

 			Get();

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

 			break;

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

 			break;

 		}

-		case 120: {

+		case 121: {

 			Get();

 			x = t;  y = Token.NoToken; 

 			if (la.val == "!") {

-				Expect(120);

+				Expect(121);

 				y = t; 

 			}

 			if (y == Token.NoToken) {

@@ -3442,17 +3451,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			x = t;  op = BinaryExpr.Opcode.Neq; 

 			break;

 		}

-		case 108: {

+		case 109: {

 			Get();

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

 			break;

 		}

-		case 109: {

+		case 110: {

 			Get();

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

 			break;

 		}

-		default: SynErr(219); break;

+		default: SynErr(220); break;

 		}

 	}

 

@@ -3468,23 +3477,23 @@ 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 == 126) {

+		if (la.kind == 127) {

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(220);

+		} else SynErr(221);

 	}

 

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

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

-		if (la.kind == 127) {

+		if (la.kind == 128) {

 			Get();

 			x = t; 

 			UnaryExpression(out e, allowSemi, allowLambda);

 			e = new NegationExpression(x, e); 

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

+		} else if (la.kind == 121 || la.kind == 122) {

 			NegOp();

 			x = t; 

 			UnaryExpression(out e, allowSemi, allowLambda);

@@ -3534,7 +3543,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			while (IsSuffix()) {

 				Suffix(ref e);

 			}

-		} else SynErr(221);

+		} else SynErr(222);

 	}

 

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

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

 			Get();

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

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

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

 			Get();

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

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

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

 			Get();

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

-		} else SynErr(222);

+		} else SynErr(223);

 	}

 

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

@@ -3583,10 +3592,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (IsGenericInstantiation()) {

 				typeArgs = new List<Type>(); 

 				GenericInstantiation(typeArgs);

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

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

 				HashCall(id, out openParen, out typeArgs, out args);

 			} else if (StartOf(30)) {

-			} else SynErr(223);

+			} else SynErr(224);

 			e = new ExprDotName(id, e, id.val, typeArgs);

 			if (openParen != null) {

 			 e = new ApplySuffix(openParen, e, args);

@@ -3598,14 +3607,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			if (StartOf(7)) {

 				Expression(out ee, true, true);

 				e0 = ee; 

-				if (la.kind == 136) {

+				if (la.kind == 137) {

 					Get();

 					anyDots = true; 

 					if (StartOf(7)) {

 						Expression(out ee, true, true);

 						e1 = ee; 

 					}

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

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

 					Get();

 					Expression(out ee, true, true);

 					e1 = ee; 

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

 						

 					}

-				} else SynErr(224);

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

+				} else SynErr(225);

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

 				Get();

 				anyDots = true; 

 				if (StartOf(7)) {

 					Expression(out ee, true, true);

 					e1 = ee; 

 				}

-			} else SynErr(225);

+			} else SynErr(226);

 			if (multipleIndices != null) {

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

 			 // make sure an array class with this dimensionality exists

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

 			Expect(50);

 			e = new ApplySuffix(openParen, e, args); 

-		} else SynErr(226);

+		} else SynErr(227);

 	}

 

 	void ISetDisplayExpr(IToken/*!*/ setToken, bool finite, out Expression e) {

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

 			}

 			Expect(50);

-		} else SynErr(227);

+		} else SynErr(228);

 		while (la.kind == 43 || la.kind == 44) {

 			if (la.kind == 43) {

 				Get();

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

 		

 		switch (la.kind) {

-		case 97: {

+		case 98: {

 			Get();

 			x = t; 

 			Expression(out e, true, true);

@@ -3770,11 +3779,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			e = new ITEExpr(x, e, e0, e1); 

 			break;

 		}

-		case 99: {

+		case 100: {

 			MatchExpression(out e, allowSemi, allowLambda);

 			break;

 		}

-		case 102: case 122: case 123: case 124: {

+		case 103: case 123: case 124: case 125: {

 			QuantifierGuts(out e, allowSemi, allowLambda);

 			break;

 		}

@@ -3790,13 +3799,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			SetComprehensionExpr(x, false, out e, allowSemi, allowLambda);

 			break;

 		}

-		case 30: case 31: case 100: {

+		case 30: case 31: case 101: {

 			StmtInExpr(out s);

 			Expression(out e, allowSemi, allowLambda);

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

 			break;

 		}

-		case 71: case 76: {

+		case 72: case 77: {

 			LetExpr(out e, allowSemi, allowLambda);

 			break;

 		}

@@ -3812,11 +3821,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			MapComprehensionExpr(x, false, out e, allowSemi, allowLambda);

 			break;

 		}

-		case 90: {

+		case 91: {

 			NamedExpr(out e, allowSemi, allowLambda);

 			break;

 		}

-		default: SynErr(228); break;

+		default: SynErr(229); break;

 		}

 	}

 

@@ -3828,10 +3837,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		if (IsGenericInstantiation()) {

 			typeArgs = new List<Type>(); 

 			GenericInstantiation(typeArgs);

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

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

 			HashCall(id, out openParen, out typeArgs, out args);

 		} else if (StartOf(30)) {

-		} else SynErr(229);

+		} else SynErr(230);

 		e = new NameSegment(id, id.val, typeArgs);

 		if (openParen != null) {

 		 e = new ApplySuffix(openParen, e, args);

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

 			e = new SeqDisplayExpr(x, elements); 

 			Expect(48);

-		} else SynErr(230);

+		} else SynErr(231);

 	}

 

 	void MultiSetExpr(out Expression e) {

@@ -3884,7 +3893,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			Expression(out e, true, true);

 			e = new MultiSetFormingExpr(x, e); 

 			Expect(50);

-		} else SynErr(231);

+		} else SynErr(232);

 	}

 

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

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

 		

 		switch (la.kind) {

-		case 130: {

+		case 131: {

 			Get();

 			e = new LiteralExpr(t, false); 

 			break;

 		}

-		case 131: {

+		case 132: {

 			Get();

 			e = new LiteralExpr(t, true); 

 			break;

 		}

-		case 132: {

+		case 133: {

 			Get();

 			e = new LiteralExpr(t); 

 			break;

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

 			break;

 		}

-		case 133: {

+		case 134: {

 			Get();

 			e = new ThisExpr(t); 

 			break;

 		}

-		case 134: {

+		case 135: {

 			Get();

 			x = t; 

 			Expect(49);

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

 			break;

 		}

-		case 135: {

+		case 136: {

 			Get();

 			x = t; 

 			Expect(49);

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

 			break;

 		}

-		default: SynErr(232); break;

+		default: SynErr(233); break;

 		}

 	}

 

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

 			}

 			

-		} else SynErr(233);

+		} else SynErr(234);

 	}

 

 	void Dec(out Basetypes.BigDec d) {

@@ -4053,20 +4062,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		} else if (la.kind == 29) {

 			Get();

 			oneShot = true; 

-		} else SynErr(234);

+		} else SynErr(235);

 	}

 

 	void MapLiteralExpressions(out List<ExpressionPair> elements) {

 		Expression/*!*/ d, r;

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

 		Expression(out d, true, true);

-		Expect(93);

+		Expect(94);

 		Expression(out r, true, true);

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

 		while (la.kind == 22) {

 			Get();

 			Expression(out d, true, true);

-			Expect(93);

+			Expect(94);

 			Expression(out r, true, true);

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

 		}

@@ -4100,7 +4109,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();

 		bool usesOptionalBrace = false;

 		

-		Expect(99);

+		Expect(100);

 		x = t; 

 		Expression(out e, allowSemi, allowLambda);

 		if (la.kind == _lbrace) {

@@ -4116,7 +4125,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				CaseExpression(out c, allowSemi, allowLambda);

 				cases.Add(c); 

 			}

-		} else SynErr(235);

+		} else SynErr(236);

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

 	}

 

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

 		Expression/*!*/ body;

 		

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

+		if (la.kind == 103 || la.kind == 123) {

 			Forall();

 			x = t;  univ = true; 

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

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

 			Exists();

 			x = t; 

-		} else SynErr(236);

+		} else SynErr(237);

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

 		QSep();

 		Expression(out body, allowSemi, allowLambda);

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

 	void StmtInExpr(out Statement s) {

 		s = dummyStmt; 

-		if (la.kind == 100) {

+		if (la.kind == 101) {

 			AssertStmt(out s);

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

 			AssumeStmt(out s);

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

 			CalcStmt(out s);

-		} else SynErr(237);

+		} else SynErr(238);

 	}

 

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

@@ -4196,11 +4205,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 		Attributes attrs = null;

 		e = dummyExpr;

 		

-		if (la.kind == 71) {

+		if (la.kind == 72) {

 			Get();

 			isGhost = true;  x = t; 

 		}

-		Expect(76);

+		Expect(77);

 		if (!isGhost) { x = t; } 

 		CasePattern(out pat);

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

@@ -4213,13 +4222,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 			letLHSs.Add(pat);

 			

 		}

-		if (la.kind == 93) {

+		if (la.kind == 94) {

 			Get();

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

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

 			while (la.kind == 45) {

 				Attribute(ref attrs);

 			}

-			Expect(95);

+			Expect(96);

 			exact = false;

 			foreach (var lhs in letLHSs) {

 			 if (lhs.Arguments != null) {

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

 			}

 			

-		} else SynErr(238);

+		} else SynErr(239);

 		Expression(out e, false, true);

 		letRHSs.Add(e); 

 		while (la.kind == 22) {

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

 		Expression expr;

 		

-		Expect(90);

+		Expect(91);

 		x = t; 

 		NoUSIdent(out d);

 		Expect(21);

@@ -4287,7 +4296,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
 				arguments.Add(pat); 

 			}

 			Expect(50);

-		} else SynErr(239);

+		} else SynErr(240);

 		Expect(28);

 		Expression(out body, allowSemi, allowLambda);

 		c = new MatchCaseExpr(x, name, arguments, body); 

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

 	void HashCall(IToken id, out IToken openParen, out List<Type> typeArgs, out List<Expression> args) {

 		Expression k; args = new List<Expression>(); typeArgs = null; 

-		Expect(105);

+		Expect(106);

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

 		if (la.kind == 51) {

 			typeArgs = new List<Type>(); 

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

 			Get();

 			x = t; 

-		} else SynErr(240);

+		} else SynErr(241);

 	}

 

 

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

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+		{_T,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_x,_x,_T, _x,_x,_T,_T, _T,_x,_x,_T, _T,_x,_x,_T, _T,_x,_T,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _T,_T,_x,_x, _T,_x,_x,_T, _T,_T,_T,_T, _T,_T,_x,_T, _T,_x,_x,_T, _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,_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,_T,_T,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_x,_x, _T,_x,_x,_x, _x,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_x,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_T,_x,_x, _x,_T,_T,_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,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_T,_x,_x,_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,_T,_T,_T, _T,_T,_x,_x, _x,_x,_T,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_x,_x, _T,_x,_T,_x, _x,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_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,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_T,_T,_T, _x,_T,_T,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _T,_x,_x,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_T,_T,_T, _T,_T,_x,_T, _T,_T,_T,_x, _x,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_x,_x, _T,_x,_x,_x, _x,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_T, _T,_T,_T,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _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},

+		{_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_T,_T,_x, _x,_T,_T,_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,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _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,_T, _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,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_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,_x, _x,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _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,_T, _T,_T,_T,_T, _T,_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,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_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,_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, _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,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_T,_T,_T, _x,_T,_T,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _T,_x,_x,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_T,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_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,_x, _x,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _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,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_x,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_T,_T,_T, _x,_T,_T,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _x,_T,_x,_x, _x,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _T,_x,_x,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_x,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_T,_T,_T, _x,_T,_T,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _x,_T,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _T,_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,_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, _x,_x,_x,_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,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _T,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _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,_T, _T,_T,_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,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _T,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_T,_x,_T, _T,_x,_x,_T, _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,_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,_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,_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,_x,_x,_x, _T,_x,_T,_x, _x,_T,_T,_T, _x,_T,_T,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _x,_T,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_T,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _T,_x,_x,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_x,_x,_T,_T, _T,_x,_x,_x, _T,_x,_T,_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,_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,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_T,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_T, _T,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _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,_T, _T,_T,_T,_T, _T,_x,_x,_x},

+		{_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_x, _x,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x},

+		{_T,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _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,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_x, _T,_T,_x,_x, _T,_x,_x,_x, _x,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_T,_T, _T,_x,_T,_T, _T,_T,_T,_T, _T,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_x,_x, _x,_x,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_x,_x},

+		{_T,_T,_T,_T, _T,_x,_x,_x, _T,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_T,_T,_T, _T,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_x, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_x, _T,_T,_x,_x, _T,_x,_x,_x, _x,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_x,_T,_T, _x,_x,_T,_T, _T,_T,_T,_T, _T,_T,_x,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_x,_x, _x,_x,_T,_T, _T,_T,_T,_T, _T,_T,_T,_T, _T,_T,_x,_x}

 

 	};

 } // end Parser

@@ -4486,185 +4495,186 @@ public class Errors {
 			case 59: s = "\"include\" expected"; break;

 			case 60: s = "\"abstract\" expected"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-			case 144: s = "invalid NewtypeDecl"; break;

-			case 145: s = "invalid OtherTypeDecl"; break;

-			case 146: s = "this symbol not expected in OtherTypeDecl"; break;

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

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

-			case 149: s = "this symbol not expected in TraitDecl"; break;

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

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

-			case 152: s = "invalid FunctionDecl"; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+			case 110: s = "\"\\u2265\" expected"; break;

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

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

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

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

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

+			case 116: s = "\"\\u21d0\" expected"; break;

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

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

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

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

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

+			case 122: s = "\"\\u00ac\" expected"; break;

+			case 123: s = "\"\\u2200\" expected"; break;

+			case 124: s = "\"exists\" expected"; break;

+			case 125: s = "\"\\u2203\" expected"; break;

+			case 126: s = "\"in\" expected"; break;

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

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

+			case 129: s = "\"/\" expected"; break;

+			case 130: s = "\"%\" expected"; break;

+			case 131: s = "\"false\" expected"; break;

+			case 132: s = "\"true\" expected"; break;

+			case 133: s = "\"null\" expected"; break;

+			case 134: s = "\"this\" expected"; break;

+			case 135: s = "\"fresh\" expected"; break;

+			case 136: s = "\"old\" expected"; break;

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

+			case 138: s = "??? expected"; break;

+			case 139: s = "this symbol not expected in SubModuleDecl"; break;

+			case 140: s = "invalid SubModuleDecl"; break;

+			case 141: s = "this symbol not expected in ClassDecl"; break;

+			case 142: s = "this symbol not expected in DatatypeDecl"; break;

+			case 143: s = "invalid DatatypeDecl"; break;

+			case 144: s = "this symbol not expected in DatatypeDecl"; break;

+			case 145: s = "invalid NewtypeDecl"; break;

+			case 146: s = "invalid OtherTypeDecl"; break;

+			case 147: s = "this symbol not expected in OtherTypeDecl"; break;

+			case 148: s = "this symbol not expected in IteratorDecl"; break;

+			case 149: s = "invalid IteratorDecl"; break;

+			case 150: s = "this symbol not expected in TraitDecl"; break;

+			case 151: s = "invalid ClassMemberDecl"; break;

+			case 152: s = "this symbol not expected in FieldDecl"; break;

 			case 153: s = "invalid FunctionDecl"; break;

 			case 154: s = "invalid FunctionDecl"; break;

 			case 155: s = "invalid FunctionDecl"; break;

 			case 156: s = "invalid FunctionDecl"; break;

-			case 157: s = "this symbol not expected in MethodDecl"; break;

-			case 158: s = "invalid MethodDecl"; break;

+			case 157: s = "invalid FunctionDecl"; break;

+			case 158: s = "this symbol not expected in MethodDecl"; break;

 			case 159: s = "invalid MethodDecl"; break;

-			case 160: s = "invalid FIdentType"; break;

-			case 161: s = "this symbol not expected in OldSemi"; break;

-			case 162: s = "invalid TypeIdentOptional"; break;

-			case 163: s = "invalid TypeAndToken"; break;

-			case 164: s = "this symbol not expected in IteratorSpec"; break;

-			case 165: s = "invalid IteratorSpec"; break;

+			case 160: s = "invalid MethodDecl"; break;

+			case 161: s = "invalid FIdentType"; break;

+			case 162: s = "this symbol not expected in OldSemi"; break;

+			case 163: s = "invalid TypeIdentOptional"; break;

+			case 164: s = "invalid TypeAndToken"; break;

+			case 165: s = "this symbol not expected in IteratorSpec"; break;

 			case 166: s = "invalid IteratorSpec"; break;

-			case 167: s = "this symbol not expected in MethodSpec"; break;

-			case 168: s = "invalid MethodSpec"; break;

+			case 167: s = "invalid IteratorSpec"; break;

+			case 168: s = "this symbol not expected in MethodSpec"; break;

 			case 169: s = "invalid MethodSpec"; break;

-			case 170: s = "invalid FrameExpression"; break;

-			case 171: s = "this symbol not expected in FunctionSpec"; break;

-			case 172: s = "invalid FunctionSpec"; break;

-			case 173: s = "invalid PossiblyWildFrameExpression"; break;

-			case 174: s = "invalid PossiblyWildExpression"; break;

-			case 175: s = "this symbol not expected in OneStmt"; break;

-			case 176: s = "invalid OneStmt"; break;

-			case 177: s = "this symbol not expected in OneStmt"; break;

-			case 178: s = "invalid OneStmt"; break;

-			case 179: s = "invalid AssertStmt"; break;

-			case 180: s = "invalid AssumeStmt"; break;

-			case 181: s = "invalid UpdateStmt"; break;

+			case 170: s = "invalid MethodSpec"; break;

+			case 171: s = "invalid FrameExpression"; break;

+			case 172: s = "this symbol not expected in FunctionSpec"; break;

+			case 173: s = "invalid FunctionSpec"; break;

+			case 174: s = "invalid PossiblyWildFrameExpression"; break;

+			case 175: s = "invalid PossiblyWildExpression"; break;

+			case 176: s = "this symbol not expected in OneStmt"; break;

+			case 177: s = "invalid OneStmt"; break;

+			case 178: s = "this symbol not expected in OneStmt"; break;

+			case 179: s = "invalid OneStmt"; break;

+			case 180: s = "invalid AssertStmt"; break;

+			case 181: s = "invalid AssumeStmt"; break;

 			case 182: s = "invalid UpdateStmt"; break;

-			case 183: s = "this symbol not expected in VarDeclStatement"; break;

-			case 184: s = "invalid IfStmt"; break;

+			case 183: s = "invalid UpdateStmt"; break;

+			case 184: s = "this symbol not expected in VarDeclStatement"; break;

 			case 185: s = "invalid IfStmt"; break;

-			case 186: s = "invalid WhileStmt"; break;

+			case 186: s = "invalid IfStmt"; break;

 			case 187: s = "invalid WhileStmt"; break;

-			case 188: s = "invalid MatchStmt"; break;

-			case 189: s = "invalid ForallStmt"; break;

+			case 188: s = "invalid WhileStmt"; break;

+			case 189: s = "invalid MatchStmt"; break;

 			case 190: s = "invalid ForallStmt"; break;

-			case 191: s = "invalid CalcStmt"; break;

-			case 192: s = "invalid ModifyStmt"; break;

-			case 193: s = "this symbol not expected in ModifyStmt"; break;

-			case 194: s = "invalid ModifyStmt"; break;

-			case 195: s = "invalid ReturnStmt"; break;

-			case 196: s = "invalid Rhs"; break;

-			case 197: s = "invalid Lhs"; break;

-			case 198: s = "invalid Guard"; break;

-			case 199: s = "this symbol not expected in LoopSpec"; break;

+			case 191: s = "invalid ForallStmt"; break;

+			case 192: s = "invalid CalcStmt"; break;

+			case 193: s = "invalid ModifyStmt"; break;

+			case 194: s = "this symbol not expected in ModifyStmt"; break;

+			case 195: s = "invalid ModifyStmt"; break;

+			case 196: s = "invalid ReturnStmt"; break;

+			case 197: s = "invalid Rhs"; break;

+			case 198: s = "invalid Lhs"; break;

+			case 199: s = "invalid Guard"; break;

 			case 200: s = "this symbol not expected in LoopSpec"; break;

 			case 201: s = "this symbol not expected in LoopSpec"; break;

-			case 202: s = "invalid LoopSpec"; break;

-			case 203: s = "invalid CaseStatement"; break;

-			case 204: s = "this symbol not expected in CaseStatement"; break;

+			case 202: s = "this symbol not expected in LoopSpec"; break;

+			case 203: s = "invalid LoopSpec"; break;

+			case 204: s = "invalid CaseStatement"; break;

 			case 205: s = "this symbol not expected in CaseStatement"; break;

-			case 206: s = "invalid CasePattern"; break;

-			case 207: s = "invalid CalcOp"; break;

-			case 208: s = "invalid EquivOp"; break;

-			case 209: s = "invalid ImpliesOp"; break;

-			case 210: s = "invalid ExpliesOp"; break;

-			case 211: s = "invalid AndOp"; break;

-			case 212: s = "invalid OrOp"; break;

-			case 213: s = "invalid NegOp"; break;

-			case 214: s = "invalid Forall"; break;

-			case 215: s = "invalid Exists"; break;

-			case 216: s = "invalid QSep"; break;

-			case 217: s = "invalid ImpliesExpliesExpression"; break;

-			case 218: s = "invalid LogicalExpression"; break;

-			case 219: s = "invalid RelOp"; break;

-			case 220: s = "invalid AddOp"; break;

-			case 221: s = "invalid UnaryExpression"; break;

-			case 222: s = "invalid MulOp"; break;

-			case 223: s = "invalid Suffix"; break;

+			case 206: s = "this symbol not expected in CaseStatement"; break;

+			case 207: s = "invalid CasePattern"; break;

+			case 208: s = "invalid CalcOp"; break;

+			case 209: s = "invalid EquivOp"; break;

+			case 210: s = "invalid ImpliesOp"; break;

+			case 211: s = "invalid ExpliesOp"; break;

+			case 212: s = "invalid AndOp"; break;

+			case 213: s = "invalid OrOp"; break;

+			case 214: s = "invalid NegOp"; break;

+			case 215: s = "invalid Forall"; break;

+			case 216: s = "invalid Exists"; break;

+			case 217: s = "invalid QSep"; break;

+			case 218: s = "invalid ImpliesExpliesExpression"; break;

+			case 219: s = "invalid LogicalExpression"; break;

+			case 220: s = "invalid RelOp"; break;

+			case 221: s = "invalid AddOp"; break;

+			case 222: s = "invalid UnaryExpression"; break;

+			case 223: s = "invalid MulOp"; break;

 			case 224: s = "invalid Suffix"; break;

 			case 225: s = "invalid Suffix"; break;

 			case 226: s = "invalid Suffix"; break;

-			case 227: s = "invalid LambdaExpression"; break;

-			case 228: s = "invalid EndlessExpression"; break;

-			case 229: s = "invalid NameSegment"; break;

-			case 230: s = "invalid DisplayExpr"; break;

-			case 231: s = "invalid MultiSetExpr"; break;

-			case 232: s = "invalid ConstAtomExpression"; break;

-			case 233: s = "invalid Nat"; break;

-			case 234: s = "invalid LambdaArrow"; break;

-			case 235: s = "invalid MatchExpression"; break;

-			case 236: s = "invalid QuantifierGuts"; break;

-			case 237: s = "invalid StmtInExpr"; break;

-			case 238: s = "invalid LetExpr"; break;

-			case 239: s = "invalid CaseExpression"; break;

-			case 240: s = "invalid DotSuffix"; break;

+			case 227: s = "invalid Suffix"; break;

+			case 228: s = "invalid LambdaExpression"; break;

+			case 229: s = "invalid EndlessExpression"; break;

+			case 230: s = "invalid NameSegment"; break;

+			case 231: s = "invalid DisplayExpr"; break;

+			case 232: s = "invalid MultiSetExpr"; break;

+			case 233: s = "invalid ConstAtomExpression"; break;

+			case 234: s = "invalid Nat"; break;

+			case 235: s = "invalid LambdaArrow"; break;

+			case 236: s = "invalid MatchExpression"; break;

+			case 237: s = "invalid QuantifierGuts"; break;

+			case 238: s = "invalid StmtInExpr"; break;

+			case 239: s = "invalid LetExpr"; break;

+			case 240: s = "invalid CaseExpression"; break;

+			case 241: s = "invalid DotSuffix"; break;

 

 			default: s = "error " + n; break;

 		}

diff --git a/Source/Dafny/RefinementTransformer.cs b/Source/Dafny/RefinementTransformer.cs
index 05146b7d..2d32f78a 100644
--- a/Source/Dafny/RefinementTransformer.cs
+++ b/Source/Dafny/RefinementTransformer.cs
@@ -86,6 +86,15 @@ namespace Microsoft.Dafny
         if (Resolver.ResolvePath(m.RefinementBaseRoot, m.RefinementBaseName, out RefinedSig, reporter)) {

           if (RefinedSig.ModuleDef != null) {

             m.RefinementBase = RefinedSig.ModuleDef;

+            if (m.IsExclusiveRefinement) {

+              if (null == m.RefinementBase.ExclusiveRefinement) {

+                m.RefinementBase.ExclusiveRefinement = m;

+              } else {

+                this.reporter.Error(

+                    m.tok,

+                    "no more than one exclusive refinement may exist for a given module.");

+              }

+            }

             PreResolveWorker(m);

           } else {

             reporter.Error(m.RefinementBaseName[0], "module ({0}) named as refinement base is not a literal module or simple reference to a literal module", Util.Comma(".", m.RefinementBaseName, x => x.val));

diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs
index 29e36ccd..2d274ffe 100644
--- a/Source/Dafny/Resolver.cs
+++ b/Source/Dafny/Resolver.cs
@@ -305,6 +305,33 @@ namespace Microsoft.Dafny
 

       systemNameInfo = RegisterTopLevelDecls(prog.BuiltIns.SystemModule, false);

       prog.CompileModules.Add(prog.BuiltIns.SystemModule);

+

+      // first, we need to detect which top-level modules have exclusive refinement relationships.

+      foreach (ModuleDecl decl in sortedDecls) {

+        if (decl is LiteralModuleDecl) {

+          var literalDecl = (LiteralModuleDecl)decl;

+          var m = literalDecl.ModuleDef;

+          if (m.RefinementBaseRoot != null) {

+            if (m.IsExclusiveRefinement) {

+              foreach (var d in sortedDecls) {

+                // refinement dependencies won't be later in the sorted module list than the one we're looking at.

+                if (Object.ReferenceEquals(d, decl)) {

+                  break;

+                }

+                if (d is LiteralModuleDecl) {

+                  var ld = (LiteralModuleDecl)d;

+                  // currently, only exclusive refinements of top-level modules are supported.

+                  if (string.Equals(m.RefinementBaseName[0].val, m.RefinementBaseRoot.Name, StringComparison.InvariantCulture)

+                      && string.Equals(m.RefinementBaseName[0].val, ld.ModuleDef.Name, StringComparison.InvariantCulture)) {

+                    ld.ModuleDef.ExclusiveRefinementCount += 1;

+                  }

+                }

+              }

+            }

+          }

+        }

+      }

+

       foreach (var decl in sortedDecls) {

         if (decl is LiteralModuleDecl) {

           // The declaration is a literal module, so it has members and such that we need

@@ -360,20 +387,27 @@ namespace Microsoft.Dafny
           var abs = (ModuleFacadeDecl)decl;

           ModuleSignature p;

           if (ResolvePath(abs.Root, abs.Path, out p, this)) {

-            abs.Signature = MakeAbstractSignature(p, abs.FullCompileName, abs.Height, prog.Modules);

             abs.OriginalSignature = p;

-            ModuleSignature compileSig;

-            if (abs.CompilePath != null) {

-              if (ResolvePath(abs.CompileRoot, abs.CompilePath, out compileSig, this)) {

-                if (refinementTransformer.CheckIsRefinement(compileSig, p)) {

-                  abs.Signature.CompileSignature = compileSig;

-                } else {

-                  Error(abs.CompilePath[0],

-                  "module " + Util.Comma(".", abs.CompilePath, x => x.val) + " must be a refinement of " + Util.Comma(".", abs.Path, x => x.val));

+            // ModuleDefinition.ExclusiveRefinement may not be set at this point but ExclusiveRefinementCount will be.

+            if (0 == abs.Root.Signature.ModuleDef.ExclusiveRefinementCount) {

+              abs.Signature = MakeAbstractSignature(p, abs.FullCompileName, abs.Height, prog.Modules);

+              ModuleSignature compileSig;

+              if (abs.CompilePath != null) {

+                if (ResolvePath(abs.CompileRoot, abs.CompilePath, out compileSig, this)) {

+                  if (refinementTransformer.CheckIsRefinement(compileSig, p)) {

+                    abs.Signature.CompileSignature = compileSig;

+                  } else {

+                    Error(

+                      abs.CompilePath[0],

+                      "module " + Util.Comma(".", abs.CompilePath, x => x.val) + " must be a refinement of "

+                      + Util.Comma(".", abs.Path, x => x.val));

+                  }

+                  abs.Signature.IsGhost = compileSig.IsGhost;

+                  // always keep the ghost information, to supress a spurious error message when the compile module isn't actually a refinement

                 }

-                abs.Signature.IsGhost = compileSig.IsGhost;

-                // always keep the ghost information, to supress a spurious error message when the compile module isn't actually a refinement

               }

+            } else {

+              abs.Signature = p;

             }

           } else {

             abs.Signature = new ModuleSignature(); // there was an error, give it a valid but empty signature

@@ -1198,7 +1232,8 @@ namespace Microsoft.Dafny
     }

 

     private ModuleSignature MakeAbstractSignature(ModuleSignature p, string Name, int Height, List<ModuleDefinition> mods) {

-      var mod = new ModuleDefinition(Token.NoToken, Name + ".Abs", true, true, null, null, null, false);

+      var mod = new ModuleDefinition(Token.NoToken, Name + ".Abs", true, true, /*isExclusiveRefinement:*/ false, null, null, null, false);

+      mod.ClonedFrom = p.ModuleDef;

       mod.Height = Height;

       foreach (var kv in p.TopLevels) {

         mod.TopLevelDecls.Add(CloneDeclaration(kv.Value, mod, mods, Name));

@@ -1207,6 +1242,7 @@ namespace Microsoft.Dafny
       sig.Refines = p.Refines;

       sig.CompileSignature = p;

       sig.IsGhost = p.IsGhost;

+      sig.ExclusiveRefinement = p.ExclusiveRefinement;

       mods.Add(mod);

       ResolveModuleDefinition(mod, sig);

       return sig;

@@ -4200,8 +4236,15 @@ namespace Microsoft.Dafny
           } else if (r.Type is Resolver_IdentifierExpr.ResolverType_Type) {

             var d = r.Decl;

             if (d is OpaqueTypeDecl) {

-              t.ResolvedParam = ((OpaqueTypeDecl)d).TheType;  // resolve like a type parameter, and it may have type parameters if it's an opaque type              

-              t.ResolvedClass = d;  // Store the decl, so the compiler will generate the fully qualified name

+              var dd = (OpaqueTypeDecl)d;

+              if (dd.Module.ClonedFrom != null && dd.Module.ClonedFrom.ExclusiveRefinement != null) {

+                t.ResolvedParam = ((OpaqueTypeDecl)dd.ClonedFrom).TheType;

+                t.ResolvedClass = d;  // Store the decl, so the compiler will generate the fully qualified name

+              } else {

+                t.ResolvedParam = ((OpaqueTypeDecl)d).TheType;

+                // resolve like a type parameter, and it may have type parameters if it's an opaque type

+                t.ResolvedClass = d;  // Store the decl, so the compiler will generate the fully qualified name

+              }

             } else if (d is NewtypeDecl) {

               var dd = (NewtypeDecl)d;

               var caller = context as ICallable;

diff --git a/Source/Dafny/Scanner.cs b/Source/Dafny/Scanner.cs
index d0d2e4dd..325a2f2c 100644
--- a/Source/Dafny/Scanner.cs
+++ b/Source/Dafny/Scanner.cs
@@ -211,13 +211,13 @@ public class UTF8Buffer: Buffer {
 public class Scanner {

 	const char EOL = '\n';

 	const int eofSym = 0; /* pdt */

-	const int maxT = 137;

-	const int noSym = 137;

+	const int maxT = 138;

+	const int noSym = 138;

 

 

 	[ContractInvariantMethod]

 	void objectInvariant(){

-		Contract.Invariant(buffer!=null);

+		Contract.Invariant(this._buffer != null);

 		Contract.Invariant(t != null);

 		Contract.Invariant(start != null);

 		Contract.Invariant(tokens != null);

@@ -227,7 +227,18 @@ public class Scanner {
 		Contract.Invariant(errorHandler != null);

 	}

 

-	public Buffer/*!*/ buffer; // scanner buffer

+	private Buffer/*!*/ _buffer; // scanner buffer

+

+	public Buffer/*!*/ buffer {

+		get {

+			Contract.Ensures(Contract.Result<Buffer>() != null);

+			return this._buffer;

+		}

+		set {

+			Contract.Requires(value != null);

+			this._buffer = value;

+		}

+	}

 

 	Token/*!*/ t;          // current token

 	int ch;           // current input character

@@ -299,7 +310,7 @@ public class Scanner {
 	}

 

 //	[NotDelayed]

-	public Scanner (string/*!*/ fileName, Errors/*!*/ errorHandler) : base() {

+	public Scanner (string/*!*/ fileName, Errors/*!*/ errorHandler, bool useBaseName = false) : base() {

 	  Contract.Requires(fileName != null);

 	  Contract.Requires(errorHandler != null);

 		this.errorHandler = errorHandler;

@@ -307,8 +318,8 @@ public class Scanner {
 		t = new Token(); // dummy because t is a non-null field

 		try {

 			Stream stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);

-			buffer = new Buffer(stream, false);

-			Filename = fileName;

+			this._buffer = new Buffer(stream, false);

+			Filename = useBaseName? GetBaseName(fileName): fileName;

 			Init();

 		} catch (IOException) {

 			throw new FatalError("Cannot open file " + fileName);

@@ -316,18 +327,22 @@ public class Scanner {
 	}

 

 //	[NotDelayed]

-	public Scanner (Stream/*!*/ s, Errors/*!*/ errorHandler, string/*!*/ fileName) : base() {

+	public Scanner (Stream/*!*/ s, Errors/*!*/ errorHandler, string/*!*/ fileName, bool useBaseName = false) : base() {

 	  Contract.Requires(s != null);

 	  Contract.Requires(errorHandler != null);

 	  Contract.Requires(fileName != null);

 		pt = tokens = new Token();  // first token is a dummy

 		t = new Token(); // dummy because t is a non-null field

-		buffer = new Buffer(s, true);

+		this._buffer = new Buffer(s, true);

 		this.errorHandler = errorHandler;

-		this.Filename = fileName;

+		this.Filename = useBaseName? GetBaseName(fileName) : fileName;

 		Init();

 	}

 

+    string GetBaseName(string fileName) {

+        return System.IO.Path.GetFileName(fileName); // Return basename

+    }

+

 	void Init() {

 		pos = -1; line = 1; col = 0;

 		oldEols = 0;

@@ -522,53 +537,54 @@ public class Scanner {
 			case "include": t.kind = 59; break;

 			case "abstract": t.kind = 60; break;

 			case "module": t.kind = 61; break;

-			case "refines": t.kind = 62; break;

-			case "import": t.kind = 63; break;

-			case "opened": t.kind = 64; break;

-			case "as": t.kind = 66; break;

-			case "default": t.kind = 67; break;

-			case "class": t.kind = 68; break;

-			case "extends": t.kind = 69; break;

-			case "trait": t.kind = 70; break;

-			case "ghost": t.kind = 71; break;

-			case "static": t.kind = 72; break;

-			case "protected": t.kind = 73; break;

-			case "datatype": t.kind = 74; break;

-			case "codatatype": t.kind = 75; break;

-			case "var": t.kind = 76; break;

-			case "newtype": t.kind = 77; break;

-			case "type": t.kind = 78; break;

-			case "iterator": t.kind = 79; break;

-			case "yields": t.kind = 80; break;

-			case "returns": t.kind = 81; break;

-			case "method": t.kind = 82; break;

-			case "colemma": t.kind = 83; break;

-			case "comethod": t.kind = 84; break;

-			case "constructor": t.kind = 85; break;

-			case "free": t.kind = 86; break;

-			case "ensures": t.kind = 87; break;

-			case "yield": t.kind = 88; break;

-			case "label": t.kind = 90; break;

-			case "break": t.kind = 91; break;

-			case "where": t.kind = 92; break;

-			case "return": t.kind = 94; break;

-			case "new": t.kind = 96; break;

-			case "if": t.kind = 97; break;

-			case "while": t.kind = 98; break;

-			case "match": t.kind = 99; break;

-			case "assert": t.kind = 100; break;

-			case "print": t.kind = 101; break;

-			case "forall": t.kind = 102; break;

-			case "parallel": t.kind = 103; break;

-			case "modify": t.kind = 104; break;

-			case "exists": t.kind = 123; break;

-			case "in": t.kind = 125; break;

-			case "false": t.kind = 130; break;

-			case "true": t.kind = 131; break;

-			case "null": t.kind = 132; break;

-			case "this": t.kind = 133; break;

-			case "fresh": t.kind = 134; break;

-			case "old": t.kind = 135; break;

+			case "exclusively": t.kind = 62; break;

+			case "refines": t.kind = 63; break;

+			case "import": t.kind = 64; break;

+			case "opened": t.kind = 65; break;

+			case "as": t.kind = 67; break;

+			case "default": t.kind = 68; break;

+			case "class": t.kind = 69; break;

+			case "extends": t.kind = 70; break;

+			case "trait": t.kind = 71; break;

+			case "ghost": t.kind = 72; break;

+			case "static": t.kind = 73; break;

+			case "protected": t.kind = 74; break;

+			case "datatype": t.kind = 75; break;

+			case "codatatype": t.kind = 76; break;

+			case "var": t.kind = 77; break;

+			case "newtype": t.kind = 78; break;

+			case "type": t.kind = 79; break;

+			case "iterator": t.kind = 80; break;

+			case "yields": t.kind = 81; break;

+			case "returns": t.kind = 82; break;

+			case "method": t.kind = 83; break;

+			case "colemma": t.kind = 84; break;

+			case "comethod": t.kind = 85; break;

+			case "constructor": t.kind = 86; break;

+			case "free": t.kind = 87; break;

+			case "ensures": t.kind = 88; break;

+			case "yield": t.kind = 89; break;

+			case "label": t.kind = 91; break;

+			case "break": t.kind = 92; break;

+			case "where": t.kind = 93; break;

+			case "return": t.kind = 95; break;

+			case "new": t.kind = 97; break;

+			case "if": t.kind = 98; break;

+			case "while": t.kind = 99; break;

+			case "match": t.kind = 100; break;

+			case "assert": t.kind = 101; break;

+			case "print": t.kind = 102; break;

+			case "forall": t.kind = 103; break;

+			case "parallel": t.kind = 104; break;

+			case "modify": t.kind = 105; break;

+			case "exists": t.kind = 124; break;

+			case "in": t.kind = 126; break;

+			case "false": t.kind = 131; break;

+			case "true": t.kind = 132; break;

+			case "null": t.kind = 133; break;

+			case "this": t.kind = 134; break;

+			case "fresh": t.kind = 135; break;

+			case "old": t.kind = 136; break;

 			default: break;

 		}

 	}

@@ -829,52 +845,52 @@ public class Scanner {
 				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 65;}

 				else {t.kind = 5; break;}

 			case 66:

-				{t.kind = 89; break;}

+				{t.kind = 90; break;}

 			case 67:

-				{t.kind = 93; break;}

+				{t.kind = 94; break;}

 			case 68:

-				{t.kind = 95; break;}

+				{t.kind = 96; break;}

 			case 69:

-				{t.kind = 105; break;}

+				{t.kind = 106; break;}

 			case 70:

-				{t.kind = 107; break;}

-			case 71:

 				{t.kind = 108; break;}

-			case 72:

+			case 71:

 				{t.kind = 109; break;}

-			case 73:

+			case 72:

 				{t.kind = 110; break;}

-			case 74:

+			case 73:

 				{t.kind = 111; break;}

-			case 75:

+			case 74:

 				{t.kind = 112; break;}

-			case 76:

+			case 75:

 				{t.kind = 113; break;}

+			case 76:

+				{t.kind = 114; break;}

 			case 77:

-				{t.kind = 115; break;}

+				{t.kind = 116; break;}

 			case 78:

 				if (ch == '&') {AddCh(); goto case 79;}

 				else {goto case 0;}

 			case 79:

-				{t.kind = 116; break;}

-			case 80:

 				{t.kind = 117; break;}

-			case 81:

+			case 80:

 				{t.kind = 118; break;}

-			case 82:

+			case 81:

 				{t.kind = 119; break;}

+			case 82:

+				{t.kind = 120; break;}

 			case 83:

-				{t.kind = 121; break;}

-			case 84:

 				{t.kind = 122; break;}

+			case 84:

+				{t.kind = 123; break;}

 			case 85:

-				{t.kind = 124; break;}

+				{t.kind = 125; break;}

 			case 86:

-				{t.kind = 126; break;}

+				{t.kind = 127; break;}

 			case 87:

-				{t.kind = 128; break;}

-			case 88:

 				{t.kind = 129; break;}

+			case 88:

+				{t.kind = 130; break;}

 			case 89:

 				recEnd = pos; recKind = 21;

 				if (ch == ':') {AddCh(); goto case 30;}

@@ -890,14 +906,14 @@ public class Scanner {
 				if (ch == '.') {AddCh(); goto case 97;}

 				else {t.kind = 26; break;}

 			case 92:

-				recEnd = pos; recKind = 65;

+				recEnd = pos; recKind = 66;

 				if (ch == '>') {AddCh(); goto case 33;}

 				else if (ch == '=') {AddCh(); goto case 98;}

-				else {t.kind = 65; break;}

+				else {t.kind = 66; break;}

 			case 93:

-				recEnd = pos; recKind = 127;

+				recEnd = pos; recKind = 128;

 				if (ch == '>') {AddCh(); goto case 34;}

-				else {t.kind = 127; break;}

+				else {t.kind = 128; break;}

 			case 94:

 				recEnd = pos; recKind = 51;

 				if (ch == '=') {AddCh(); goto case 99;}

@@ -907,26 +923,26 @@ public class Scanner {
 				if (ch == '=') {AddCh(); goto case 70;}

 				else {t.kind = 52; break;}

 			case 96:

-				recEnd = pos; recKind = 120;

+				recEnd = pos; recKind = 121;

 				if (ch == '=') {AddCh(); goto case 41;}

 				else if (ch == 'i') {AddCh(); goto case 44;}

-				else {t.kind = 120; break;}

+				else {t.kind = 121; break;}

 			case 97:

-				recEnd = pos; recKind = 136;

+				recEnd = pos; recKind = 137;

 				if (ch == '.') {AddCh(); goto case 47;}

-				else {t.kind = 136; break;}

+				else {t.kind = 137; break;}

 			case 98:

 				recEnd = pos; recKind = 53;

 				if (ch == '>') {AddCh(); goto case 75;}

 				else {t.kind = 53; break;}

 			case 99:

-				recEnd = pos; recKind = 106;

+				recEnd = pos; recKind = 107;

 				if (ch == '=') {AddCh(); goto case 100;}

-				else {t.kind = 106; break;}

+				else {t.kind = 107; break;}

 			case 100:

-				recEnd = pos; recKind = 114;

+				recEnd = pos; recKind = 115;

 				if (ch == '>') {AddCh(); goto case 73;}

-				else {t.kind = 114; break;}

+				else {t.kind = 115; break;}

 

 		}

 		t.val = new String(tval, 0, tlen);

diff --git a/Source/Dafny/Translator.cs b/Source/Dafny/Translator.cs
index c834d23e..cefce6b6 100644
--- a/Source/Dafny/Translator.cs
+++ b/Source/Dafny/Translator.cs
@@ -6250,9 +6250,7 @@ namespace Microsoft.Dafny {
           } else {

             bool splitHappened;  // we actually don't care

             foreach (var s in TrSplitExpr(p.E, etran, kind == MethodTranslationKind.InterModuleCall ? 0 : int.MaxValue, true /* kind == MethodTranslationKind.Implementation */, out splitHappened)) {

-              if ((kind == MethodTranslationKind.IntraModuleCall || kind == MethodTranslationKind.CoCall) && RefinementToken.IsInherited(s.E.tok, currentModule)) {

-                // this precondition was inherited into this module, so just ignore it

-              } else if (s.IsOnlyChecked && bodyKind) {

+              if (s.IsOnlyChecked && bodyKind) {

                 // don't include in split

               } else if (s.IsOnlyFree && !bodyKind) {

                 // don't include in split -- it would be ignored, anyhow