summaryrefslogtreecommitdiff
path: root/Source/Dafny
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Dafny')
-rw-r--r--Source/Dafny/Cloner.cs5
-rw-r--r--Source/Dafny/Dafny.atg47
-rw-r--r--Source/Dafny/DafnyAst.cs36
-rw-r--r--Source/Dafny/Parser.cs1069
-rw-r--r--Source/Dafny/Resolver.cs106
-rw-r--r--Source/Dafny/Scanner.cs175
6 files changed, 846 insertions, 592 deletions
diff --git a/Source/Dafny/Cloner.cs b/Source/Dafny/Cloner.cs
index 6b3b0caa..8971d2c1 100644
--- a/Source/Dafny/Cloner.cs
+++ b/Source/Dafny/Cloner.cs
@@ -126,6 +126,11 @@ namespace Microsoft.Dafny
abs.Signature = a.Signature;
abs.OriginalSignature = a.OriginalSignature;
return abs;
+ } else if (d is ModuleExportDecl) {
+ var a = (ModuleExportDecl)d;
+ var export = new ModuleExportDecl(a.tok, m, a.IsDefault, a.Exports, a.Extends);
+ export.Signature = a.Signature;
+ return export;
} else {
Contract.Assert(false); // unexpected declaration
return null; // to please compiler
diff --git a/Source/Dafny/Dafny.atg b/Source/Dafny/Dafny.atg
index eb0c3303..e3696c5b 100644
--- a/Source/Dafny/Dafny.atg
+++ b/Source/Dafny/Dafny.atg
@@ -502,6 +502,13 @@ bool IsType(ref IToken pt) {
}
}
+
+bool IsDefaultImport() {
+ scanner.ResetPeek();
+ Token x = scanner.Peek(); // lookahead token again
+ return la.val == "default" && x.val != "export";
+}
+
/*--------------------------------------------------------------------------*/
CHARACTERS
letter = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".
@@ -708,7 +715,7 @@ SubModuleDecl<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl sub
| "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; .)
- { TopDecl<module, namedModuleDefaultClassMembers, /* isTopLevel */ false, isAbstract> }
+ { TopDecl<module, namedModuleDefaultClassMembers, /* isTopLevel */ false, isAbstract>}
"}" (. module.BodyEndTok = t;
module.TopLevelDecls.Add(new DefaultClassDecl(module, namedModuleDefaultClassMembers));
submodule = new LiteralModuleDecl(module, parent); .)
@@ -718,8 +725,16 @@ SubModuleDecl<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl sub
(. EncodeExternAsAttribute(dmod, ref attrs, id, /* needAxiom */ false); .)
[ "=" QualifiedModuleName<out idPath>
(. submodule = new AliasModuleDecl(idPath, id, parent, opened); .)
- | "as" QualifiedModuleName<out idPath> ["default" QualifiedModuleName<out idAssignment> ]
+ | "as" QualifiedModuleName<out idPath> [IF(IsDefaultImport()) "default" QualifiedModuleName<out idAssignment> ]
+ (. submodule = new ModuleFacadeDecl(idPath, id, parent, idAssignment, opened);
+ //errors.Warning(t, "\"import A as B\" has been deprecated; in the new syntax, it is \"import A:B\"");
+ .)
+ | ":" QualifiedModuleName<out idPath>
(. submodule = new ModuleFacadeDecl(idPath, id, parent, idAssignment, opened); .)
+ | "." QualifiedModuleName<out idPath>
+ (. idPath.Insert(0, id);
+ submodule = new AliasModuleDecl(idPath, id, parent, opened);
+ .)
]
[ SYNC ";"
// This semi-colon used to be required, but it seems silly to have it.
@@ -733,6 +748,33 @@ SubModuleDecl<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl sub
submodule = new AliasModuleDecl(idPath, id, parent, opened);
}
.)
+ | (.
+ bool isDefault = false;
+ bool includeBody;
+ IToken exportId;
+ List<ExportSignature> exports = new List<ExportSignature>();;
+ List<string> extends = new List<string>();
+ .)
+ ["default" (. isDefault = true; .) ]
+ "export"
+ NoUSIdent<out exportId>
+ ["extends"
+ NoUSIdent<out id>(. extends.Add(id.val); .)
+ {"," NoUSIdent<out id> (. extends.Add(id.val); .) }
+ ]
+ "{"
+ NoUSIdent<out id> (. includeBody = false; .)
+ ['+' (. includeBody = true; .)]
+ (. exports.Add(new ExportSignature(id, includeBody)); .)
+ { ","
+ NoUSIdent<out id> (. includeBody = false; .)
+ ['+' (. includeBody = true; .)]
+ (. exports.Add(new ExportSignature(id, includeBody)); .)
+ }
+ "}"
+ (.
+ submodule = new ModuleExportDecl(exportId, parent, isDefault, exports, extends);
+ .)
)
.
@@ -744,6 +786,7 @@ QualifiedModuleName<.out List<IToken> ids.>
}
.
+
ClassDecl<DeclModifierData dmodClass, ModuleDefinition/*!*/ module, out ClassDecl/*!*/ c>
= (. Contract.Requires(module != null);
Contract.Ensures(Contract.ValueAtReturn(out c) != null);
diff --git a/Source/Dafny/DafnyAst.cs b/Source/Dafny/DafnyAst.cs
index a51e30de..33186a76 100644
--- a/Source/Dafny/DafnyAst.cs
+++ b/Source/Dafny/DafnyAst.cs
@@ -1662,6 +1662,8 @@ namespace Microsoft.Dafny {
public class LiteralModuleDecl : ModuleDecl
{
public readonly ModuleDefinition ModuleDef;
+ public ModuleSignature DefaultExport; // the default export of the module. fill in by the resolver.
+
public LiteralModuleDecl(ModuleDefinition module, ModuleDefinition parent)
: base(module.tok, module.Name, parent, false) {
ModuleDef = module;
@@ -1680,6 +1682,7 @@ namespace Microsoft.Dafny {
}
public override object Dereference() { return Signature.ModuleDef; }
}
+
// Represents "module name as path [ = compilePath];", where name is a identifier and path is a possibly qualified name.
public class ModuleFacadeDecl : ModuleDecl
{
@@ -1698,6 +1701,39 @@ namespace Microsoft.Dafny {
public override object Dereference() { return this; }
}
+ // Represents the exports of a module.
+ public class ModuleExportDecl : ModuleDecl
+ {
+ public bool IsDefault;
+ public List<ExportSignature> Exports; // list of TopLevelDecl that are included in the export
+ public List<string> Extends; // list of exports that are extended
+ public readonly List<ModuleExportDecl> ExtendDecls = new List<ModuleExportDecl>(); // fill in by the resolver
+
+ public ModuleExportDecl(IToken tok, ModuleDefinition parent, bool isDefault,
+ List<ExportSignature> exports, List<string> extends)
+ : base(tok, tok.val, parent, false) {
+ IsDefault = isDefault;
+ Exports = exports;
+ Extends = extends;
+ }
+
+ public override object Dereference() { return this; }
+ }
+
+ public class ExportSignature
+ {
+ public bool IncludeBody;
+ public IToken Id;
+ public string Name;
+ public Declaration Decl; // fill in by the resolver
+
+ public ExportSignature(IToken id, bool includeBody) {
+ Id = id;
+ Name = id.val;
+ IncludeBody = includeBody;
+ }
+ }
+
public class ModuleSignature {
private ModuleDefinition exclusiveRefinement = null;
public readonly Dictionary<string, TopLevelDecl> TopLevels = new Dictionary<string, TopLevelDecl>();
diff --git a/Source/Dafny/Parser.cs b/Source/Dafny/Parser.cs
index 943e2cf6..c7955dc8 100644
--- a/Source/Dafny/Parser.cs
+++ b/Source/Dafny/Parser.cs
@@ -73,7 +73,7 @@ public class Parser {
public const int _star = 57;
public const int _notIn = 58;
public const int _ellipsis = 59;
- public const int maxT = 139;
+ public const int maxT = 140;
const bool _T = true;
const bool _x = false;
@@ -574,6 +574,13 @@ bool IsType(ref IToken pt) {
}
}
+
+bool IsDefaultImport() {
+ scanner.ResetPeek();
+ Token x = scanner.Peek(); // lookahead token again
+ return la.val == "default" && x.val != "export";
+}
+
/*--------------------------------------------------------------------------*/
@@ -697,47 +704,47 @@ bool IsType(ref IToken pt) {
DeclModifier(ref dmod);
}
switch (la.kind) {
- case 66: case 69: {
+ case 66: case 69: case 73: case 74: {
SubModuleDecl(dmod, module, out submodule);
module.TopLevelDecls.Add(submodule);
break;
}
- case 74: {
+ case 77: {
ClassDecl(dmod, module, out c);
module.TopLevelDecls.Add(c);
break;
}
- case 77: case 78: {
+ case 79: case 80: {
DatatypeDecl(dmod, module, out dt);
module.TopLevelDecls.Add(dt);
break;
}
- case 80: {
+ case 82: {
NewtypeDecl(dmod, module, out td);
module.TopLevelDecls.Add(td);
break;
}
- case 81: {
+ case 83: {
OtherTypeDecl(dmod, module, out td);
module.TopLevelDecls.Add(td);
break;
}
- case 82: {
+ case 84: {
IteratorDecl(dmod, module, out iter);
module.TopLevelDecls.Add(iter);
break;
}
- case 76: {
+ case 78: {
TraitDecl(dmod, module, out trait);
module.TopLevelDecls.Add(trait);
break;
}
- case 38: case 39: case 40: case 41: case 42: case 79: case 85: case 86: case 87: case 88: {
+ case 38: case 39: case 40: case 41: case 42: case 81: case 87: case 88: case 89: case 90: {
ClassMemberDecl(dmod, membersDefaultClass, false, !DafnyOptions.O.AllowGlobals,
!isTopLevel && DafnyOptions.O.IronDafny && isAbstract);
break;
}
- default: SynErr(140); break;
+ default: SynErr(141); break;
}
}
@@ -764,7 +771,7 @@ bool IsType(ref IToken pt) {
dmod.ExternName = new StringLiteralExpr(t, s, isVerbatimString);
}
- } else SynErr(141);
+ } else SynErr(142);
}
void SubModuleDecl(DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl submodule) {
@@ -815,23 +822,35 @@ bool IsType(ref IToken pt) {
}
NoUSIdent(out id);
EncodeExternAsAttribute(dmod, ref attrs, id, /* needAxiom */ false);
- if (la.kind == 71 || la.kind == 72) {
+ if (StartOf(3)) {
if (la.kind == 71) {
Get();
QualifiedModuleName(out idPath);
submodule = new AliasModuleDecl(idPath, id, parent, opened);
- } else {
+ } else if (la.kind == 72) {
Get();
QualifiedModuleName(out idPath);
- if (la.kind == 73) {
- Get();
+ if (IsDefaultImport()) {
+ Expect(73);
QualifiedModuleName(out idAssignment);
}
submodule = new ModuleFacadeDecl(idPath, id, parent, idAssignment, opened);
+ //errors.Warning(t, "\"import A as B\" has been deprecated; in the new syntax, it is \"import A:B\"");
+
+ } else if (la.kind == 21) {
+ Get();
+ QualifiedModuleName(out idPath);
+ submodule = new ModuleFacadeDecl(idPath, id, parent, idAssignment, opened);
+ } else {
+ Get();
+ QualifiedModuleName(out idPath);
+ idPath.Insert(0, id);
+ submodule = new AliasModuleDecl(idPath, id, parent, opened);
+
}
}
if (la.kind == 28) {
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(142); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(143); 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");
}
@@ -841,7 +860,51 @@ bool IsType(ref IToken pt) {
submodule = new AliasModuleDecl(idPath, id, parent, opened);
}
- } else SynErr(143);
+ } else if (la.kind == 73 || la.kind == 74) {
+ bool isDefault = false;
+ bool includeBody;
+ IToken exportId;
+ List<ExportSignature> exports = new List<ExportSignature>();;
+ List<string> extends = new List<string>();
+
+ if (la.kind == 73) {
+ Get();
+ isDefault = true;
+ }
+ Expect(74);
+ NoUSIdent(out exportId);
+ if (la.kind == 75) {
+ Get();
+ NoUSIdent(out id);
+ extends.Add(id.val);
+ while (la.kind == 22) {
+ Get();
+ NoUSIdent(out id);
+ extends.Add(id.val);
+ }
+ }
+ Expect(46);
+ NoUSIdent(out id);
+ includeBody = false;
+ if (la.kind == 76) {
+ Get();
+ includeBody = true;
+ }
+ exports.Add(new ExportSignature(id, includeBody));
+ while (la.kind == 22) {
+ Get();
+ NoUSIdent(out id);
+ includeBody = false;
+ if (la.kind == 76) {
+ Get();
+ includeBody = true;
+ }
+ exports.Add(new ExportSignature(id, includeBody));
+ }
+ Expect(47);
+ submodule = new ModuleExportDecl(exportId, parent, isDefault, exports, extends);
+
+ } else SynErr(144);
}
void ClassDecl(DeclModifierData dmodClass, ModuleDefinition/*!*/ module, out ClassDecl/*!*/ c) {
@@ -857,8 +920,8 @@ bool IsType(ref IToken pt) {
CheckDeclModifiers(dmodClass, "Classes", AllowedDeclModifiers.Extern);
DeclModifierData dmod;
- while (!(la.kind == 0 || la.kind == 74)) {SynErr(144); Get();}
- Expect(74);
+ while (!(la.kind == 0 || la.kind == 77)) {SynErr(145); Get();}
+ Expect(77);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -879,7 +942,7 @@ bool IsType(ref IToken pt) {
}
Expect(46);
bodyStart = t;
- while (StartOf(3)) {
+ while (StartOf(4)) {
dmod = new DeclModifierData();
while (StartOf(2)) {
DeclModifier(ref dmod);
@@ -904,13 +967,13 @@ bool IsType(ref IToken pt) {
bool co = false;
CheckDeclModifiers(dmod, "Datatypes or codatatypes", AllowedDeclModifiers.None);
- while (!(la.kind == 0 || la.kind == 77 || la.kind == 78)) {SynErr(145); Get();}
- if (la.kind == 77) {
+ while (!(la.kind == 0 || la.kind == 79 || la.kind == 80)) {SynErr(146); Get();}
+ if (la.kind == 79) {
Get();
- } else if (la.kind == 78) {
+ } else if (la.kind == 80) {
Get();
co = true;
- } else SynErr(146);
+ } else SynErr(147);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -926,7 +989,7 @@ bool IsType(ref IToken pt) {
DatatypeMemberDecl(ctors);
}
if (la.kind == 28) {
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(147); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(148); 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");
}
@@ -948,7 +1011,7 @@ bool IsType(ref IToken pt) {
Expression wh;
CheckDeclModifiers(dmod, "Newtypes", AllowedDeclModifiers.None);
- Expect(80);
+ Expect(82);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -964,10 +1027,10 @@ bool IsType(ref IToken pt) {
Expect(23);
Expression(out wh, false, true);
td = new NewtypeDecl(theVerifyThisFile ? id : new IncludeToken(id), id.val, module, new BoundVar(bvId, bvId.val, baseType), wh, attrs);
- } else if (StartOf(4)) {
+ } else if (StartOf(5)) {
Type(out baseType);
td = new NewtypeDecl(theVerifyThisFile ? id : new IncludeToken(id), id.val, module, baseType, attrs);
- } else SynErr(148);
+ } else SynErr(149);
}
void OtherTypeDecl(DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl td) {
@@ -979,7 +1042,7 @@ bool IsType(ref IToken pt) {
Type ty;
CheckDeclModifiers(dmod, "Type aliases", AllowedDeclModifiers.None);
- Expect(81);
+ Expect(83);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -992,7 +1055,7 @@ bool IsType(ref IToken pt) {
if (la.kind == 52) {
GenericParameters(typeArgs);
}
- } else if (StartOf(5)) {
+ } else if (StartOf(6)) {
if (la.kind == 52) {
GenericParameters(typeArgs);
}
@@ -1001,13 +1064,13 @@ bool IsType(ref IToken pt) {
Type(out ty);
td = new TypeSynonymDecl(id, id.val, typeArgs, module, ty, attrs);
}
- } else SynErr(149);
+ } else SynErr(150);
if (td == null) {
td = new OpaqueTypeDecl(id, id.val, module, eqSupport, typeArgs, attrs);
}
if (la.kind == 28) {
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(150); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(151); 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");
}
@@ -1037,8 +1100,8 @@ bool IsType(ref IToken pt) {
IToken bodyEnd = Token.NoToken;
CheckDeclModifiers(dmod, "Iterators", AllowedDeclModifiers.None);
- while (!(la.kind == 0 || la.kind == 82)) {SynErr(151); Get();}
- Expect(82);
+ while (!(la.kind == 0 || la.kind == 84)) {SynErr(152); Get();}
+ Expect(84);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -1048,8 +1111,8 @@ bool IsType(ref IToken pt) {
GenericParameters(typeArgs);
}
Formals(true, true, ins);
- if (la.kind == 83 || la.kind == 84) {
- if (la.kind == 83) {
+ if (la.kind == 85 || la.kind == 86) {
+ if (la.kind == 85) {
Get();
} else {
Get();
@@ -1060,8 +1123,8 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(152);
- while (StartOf(6)) {
+ } else SynErr(153);
+ while (StartOf(7)) {
IteratorSpec(reads, mod, decreases, req, ens, yieldReq, yieldEns, ref readsAttrs, ref modAttrs, ref decrAttrs);
}
if (la.kind == 46) {
@@ -1080,8 +1143,8 @@ bool IsType(ref IToken pt) {
void TraitDecl(DeclModifierData dmodIn, ModuleDefinition/*!*/ module, out TraitDecl/*!*/ trait) {
Contract.Requires(module != null);
- CheckDeclModifiers(dmodIn, "Traits", AllowedDeclModifiers.None);
Contract.Ensures(Contract.ValueAtReturn(out trait) != null);
+ CheckDeclModifiers(dmodIn, "Traits", AllowedDeclModifiers.None);
IToken/*!*/ id;
Attributes attrs = null;
List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>(); //traits should not support type parameters at the moment
@@ -1089,8 +1152,8 @@ bool IsType(ref IToken pt) {
IToken bodyStart;
DeclModifierData dmod;
- while (!(la.kind == 0 || la.kind == 76)) {SynErr(153); Get();}
- Expect(76);
+ while (!(la.kind == 0 || la.kind == 78)) {SynErr(154); Get();}
+ Expect(78);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -1100,7 +1163,7 @@ bool IsType(ref IToken pt) {
}
Expect(46);
bodyStart = t;
- while (StartOf(3)) {
+ while (StartOf(4)) {
dmod = new DeclModifierData();
while (StartOf(2)) {
DeclModifier(ref dmod);
@@ -1119,7 +1182,7 @@ bool IsType(ref IToken pt) {
Method/*!*/ m;
Function/*!*/ f;
- if (la.kind == 79) {
+ if (la.kind == 81) {
if (moduleLevelDecl) {
SemErr(la, "fields are not allowed to be declared at the module level; instead, wrap the field in a 'class' declaration");
dmod.IsStatic = false;
@@ -1134,7 +1197,7 @@ bool IsType(ref IToken pt) {
FunctionDecl(dmod, isWithinAbstractModule, out f);
mm.Add(f);
- } else if (StartOf(7)) {
+ } else if (StartOf(8)) {
if (moduleLevelDecl && dmod.StaticToken != null) {
errors.Warning(dmod.StaticToken, "module-level methods are always non-instance, so the 'static' keyword is not allowed here");
dmod.IsStatic = false;
@@ -1142,7 +1205,7 @@ bool IsType(ref IToken pt) {
MethodDecl(dmod, allowConstructors, isWithinAbstractModule, out m);
mm.Add(m);
- } else SynErr(154);
+ } else SynErr(155);
}
void Attribute(ref Attributes attrs) {
@@ -1153,7 +1216,7 @@ bool IsType(ref IToken pt) {
Expect(21);
NoUSIdent(out x);
name = x.val;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(args);
}
Expect(47);
@@ -1228,8 +1291,8 @@ bool IsType(ref IToken pt) {
IToken/*!*/ id; Type/*!*/ ty;
CheckDeclModifiers(dmod, "Fields", AllowedDeclModifiers.Ghost);
- while (!(la.kind == 0 || la.kind == 79)) {SynErr(155); Get();}
- Expect(79);
+ while (!(la.kind == 0 || la.kind == 81)) {SynErr(156); Get();}
+ Expect(81);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -1264,7 +1327,7 @@ bool IsType(ref IToken pt) {
if (la.kind == 38) {
Get();
- if (la.kind == 85) {
+ if (la.kind == 87) {
Get();
isFunctionMethod = true;
}
@@ -1290,11 +1353,11 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(156);
+ } else SynErr(157);
} else if (la.kind == 39) {
Get();
isPredicate = true;
- if (la.kind == 85) {
+ if (la.kind == 87) {
Get();
isFunctionMethod = true;
}
@@ -1310,7 +1373,7 @@ bool IsType(ref IToken pt) {
Attribute(ref attrs);
}
NoUSIdent(out id);
- if (StartOf(9)) {
+ if (StartOf(10)) {
if (la.kind == 52) {
GenericParameters(typeArgs);
}
@@ -1327,7 +1390,7 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(157);
+ } else SynErr(158);
} else if (la.kind == 40) {
Get();
Expect(39);
@@ -1351,7 +1414,7 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(158);
+ } else SynErr(159);
} else if (la.kind == 42) {
Get();
isCoPredicate = true;
@@ -1374,10 +1437,10 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(159);
- } else SynErr(160);
+ } else SynErr(160);
+ } else SynErr(161);
decreases = isIndPredicate || isCoPredicate ? null : new List<Expression/*!*/>();
- while (StartOf(10)) {
+ while (StartOf(11)) {
FunctionSpec(reqs, reads, ens, decreases);
}
if (la.kind == 46) {
@@ -1437,9 +1500,9 @@ bool IsType(ref IToken pt) {
AllowedDeclModifiers allowed = AllowedDeclModifiers.None;
string caption = "";
- while (!(StartOf(11))) {SynErr(161); Get();}
+ while (!(StartOf(12))) {SynErr(162); Get();}
switch (la.kind) {
- case 85: {
+ case 87: {
Get();
caption = "Methods";
allowed = AllowedDeclModifiers.Ghost | AllowedDeclModifiers.Static
@@ -1453,14 +1516,14 @@ bool IsType(ref IToken pt) {
| AllowedDeclModifiers.Protected;
break;
}
- case 86: {
+ case 88: {
Get();
isCoLemma = true; caption = "Colemmas";
allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static
| AllowedDeclModifiers.Protected;
break;
}
- case 87: {
+ case 89: {
Get();
isCoLemma = true; caption = "Comethods";
allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static
@@ -1476,7 +1539,7 @@ bool IsType(ref IToken pt) {
allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static;
break;
}
- case 88: {
+ case 90: {
Get();
if (allowConstructor) {
isConstructor = true;
@@ -1488,7 +1551,7 @@ bool IsType(ref IToken pt) {
break;
}
- default: SynErr(162); break;
+ default: SynErr(163); break;
}
keywordToken = t;
CheckDeclModifiers(dmod, caption, allowed);
@@ -1512,7 +1575,7 @@ bool IsType(ref IToken pt) {
GenericParameters(typeArgs);
}
Formals(true, !dmod.IsGhost, ins);
- if (la.kind == 84) {
+ if (la.kind == 86) {
Get();
if (isConstructor) { SemErr(t, "constructors cannot have out-parameters"); }
Formals(false, !dmod.IsGhost, outs);
@@ -1520,8 +1583,8 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 59) {
Get();
signatureEllipsis = t;
- } else SynErr(163);
- while (StartOf(12)) {
+ } else SynErr(164);
+ while (StartOf(13)) {
MethodSpec(req, mod, ens, dec, ref decAttrs, ref modAttrs);
}
if (la.kind == 46) {
@@ -1572,7 +1635,7 @@ bool IsType(ref IToken pt) {
void FormalsOptionalIds(List<Formal/*!*/>/*!*/ formals) {
Contract.Requires(cce.NonNullElements(formals)); IToken/*!*/ id; Type/*!*/ ty; string/*!*/ name; bool isGhost;
Expect(50);
- if (StartOf(13)) {
+ if (StartOf(14)) {
TypeIdentOptional(out id, out name, out ty, out isGhost);
formals.Add(new Formal(id, name, ty, true, isGhost));
while (la.kind == 22) {
@@ -1593,14 +1656,14 @@ bool IsType(ref IToken pt) {
} else if (la.kind == 2) {
Get();
id = t;
- } else SynErr(164);
+ } else SynErr(165);
Expect(21);
Type(out ty);
}
void OldSemi() {
if (la.kind == 28) {
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(165); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(166); Get();}
Get();
}
}
@@ -1679,7 +1742,7 @@ bool IsType(ref IToken pt) {
Get();
isGhost = true;
}
- if (StartOf(4)) {
+ if (StartOf(5)) {
TypeAndToken(out id, out ty);
if (la.kind == 21) {
Get();
@@ -1697,7 +1760,7 @@ bool IsType(ref IToken pt) {
id = t; name = id.val;
Expect(21);
Type(out ty);
- } else SynErr(166);
+ } else SynErr(167);
if (name != null) {
identName = name;
} else {
@@ -1848,7 +1911,7 @@ bool IsType(ref IToken pt) {
case 50: {
Get();
tok = t; tupleArgTypes = new List<Type>();
- if (StartOf(4)) {
+ if (StartOf(5)) {
Type(out ty);
tupleArgTypes.Add(ty);
while (la.kind == 22) {
@@ -1885,7 +1948,7 @@ bool IsType(ref IToken pt) {
ty = new UserDefinedType(e.tok, e);
break;
}
- default: SynErr(167); break;
+ default: SynErr(168); break;
}
if (la.kind == 30) {
Type t2;
@@ -1924,7 +1987,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(14))) {SynErr(168); Get();}
+ while (!(StartOf(15))) {SynErr(169); Get();}
if (la.kind == 44) {
Get();
while (IsAttribute()) {
@@ -1951,14 +2014,14 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
mod.Add(fe);
}
OldSemi();
- } else if (StartOf(15)) {
- if (la.kind == 89) {
+ } else if (StartOf(16)) {
+ if (la.kind == 91) {
Get();
isFree = true;
errors.Warning(t, "the 'free' keyword is soon to be deprecated");
}
- if (la.kind == 91) {
+ if (la.kind == 93) {
Get();
isYield = true;
}
@@ -1972,7 +2035,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
req.Add(new MaybeFreeExpression(e, isFree));
}
- } else if (la.kind == 90) {
+ } else if (la.kind == 92) {
Get();
while (IsAttribute()) {
Attribute(ref ensAttrs);
@@ -1985,7 +2048,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs));
}
- } else SynErr(169);
+ } else SynErr(170);
} else if (la.kind == 36) {
Get();
while (IsAttribute()) {
@@ -1993,7 +2056,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
}
DecreasesList(decreases, false, false);
OldSemi();
- } else SynErr(170);
+ } else SynErr(171);
}
void BlockStmt(out BlockStmt/*!*/ block, out IToken bodyStart, out IToken bodyEnd) {
@@ -2002,7 +2065,7 @@ ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs) {
Expect(46);
bodyStart = t;
- while (StartOf(16)) {
+ while (StartOf(17)) {
Stmt(body);
}
Expect(47);
@@ -2015,7 +2078,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(17))) {SynErr(171); Get();}
+ while (!(StartOf(18))) {SynErr(172); Get();}
if (la.kind == 43) {
Get();
while (IsAttribute()) {
@@ -2029,8 +2092,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
mod.Add(fe);
}
OldSemi();
- } else if (la.kind == 45 || la.kind == 89 || la.kind == 90) {
- if (la.kind == 89) {
+ } else if (la.kind == 45 || la.kind == 91 || la.kind == 92) {
+ if (la.kind == 91) {
Get();
isFree = true;
errors.Warning(t, "the 'free' keyword is soon to be deprecated");
@@ -2041,7 +2104,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 == 90) {
+ } else if (la.kind == 92) {
Get();
while (IsAttribute()) {
Attribute(ref ensAttrs);
@@ -2049,7 +2112,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(172);
+ } else SynErr(173);
} else if (la.kind == 36) {
Get();
while (IsAttribute()) {
@@ -2057,7 +2120,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
DecreasesList(decreases, true, false);
OldSemi();
- } else SynErr(173);
+ } else SynErr(174);
}
void FrameExpression(out FrameExpression fe, bool allowSemi, bool allowLambda) {
@@ -2067,21 +2130,21 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
string fieldName = null; IToken feTok = null;
fe = null;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out e, allowSemi, allowLambda);
feTok = e.tok;
- if (la.kind == 92) {
+ if (la.kind == 94) {
Get();
Ident(out id);
fieldName = id.val; feTok = id;
}
fe = new FrameExpression(feTok, e, fieldName);
- } else if (la.kind == 92) {
+ } else if (la.kind == 94) {
Get();
Ident(out id);
fieldName = id.val;
fe = new FrameExpression(id, new ImplicitThisExpr(id), fieldName);
- } else SynErr(174);
+ } else SynErr(175);
}
void DecreasesList(List<Expression> decreases, bool allowWildcard, bool allowLambda) {
@@ -2136,7 +2199,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(18))) {SynErr(175); Get();}
+ while (!(StartOf(19))) {SynErr(176); Get();}
if (la.kind == 45) {
Get();
Expression(out e, false, false);
@@ -2152,7 +2215,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
reads.Add(fe);
}
OldSemi();
- } else if (la.kind == 90) {
+ } else if (la.kind == 92) {
Get();
Expression(out e, false, false);
OldSemi();
@@ -2166,7 +2229,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
DecreasesList(decreases, false, false);
OldSemi();
- } else SynErr(176);
+ } else SynErr(177);
}
void FunctionBody(out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd) {
@@ -2183,9 +2246,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (la.kind == 57) {
Get();
fe = new FrameExpression(t, new WildcardExpr(t), null);
- } else if (StartOf(19)) {
+ } else if (StartOf(20)) {
FrameExpression(out fe, allowSemi, false);
- } else SynErr(177);
+ } else SynErr(178);
}
void PossiblyWildExpression(out Expression e, bool allowLambda) {
@@ -2194,9 +2257,9 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (la.kind == 57) {
Get();
e = new WildcardExpr(t);
- } else if (StartOf(8)) {
+ } else if (StartOf(9)) {
Expression(out e, false, allowLambda);
- } else SynErr(178);
+ } else SynErr(179);
}
void Stmt(List<Statement/*!*/>/*!*/ ss) {
@@ -2213,14 +2276,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
IToken bodyStart, bodyEnd;
int breakCount;
- while (!(StartOf(20))) {SynErr(179); Get();}
+ while (!(StartOf(21))) {SynErr(180); Get();}
switch (la.kind) {
case 46: {
BlockStmt(out bs, out bodyStart, out bodyEnd);
s = bs;
break;
}
- case 102: {
+ case 104: {
AssertStmt(out s);
break;
}
@@ -2228,31 +2291,31 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
AssumeStmt(out s);
break;
}
- case 103: {
+ case 105: {
PrintStmt(out s);
break;
}
- case 1: case 2: case 3: case 4: case 8: case 10: case 19: case 20: case 23: case 50: case 132: case 133: case 134: case 135: case 136: case 137: {
+ case 1: case 2: case 3: case 4: case 8: case 10: case 19: case 20: case 23: case 50: case 133: case 134: case 135: case 136: case 137: case 138: {
UpdateStmt(out s);
break;
}
- case 62: case 79: {
+ case 62: case 81: {
VarDeclStatement(out s);
break;
}
- case 99: {
+ case 101: {
IfStmt(out s);
break;
}
- case 100: {
+ case 102: {
WhileStmt(out s);
break;
}
- case 101: {
+ case 103: {
MatchStmt(out s);
break;
}
- case 104: case 105: {
+ case 106: case 107: {
ForallStmt(out s);
break;
}
@@ -2260,11 +2323,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
CalcStmt(out s);
break;
}
- case 106: {
+ case 108: {
ModifyStmt(out s);
break;
}
- case 93: {
+ case 95: {
Get();
x = t;
NoUSIdent(out id);
@@ -2273,24 +2336,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
s.Labels = new LList<Label>(new Label(x, id.val), s.Labels);
break;
}
- case 94: {
+ case 96: {
Get();
x = t; breakCount = 1; label = null;
if (la.kind == 1) {
NoUSIdent(out id);
label = id.val;
- } else if (la.kind == 28 || la.kind == 94) {
- while (la.kind == 94) {
+ } else if (la.kind == 28 || la.kind == 96) {
+ while (la.kind == 96) {
Get();
breakCount++;
}
- } else SynErr(180);
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(181); Get();}
+ } else SynErr(181);
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(182); Get();}
Expect(28);
s = label != null ? new BreakStmt(x, t, label) : new BreakStmt(x, t, breakCount);
break;
}
- case 91: case 97: {
+ case 93: case 99: {
ReturnStmt(out s);
break;
}
@@ -2298,7 +2361,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
SkeletonStmt(out s);
break;
}
- default: SynErr(182); break;
+ default: SynErr(183); break;
}
}
@@ -2307,17 +2370,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expression e = dummyExpr; Attributes attrs = null;
IToken dotdotdot = null;
- Expect(102);
+ Expect(104);
x = t;
while (IsAttribute()) {
Attribute(ref attrs);
}
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out e, false, true);
} else if (la.kind == 59) {
Get();
dotdotdot = t;
- } else SynErr(183);
+ } else SynErr(184);
Expect(28);
if (dotdotdot != null) {
s = new SkeletonStatement(new AssertStmt(x, t, new LiteralExpr(x, true), attrs), dotdotdot, null);
@@ -2337,12 +2400,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
while (IsAttribute()) {
Attribute(ref attrs);
}
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out e, false, true);
} else if (la.kind == 59) {
Get();
dotdotdot = t;
- } else SynErr(184);
+ } else SynErr(185);
Expect(28);
if (dotdotdot != null) {
s = new SkeletonStatement(new AssumeStmt(x, t, new LiteralExpr(x, true), attrs), dotdotdot, null);
@@ -2357,7 +2420,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
IToken x; Expression e;
var args = new List<Expression>();
- Expect(103);
+ Expect(105);
x = t;
Expression(out e, false, true);
args.Add(e);
@@ -2387,14 +2450,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
Expect(28);
endTok = t; rhss.Add(new ExprRhs(e, attrs));
- } else if (la.kind == 22 || la.kind == 25 || la.kind == 96) {
+ } else if (la.kind == 22 || la.kind == 25 || la.kind == 98) {
lhss.Add(e);
while (la.kind == 22) {
Get();
Lhs(out e);
lhss.Add(e);
}
- if (la.kind == 96) {
+ if (la.kind == 98) {
Get();
x = t;
Rhs(out r);
@@ -2412,13 +2475,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
suchThatAssume = t;
}
Expression(out suchThat, false, true);
- } else SynErr(185);
+ } else SynErr(186);
Expect(28);
endTok = t;
} else if (la.kind == 21) {
Get();
SemErr(t, "invalid statement (did you forget the 'label' keyword?)");
- } else SynErr(186);
+ } else SynErr(187);
if (suchThat != null) {
s = new AssignSuchThatStmt(x, endTok, lhss, suchThat, suchThatAssume, null);
} else {
@@ -2447,7 +2510,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Get();
isGhost = true; x = t;
}
- Expect(79);
+ Expect(81);
if (!isGhost) { x = t; }
if (la.kind == 1 || la.kind == 46) {
while (la.kind == 46) {
@@ -2463,8 +2526,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 == 25 || la.kind == 46 || la.kind == 96) {
- if (la.kind == 96) {
+ if (la.kind == 25 || la.kind == 46 || la.kind == 98) {
+ if (la.kind == 98) {
Get();
assignTok = t;
Rhs(out r);
@@ -2487,7 +2550,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expression(out suchThat, false, true);
}
}
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(187); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(188); Get();}
Expect(28);
endTok = t;
ConcreteUpdateStatement update;
@@ -2533,7 +2596,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (isGhost) { pat.Vars.Iter(bv => bv.IsGhost = true); }
letLHSs.Add(pat);
- if (la.kind == 96) {
+ if (la.kind == 98) {
Get();
} else if (la.kind == 25 || la.kind == 46) {
while (la.kind == 46) {
@@ -2541,12 +2604,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
Expect(25);
SemErr(pat.tok, "LHS of assign-such-that expression must be variables, not general patterns");
- } else SynErr(188);
+ } else SynErr(189);
Expression(out e, false, true);
letRHSs.Add(e);
Expect(28);
s = new LetStmt(e.tok, e.tok, letLHSs, letRHSs);
- } else SynErr(189);
+ } else SynErr(190);
}
void IfStmt(out Statement/*!*/ ifStmt) {
@@ -2560,16 +2623,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
List<GuardedAlternative> alternatives;
ifStmt = dummyStmt; // to please the compiler
- Expect(99);
+ Expect(101);
x = t;
if (IsAlternative()) {
AlternativeBlock(true, out alternatives, out endTok);
ifStmt = new AlternativeStmt(x, endTok, alternatives);
- } else if (StartOf(21)) {
+ } else if (StartOf(22)) {
if (IsExistentialGuard()) {
ExistentialGuard(out guard, true);
isExistentialGuard = true;
- } else if (StartOf(22)) {
+ } else if (StartOf(23)) {
Guard(out guard);
} else {
Get();
@@ -2579,13 +2642,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
endTok = thn.EndTok;
if (la.kind == 35) {
Get();
- if (la.kind == 99) {
+ if (la.kind == 101) {
IfStmt(out s);
els = s; endTok = s.EndTok;
} else if (la.kind == 46) {
BlockStmt(out bs, out bodyStart, out bodyEnd);
els = bs; endTok = bs.EndTok;
- } else SynErr(190);
+ } else SynErr(191);
}
if (guardEllipsis != null) {
ifStmt = new SkeletonStatement(new IfStmt(x, endTok, isExistentialGuard, guard, thn, els), guardEllipsis, null);
@@ -2593,7 +2656,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
ifStmt = new IfStmt(x, endTok, isExistentialGuard, guard, thn, els);
}
- } else SynErr(191);
+ } else SynErr(192);
}
void WhileStmt(out Statement stmt) {
@@ -2612,23 +2675,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
stmt = dummyStmt; // to please the compiler
bool isDirtyLoop = true;
- Expect(100);
+ Expect(102);
x = t;
if (IsLoopSpec() || IsAlternative()) {
- while (StartOf(23)) {
+ while (StartOf(24)) {
LoopSpec(invariants, decreases, ref mod, ref decAttrs, ref modAttrs);
}
AlternativeBlock(false, out alternatives, out endTok);
stmt = new AlternativeLoopStmt(x, endTok, invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), alternatives);
- } else if (StartOf(21)) {
- if (StartOf(22)) {
+ } else if (StartOf(22)) {
+ if (StartOf(23)) {
Guard(out guard);
Contract.Assume(guard == null || cce.Owner.None(guard));
} else {
Get();
guardEllipsis = t;
}
- while (StartOf(23)) {
+ while (StartOf(24)) {
LoopSpec(invariants, decreases, ref mod, ref decAttrs, ref modAttrs);
}
if (la.kind == _lbrace) {
@@ -2637,8 +2700,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == _ellipsis) {
Expect(59);
bodyEllipsis = t; endTok = t; isDirtyLoop = false;
- } else if (StartOf(24)) {
- } else SynErr(192);
+ } else if (StartOf(25)) {
+ } else SynErr(193);
if (guardEllipsis != null || bodyEllipsis != null) {
if (mod != null) {
SemErr(mod[0].E.tok, "'modifies' clauses are not allowed on refining loops");
@@ -2656,7 +2719,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(193);
+ } else SynErr(194);
}
void MatchStmt(out Statement/*!*/ s) {
@@ -2665,7 +2728,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>();
bool usesOptionalBrace = false;
- Expect(101);
+ Expect(103);
x = t;
Expression(out e, true, true);
if (la.kind == _lbrace) {
@@ -2676,12 +2739,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
cases.Add(c);
}
Expect(47);
- } else if (StartOf(24)) {
+ } else if (StartOf(25)) {
while (la.kind == _case) {
CaseStatement(out c);
cases.Add(c);
}
- } else SynErr(194);
+ } else SynErr(195);
s = new MatchStmt(x, t, e, cases, usesOptionalBrace);
}
@@ -2698,38 +2761,38 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
IToken bodyStart, bodyEnd;
IToken tok = Token.NoToken;
- if (la.kind == 104) {
+ if (la.kind == 106) {
Get();
x = t; tok = x;
- } else if (la.kind == 105) {
+ } else if (la.kind == 107) {
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(195);
+ } else SynErr(196);
if (la.kind == _openparen) {
Expect(50);
if (la.kind == 1) {
QuantifierDomain(out bvars, out attrs, out range);
}
Expect(51);
- } else if (StartOf(25)) {
+ } else if (StartOf(26)) {
if (la.kind == _ident) {
QuantifierDomain(out bvars, out attrs, out range);
}
- } else SynErr(196);
+ } else SynErr(197);
if (bvars == null) { bvars = new List<BoundVar>(); }
if (range == null) { range = new LiteralExpr(x, true); }
- while (la.kind == 89 || la.kind == 90) {
+ while (la.kind == 91 || la.kind == 92) {
isFree = false;
- if (la.kind == 89) {
+ if (la.kind == 91) {
Get();
isFree = true;
errors.Warning(t, "the 'free' keyword is soon to be deprecated");
}
- Expect(90);
+ Expect(92);
Expression(out e, false, true);
ens.Add(new MaybeFreeExpression(e, isFree));
OldSemi();
@@ -2768,7 +2831,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
while (IsAttribute()) {
Attribute(ref attrs);
}
- if (StartOf(26)) {
+ if (StartOf(27)) {
CalcOp(out opTok, out calcOp);
maybeOp = calcOp.ResultOp(calcOp); // guard against non-transitive calcOp (like !=)
if (maybeOp == null) {
@@ -2778,11 +2841,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
Expect(46);
- while (StartOf(8)) {
+ while (StartOf(9)) {
Expression(out e, false, true);
lines.Add(e); stepOp = calcOp; danglingOperator = null;
Expect(28);
- if (StartOf(26)) {
+ if (StartOf(27)) {
CalcOp(out opTok, out op);
maybeOp = resOp.ResultOp(op);
if (maybeOp == null) {
@@ -2807,7 +2870,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 32) {
CalcStmt(out subCalc);
hintEnd = subCalc.EndTok; subhints.Add(subCalc);
- } else SynErr(197);
+ } else SynErr(198);
}
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);
@@ -2833,12 +2896,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
BlockStmt body = null; IToken bodyStart;
IToken ellipsisToken = null;
- Expect(106);
+ Expect(108);
tok = t;
while (IsAttribute()) {
Attribute(ref attrs);
}
- if (StartOf(19)) {
+ if (StartOf(20)) {
FrameExpression(out fe, false, true);
mod.Add(fe);
while (la.kind == 22) {
@@ -2849,14 +2912,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 59) {
Get();
ellipsisToken = t;
- } else SynErr(198);
+ } else SynErr(199);
if (la.kind == 46) {
BlockStmt(out body, out bodyStart, out endTok);
} else if (la.kind == 28) {
- while (!(la.kind == 0 || la.kind == 28)) {SynErr(199); Get();}
+ while (!(la.kind == 0 || la.kind == 28)) {SynErr(200); Get();}
Get();
endTok = t;
- } else SynErr(200);
+ } else SynErr(201);
s = new ModifyStmt(tok, endTok, mod, attrs, body);
if (ellipsisToken != null) {
s = new SkeletonStatement(s, ellipsisToken, null);
@@ -2870,14 +2933,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
AssignmentRhs r;
bool isYield = false;
- if (la.kind == 97) {
+ if (la.kind == 99) {
Get();
returnTok = t;
- } else if (la.kind == 91) {
+ } else if (la.kind == 93) {
Get();
returnTok = t; isYield = true;
- } else SynErr(201);
- if (StartOf(27)) {
+ } else SynErr(202);
+ if (StartOf(28)) {
Rhs(out r);
rhss = new List<AssignmentRhs>(); rhss.Add(r);
while (la.kind == 22) {
@@ -2902,7 +2965,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expression e;
Expect(59);
dotdotdot = t;
- if (la.kind == 95) {
+ if (la.kind == 97) {
Get();
names = new List<IToken>(); exprs = new List<Expression>(); whereTok = t;
Ident(out tok);
@@ -2912,7 +2975,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Ident(out tok);
names.Add(tok);
}
- Expect(96);
+ Expect(98);
Expression(out e, false, true);
exprs.Add(e);
while (la.kind == 22) {
@@ -2939,7 +3002,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
r = dummyRhs; // to please compiler
Attributes attrs = null;
- if (la.kind == 98) {
+ if (la.kind == 100) {
Get();
newToken = t;
TypeAndToken(out x, out ty);
@@ -2954,7 +3017,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else {
x = null; args = new List<Expression/*!*/>();
Get();
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(args);
}
Expect(51);
@@ -2971,10 +3034,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 57) {
Get();
r = new HavocRhs(t);
- } else if (StartOf(8)) {
+ } else if (StartOf(9)) {
Expression(out e, false, true);
r = new ExprRhs(e);
- } else SynErr(202);
+ } else SynErr(203);
while (la.kind == 46) {
Attribute(ref attrs);
}
@@ -2989,13 +3052,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
while (la.kind == 27 || la.kind == 48 || la.kind == 50) {
Suffix(ref e);
}
- } else if (StartOf(28)) {
+ } else if (StartOf(29)) {
ConstAtomExpression(out e, false, false);
Suffix(ref e);
while (la.kind == 27 || la.kind == 48 || la.kind == 50) {
Suffix(ref e);
}
- } else SynErr(203);
+ } else SynErr(204);
}
void Expressions(List<Expression> args) {
@@ -3052,7 +3115,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
IdentTypeOptional(out bv);
pat = new CasePattern(bv.tok, bv);
- } else SynErr(204);
+ } else SynErr(205);
if (pat == null) {
pat = new CasePattern(t, "_ParseError", new List<CasePattern>());
}
@@ -3072,12 +3135,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (allowExistentialGuards && IsExistentialGuard()) {
ExistentialGuard(out e, false );
isExistentialGuard = true;
- } else if (StartOf(8)) {
+ } else if (StartOf(9)) {
Expression(out e, true, false);
- } else SynErr(205);
+ } else SynErr(206);
Expect(29);
body = new List<Statement>();
- while (StartOf(16)) {
+ while (StartOf(17)) {
Stmt(body);
}
alternatives.Add(new GuardedAlternative(x, isExistentialGuard, e, body));
@@ -3117,19 +3180,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expect(57);
Expect(51);
e = null;
- } else if (StartOf(8)) {
+ } else if (StartOf(9)) {
Expression(out ee, true, true);
e = ee;
- } else SynErr(206);
+ } else SynErr(207);
}
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 == 37 || la.kind == 89) {
- while (!(la.kind == 0 || la.kind == 37 || la.kind == 89)) {SynErr(207); Get();}
- if (la.kind == 89) {
+ if (la.kind == 37 || la.kind == 91) {
+ while (!(la.kind == 0 || la.kind == 37 || la.kind == 91)) {SynErr(208); Get();}
+ if (la.kind == 91) {
Get();
isFree = true; errors.Warning(t, "the 'free' keyword is soon to be deprecated");
}
@@ -3141,7 +3204,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
invariants.Add(new MaybeFreeExpression(e, isFree, attrs));
OldSemi();
} else if (la.kind == 36) {
- while (!(la.kind == 0 || la.kind == 36)) {SynErr(208); Get();}
+ while (!(la.kind == 0 || la.kind == 36)) {SynErr(209); Get();}
Get();
while (IsAttribute()) {
Attribute(ref decAttrs);
@@ -3149,7 +3212,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
DecreasesList(decreases, true, true);
OldSemi();
} else if (la.kind == 43) {
- while (!(la.kind == 0 || la.kind == 43)) {SynErr(209); Get();}
+ while (!(la.kind == 0 || la.kind == 43)) {SynErr(210); Get();}
Get();
mod = mod ?? new List<FrameExpression>();
while (IsAttribute()) {
@@ -3163,7 +3226,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
mod.Add(fe);
}
OldSemi();
- } else SynErr(210);
+ } else SynErr(211);
}
void CaseStatement(out MatchCaseStmt/*!*/ c) {
@@ -3200,12 +3263,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
arguments.Add(pat);
}
Expect(51);
- } else SynErr(211);
+ } else SynErr(212);
Expect(29);
- while (!(StartOf(29))) {SynErr(212); Get();}
+ while (!(StartOf(30))) {SynErr(213); Get();}
while (IsNotEndOfCase()) {
Stmt(body);
- while (!(StartOf(29))) {SynErr(213); Get();}
+ while (!(StartOf(30))) {SynErr(214); Get();}
}
c = new MatchCaseStmt(x, name, arguments, body);
}
@@ -3241,7 +3304,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
case 54: {
Get();
x = t; binOp = BinaryExpr.Opcode.Eq;
- if (la.kind == 107) {
+ if (la.kind == 109) {
Get();
Expect(48);
Expression(out k, true, true);
@@ -3259,12 +3322,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
x = t; binOp = BinaryExpr.Opcode.Gt;
break;
}
- case 108: {
+ case 110: {
Get();
x = t; binOp = BinaryExpr.Opcode.Le;
break;
}
- case 109: {
+ case 111: {
Get();
x = t; binOp = BinaryExpr.Opcode.Ge;
break;
@@ -3279,32 +3342,32 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
x = t; binOp = BinaryExpr.Opcode.Neq;
break;
}
- case 110: {
+ case 112: {
Get();
x = t; binOp = BinaryExpr.Opcode.Le;
break;
}
- case 111: {
+ case 113: {
Get();
x = t; binOp = BinaryExpr.Opcode.Ge;
break;
}
- case 112: case 113: {
+ case 114: case 115: {
EquivOp();
x = t; binOp = BinaryExpr.Opcode.Iff;
break;
}
- case 114: case 115: {
+ case 116: case 117: {
ImpliesOp();
x = t; binOp = BinaryExpr.Opcode.Imp;
break;
}
- case 116: case 117: {
+ case 118: case 119: {
ExpliesOp();
x = t; binOp = BinaryExpr.Opcode.Exp;
break;
}
- default: SynErr(214); break;
+ default: SynErr(215); break;
}
if (k == null) {
op = new Microsoft.Dafny.CalcStmt.BinaryCalcOp(binOp);
@@ -3315,14 +3378,6 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
void EquivOp() {
- if (la.kind == 112) {
- Get();
- } else if (la.kind == 113) {
- Get();
- } else SynErr(215);
- }
-
- void ImpliesOp() {
if (la.kind == 114) {
Get();
} else if (la.kind == 115) {
@@ -3330,7 +3385,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else SynErr(216);
}
- void ExpliesOp() {
+ void ImpliesOp() {
if (la.kind == 116) {
Get();
} else if (la.kind == 117) {
@@ -3338,7 +3393,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else SynErr(217);
}
- void AndOp() {
+ void ExpliesOp() {
if (la.kind == 118) {
Get();
} else if (la.kind == 119) {
@@ -3346,7 +3401,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else SynErr(218);
}
- void OrOp() {
+ void AndOp() {
if (la.kind == 120) {
Get();
} else if (la.kind == 121) {
@@ -3354,7 +3409,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else SynErr(219);
}
- void NegOp() {
+ void OrOp() {
if (la.kind == 122) {
Get();
} else if (la.kind == 123) {
@@ -3362,28 +3417,36 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else SynErr(220);
}
- void Forall() {
- if (la.kind == 104) {
+ void NegOp() {
+ if (la.kind == 124) {
Get();
- } else if (la.kind == 124) {
+ } else if (la.kind == 125) {
Get();
} else SynErr(221);
}
- void Exists() {
- if (la.kind == 125) {
+ void Forall() {
+ if (la.kind == 106) {
Get();
} else if (la.kind == 126) {
Get();
} else SynErr(222);
}
+ void Exists() {
+ if (la.kind == 127) {
+ Get();
+ } else if (la.kind == 128) {
+ Get();
+ } else SynErr(223);
+ }
+
void QSep() {
if (la.kind == 24) {
Get();
} else if (la.kind == 26) {
Get();
- } else SynErr(223);
+ } else SynErr(224);
}
void EquivExpression(out Expression e0, bool allowSemi, bool allowLambda) {
@@ -3401,12 +3464,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 == 114 || la.kind == 115) {
+ if (la.kind == 116 || la.kind == 117) {
ImpliesOp();
x = t;
ImpliesExpression(out e1, allowSemi, allowLambda);
e0 = new BinaryExpr(x, BinaryExpr.Opcode.Imp, e0, e1);
- } else if (la.kind == 116 || la.kind == 117) {
+ } else if (la.kind == 118 || la.kind == 119) {
ExpliesOp();
x = t;
LogicalExpression(out e1, allowSemi, allowLambda);
@@ -3418,7 +3481,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e0 = new BinaryExpr(x, BinaryExpr.Opcode.Exp, e1, e0);
}
- } else SynErr(224);
+ } else SynErr(225);
}
}
@@ -3426,7 +3489,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 == 118 || la.kind == 119) {
+ if (la.kind == 120 || la.kind == 121) {
AndOp();
x = t;
RelationalExpression(out e1, allowSemi, allowLambda);
@@ -3437,7 +3500,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 == 120 || la.kind == 121) {
+ } else if (la.kind == 122 || la.kind == 123) {
OrOp();
x = t;
RelationalExpression(out e1, allowSemi, allowLambda);
@@ -3448,7 +3511,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(225);
+ } else SynErr(226);
}
}
@@ -3584,7 +3647,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
case 54: {
Get();
x = t; op = BinaryExpr.Opcode.Eq;
- if (la.kind == 107) {
+ if (la.kind == 109) {
Get();
Expect(48);
Expression(out k, true, true);
@@ -3602,12 +3665,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
x = t; op = BinaryExpr.Opcode.Gt;
break;
}
- case 108: {
+ case 110: {
Get();
x = t; op = BinaryExpr.Opcode.Le;
break;
}
- case 109: {
+ case 111: {
Get();
x = t; op = BinaryExpr.Opcode.Ge;
break;
@@ -3615,7 +3678,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
case 55: {
Get();
x = t; op = BinaryExpr.Opcode.Neq;
- if (la.kind == 107) {
+ if (la.kind == 109) {
Get();
Expect(48);
Expression(out k, true, true);
@@ -3623,7 +3686,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
break;
}
- case 127: {
+ case 129: {
Get();
x = t; op = BinaryExpr.Opcode.In;
break;
@@ -3633,11 +3696,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
x = t; op = BinaryExpr.Opcode.NotIn;
break;
}
- case 122: {
+ case 124: {
Get();
x = t; y = Token.NoToken;
if (la.val == "!") {
- Expect(122);
+ Expect(124);
y = t;
}
if (y == Token.NoToken) {
@@ -3656,17 +3719,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
x = t; op = BinaryExpr.Opcode.Neq;
break;
}
- case 110: {
+ case 112: {
Get();
x = t; op = BinaryExpr.Opcode.Le;
break;
}
- case 111: {
+ case 113: {
Get();
x = t; op = BinaryExpr.Opcode.Ge;
break;
}
- default: SynErr(226); break;
+ default: SynErr(227); break;
}
}
@@ -3682,23 +3745,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 == 128) {
+ if (la.kind == 76) {
Get();
x = t; op = BinaryExpr.Opcode.Add;
- } else if (la.kind == 129) {
+ } else if (la.kind == 130) {
Get();
x = t; op = BinaryExpr.Opcode.Sub;
- } else SynErr(227);
+ } else SynErr(228);
}
void UnaryExpression(out Expression e, bool allowSemi, bool allowLambda) {
Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x; e = dummyExpr;
- if (la.kind == 129) {
+ if (la.kind == 130) {
Get();
x = t;
UnaryExpression(out e, allowSemi, allowLambda);
e = new NegationExpression(x, e);
- } else if (la.kind == 122 || la.kind == 123) {
+ } else if (la.kind == 124 || la.kind == 125) {
NegOp();
x = t;
UnaryExpression(out e, allowSemi, allowLambda);
@@ -3726,7 +3789,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
} else if (IsLambda(allowLambda)) {
LambdaExpression(out e, allowSemi);
- } else if (StartOf(30)) {
+ } else if (StartOf(31)) {
EndlessExpression(out e, allowSemi, allowLambda);
} else if (la.kind == 1) {
NameSegment(out e);
@@ -3743,12 +3806,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
while (IsSuffix()) {
Suffix(ref e);
}
- } else if (StartOf(28)) {
+ } else if (StartOf(29)) {
ConstAtomExpression(out e, allowSemi, allowLambda);
while (IsSuffix()) {
Suffix(ref e);
}
- } else SynErr(228);
+ } else SynErr(229);
}
void MulOp(out IToken x, out BinaryExpr.Opcode op) {
@@ -3756,13 +3819,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (la.kind == 57) {
Get();
x = t; op = BinaryExpr.Opcode.Mul;
- } else if (la.kind == 130) {
+ } else if (la.kind == 131) {
Get();
x = t; op = BinaryExpr.Opcode.Div;
- } else if (la.kind == 131) {
+ } else if (la.kind == 132) {
Get();
x = t; op = BinaryExpr.Opcode.Mod;
- } else SynErr(229);
+ } else SynErr(230);
}
void MapDisplayExpr(IToken/*!*/ mapToken, bool finite, out Expression e) {
@@ -3771,7 +3834,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = dummyExpr;
Expect(48);
- if (StartOf(8)) {
+ if (StartOf(9)) {
MapLiteralExpressions(out elements);
}
e = new MapDisplayExpr(mapToken, finite, elements);
@@ -3801,7 +3864,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
Expect(51);
e = new DatatypeUpdateExpr(x, e, updates);
- } else if (StartOf(31)) {
+ } else if (StartOf(32)) {
DotSuffix(out id, out x);
if (x != null) {
// process id as a Suffix in its own right
@@ -3813,30 +3876,30 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (IsGenericInstantiation()) {
typeArgs = new List<Type>();
GenericInstantiation(typeArgs);
- } else if (la.kind == 107) {
+ } else if (la.kind == 109) {
HashCall(id, out openParen, out typeArgs, out args);
- } else if (StartOf(32)) {
- } else SynErr(230);
+ } else if (StartOf(33)) {
+ } else SynErr(231);
e = new ExprDotName(id, e, id.val, typeArgs);
if (openParen != null) {
e = new ApplySuffix(openParen, e, args);
}
- } else SynErr(231);
+ } else SynErr(232);
} else if (la.kind == 48) {
Get();
x = t;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out ee, true, true);
e0 = ee;
- if (la.kind == 138) {
+ if (la.kind == 139) {
Get();
anyDots = true;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out ee, true, true);
e1 = ee;
}
- } else if (la.kind == 96) {
+ } else if (la.kind == 98) {
Get();
Expression(out ee, true, true);
e1 = ee;
@@ -3846,7 +3909,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
multipleLengths.Add(e0); // account for the Expression read before the colon
takeRest = true;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out ee, true, true);
multipleLengths.Add(ee); takeRest = false;
while (IsNonFinalColon()) {
@@ -3870,15 +3933,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
multipleIndices.Add(ee);
}
- } else SynErr(232);
- } else if (la.kind == 138) {
+ } else SynErr(233);
+ } else if (la.kind == 139) {
Get();
anyDots = true;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expression(out ee, true, true);
e1 = ee;
}
- } else SynErr(233);
+ } else SynErr(234);
if (multipleIndices != null) {
e = new MultiSelectExpr(x, e, multipleIndices);
// make sure an array class with this dimensionality exists
@@ -3917,12 +3980,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 50) {
Get();
IToken openParen = t; var args = new List<Expression>();
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(args);
}
Expect(51);
e = new ApplySuffix(openParen, e, args);
- } else SynErr(234);
+ } else SynErr(235);
}
void ISetDisplayExpr(IToken/*!*/ setToken, bool finite, out Expression e) {
@@ -3931,7 +3994,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = dummyExpr;
Expect(46);
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(elements);
}
e = new SetDisplayExpr(setToken, finite, elements);
@@ -3964,7 +4027,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
}
Expect(51);
- } else SynErr(235);
+ } else SynErr(236);
while (la.kind == 44 || la.kind == 45) {
if (la.kind == 44) {
Get();
@@ -3990,7 +4053,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = dummyExpr;
switch (la.kind) {
- case 99: {
+ case 101: {
Get();
x = t;
Expression(out e, true, true);
@@ -4001,11 +4064,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = new ITEExpr(x, e, e0, e1);
break;
}
- case 101: {
+ case 103: {
MatchExpression(out e, allowSemi, allowLambda);
break;
}
- case 104: case 124: case 125: case 126: {
+ case 106: case 126: case 127: case 128: {
QuantifierGuts(out e, allowSemi, allowLambda);
break;
}
@@ -4021,13 +4084,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
SetComprehensionExpr(x, false, out e, allowSemi, allowLambda);
break;
}
- case 31: case 32: case 102: {
+ case 31: case 32: case 104: {
StmtInExpr(out s);
Expression(out e, allowSemi, allowLambda);
e = new StmtExpr(s.Tok, s, e);
break;
}
- case 62: case 79: {
+ case 62: case 81: {
LetExpr(out e, allowSemi, allowLambda);
break;
}
@@ -4043,11 +4106,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
MapComprehensionExpr(x, false, out e, allowSemi, allowLambda);
break;
}
- case 93: {
+ case 95: {
NamedExpr(out e, allowSemi, allowLambda);
break;
}
- default: SynErr(236); break;
+ default: SynErr(237); break;
}
}
@@ -4059,10 +4122,10 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (IsGenericInstantiation()) {
typeArgs = new List<Type>();
GenericInstantiation(typeArgs);
- } else if (la.kind == 107) {
+ } else if (la.kind == 109) {
HashCall(id, out openParen, out typeArgs, out args);
- } else if (StartOf(32)) {
- } else SynErr(237);
+ } else if (StartOf(33)) {
+ } else SynErr(238);
e = new NameSegment(id, id.val, typeArgs);
if (openParen != null) {
e = new ApplySuffix(openParen, e, args);
@@ -4078,7 +4141,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (la.kind == 46) {
Get();
x = t; elements = new List<Expression/*!*/>();
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(elements);
}
e = new SetDisplayExpr(x, true, elements);
@@ -4086,12 +4149,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 48) {
Get();
x = t; elements = new List<Expression/*!*/>();
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(elements);
}
e = new SeqDisplayExpr(x, elements);
Expect(49);
- } else SynErr(238);
+ } else SynErr(239);
}
void MultiSetExpr(out Expression e) {
@@ -4104,7 +4167,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
if (la.kind == 46) {
Get();
elements = new List<Expression/*!*/>();
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(elements);
}
e = new MultiSetDisplayExpr(x, elements);
@@ -4115,7 +4178,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expression(out e, true, true);
e = new MultiSetFormingExpr(x, e);
Expect(51);
- } else SynErr(239);
+ } else SynErr(240);
}
void ConstAtomExpression(out Expression e, bool allowSemi, bool allowLambda) {
@@ -4124,17 +4187,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = dummyExpr; Type toType = null;
switch (la.kind) {
- case 132: {
+ case 133: {
Get();
e = new LiteralExpr(t, false);
break;
}
- case 133: {
+ case 134: {
Get();
e = new LiteralExpr(t, true);
break;
}
- case 134: {
+ case 135: {
Get();
e = new LiteralExpr(t);
break;
@@ -4162,12 +4225,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
break;
}
- case 135: {
+ case 136: {
Get();
e = new ThisExpr(t);
break;
}
- case 136: {
+ case 137: {
Get();
x = t;
Expect(50);
@@ -4176,7 +4239,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Fresh, e);
break;
}
- case 137: {
+ case 138: {
Get();
x = t;
Expect(50);
@@ -4211,7 +4274,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
ParensExpression(out e, allowSemi, allowLambda);
break;
}
- default: SynErr(240); break;
+ default: SynErr(241); break;
}
}
@@ -4240,7 +4303,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
n = BigInteger.Zero;
}
- } else SynErr(241);
+ } else SynErr(242);
}
void Dec(out Basetypes.BigDec d) {
@@ -4262,7 +4325,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expect(50);
x = t;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(args);
}
Expect(51);
@@ -4284,20 +4347,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 30) {
Get();
oneShot = true;
- } else SynErr(242);
+ } else SynErr(243);
}
void MapLiteralExpressions(out List<ExpressionPair> elements) {
Expression/*!*/ d, r;
elements = new List<ExpressionPair/*!*/>();
Expression(out d, true, true);
- Expect(96);
+ Expect(98);
Expression(out r, true, true);
elements.Add(new ExpressionPair(d,r));
while (la.kind == 22) {
Get();
Expression(out d, true, true);
- Expect(96);
+ Expect(98);
Expression(out r, true, true);
elements.Add(new ExpressionPair(d,r));
}
@@ -4331,7 +4394,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();
bool usesOptionalBrace = false;
- Expect(101);
+ Expect(103);
x = t;
Expression(out e, allowSemi, allowLambda);
if (la.kind == _lbrace) {
@@ -4342,12 +4405,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
cases.Add(c);
}
Expect(47);
- } else if (StartOf(33)) {
+ } else if (StartOf(34)) {
while (la.kind == _case) {
CaseExpression(out c, allowSemi, allowLambda);
cases.Add(c);
}
- } else SynErr(243);
+ } else SynErr(244);
e = new MatchExpr(x, e, cases, usesOptionalBrace);
}
@@ -4359,13 +4422,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Expression range;
Expression/*!*/ body;
- if (la.kind == 104 || la.kind == 124) {
+ if (la.kind == 106 || la.kind == 126) {
Forall();
x = t; univ = true;
- } else if (la.kind == 125 || la.kind == 126) {
+ } else if (la.kind == 127 || la.kind == 128) {
Exists();
x = t;
- } else SynErr(244);
+ } else SynErr(245);
QuantifierDomain(out bvars, out attrs, out range);
QSep();
Expression(out body, allowSemi, allowLambda);
@@ -4408,13 +4471,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
void StmtInExpr(out Statement s) {
s = dummyStmt;
- if (la.kind == 102) {
+ if (la.kind == 104) {
AssertStmt(out s);
} else if (la.kind == 31) {
AssumeStmt(out s);
} else if (la.kind == 32) {
CalcStmt(out s);
- } else SynErr(245);
+ } else SynErr(246);
}
void LetExpr(out Expression e, bool allowSemi, bool allowLambda) {
@@ -4431,7 +4494,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
Get();
isGhost = true; x = t;
}
- Expect(79);
+ Expect(81);
if (!isGhost) { x = t; }
CasePattern(out pat);
if (isGhost) { pat.Vars.Iter(bv => bv.IsGhost = true); }
@@ -4444,7 +4507,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
letLHSs.Add(pat);
}
- if (la.kind == 96) {
+ if (la.kind == 98) {
Get();
} else if (la.kind == 25 || la.kind == 46) {
while (la.kind == 46) {
@@ -4458,7 +4521,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
}
}
- } else SynErr(246);
+ } else SynErr(247);
Expression(out e, false, true);
letRHSs.Add(e);
while (la.kind == 22) {
@@ -4476,7 +4539,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
e = dummyExpr;
Expression expr;
- Expect(93);
+ Expect(95);
x = t;
NoUSIdent(out d);
Expect(21);
@@ -4518,7 +4581,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
arguments.Add(pat);
}
Expect(51);
- } else SynErr(247);
+ } else SynErr(248);
Expect(29);
Expression(out body, allowSemi, allowLambda);
c = new MatchCaseExpr(x, name, arguments, body);
@@ -4526,7 +4589,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(107);
+ Expect(109);
id.val = id.val + "#";
if (la.kind == 52) {
typeArgs = new List<Type>();
@@ -4538,7 +4601,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
args.Add(k);
Expect(50);
openParen = t;
- if (StartOf(8)) {
+ if (StartOf(9)) {
Expressions(args);
}
Expect(51);
@@ -4552,8 +4615,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 2) {
Get();
id = t;
- } else SynErr(248);
- Expect(96);
+ } else SynErr(249);
+ Expect(98);
Expression(out e, true, true);
}
@@ -4595,7 +4658,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo
} else if (la.kind == 44) {
Get();
x = t;
- } else SynErr(249);
+ } else SynErr(250);
}
@@ -4610,40 +4673,41 @@ 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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_x, _T,_T,_T,_T, _x,_x,_T,_x, _x,_T,_T,_T, _T,_T,_T,_T, _x,_T,_T,_x, _x,_T,_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,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_T,_x, _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,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x},
- {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_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,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_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,_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,_T, _T,_T,_T,_x, _x,_T,_x,_T, _x,_x,_T,_x, _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, _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, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_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,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_T,_x, _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,_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},
- {_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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,_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, _x,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x},
- {_x,_T,_T,_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,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_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, _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, _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, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_T,_T,_x, _x,_T,_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,_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, _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},
- {_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_T,_T,_x, _x,_T,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_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,_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, _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,_x,_x,_x, _x,_x,_x,_T, _T,_x,_x,_T, _x,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_T,_T,_x, _x,_T,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _x,_T,_T,_x, _x,_T,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_T,_T,_x, _x,_T,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_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},
- {_x,_T,_T,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x},
- {_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,_T, _x,_T,_T,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_T,_x, _T,_T,_T,_T, _T,_T,_T,_x, _x,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_x, _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,_x,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_x,_T,_x, _T,_T,_T,_T, _T,_T,_T,_x, _x,_T,_T,_T, _T,_T,_T,_T, _T,_T,_T,_x, _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,_x,_x,_T, _x,_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,_T,_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,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_T,_T,_x, _x,_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,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _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,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x},
+ {_T,_x,_x,_x, _x,_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,_T, _T,_T,_T,_x, _x,_T,_x,_T, _x,_T,_T,_x, _x,_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, _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, _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, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_T,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _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,_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,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_T,_T,_x, _x,_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, _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,_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},
+ {_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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,_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, _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, _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,_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,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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, _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, _x,_x,_x,_T, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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, _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},
+ {_T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_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,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_T,_T, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_x,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _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,_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,_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, _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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_x,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _T,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _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,_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,_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,_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,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_T, _T,_x,_x,_T, _x,_T,_T,_T, _T,_T,_T,_T, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_T, _T,_T,_T,_x, _x,_x},
+ {_x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_T,_x, _x,_T,_T,_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,_T,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_T, _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,_x, _T,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _T,_T,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_x, _x,_x,_x,_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, _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,_T, _x,_T,_T,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_T,_T,_x, _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,_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, _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,_x,_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,_T, _T,_T,_T,_x, _x,_T,_x,_x, _x,_T,_T,_x, _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,_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, _x,_x}
};
} // end Parser
@@ -4745,182 +4809,183 @@ public class Errors {
case 71: s = "\"=\" expected"; break;
case 72: s = "\"as\" expected"; break;
case 73: s = "\"default\" expected"; break;
- case 74: s = "\"class\" expected"; break;
+ case 74: s = "\"export\" expected"; break;
case 75: s = "\"extends\" expected"; break;
- case 76: s = "\"trait\" expected"; break;
- case 77: s = "\"datatype\" expected"; break;
- case 78: s = "\"codatatype\" expected"; break;
- case 79: s = "\"var\" expected"; break;
- case 80: s = "\"newtype\" expected"; break;
- case 81: s = "\"type\" expected"; break;
- case 82: s = "\"iterator\" expected"; break;
- case 83: s = "\"yields\" expected"; break;
- case 84: s = "\"returns\" expected"; break;
- case 85: s = "\"method\" expected"; break;
- case 86: s = "\"colemma\" expected"; break;
- case 87: s = "\"comethod\" expected"; break;
- case 88: s = "\"constructor\" expected"; break;
- case 89: s = "\"free\" expected"; break;
- case 90: s = "\"ensures\" expected"; break;
- case 91: s = "\"yield\" expected"; break;
- case 92: s = "\"`\" expected"; break;
- case 93: s = "\"label\" expected"; break;
- case 94: s = "\"break\" expected"; break;
- case 95: s = "\"where\" expected"; break;
- case 96: s = "\":=\" expected"; break;
- case 97: s = "\"return\" expected"; break;
- case 98: s = "\"new\" expected"; break;
- case 99: s = "\"if\" expected"; break;
- case 100: s = "\"while\" expected"; break;
- case 101: s = "\"match\" expected"; break;
- case 102: s = "\"assert\" expected"; break;
- case 103: s = "\"print\" expected"; break;
- case 104: s = "\"forall\" expected"; break;
- case 105: s = "\"parallel\" expected"; break;
- case 106: s = "\"modify\" expected"; break;
- case 107: s = "\"#\" expected"; break;
- case 108: s = "\"<=\" expected"; break;
- case 109: s = "\">=\" expected"; break;
- case 110: s = "\"\\u2264\" expected"; break;
- case 111: s = "\"\\u2265\" expected"; break;
- case 112: s = "\"<==>\" expected"; break;
- case 113: s = "\"\\u21d4\" expected"; break;
- case 114: s = "\"==>\" expected"; break;
- case 115: s = "\"\\u21d2\" expected"; break;
- case 116: s = "\"<==\" expected"; break;
- case 117: s = "\"\\u21d0\" expected"; break;
- case 118: s = "\"&&\" expected"; break;
- case 119: s = "\"\\u2227\" expected"; break;
- case 120: s = "\"||\" expected"; break;
- case 121: s = "\"\\u2228\" expected"; break;
- case 122: s = "\"!\" expected"; break;
- case 123: s = "\"\\u00ac\" expected"; break;
- case 124: s = "\"\\u2200\" expected"; break;
- case 125: s = "\"exists\" expected"; break;
- case 126: s = "\"\\u2203\" expected"; break;
- case 127: s = "\"in\" expected"; break;
- case 128: s = "\"+\" expected"; break;
- case 129: s = "\"-\" expected"; break;
- case 130: s = "\"/\" expected"; break;
- case 131: s = "\"%\" expected"; break;
- case 132: s = "\"false\" expected"; break;
- case 133: s = "\"true\" expected"; break;
- case 134: s = "\"null\" expected"; break;
- case 135: s = "\"this\" expected"; break;
- case 136: s = "\"fresh\" expected"; break;
- case 137: s = "\"old\" expected"; break;
- case 138: s = "\"..\" expected"; break;
- case 139: s = "??? expected"; break;
- case 140: s = "invalid TopDecl"; break;
- case 141: s = "invalid DeclModifier"; break;
- case 142: s = "this symbol not expected in SubModuleDecl"; break;
- case 143: s = "invalid SubModuleDecl"; break;
- case 144: s = "this symbol not expected in ClassDecl"; break;
- case 145: s = "this symbol not expected in DatatypeDecl"; break;
- case 146: s = "invalid DatatypeDecl"; break;
- case 147: s = "this symbol not expected in DatatypeDecl"; break;
- case 148: s = "invalid NewtypeDecl"; break;
- case 149: s = "invalid OtherTypeDecl"; break;
- case 150: s = "this symbol not expected in OtherTypeDecl"; break;
- case 151: s = "this symbol not expected in IteratorDecl"; break;
- case 152: s = "invalid IteratorDecl"; break;
- case 153: s = "this symbol not expected in TraitDecl"; break;
- case 154: s = "invalid ClassMemberDecl"; break;
- case 155: s = "this symbol not expected in FieldDecl"; break;
- case 156: s = "invalid FunctionDecl"; break;
+ case 76: s = "\"+\" expected"; break;
+ case 77: s = "\"class\" expected"; break;
+ case 78: s = "\"trait\" expected"; break;
+ case 79: s = "\"datatype\" expected"; break;
+ case 80: s = "\"codatatype\" expected"; break;
+ case 81: s = "\"var\" expected"; break;
+ case 82: s = "\"newtype\" expected"; break;
+ case 83: s = "\"type\" expected"; break;
+ case 84: s = "\"iterator\" expected"; break;
+ case 85: s = "\"yields\" expected"; break;
+ case 86: s = "\"returns\" expected"; break;
+ case 87: s = "\"method\" expected"; break;
+ case 88: s = "\"colemma\" expected"; break;
+ case 89: s = "\"comethod\" expected"; break;
+ case 90: s = "\"constructor\" expected"; break;
+ case 91: s = "\"free\" expected"; break;
+ case 92: s = "\"ensures\" expected"; break;
+ case 93: s = "\"yield\" expected"; break;
+ case 94: s = "\"`\" expected"; break;
+ case 95: s = "\"label\" expected"; break;
+ case 96: s = "\"break\" expected"; break;
+ case 97: s = "\"where\" expected"; break;
+ case 98: s = "\":=\" expected"; break;
+ case 99: s = "\"return\" expected"; break;
+ case 100: s = "\"new\" expected"; break;
+ case 101: s = "\"if\" expected"; break;
+ case 102: s = "\"while\" expected"; break;
+ case 103: s = "\"match\" expected"; break;
+ case 104: s = "\"assert\" expected"; break;
+ case 105: s = "\"print\" expected"; break;
+ case 106: s = "\"forall\" expected"; break;
+ case 107: s = "\"parallel\" expected"; break;
+ case 108: s = "\"modify\" expected"; break;
+ case 109: s = "\"#\" expected"; break;
+ case 110: s = "\"<=\" expected"; break;
+ case 111: s = "\">=\" expected"; break;
+ case 112: s = "\"\\u2264\" expected"; break;
+ case 113: s = "\"\\u2265\" expected"; break;
+ case 114: s = "\"<==>\" expected"; break;
+ case 115: s = "\"\\u21d4\" expected"; break;
+ case 116: s = "\"==>\" expected"; break;
+ case 117: s = "\"\\u21d2\" expected"; break;
+ case 118: s = "\"<==\" expected"; break;
+ case 119: s = "\"\\u21d0\" expected"; break;
+ case 120: s = "\"&&\" expected"; break;
+ case 121: s = "\"\\u2227\" expected"; break;
+ case 122: s = "\"||\" expected"; break;
+ case 123: s = "\"\\u2228\" expected"; break;
+ case 124: s = "\"!\" expected"; break;
+ case 125: s = "\"\\u00ac\" expected"; break;
+ case 126: s = "\"\\u2200\" expected"; break;
+ case 127: s = "\"exists\" expected"; break;
+ case 128: s = "\"\\u2203\" expected"; break;
+ case 129: s = "\"in\" expected"; break;
+ case 130: s = "\"-\" expected"; break;
+ case 131: s = "\"/\" expected"; break;
+ case 132: s = "\"%\" expected"; break;
+ case 133: s = "\"false\" expected"; break;
+ case 134: s = "\"true\" expected"; break;
+ case 135: s = "\"null\" expected"; break;
+ case 136: s = "\"this\" expected"; break;
+ case 137: s = "\"fresh\" expected"; break;
+ case 138: s = "\"old\" expected"; break;
+ case 139: s = "\"..\" expected"; break;
+ case 140: s = "??? expected"; break;
+ case 141: s = "invalid TopDecl"; break;
+ case 142: s = "invalid DeclModifier"; break;
+ case 143: s = "this symbol not expected in SubModuleDecl"; break;
+ case 144: s = "invalid SubModuleDecl"; break;
+ case 145: s = "this symbol not expected in ClassDecl"; break;
+ case 146: s = "this symbol not expected in DatatypeDecl"; break;
+ case 147: s = "invalid DatatypeDecl"; break;
+ case 148: s = "this symbol not expected in DatatypeDecl"; break;
+ case 149: s = "invalid NewtypeDecl"; break;
+ case 150: s = "invalid OtherTypeDecl"; break;
+ case 151: s = "this symbol not expected in OtherTypeDecl"; break;
+ case 152: s = "this symbol not expected in IteratorDecl"; break;
+ case 153: s = "invalid IteratorDecl"; break;
+ case 154: s = "this symbol not expected in TraitDecl"; break;
+ case 155: s = "invalid ClassMemberDecl"; break;
+ case 156: s = "this symbol not expected in FieldDecl"; break;
case 157: s = "invalid FunctionDecl"; break;
case 158: s = "invalid FunctionDecl"; break;
case 159: s = "invalid FunctionDecl"; break;
case 160: s = "invalid FunctionDecl"; break;
- case 161: s = "this symbol not expected in MethodDecl"; break;
- case 162: s = "invalid MethodDecl"; break;
+ case 161: s = "invalid FunctionDecl"; break;
+ case 162: s = "this symbol not expected in MethodDecl"; break;
case 163: s = "invalid MethodDecl"; break;
- case 164: s = "invalid FIdentType"; break;
- case 165: s = "this symbol not expected in OldSemi"; break;
- case 166: s = "invalid TypeIdentOptional"; break;
- case 167: s = "invalid TypeAndToken"; break;
- case 168: s = "this symbol not expected in IteratorSpec"; break;
- case 169: s = "invalid IteratorSpec"; break;
+ case 164: s = "invalid MethodDecl"; break;
+ case 165: s = "invalid FIdentType"; break;
+ case 166: s = "this symbol not expected in OldSemi"; break;
+ case 167: s = "invalid TypeIdentOptional"; break;
+ case 168: s = "invalid TypeAndToken"; break;
+ case 169: s = "this symbol not expected in IteratorSpec"; break;
case 170: s = "invalid IteratorSpec"; break;
- case 171: s = "this symbol not expected in MethodSpec"; break;
- case 172: s = "invalid MethodSpec"; break;
+ case 171: s = "invalid IteratorSpec"; break;
+ case 172: s = "this symbol not expected in MethodSpec"; break;
case 173: s = "invalid MethodSpec"; break;
- case 174: s = "invalid FrameExpression"; break;
- case 175: s = "this symbol not expected in FunctionSpec"; break;
- case 176: s = "invalid FunctionSpec"; break;
- case 177: s = "invalid PossiblyWildFrameExpression"; break;
- case 178: s = "invalid PossiblyWildExpression"; break;
- case 179: s = "this symbol not expected in OneStmt"; break;
- case 180: s = "invalid OneStmt"; break;
- case 181: s = "this symbol not expected in OneStmt"; break;
- case 182: s = "invalid OneStmt"; break;
- case 183: s = "invalid AssertStmt"; break;
- case 184: s = "invalid AssumeStmt"; break;
- case 185: s = "invalid UpdateStmt"; break;
+ case 174: s = "invalid MethodSpec"; break;
+ case 175: s = "invalid FrameExpression"; break;
+ case 176: s = "this symbol not expected in FunctionSpec"; break;
+ case 177: s = "invalid FunctionSpec"; break;
+ case 178: s = "invalid PossiblyWildFrameExpression"; break;
+ case 179: s = "invalid PossiblyWildExpression"; break;
+ case 180: s = "this symbol not expected in OneStmt"; break;
+ case 181: s = "invalid OneStmt"; break;
+ case 182: s = "this symbol not expected in OneStmt"; break;
+ case 183: s = "invalid OneStmt"; break;
+ case 184: s = "invalid AssertStmt"; break;
+ case 185: s = "invalid AssumeStmt"; break;
case 186: s = "invalid UpdateStmt"; break;
- case 187: s = "this symbol not expected in VarDeclStatement"; break;
- case 188: s = "invalid VarDeclStatement"; break;
+ case 187: s = "invalid UpdateStmt"; break;
+ case 188: s = "this symbol not expected in VarDeclStatement"; break;
case 189: s = "invalid VarDeclStatement"; break;
- case 190: s = "invalid IfStmt"; break;
+ case 190: s = "invalid VarDeclStatement"; break;
case 191: s = "invalid IfStmt"; break;
- case 192: s = "invalid WhileStmt"; break;
+ case 192: s = "invalid IfStmt"; break;
case 193: s = "invalid WhileStmt"; break;
- case 194: s = "invalid MatchStmt"; break;
- case 195: s = "invalid ForallStmt"; break;
+ case 194: s = "invalid WhileStmt"; break;
+ case 195: s = "invalid MatchStmt"; break;
case 196: s = "invalid ForallStmt"; break;
- case 197: s = "invalid CalcStmt"; break;
- case 198: s = "invalid ModifyStmt"; break;
- case 199: s = "this symbol not expected in ModifyStmt"; break;
- case 200: s = "invalid ModifyStmt"; break;
- case 201: s = "invalid ReturnStmt"; break;
- case 202: s = "invalid Rhs"; break;
- case 203: s = "invalid Lhs"; break;
- case 204: s = "invalid CasePattern"; break;
- case 205: s = "invalid AlternativeBlock"; break;
- case 206: s = "invalid Guard"; break;
- case 207: s = "this symbol not expected in LoopSpec"; break;
+ case 197: s = "invalid ForallStmt"; break;
+ case 198: s = "invalid CalcStmt"; break;
+ case 199: s = "invalid ModifyStmt"; break;
+ case 200: s = "this symbol not expected in ModifyStmt"; break;
+ case 201: s = "invalid ModifyStmt"; break;
+ case 202: s = "invalid ReturnStmt"; break;
+ case 203: s = "invalid Rhs"; break;
+ case 204: s = "invalid Lhs"; break;
+ case 205: s = "invalid CasePattern"; break;
+ case 206: s = "invalid AlternativeBlock"; break;
+ case 207: s = "invalid Guard"; break;
case 208: s = "this symbol not expected in LoopSpec"; break;
case 209: s = "this symbol not expected in LoopSpec"; break;
- case 210: s = "invalid LoopSpec"; break;
- case 211: s = "invalid CaseStatement"; break;
- case 212: s = "this symbol not expected in CaseStatement"; break;
+ case 210: s = "this symbol not expected in LoopSpec"; break;
+ case 211: s = "invalid LoopSpec"; break;
+ case 212: s = "invalid CaseStatement"; break;
case 213: s = "this symbol not expected in CaseStatement"; break;
- case 214: s = "invalid CalcOp"; break;
- case 215: s = "invalid EquivOp"; break;
- case 216: s = "invalid ImpliesOp"; break;
- case 217: s = "invalid ExpliesOp"; break;
- case 218: s = "invalid AndOp"; break;
- case 219: s = "invalid OrOp"; break;
- case 220: s = "invalid NegOp"; break;
- case 221: s = "invalid Forall"; break;
- case 222: s = "invalid Exists"; break;
- case 223: s = "invalid QSep"; break;
- case 224: s = "invalid ImpliesExpliesExpression"; break;
- case 225: s = "invalid LogicalExpression"; break;
- case 226: s = "invalid RelOp"; break;
- case 227: s = "invalid AddOp"; break;
- case 228: s = "invalid UnaryExpression"; break;
- case 229: s = "invalid MulOp"; break;
- case 230: s = "invalid Suffix"; break;
+ case 214: s = "this symbol not expected in CaseStatement"; break;
+ case 215: s = "invalid CalcOp"; break;
+ case 216: s = "invalid EquivOp"; break;
+ case 217: s = "invalid ImpliesOp"; break;
+ case 218: s = "invalid ExpliesOp"; break;
+ case 219: s = "invalid AndOp"; break;
+ case 220: s = "invalid OrOp"; break;
+ case 221: s = "invalid NegOp"; break;
+ case 222: s = "invalid Forall"; break;
+ case 223: s = "invalid Exists"; break;
+ case 224: s = "invalid QSep"; break;
+ case 225: s = "invalid ImpliesExpliesExpression"; break;
+ case 226: s = "invalid LogicalExpression"; break;
+ case 227: s = "invalid RelOp"; break;
+ case 228: s = "invalid AddOp"; break;
+ case 229: s = "invalid UnaryExpression"; break;
+ case 230: s = "invalid MulOp"; break;
case 231: s = "invalid Suffix"; break;
case 232: s = "invalid Suffix"; break;
case 233: s = "invalid Suffix"; break;
case 234: s = "invalid Suffix"; break;
- case 235: s = "invalid LambdaExpression"; break;
- case 236: s = "invalid EndlessExpression"; break;
- case 237: s = "invalid NameSegment"; break;
- case 238: s = "invalid DisplayExpr"; break;
- case 239: s = "invalid MultiSetExpr"; break;
- case 240: s = "invalid ConstAtomExpression"; break;
- case 241: s = "invalid Nat"; break;
- case 242: s = "invalid LambdaArrow"; break;
- case 243: s = "invalid MatchExpression"; break;
- case 244: s = "invalid QuantifierGuts"; break;
- case 245: s = "invalid StmtInExpr"; break;
- case 246: s = "invalid LetExpr"; break;
- case 247: s = "invalid CaseExpression"; break;
- case 248: s = "invalid MemberBindingUpdate"; break;
- case 249: s = "invalid DotSuffix"; break;
+ case 235: s = "invalid Suffix"; break;
+ case 236: s = "invalid LambdaExpression"; break;
+ case 237: s = "invalid EndlessExpression"; break;
+ case 238: s = "invalid NameSegment"; break;
+ case 239: s = "invalid DisplayExpr"; break;
+ case 240: s = "invalid MultiSetExpr"; break;
+ case 241: s = "invalid ConstAtomExpression"; break;
+ case 242: s = "invalid Nat"; break;
+ case 243: s = "invalid LambdaArrow"; break;
+ case 244: s = "invalid MatchExpression"; break;
+ case 245: s = "invalid QuantifierGuts"; break;
+ case 246: s = "invalid StmtInExpr"; break;
+ case 247: s = "invalid LetExpr"; break;
+ case 248: s = "invalid CaseExpression"; break;
+ case 249: s = "invalid MemberBindingUpdate"; break;
+ case 250: s = "invalid DotSuffix"; break;
default: s = "error " + n; break;
}
diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs
index eb82df72..bddf62e2 100644
--- a/Source/Dafny/Resolver.cs
+++ b/Source/Dafny/Resolver.cs
@@ -324,6 +324,7 @@ namespace Microsoft.Dafny
// set up environment
var preResolveErrorCount = reporter.Count(ErrorLevel.Error);
ResolveModuleDefinition(m, sig);
+ ResolveModuleExport(literalDecl, sig);
foreach (var r in rewriters) {
if (reporter.Count(ErrorLevel.Error) != preResolveErrorCount) {
break;
@@ -368,7 +369,7 @@ namespace Microsoft.Dafny
if (refinementTransformer.CheckIsRefinement(compileSig, p)) {
abs.Signature.CompileSignature = compileSig;
} else {
- reporter.Error(MessageSource.Resolver,
+ reporter.Error(MessageSource.Resolver,
abs.CompilePath[0],
"module " + Util.Comma(".", abs.CompilePath, x => x.val) + " must be a refinement of "
+ Util.Comma(".", abs.Path, x => x.val));
@@ -383,6 +384,11 @@ namespace Microsoft.Dafny
} else {
abs.Signature = new ModuleSignature(); // there was an error, give it a valid but empty signature
}
+ } else if (decl is ModuleExportDecl) {
+ ModuleExportDecl export = (ModuleExportDecl)decl;
+ export.Signature = new ModuleSignature();
+ export.Signature.IsAbstract = false;
+ export.Signature.ModuleDef = null;
} else { Contract.Assert(false); }
Contract.Assert(decl.Signature != null);
}
@@ -720,6 +726,96 @@ namespace Microsoft.Dafny
}
}
+ // Resolve the exports and detect cycles.
+ private void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature sig) {
+ ModuleDefinition m = literalDecl.ModuleDef;
+ literalDecl.DefaultExport = sig;
+ Graph<ModuleExportDecl> exportDependencies = new Graph<ModuleExportDecl>();
+ foreach (TopLevelDecl toplevel in m.TopLevelDecls) {
+ if (toplevel is ModuleExportDecl) {
+ ModuleExportDecl d = (ModuleExportDecl) toplevel;
+ exportDependencies.AddVertex(d);
+ foreach (string s in d.Extends) {
+ TopLevelDecl top;
+ if (sig.TopLevels.TryGetValue(s, out top) && top is ModuleExportDecl) {
+ ModuleExportDecl extend = (ModuleExportDecl) top;
+ d.ExtendDecls.Add(extend);
+ exportDependencies.AddEdge(d, extend);
+ } else {
+ reporter.Error(MessageSource.Resolver, m.tok, s + " must be an export of" + m + " to be extended");
+ }
+ }
+ foreach (ExportSignature export in d.Exports) {
+ // check to see if it is a datatype or a member or
+ // static function or method in the enclosing module or its imports
+ TopLevelDecl decl;
+ MemberDecl member;
+ string name = export.Name;
+ if (sig.TopLevels.TryGetValue(name, out decl)) {
+ // Member of the enclosing module
+ export.Decl = decl;
+ } else if (sig.StaticMembers.TryGetValue(name, out member)) {
+ export.Decl = member;
+ } else {
+ reporter.Error(MessageSource.Resolver, d.tok, name + " must be a member of " + m + " to be exported");
+ }
+ }
+ }
+ }
+
+ // detect cycles in the extend
+ var cycle = exportDependencies.TryFindCycle();
+ if (cycle != null) {
+ var cy = Util.Comma(" -> ", cycle, c => c.Name);
+ reporter.Error(MessageSource.Resolver, cycle[0], "module export contains a cycle: {0}", cy);
+ return;
+ }
+
+ // fill in the exports for the extends.
+ List<ModuleExportDecl> sortedDecls = exportDependencies.TopologicallySortedComponents();
+ ModuleExportDecl defaultExport = null;
+ foreach (ModuleExportDecl decl in sortedDecls) {
+ if (decl.IsDefault) {
+ if (defaultExport == null) {
+ defaultExport = decl;
+ } else {
+ reporter.Error(MessageSource.Resolver, m.tok, "more than one default export declared: {0}, {1}", defaultExport, decl);
+ }
+ }
+ // fill in export signature
+ ModuleSignature signature = decl.Signature;
+ foreach (ModuleExportDecl extend in decl.ExtendDecls) {
+ ModuleSignature s = extend.Signature;
+ foreach (var kv in s.TopLevels) {
+ if (!signature.TopLevels.ContainsKey(kv.Key)) {
+ signature.TopLevels.Add(kv.Key, kv.Value);
+ }
+ }
+ foreach (var kv in s.Ctors) {
+ if (!signature.Ctors.ContainsKey(kv.Key)) {
+ signature.Ctors.Add(kv.Key, kv.Value);
+ }
+ }
+ foreach (var kv in s.StaticMembers) {
+ if (!signature.StaticMembers.ContainsKey(kv.Key)) {
+ signature.StaticMembers.Add(kv.Key, kv.Value);
+ }
+ }
+ }
+ foreach (ExportSignature export in decl.Exports) {
+ if (export.Decl is TopLevelDecl) {
+ signature.TopLevels.Add(export.Name, (TopLevelDecl)export.Decl);
+ } else if (export.Decl is MemberDecl) {
+ signature.StaticMembers.Add(export.Name, (MemberDecl)export.Decl);
+ }
+ }
+ }
+
+ // set the default export if it exists, otherwise, default is export everything
+ if (defaultExport != null) {
+ literalDecl.DefaultExport = defaultExport.Signature;
+ }
+ }
public class ModuleBindings
{
@@ -1326,6 +1422,13 @@ namespace Microsoft.Dafny
public static bool ResolvePath(ModuleDecl root, List<IToken> Path, out ModuleSignature p, ErrorReporter reporter) {
+ if (Path.Count == 1 && root is LiteralModuleDecl) {
+ // use the default export when the importing the root
+ LiteralModuleDecl decl = (LiteralModuleDecl)root;
+ p = decl.DefaultExport;
+ return true;
+ }
+
p = root.Signature;
int i = 1;
while (i < Path.Count) {
@@ -1590,6 +1693,7 @@ namespace Microsoft.Dafny
}
}
+
// ---------------------------------- Pass 2 ----------------------------------
// This pass fills in various additional information.
// ----------------------------------------------------------------------------
diff --git a/Source/Dafny/Scanner.cs b/Source/Dafny/Scanner.cs
index 784f9cd5..cb3dbe7e 100644
--- a/Source/Dafny/Scanner.cs
+++ b/Source/Dafny/Scanner.cs
@@ -211,8 +211,8 @@ public class UTF8Buffer: Buffer {
public class Scanner {
const char EOL = '\n';
const int eofSym = 0; /* pdt */
- const int maxT = 139;
- const int noSym = 139;
+ const int maxT = 140;
+ const int noSym = 140;
[ContractInvariantMethod]
@@ -292,20 +292,20 @@ public class Scanner {
start[33] = 96;
start[8800] = 43;
start[42] = 44;
- start[96] = 67;
- start[35] = 69;
- start[8804] = 71;
- start[8805] = 72;
- start[8660] = 74;
- start[8658] = 76;
- start[8656] = 77;
- start[38] = 78;
- start[8743] = 80;
- start[8744] = 82;
- start[172] = 83;
- start[8704] = 84;
- start[8707] = 85;
- start[43] = 86;
+ start[43] = 67;
+ start[96] = 68;
+ start[35] = 70;
+ start[8804] = 72;
+ start[8805] = 73;
+ start[8660] = 75;
+ start[8658] = 77;
+ start[8656] = 78;
+ start[38] = 79;
+ start[8743] = 81;
+ start[8744] = 83;
+ start[172] = 84;
+ start[8704] = 85;
+ start[8707] = 86;
start[47] = 87;
start[37] = 88;
start[Buffer.EOF] = -1;
@@ -552,45 +552,46 @@ public class Scanner {
case "opened": t.kind = 70; break;
case "as": t.kind = 72; break;
case "default": t.kind = 73; break;
- case "class": t.kind = 74; break;
+ case "export": t.kind = 74; break;
case "extends": t.kind = 75; break;
- case "trait": t.kind = 76; break;
- case "datatype": t.kind = 77; break;
- case "codatatype": t.kind = 78; break;
- case "var": t.kind = 79; break;
- case "newtype": t.kind = 80; break;
- case "type": t.kind = 81; break;
- case "iterator": t.kind = 82; break;
- case "yields": t.kind = 83; break;
- case "returns": t.kind = 84; break;
- case "method": t.kind = 85; break;
- case "colemma": t.kind = 86; break;
- case "comethod": t.kind = 87; break;
- case "constructor": t.kind = 88; break;
- case "free": t.kind = 89; break;
- case "ensures": t.kind = 90; break;
- case "yield": t.kind = 91; break;
- case "label": t.kind = 93; break;
- case "break": t.kind = 94; break;
- case "where": t.kind = 95; break;
- case "return": t.kind = 97; break;
- case "new": t.kind = 98; break;
- case "if": t.kind = 99; break;
- case "while": t.kind = 100; break;
- case "match": t.kind = 101; break;
- case "assert": t.kind = 102; break;
- case "print": t.kind = 103; break;
- case "forall": t.kind = 104; break;
- case "parallel": t.kind = 105; break;
- case "modify": t.kind = 106; break;
- case "exists": t.kind = 125; break;
- case "in": t.kind = 127; break;
- case "false": t.kind = 132; break;
- case "true": t.kind = 133; break;
- case "null": t.kind = 134; break;
- case "this": t.kind = 135; break;
- case "fresh": t.kind = 136; break;
- case "old": t.kind = 137; break;
+ case "class": t.kind = 77; break;
+ case "trait": t.kind = 78; break;
+ case "datatype": t.kind = 79; break;
+ case "codatatype": t.kind = 80; break;
+ case "var": t.kind = 81; break;
+ case "newtype": t.kind = 82; break;
+ case "type": t.kind = 83; break;
+ case "iterator": t.kind = 84; break;
+ case "yields": t.kind = 85; break;
+ case "returns": t.kind = 86; break;
+ case "method": t.kind = 87; break;
+ case "colemma": t.kind = 88; break;
+ case "comethod": t.kind = 89; break;
+ case "constructor": t.kind = 90; break;
+ case "free": t.kind = 91; break;
+ case "ensures": t.kind = 92; break;
+ case "yield": t.kind = 93; break;
+ case "label": t.kind = 95; break;
+ case "break": t.kind = 96; break;
+ case "where": t.kind = 97; break;
+ case "return": t.kind = 99; break;
+ case "new": t.kind = 100; break;
+ case "if": t.kind = 101; break;
+ case "while": t.kind = 102; break;
+ case "match": t.kind = 103; break;
+ case "assert": t.kind = 104; break;
+ case "print": t.kind = 105; break;
+ case "forall": t.kind = 106; break;
+ case "parallel": t.kind = 107; break;
+ case "modify": t.kind = 108; break;
+ case "exists": t.kind = 127; break;
+ case "in": t.kind = 129; break;
+ case "false": t.kind = 133; break;
+ case "true": t.kind = 134; break;
+ case "null": t.kind = 135; break;
+ case "this": t.kind = 136; break;
+ case "fresh": t.kind = 137; break;
+ case "old": t.kind = 138; break;
default: break;
}
}
@@ -853,59 +854,59 @@ public class Scanner {
else if (ch >= '0' && ch <= '9') {AddCh(); goto case 66;}
else {t.kind = 5; break;}
case 67:
- {t.kind = 92; break;}
+ {t.kind = 76; break;}
case 68:
- {t.kind = 96; break;}
+ {t.kind = 94; break;}
case 69:
- {t.kind = 107; break;}
+ {t.kind = 98; break;}
case 70:
{t.kind = 109; break;}
case 71:
- {t.kind = 110; break;}
- case 72:
{t.kind = 111; break;}
- case 73:
+ case 72:
{t.kind = 112; break;}
- case 74:
+ case 73:
{t.kind = 113; break;}
- case 75:
+ case 74:
{t.kind = 114; break;}
- case 76:
+ case 75:
{t.kind = 115; break;}
+ case 76:
+ {t.kind = 116; break;}
case 77:
{t.kind = 117; break;}
case 78:
- if (ch == '&') {AddCh(); goto case 79;}
- else {goto case 0;}
+ {t.kind = 119; break;}
case 79:
- {t.kind = 118; break;}
+ if (ch == '&') {AddCh(); goto case 80;}
+ else {goto case 0;}
case 80:
- {t.kind = 119; break;}
- case 81:
{t.kind = 120; break;}
- case 82:
+ case 81:
{t.kind = 121; break;}
+ case 82:
+ {t.kind = 122; break;}
case 83:
{t.kind = 123; break;}
case 84:
- {t.kind = 124; break;}
+ {t.kind = 125; break;}
case 85:
{t.kind = 126; break;}
case 86:
{t.kind = 128; break;}
case 87:
- {t.kind = 130; break;}
- case 88:
{t.kind = 131; break;}
+ case 88:
+ {t.kind = 132; break;}
case 89:
recEnd = pos; recKind = 21;
if (ch == ':') {AddCh(); goto case 30;}
else if (ch == '|') {AddCh(); goto case 31;}
- else if (ch == '=') {AddCh(); goto case 68;}
+ else if (ch == '=') {AddCh(); goto case 69;}
else {t.kind = 21; break;}
case 90:
recEnd = pos; recKind = 23;
- if (ch == '|') {AddCh(); goto case 81;}
+ if (ch == '|') {AddCh(); goto case 82;}
else {t.kind = 23; break;}
case 91:
recEnd = pos; recKind = 27;
@@ -917,38 +918,38 @@ public class Scanner {
else if (ch == '=') {AddCh(); goto case 98;}
else {t.kind = 71; break;}
case 93:
- recEnd = pos; recKind = 129;
+ recEnd = pos; recKind = 130;
if (ch == '>') {AddCh(); goto case 35;}
- else {t.kind = 129; break;}
+ else {t.kind = 130; break;}
case 94:
recEnd = pos; recKind = 52;
if (ch == '=') {AddCh(); goto case 99;}
else {t.kind = 52; break;}
case 95:
recEnd = pos; recKind = 53;
- if (ch == '=') {AddCh(); goto case 70;}
+ if (ch == '=') {AddCh(); goto case 71;}
else {t.kind = 53; break;}
case 96:
- recEnd = pos; recKind = 122;
+ recEnd = pos; recKind = 124;
if (ch == '=') {AddCh(); goto case 42;}
else if (ch == 'i') {AddCh(); goto case 45;}
- else {t.kind = 122; break;}
+ else {t.kind = 124; break;}
case 97:
- recEnd = pos; recKind = 138;
+ recEnd = pos; recKind = 139;
if (ch == '.') {AddCh(); goto case 48;}
- else {t.kind = 138; break;}
+ else {t.kind = 139; break;}
case 98:
recEnd = pos; recKind = 54;
- if (ch == '>') {AddCh(); goto case 75;}
+ if (ch == '>') {AddCh(); goto case 76;}
else {t.kind = 54; break;}
case 99:
- recEnd = pos; recKind = 108;
+ recEnd = pos; recKind = 110;
if (ch == '=') {AddCh(); goto case 100;}
- else {t.kind = 108; break;}
+ else {t.kind = 110; break;}
case 100:
- recEnd = pos; recKind = 116;
- if (ch == '>') {AddCh(); goto case 73;}
- else {t.kind = 116; break;}
+ recEnd = pos; recKind = 118;
+ if (ch == '>') {AddCh(); goto case 74;}
+ else {t.kind = 118; break;}
}
t.val = new String(tval, 0, tlen);