diff options
| author |  Unknown <t-jasonk@Z3507288.redmond.corp.microsoft.com> | 2012-05-25 11:22:33 -0700 |
|---|---|---|
| committer | Unknown <t-jasonk@Z3507288.redmond.corp.microsoft.com> | 2012-05-25 11:22:33 -0700 |
| commit | 9efc37006cb9e64539d053f701ddc461c6cdc048 (patch) | |
| tree | d9b404dbdf1be266eae4e0bb0737f3b1fb0dce59 | |
| parent | a6854b96780ee152ff5462695b602edf98e84e61 (diff) | |
Dafny: added finite maps
| -rw-r--r-- | Binaries/DafnyPrelude.bpl | 59 | ||||
| -rw-r--r-- | Dafny/Dafny.atg | 26 | ||||
| -rw-r--r-- | Dafny/DafnyAst.cs | 58 | ||||
| -rw-r--r-- | Dafny/Parser.cs | 743 | ||||
| -rw-r--r-- | Dafny/RefinementTransformer.cs | 10 | ||||
| -rw-r--r-- | Dafny/Resolver.cs | 157 | ||||
| -rw-r--r-- | Dafny/Scanner.cs | 145 | ||||
| -rw-r--r-- | Dafny/Translator.cs | 202 | ||||
| -rw-r--r-- | Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs | 3 |
9 files changed, 912 insertions, 491 deletions
diff --git a/Binaries/DafnyPrelude.bpl b/Binaries/DafnyPrelude.bpl index b3fc7e24..09b6efcf 100644 --- a/Binaries/DafnyPrelude.bpl +++ b/Binaries/DafnyPrelude.bpl @@ -358,6 +358,49 @@ axiom (forall<T> s: Seq T, v: T, n: int :: 0 <= n && n <= Seq#Length(s) ==> Seq#Drop(Seq#Build(s, v), n) == Seq#Build(Seq#Drop(s, n), v) );
// ---------------------------------------------------------------
+// -- Axiomatization of Maps -------------------------------------
+// ---------------------------------------------------------------
+
+type Map U V;
+
+function Map#Domain<U, V>(Map U V): [U] bool;
+function Map#Elements<U, V>(Map U V): [U]V;
+
+function Map#Empty<U, V>(): Map U V;
+axiom (forall<U, V> u: U ::
+ { Map#Domain(Map#Empty(): Map U V)[u] }
+ !Map#Domain(Map#Empty(): Map U V)[u]);
+
+//Build is used in displays, and for map updates
+function Map#Build<U, V>(Map U V, U, V): Map U V;
+/*axiom (forall<U, V> m: Map U V, u: U, v: V ::
+ { Map#Domain(Map#Build(m, u, v))[u] } { Map#Elements(Map#Build(m, u, v))[u] }
+ Map#Domain(Map#Build(m, u, v))[u] && Map#Elements(Map#Build(m, u, v))[u] == v);*/
+
+axiom (forall<U, V> m: Map U V, u: U, u': U, v: V ::
+ { Map#Domain(Map#Build(m, u, v))[u'] } { Map#Elements(Map#Build(m, u, v))[u'] }
+ (u' == u ==> Map#Domain(Map#Build(m, u, v))[u'] &&
+ Map#Elements(Map#Build(m, u, v))[u'] == v) &&
+ (u' != u ==> Map#Domain(Map#Build(m, u, v))[u'] == Map#Domain(m)[u'] &&
+ Map#Elements(Map#Build(m, u, v))[u'] == Map#Elements(m)[u']));
+
+//equality for maps
+function Map#Equal<U, V>(Map U V, Map U V): bool;
+axiom (forall<U, V> m: Map U V, m': Map U V::
+ { Map#Equal(m, m') }
+ Map#Equal(m, m') <==> (forall u : U :: Map#Domain(m)[u] == Map#Domain(m')[u]) &&
+ (forall u : U :: Map#Domain(m)[u] ==> Map#Elements(m)[u] == Map#Elements(m')[u]));
+// extensionality
+axiom (forall<U, V> m: Map U V, m': Map U V::
+ { Map#Equal(m, m') }
+ Map#Equal(m, m') ==> m == m');
+
+function Map#Disjoint<U, V>(Map U V, Map U V): bool;
+axiom (forall<U, V> m: Map U V, m': Map U V ::
+ { Map#Disjoint(m, m') }
+ Map#Disjoint(m, m') <==> (forall o: U :: {Map#Domain(m)[o]} {Map#Domain(m')[o]} !Map#Domain(m)[o] || !Map#Domain(m')[o]));
+
+// ---------------------------------------------------------------
// -- Boxing and unboxing ----------------------------------------
// ---------------------------------------------------------------
@@ -371,6 +414,7 @@ axiom (forall b: BoxType :: { $Unbox(b): int } $Box($Unbox(b): int) == b); axiom (forall b: BoxType :: { $Unbox(b): ref } $Box($Unbox(b): ref) == b);
axiom (forall b: BoxType :: { $Unbox(b): Set BoxType } $Box($Unbox(b): Set BoxType) == b);
axiom (forall b: BoxType :: { $Unbox(b): Seq BoxType } $Box($Unbox(b): Seq BoxType) == b);
+axiom (forall b: BoxType :: { $Unbox(b): Map BoxType BoxType } $Box($Unbox(b): Map BoxType BoxType) == b);
axiom (forall b: BoxType :: { $Unbox(b): DatatypeType } $Box($Unbox(b): DatatypeType) == b);
// Note: an axiom like this for bool would not be sound; instead, we do:
function $IsCanonicalBoolBox(BoxType): bool;
@@ -470,11 +514,26 @@ axiom (forall b: BoxType, h: HeapType :: { GenericAlloc(b, h), h[$Unbox(b): ref, alloc] }
GenericAlloc(b, h) ==>
$Unbox(b): ref == null || h[$Unbox(b): ref, alloc]);
+//seqs
axiom (forall b: BoxType, h: HeapType, i: int ::
{ GenericAlloc(b, h), Seq#Index($Unbox(b): Seq BoxType, i) }
GenericAlloc(b, h) &&
0 <= i && i < Seq#Length($Unbox(b): Seq BoxType) ==>
GenericAlloc( Seq#Index($Unbox(b): Seq BoxType, i), h ) );
+
+//maps
+//seq-like axiom, talking about the range elements
+axiom (forall b: BoxType, h: HeapType, i: BoxType ::
+ { GenericAlloc(b, h), Map#Domain($Unbox(b): Map BoxType BoxType)[i] }
+ GenericAlloc(b, h) && Map#Domain($Unbox(b): Map BoxType BoxType)[i] ==>
+ GenericAlloc( Map#Elements($Unbox(b): Map BoxType BoxType)[i], h ) );
+//set-like axiom, talking about the domain elements
+axiom (forall b: BoxType, h: HeapType, t: BoxType ::
+ { GenericAlloc(b, h), Map#Domain($Unbox(b): Map BoxType BoxType)[t] }
+ GenericAlloc(b, h) && Map#Domain($Unbox(b): Map BoxType BoxType)[t] ==>
+ GenericAlloc(t, h));
+
+//sets
axiom (forall b: BoxType, h: HeapType, t: BoxType ::
{ GenericAlloc(b, h), ($Unbox(b): Set BoxType)[t] }
GenericAlloc(b, h) && ($Unbox(b): Set BoxType)[t] ==>
diff --git a/Dafny/Dafny.atg b/Dafny/Dafny.atg index 1390d5ca..103cb5c7 100644 --- a/Dafny/Dafny.atg +++ b/Dafny/Dafny.atg @@ -499,6 +499,12 @@ TypeAndToken<out IToken/*!*/ tok, out Type/*!*/ ty> }
ty = new SeqType(gt[0]);
.)
+ | "map" (. tok = t; gt = new List<Type/*!*/>(); .)
+ GenericInstantiation<gt> (. if (gt.Count != 2) {
+ SemErr("map type expects exactly two type arguments");
+ }
+ ty = new MapType(gt[0], gt[1]);
+ .)
| ReferenceType<out tok, out ty>
)
.
@@ -1262,6 +1268,7 @@ UnaryExpression<out Expression/*!*/ e> { Suffix<ref e> }
| DisplayExpr<out e>
| MultiSetExpr<out e>
+ | MapExpr<out e>
| ConstAtomExpression<out e>
{ Suffix<ref e> }
)
@@ -1333,6 +1340,25 @@ MultiSetExpr<out Expression e> | (. SemErr("multiset must be followed by multiset literal or expression to coerce in parentheses."); .)
)
.
+MapExpr<out Expression e>
+= (. Contract.Ensures(Contract.ValueAtReturn(out e) != null);
+ IToken/*!*/ x = null; List<ExpressionPair/*!*/>/*!*/ elements;
+ e = dummyExpr;
+ .)
+ "map" (. x = t; .)
+ ( "{" (. elements = new List<ExpressionPair/*!*/>(); .)
+ [ MapLiteralExpressions<out elements> ] (. e = new MapDisplayExpr(x, elements);.)
+ "}"
+ | (. SemErr("map must be followed by braces."); .)
+ )
+ .
+MapLiteralExpressions<.out List<ExpressionPair> elements.>
+= (. Expression/*!*/ d, r;
+ elements = new List<ExpressionPair/*!*/>(); .)
+ Expression<out d> ":=" Expression<out r> (. elements.Add(new ExpressionPair(d,r)); .)
+ { "," Expression<out d> ":=" Expression<out r>(. elements.Add(new ExpressionPair(d,r)); .)
+ }
+ .
EndlessExpression<out Expression e>
= (. IToken/*!*/ x;
Expression e0, e1;
diff --git a/Dafny/DafnyAst.cs b/Dafny/DafnyAst.cs index ebc3782e..b42fcb5a 100644 --- a/Dafny/DafnyAst.cs +++ b/Dafny/DafnyAst.cs @@ -367,6 +367,22 @@ namespace Microsoft.Dafny { return "seq<" + base.Arg + ">";
}
}
+ public class MapType : CollectionType
+ {
+ public Type Domain, Range;
+ public MapType(Type domain, Type range) : base(domain) {
+ Contract.Requires(domain != null && range != null);
+ Domain = domain;
+ Range = range;
+ }
+ [Pure]
+ public override string ToString() {
+ Contract.Ensures(Contract.Result<string>() != null);
+ Contract.Assume(cce.IsPeerConsistent(Domain));
+ Contract.Assume(cce.IsPeerConsistent(Range));
+ return "map<" + Domain +", " + Range + ">";
+ }
+ }
public class UserDefinedType : NonProxyType
{
@@ -602,18 +618,19 @@ namespace Microsoft.Dafny { /// <summary>
/// This proxy stands for:
- /// seq(Arg) or array(Arg)
+ /// seq(Arg) or array(Arg) or map(Arg, Range)
/// </summary>
public class IndexableTypeProxy : RestrictedTypeProxy {
- public readonly Type Arg;
+ public readonly Type Arg, Domain;
[ContractInvariantMethod]
void ObjectInvariant() {
Contract.Invariant(Arg != null);
}
- public IndexableTypeProxy(Type arg) {
+ public IndexableTypeProxy(Type arg, Type domain) {
Contract.Requires(arg != null);
Arg = arg;
+ Domain = domain;
}
public override int OrderID {
get {
@@ -2379,6 +2396,15 @@ namespace Microsoft.Dafny { Contract.Requires(tok != null);
}
}
+ public class ExpressionPair {
+ public Expression A, B;
+ public ExpressionPair(Expression a, Expression b) {
+ Contract.Requires(a != null);
+ Contract.Requires(b != null);
+ A = a;
+ B = b;
+ }
+ }
public class ImplicitThisExpr : ThisExpr {
public ImplicitThisExpr(IToken tok)
@@ -2442,7 +2468,7 @@ namespace Microsoft.Dafny { Contract.Requires(cce.NonNullElements(elements));
}
}
-
+
public class MultiSetDisplayExpr : DisplayExpression {
public MultiSetDisplayExpr(IToken tok, List<Expression/*!*/>/*!*/ elements) : base(tok, elements) {
Contract.Requires(tok != null);
@@ -2450,6 +2476,15 @@ namespace Microsoft.Dafny { }
}
+ public class MapDisplayExpr : Expression {
+ public List<ExpressionPair/*!*/>/*!*/ Elements;
+ public MapDisplayExpr(IToken tok, List<ExpressionPair/*!*/>/*!*/ elements)
+ : base(tok) {
+ Contract.Requires(tok != null);
+ Contract.Requires(cce.NonNullElements(elements));
+ Elements = elements;
+ }
+ }
public class SeqDisplayExpr : DisplayExpression {
public SeqDisplayExpr(IToken tok, List<Expression/*!*/>/*!*/ elements)
: base(tok, elements) {
@@ -2795,7 +2830,7 @@ namespace Microsoft.Dafny { MultiSetUnion,
MultiSetIntersection,
MultiSetDifference,
- // sequences
+ // Sequences
SeqEq,
SeqNeq,
ProperPrefix,
@@ -2803,6 +2838,13 @@ namespace Microsoft.Dafny { Concat,
InSeq,
NotInSeq,
+ // Maps
+ MapEq,
+ MapNeq,
+ InMap,
+ NotInMap,
+ MapDisjoint,
+ MapUnion,
// datatypes
RankLt,
RankGt
@@ -2820,12 +2862,14 @@ namespace Microsoft.Dafny { case ResolvedOpcode.SetEq:
case ResolvedOpcode.MultiSetEq:
case ResolvedOpcode.SeqEq:
+ case ResolvedOpcode.MapEq:
return Opcode.Eq;
case ResolvedOpcode.NeqCommon:
case ResolvedOpcode.SetNeq:
case ResolvedOpcode.MultiSetNeq:
case ResolvedOpcode.SeqNeq:
+ case ResolvedOpcode.MapNeq:
return Opcode.Neq;
case ResolvedOpcode.Lt:
@@ -2855,6 +2899,7 @@ namespace Microsoft.Dafny { case ResolvedOpcode.Add:
case ResolvedOpcode.Union:
case ResolvedOpcode.MultiSetUnion:
+ case ResolvedOpcode.MapUnion:
case ResolvedOpcode.Concat:
return Opcode.Add;
@@ -2873,16 +2918,19 @@ namespace Microsoft.Dafny { case ResolvedOpcode.Disjoint:
case ResolvedOpcode.MultiSetDisjoint:
+ case ResolvedOpcode.MapDisjoint:
return Opcode.Disjoint;
case ResolvedOpcode.InSet:
case ResolvedOpcode.InMultiSet:
case ResolvedOpcode.InSeq:
+ case ResolvedOpcode.InMap:
return Opcode.In;
case ResolvedOpcode.NotInSet:
case ResolvedOpcode.NotInMultiSet:
case ResolvedOpcode.NotInSeq:
+ case ResolvedOpcode.NotInMap:
return Opcode.NotIn;
default:
diff --git a/Dafny/Parser.cs b/Dafny/Parser.cs index a063e26b..817df12b 100644 --- a/Dafny/Parser.cs +++ b/Dafny/Parser.cs @@ -21,7 +21,7 @@ public class Parser { public const int _colon = 5;
public const int _lbrace = 6;
public const int _rbrace = 7;
- public const int maxT = 107;
+ public const int maxT = 108;
const bool T = true;
const bool x = false;
@@ -259,7 +259,7 @@ bool IsAttribute() { defaultModule.TopLevelDecls.Add(at);
} else if (StartOf(3)) {
ClassMemberDecl(membersDefaultClass, isGhost, false);
- } else SynErr(108);
+ } else SynErr(109);
}
if (defaultModuleCreatedHere) {
defaultModule.TopLevelDecls.Add(new DefaultClassDecl(defaultModule, membersDefaultClass));
@@ -310,7 +310,7 @@ bool IsAttribute() { List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();
IToken bodyStart;
- while (!(la.kind == 0 || la.kind == 12)) {SynErr(109); Get();}
+ while (!(la.kind == 0 || la.kind == 12)) {SynErr(110); Get();}
Expect(12);
while (la.kind == 6) {
Attribute(ref attrs);
@@ -341,13 +341,13 @@ bool IsAttribute() { IToken bodyStart = Token.NoToken; // dummy assignment
bool co = false;
- while (!(la.kind == 0 || la.kind == 15 || la.kind == 16)) {SynErr(110); Get();}
+ while (!(la.kind == 0 || la.kind == 15 || la.kind == 16)) {SynErr(111); Get();}
if (la.kind == 15) {
Get();
} else if (la.kind == 16) {
Get();
co = true;
- } else SynErr(111);
+ } else SynErr(112);
while (la.kind == 6) {
Attribute(ref attrs);
}
@@ -362,7 +362,7 @@ bool IsAttribute() { Get();
DatatypeMemberDecl(ctors);
}
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(112); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(113); Get();}
Expect(19);
if (co) {
dt = new CoDatatypeDecl(id, id.val, module, typeArgs, ctors, attrs);
@@ -384,7 +384,7 @@ bool IsAttribute() { }
Ident(out id);
at = new ArbitraryTypeDecl(id, id.val, module, attrs);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(113); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(114); Get();}
Expect(19);
}
@@ -409,13 +409,13 @@ bool IsAttribute() { }
if (la.kind == 20) {
FieldDecl(mmod, mm);
- } else if (la.kind == 43 || la.kind == 44) {
+ } else if (la.kind == 44 || la.kind == 45) {
FunctionDecl(mmod, out f);
mm.Add(f);
} else if (la.kind == 25 || la.kind == 26) {
MethodDecl(mmod, allowConstructors, out m);
mm.Add(m);
- } else SynErr(114);
+ } else SynErr(115);
}
void GenericParameters(List<TypeParameter/*!*/>/*!*/ typeArgs) {
@@ -437,7 +437,7 @@ bool IsAttribute() { Attributes attrs = null;
IToken/*!*/ id; Type/*!*/ ty;
- while (!(la.kind == 0 || la.kind == 20)) {SynErr(115); Get();}
+ while (!(la.kind == 0 || la.kind == 20)) {SynErr(116); Get();}
Expect(20);
if (mmod.IsUnlimited) { SemErr(t, "fields cannot be declared 'unlimited'"); }
if (mmod.IsStatic) { SemErr(t, "fields cannot be declared 'static'"); }
@@ -452,7 +452,7 @@ bool IsAttribute() { IdentType(out id, out ty);
mm.Add(new Field(id, id.val, mmod.IsGhost, ty, attrs));
}
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(116); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(117); Get();}
Expect(19);
}
@@ -475,7 +475,7 @@ bool IsAttribute() { IToken bodyEnd = Token.NoToken;
bool signatureOmitted = false;
- if (la.kind == 43) {
+ if (la.kind == 44) {
Get();
if (la.kind == 25) {
Get();
@@ -498,8 +498,8 @@ bool IsAttribute() { Get();
signatureOmitted = true;
openParen = Token.NoToken;
- } else SynErr(117);
- } else if (la.kind == 44) {
+ } else SynErr(118);
+ } else if (la.kind == 45) {
Get();
isPredicate = true;
if (la.kind == 25) {
@@ -527,8 +527,8 @@ bool IsAttribute() { Get();
signatureOmitted = true;
openParen = Token.NoToken;
- } else SynErr(118);
- } else SynErr(119);
+ } else SynErr(119);
+ } else SynErr(120);
while (StartOf(5)) {
FunctionSpec(reqs, reads, ens, decreases);
}
@@ -567,7 +567,7 @@ bool IsAttribute() { IToken bodyStart = Token.NoToken;
IToken bodyEnd = Token.NoToken;
- while (!(la.kind == 0 || la.kind == 25 || la.kind == 26)) {SynErr(120); Get();}
+ while (!(la.kind == 0 || la.kind == 25 || la.kind == 26)) {SynErr(121); Get();}
if (la.kind == 25) {
Get();
} else if (la.kind == 26) {
@@ -578,7 +578,7 @@ bool IsAttribute() { SemErr(t, "constructors are only allowed in classes");
}
- } else SynErr(121);
+ } else SynErr(122);
if (mmod.IsUnlimited) { SemErr(t, "methods cannot be declared 'unlimited'"); }
if (isConstructor) {
if (mmod.IsGhost) {
@@ -606,7 +606,7 @@ bool IsAttribute() { } else if (la.kind == 28) {
Get();
signatureOmitted = true; openParen = Token.NoToken;
- } else SynErr(122);
+ } else SynErr(123);
while (StartOf(6)) {
MethodSpec(req, mod, ens, dec, ref decAttrs, ref modAttrs);
}
@@ -785,11 +785,22 @@ bool IsAttribute() { break;
}
- case 1: case 3: case 42: {
+ case 42: {
+ Get();
+ tok = t; gt = new List<Type/*!*/>();
+ GenericInstantiation(gt);
+ if (gt.Count != 2) {
+ SemErr("map type expects exactly two type arguments");
+ }
+ ty = new MapType(gt[0], gt[1]);
+
+ break;
+ }
+ case 1: case 3: case 43: {
ReferenceType(out tok, out ty);
break;
}
- default: SynErr(123); break;
+ default: SynErr(124); break;
}
}
@@ -814,7 +825,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(8))) {SynErr(124); Get();}
+ while (!(StartOf(8))) {SynErr(125); Get();}
if (la.kind == 29) {
Get();
while (IsAttribute()) {
@@ -829,7 +840,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo mod.Add(fe);
}
}
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(125); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(126); Get();}
Expect(19);
} else if (la.kind == 30 || la.kind == 31 || la.kind == 32) {
if (la.kind == 30) {
@@ -839,7 +850,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo if (la.kind == 31) {
Get();
Expression(out e);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(126); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(127); Get();}
Expect(19);
req.Add(new MaybeFreeExpression(e, isFree));
} else if (la.kind == 32) {
@@ -848,19 +859,19 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Attribute(ref ensAttrs);
}
Expression(out e);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(127); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(128); Get();}
Expect(19);
ens.Add(new MaybeFreeExpression(e, isFree, ensAttrs));
- } else SynErr(128);
+ } else SynErr(129);
} else if (la.kind == 33) {
Get();
while (IsAttribute()) {
Attribute(ref decAttrs);
}
DecreasesList(decreases, false);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(129); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(130); Get();}
Expect(19);
- } else SynErr(130);
+ } else SynErr(131);
}
void BlockStmt(out BlockStmt/*!*/ block, out IToken bodyStart, out IToken bodyEnd) {
@@ -880,7 +891,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void FrameExpression(out FrameExpression/*!*/ fe) {
Contract.Ensures(Contract.ValueAtReturn(out fe) != null); Expression/*!*/ e; IToken/*!*/ id; string fieldName = null;
Expression(out e);
- if (la.kind == 47) {
+ if (la.kind == 48) {
Get();
Ident(out id);
fieldName = id.val;
@@ -931,7 +942,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo tok = Token.NoToken; ty = new BoolType(); /*keep compiler happy*/
List<Type/*!*/>/*!*/ gt;
- if (la.kind == 42) {
+ if (la.kind == 43) {
Get();
tok = t; ty = new ObjectType();
} else if (la.kind == 3) {
@@ -954,20 +965,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo GenericInstantiation(gt);
}
ty = new UserDefinedType(tok, tok.val, gt);
- } else SynErr(131);
+ } else SynErr(132);
}
void FunctionSpec(List<Expression/*!*/>/*!*/ reqs, List<FrameExpression/*!*/>/*!*/ reads, List<Expression/*!*/>/*!*/ ens, List<Expression/*!*/>/*!*/ decreases) {
Contract.Requires(cce.NonNullElements(reqs)); Contract.Requires(cce.NonNullElements(reads)); Contract.Requires(cce.NonNullElements(decreases));
Expression/*!*/ e; FrameExpression/*!*/ fe;
if (la.kind == 31) {
- while (!(la.kind == 0 || la.kind == 31)) {SynErr(132); Get();}
+ while (!(la.kind == 0 || la.kind == 31)) {SynErr(133); Get();}
Get();
Expression(out e);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(133); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(134); Get();}
Expect(19);
reqs.Add(e);
- } else if (la.kind == 45) {
+ } else if (la.kind == 46) {
Get();
if (StartOf(11)) {
PossiblyWildFrameExpression(out fe);
@@ -978,20 +989,20 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo reads.Add(fe);
}
}
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(134); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(135); Get();}
Expect(19);
} else if (la.kind == 32) {
Get();
Expression(out e);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(135); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(136); Get();}
Expect(19);
ens.Add(e);
} else if (la.kind == 33) {
Get();
DecreasesList(decreases, false);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(136); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(137); Get();}
Expect(19);
- } else SynErr(137);
+ } else SynErr(138);
}
void FunctionBody(out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd) {
@@ -1005,23 +1016,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void PossiblyWildFrameExpression(out FrameExpression/*!*/ fe) {
Contract.Ensures(Contract.ValueAtReturn(out fe) != null); fe = dummyFrameExpr;
- if (la.kind == 46) {
+ if (la.kind == 47) {
Get();
fe = new FrameExpression(new WildcardExpr(t), null);
} else if (StartOf(9)) {
FrameExpression(out fe);
- } else SynErr(138);
+ } else SynErr(139);
}
void PossiblyWildExpression(out Expression/*!*/ e) {
Contract.Ensures(Contract.ValueAtReturn(out e)!=null);
e = dummyExpr;
- if (la.kind == 46) {
+ if (la.kind == 47) {
Get();
e = new WildcardExpr(t);
} else if (StartOf(9)) {
Expression(out e);
- } else SynErr(139);
+ } else SynErr(140);
}
void Stmt(List<Statement/*!*/>/*!*/ ss) {
@@ -1038,26 +1049,26 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo IToken bodyStart, bodyEnd;
int breakCount;
- while (!(StartOf(12))) {SynErr(140); Get();}
+ while (!(StartOf(12))) {SynErr(141); Get();}
switch (la.kind) {
case 6: {
BlockStmt(out bs, out bodyStart, out bodyEnd);
s = bs;
break;
}
- case 65: {
+ case 66: {
AssertStmt(out s);
break;
}
- case 66: {
+ case 67: {
AssumeStmt(out s);
break;
}
- case 67: {
+ case 68: {
PrintStmt(out s);
break;
}
- case 1: case 2: case 18: case 34: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {
+ case 1: case 2: case 18: case 34: case 93: case 94: case 95: case 96: case 97: case 98: case 99: {
UpdateStmt(out s);
break;
}
@@ -1065,23 +1076,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo VarDeclStatement(out s);
break;
}
- case 58: {
+ case 59: {
IfStmt(out s);
break;
}
- case 62: {
+ case 63: {
WhileStmt(out s);
break;
}
- case 64: {
+ case 65: {
MatchStmt(out s);
break;
}
- case 68: {
+ case 69: {
ParallelStmt(out s);
break;
}
- case 48: {
+ case 49: {
Get();
x = t;
Ident(out id);
@@ -1090,24 +1101,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo s.Labels = new LabelNode(x, id.val, s.Labels);
break;
}
- case 49: {
+ case 50: {
Get();
x = t; breakCount = 1; label = null;
if (la.kind == 1) {
Ident(out id);
label = id.val;
- } else if (la.kind == 19 || la.kind == 49) {
- while (la.kind == 49) {
+ } else if (la.kind == 19 || la.kind == 50) {
+ while (la.kind == 50) {
Get();
breakCount++;
}
- } else SynErr(141);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(142); Get();}
+ } else SynErr(142);
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(143); Get();}
Expect(19);
s = label != null ? new BreakStmt(x, label) : new BreakStmt(x, breakCount);
break;
}
- case 50: {
+ case 51: {
ReturnStmt(out s);
break;
}
@@ -1117,7 +1128,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Expect(19);
break;
}
- default: SynErr(143); break;
+ default: SynErr(144); break;
}
}
@@ -1125,7 +1136,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;
Expression/*!*/ e = null; Attributes attrs = null;
- Expect(65);
+ Expect(66);
x = t; s = null;
while (IsAttribute()) {
Attribute(ref attrs);
@@ -1134,7 +1145,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Expression(out e);
} else if (la.kind == 28) {
Get();
- } else SynErr(144);
+ } else SynErr(145);
Expect(19);
if (e == null) {
s = new SkeletonStatement(new AssertStmt(x, new LiteralExpr(x, true), attrs), true, false);
@@ -1146,7 +1157,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void AssumeStmt(out Statement/*!*/ s) {
Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x; Expression/*!*/ e;
- Expect(66);
+ Expect(67);
x = t;
Expression(out e);
Expect(19);
@@ -1157,7 +1168,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x; Attributes.Argument/*!*/ arg;
List<Attributes.Argument/*!*/> args = new List<Attributes.Argument/*!*/>();
- Expect(67);
+ Expect(68);
x = t;
AttributeArg(out arg);
args.Add(arg);
@@ -1187,14 +1198,14 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
Expect(19);
rhss.Add(new ExprRhs(e, attrs));
- } else if (la.kind == 21 || la.kind == 51 || la.kind == 52) {
+ } else if (la.kind == 21 || la.kind == 52 || la.kind == 53) {
lhss.Add(e); lhs0 = e;
while (la.kind == 21) {
Get();
Lhs(out e);
lhss.Add(e);
}
- if (la.kind == 51) {
+ if (la.kind == 52) {
Get();
x = t;
Rhs(out r, lhs0);
@@ -1204,16 +1215,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Rhs(out r, lhs0);
rhss.Add(r);
}
- } else if (la.kind == 52) {
+ } else if (la.kind == 53) {
Get();
x = t;
Expression(out suchThat);
- } else SynErr(145);
+ } else SynErr(146);
Expect(19);
} else if (la.kind == 5) {
Get();
SemErr(t, "invalid statement (did you forget the 'label' keyword?)");
- } else SynErr(146);
+ } else SynErr(147);
if (suchThat != null) {
s = new AssignSuchThatStmt(x, lhss, suchThat);
} else {
@@ -1243,8 +1254,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo LocalIdentTypeOptional(out d, isGhost);
lhss.Add(d);
}
- if (la.kind == 51 || la.kind == 52) {
- if (la.kind == 51) {
+ if (la.kind == 52 || la.kind == 53) {
+ if (la.kind == 52) {
Get();
assignTok = t;
lhs0 = new IdentifierExpr(lhss[0].Tok, lhss[0].Name);
@@ -1295,7 +1306,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<GuardedAlternative> alternatives;
ifStmt = dummyStmt; // to please the compiler
- Expect(58);
+ Expect(59);
x = t;
if (la.kind == 28 || la.kind == 34) {
if (la.kind == 34) {
@@ -1305,15 +1316,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo guardOmitted = true;
}
BlockStmt(out thn, out bodyStart, out bodyEnd);
- if (la.kind == 59) {
+ if (la.kind == 60) {
Get();
- if (la.kind == 58) {
+ if (la.kind == 59) {
IfStmt(out s);
els = s;
} else if (la.kind == 6) {
BlockStmt(out bs, out bodyStart, out bodyEnd);
els = bs;
- } else SynErr(147);
+ } else SynErr(148);
}
if (guardOmitted) {
ifStmt = new SkeletonStatement(new IfStmt(x, guard, thn, els), true, false);
@@ -1324,7 +1335,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo } else if (la.kind == 6) {
AlternativeBlock(out alternatives);
ifStmt = new AlternativeStmt(x, alternatives);
- } else SynErr(148);
+ } else SynErr(149);
}
void WhileStmt(out Statement/*!*/ stmt) {
@@ -1340,7 +1351,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<GuardedAlternative> alternatives;
stmt = dummyStmt; // to please the compiler
- Expect(62);
+ Expect(63);
x = t;
if (la.kind == 28 || la.kind == 34) {
if (la.kind == 34) {
@@ -1356,7 +1367,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo } else if (la.kind == 28) {
Get();
bodyOmitted = true;
- } else SynErr(149);
+ } else SynErr(150);
if (guardOmitted || bodyOmitted) {
if (decreases.Count != 0) {
SemErr(decreases[0].tok, "'decreases' clauses are not allowed on refining loops");
@@ -1377,18 +1388,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo LoopSpec(out invariants, out decreases, out mod, ref decAttrs, ref modAttrs);
AlternativeBlock(out alternatives);
stmt = new AlternativeLoopStmt(x, invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), alternatives);
- } else SynErr(150);
+ } else SynErr(151);
}
void MatchStmt(out Statement/*!*/ s) {
Contract.Ensures(Contract.ValueAtReturn(out s) != null);
Token x; Expression/*!*/ e; MatchCaseStmt/*!*/ c;
List<MatchCaseStmt/*!*/> cases = new List<MatchCaseStmt/*!*/>();
- Expect(64);
+ Expect(65);
x = t;
Expression(out e);
Expect(6);
- while (la.kind == 60) {
+ while (la.kind == 61) {
CaseStatement(out c);
cases.Add(c);
}
@@ -1408,7 +1419,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo BlockStmt/*!*/ block;
IToken bodyStart, bodyEnd;
- Expect(68);
+ Expect(69);
x = t;
Expect(34);
if (la.kind == 1) {
@@ -1441,7 +1452,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<AssignmentRhs> rhss = null;
AssignmentRhs r;
- Expect(50);
+ Expect(51);
returnTok = t;
if (StartOf(14)) {
Rhs(out r, null);
@@ -1465,16 +1476,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo r = null; // to please compiler
Attributes attrs = null;
- if (la.kind == 53) {
+ if (la.kind == 54) {
Get();
newToken = t;
TypeAndToken(out x, out ty);
- if (la.kind == 54 || la.kind == 56) {
- if (la.kind == 54) {
+ if (la.kind == 55 || la.kind == 57) {
+ if (la.kind == 55) {
Get();
ee = new List<Expression>();
Expressions(ee);
- Expect(55);
+ Expect(56);
UserDefinedType tmp = theBuiltIns.ArrayType(x, ee.Count, new IntType(), true);
} else {
@@ -1496,18 +1507,18 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo r = new TypeRhs(newToken, ty, initCall);
}
- } else if (la.kind == 57) {
+ } else if (la.kind == 58) {
Get();
x = t;
Expression(out e);
r = new ExprRhs(new UnaryExpr(x, UnaryExpr.Opcode.SetChoose, e));
- } else if (la.kind == 46) {
+ } else if (la.kind == 47) {
Get();
r = new HavocRhs(t);
} else if (StartOf(9)) {
Expression(out e);
r = new ExprRhs(e);
- } else SynErr(151);
+ } else SynErr(152);
while (la.kind == 6) {
Attribute(ref attrs);
}
@@ -1519,16 +1530,16 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo if (la.kind == 1) {
DottedIdentifiersAndFunction(out e);
- while (la.kind == 54 || la.kind == 56) {
+ while (la.kind == 55 || la.kind == 57) {
Suffix(ref e);
}
} else if (StartOf(15)) {
ConstAtomExpression(out e);
Suffix(ref e);
- while (la.kind == 54 || la.kind == 56) {
+ while (la.kind == 55 || la.kind == 57) {
Suffix(ref e);
}
- } else SynErr(152);
+ } else SynErr(153);
}
void Expressions(List<Expression/*!*/>/*!*/ args) {
@@ -1545,13 +1556,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void Guard(out Expression e) {
Expression/*!*/ ee; e = null;
Expect(34);
- if (la.kind == 46) {
+ if (la.kind == 47) {
Get();
e = null;
} else if (StartOf(9)) {
Expression(out ee);
e = ee;
- } else SynErr(153);
+ } else SynErr(154);
Expect(35);
}
@@ -1562,11 +1573,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<Statement> body;
Expect(6);
- while (la.kind == 60) {
+ while (la.kind == 61) {
Get();
x = t;
Expression(out e);
- Expect(61);
+ Expect(62);
body = new List<Statement>();
while (StartOf(10)) {
Stmt(body);
@@ -1584,22 +1595,22 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo mod = null;
while (StartOf(16)) {
- if (la.kind == 30 || la.kind == 63) {
+ if (la.kind == 30 || la.kind == 64) {
Invariant(out invariant);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(154); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(155); Get();}
Expect(19);
invariants.Add(invariant);
} else if (la.kind == 33) {
- while (!(la.kind == 0 || la.kind == 33)) {SynErr(155); Get();}
+ while (!(la.kind == 0 || la.kind == 33)) {SynErr(156); Get();}
Get();
while (IsAttribute()) {
Attribute(ref decAttrs);
}
DecreasesList(decreases, true);
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(156); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(157); Get();}
Expect(19);
} else {
- while (!(la.kind == 0 || la.kind == 29)) {SynErr(157); Get();}
+ while (!(la.kind == 0 || la.kind == 29)) {SynErr(158); Get();}
Get();
while (IsAttribute()) {
Attribute(ref modAttrs);
@@ -1614,7 +1625,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo mod.Add(fe);
}
}
- while (!(la.kind == 0 || la.kind == 19)) {SynErr(158); Get();}
+ while (!(la.kind == 0 || la.kind == 19)) {SynErr(159); Get();}
Expect(19);
}
}
@@ -1622,12 +1633,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void Invariant(out MaybeFreeExpression/*!*/ invariant) {
bool isFree = false; Expression/*!*/ e; List<string> ids = new List<string>(); invariant = null; Attributes attrs = null;
- while (!(la.kind == 0 || la.kind == 30 || la.kind == 63)) {SynErr(159); Get();}
+ while (!(la.kind == 0 || la.kind == 30 || la.kind == 64)) {SynErr(160); Get();}
if (la.kind == 30) {
Get();
isFree = true;
}
- Expect(63);
+ Expect(64);
while (IsAttribute()) {
Attribute(ref attrs);
}
@@ -1642,7 +1653,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo BoundVar/*!*/ bv;
List<Statement/*!*/> body = new List<Statement/*!*/>();
- Expect(60);
+ Expect(61);
x = t;
Ident(out id);
if (la.kind == 34) {
@@ -1656,7 +1667,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
Expect(35);
}
- Expect(61);
+ Expect(62);
while (StartOf(10)) {
Stmt(body);
}
@@ -1671,7 +1682,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo } else if (StartOf(9)) {
Expression(out e);
arg = new Attributes.Argument(t, e);
- } else SynErr(160);
+ } else SynErr(161);
}
void QuantifierDomain(out List<BoundVar/*!*/> bvars, out Attributes attrs, out Expression range) {
@@ -1699,7 +1710,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void EquivExpression(out Expression/*!*/ e0) {
Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x; Expression/*!*/ e1;
ImpliesExpression(out e0);
- while (la.kind == 69 || la.kind == 70) {
+ while (la.kind == 70 || la.kind == 71) {
EquivOp();
x = t;
ImpliesExpression(out e1);
@@ -1710,7 +1721,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo void ImpliesExpression(out Expression/*!*/ e0) {
Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x; Expression/*!*/ e1;
LogicalExpression(out e0);
- if (la.kind == 71 || la.kind == 72) {
+ if (la.kind == 72 || la.kind == 73) {
ImpliesOp();
x = t;
ImpliesExpression(out e1);
@@ -1719,23 +1730,23 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
void EquivOp() {
- if (la.kind == 69) {
+ if (la.kind == 70) {
Get();
- } else if (la.kind == 70) {
+ } else if (la.kind == 71) {
Get();
- } else SynErr(161);
+ } else SynErr(162);
}
void LogicalExpression(out Expression/*!*/ e0) {
Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x; Expression/*!*/ e1;
RelationalExpression(out e0);
if (StartOf(17)) {
- if (la.kind == 73 || la.kind == 74) {
+ if (la.kind == 74 || la.kind == 75) {
AndOp();
x = t;
RelationalExpression(out e1);
e0 = new BinaryExpr(x, BinaryExpr.Opcode.And, e0, e1);
- while (la.kind == 73 || la.kind == 74) {
+ while (la.kind == 74 || la.kind == 75) {
AndOp();
x = t;
RelationalExpression(out e1);
@@ -1746,7 +1757,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo x = t;
RelationalExpression(out e1);
e0 = new BinaryExpr(x, BinaryExpr.Opcode.Or, e0, e1);
- while (la.kind == 75 || la.kind == 76) {
+ while (la.kind == 76 || la.kind == 77) {
OrOp();
x = t;
RelationalExpression(out e1);
@@ -1757,11 +1768,11 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
void ImpliesOp() {
- if (la.kind == 71) {
+ if (la.kind == 72) {
Get();
- } else if (la.kind == 72) {
+ } else if (la.kind == 73) {
Get();
- } else SynErr(162);
+ } else SynErr(163);
}
void RelationalExpression(out Expression/*!*/ e) {
@@ -1855,25 +1866,25 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
void AndOp() {
- if (la.kind == 73) {
+ if (la.kind == 74) {
Get();
- } else if (la.kind == 74) {
+ } else if (la.kind == 75) {
Get();
- } else SynErr(163);
+ } else SynErr(164);
}
void OrOp() {
- if (la.kind == 75) {
+ if (la.kind == 76) {
Get();
- } else if (la.kind == 76) {
+ } else if (la.kind == 77) {
Get();
- } else SynErr(164);
+ } else SynErr(165);
}
void Term(out Expression/*!*/ e0) {
Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x; Expression/*!*/ e1; BinaryExpr.Opcode op;
Factor(out e0);
- while (la.kind == 87 || la.kind == 88) {
+ while (la.kind == 88 || la.kind == 89) {
AddOp(out x, out op);
Factor(out e1);
e0 = new BinaryExpr(x, op, e0, e1);
@@ -1886,7 +1897,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo IToken y;
switch (la.kind) {
- case 77: {
+ case 78: {
Get();
x = t; op = BinaryExpr.Opcode.Eq;
break;
@@ -1901,35 +1912,35 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo x = t; op = BinaryExpr.Opcode.Gt;
break;
}
- case 78: {
+ case 79: {
Get();
x = t; op = BinaryExpr.Opcode.Le;
break;
}
- case 79: {
+ case 80: {
Get();
x = t; op = BinaryExpr.Opcode.Ge;
break;
}
- case 80: {
+ case 81: {
Get();
x = t; op = BinaryExpr.Opcode.Neq;
break;
}
- case 81: {
+ case 82: {
Get();
x = t; op = BinaryExpr.Opcode.Disjoint;
break;
}
- case 82: {
+ case 83: {
Get();
x = t; op = BinaryExpr.Opcode.In;
break;
}
- case 83: {
+ case 84: {
Get();
x = t; y = Token.NoToken;
- if (la.kind == 82) {
+ if (la.kind == 83) {
Get();
y = t;
}
@@ -1944,29 +1955,29 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo break;
}
- case 84: {
+ case 85: {
Get();
x = t; op = BinaryExpr.Opcode.Neq;
break;
}
- case 85: {
+ case 86: {
Get();
x = t; op = BinaryExpr.Opcode.Le;
break;
}
- case 86: {
+ case 87: {
Get();
x = t; op = BinaryExpr.Opcode.Ge;
break;
}
- default: SynErr(165); break;
+ default: SynErr(166); break;
}
}
void Factor(out Expression/*!*/ e0) {
Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x; Expression/*!*/ e1; BinaryExpr.Opcode op;
UnaryExpression(out e0);
- while (la.kind == 46 || la.kind == 89 || la.kind == 90) {
+ while (la.kind == 47 || la.kind == 90 || la.kind == 91) {
MulOp(out x, out op);
UnaryExpression(out e1);
e0 = new BinaryExpr(x, op, e0, e1);
@@ -1975,44 +1986,44 @@ 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 == 87) {
+ if (la.kind == 88) {
Get();
x = t; op = BinaryExpr.Opcode.Add;
- } else if (la.kind == 88) {
+ } else if (la.kind == 89) {
Get();
x = t; op = BinaryExpr.Opcode.Sub;
- } else SynErr(166);
+ } else SynErr(167);
}
void UnaryExpression(out Expression/*!*/ e) {
Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x; e = dummyExpr;
switch (la.kind) {
- case 88: {
+ case 89: {
Get();
x = t;
UnaryExpression(out e);
e = new BinaryExpr(x, BinaryExpr.Opcode.Sub, new LiteralExpr(x, 0), e);
break;
}
- case 83: case 91: {
+ case 84: case 92: {
NegOp();
x = t;
UnaryExpression(out e);
e = new UnaryExpr(x, UnaryExpr.Opcode.Not, e);
break;
}
- case 20: case 39: case 58: case 64: case 65: case 66: case 101: case 102: case 103: case 104: {
+ case 20: case 39: case 59: case 65: case 66: case 67: case 102: case 103: case 104: case 105: {
EndlessExpression(out e);
break;
}
case 1: {
DottedIdentifiersAndFunction(out e);
- while (la.kind == 54 || la.kind == 56) {
+ while (la.kind == 55 || la.kind == 57) {
Suffix(ref e);
}
break;
}
- case 6: case 54: {
+ case 6: case 55: {
DisplayExpr(out e);
break;
}
@@ -2020,37 +2031,41 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo MultiSetExpr(out e);
break;
}
- case 2: case 18: case 34: case 92: case 93: case 94: case 95: case 96: case 97: case 98: {
+ case 42: {
+ MapExpr(out e);
+ break;
+ }
+ case 2: case 18: case 34: case 93: case 94: case 95: case 96: case 97: case 98: case 99: {
ConstAtomExpression(out e);
- while (la.kind == 54 || la.kind == 56) {
+ while (la.kind == 55 || la.kind == 57) {
Suffix(ref e);
}
break;
}
- default: SynErr(167); break;
+ default: SynErr(168); break;
}
}
void MulOp(out IToken/*!*/ x, out BinaryExpr.Opcode op) {
Contract.Ensures(Contract.ValueAtReturn(out x) != null); x = Token.NoToken; op = BinaryExpr.Opcode.Add/*(dummy)*/;
- if (la.kind == 46) {
+ if (la.kind == 47) {
Get();
x = t; op = BinaryExpr.Opcode.Mul;
- } else if (la.kind == 89) {
+ } else if (la.kind == 90) {
Get();
x = t; op = BinaryExpr.Opcode.Div;
- } else if (la.kind == 90) {
+ } else if (la.kind == 91) {
Get();
x = t; op = BinaryExpr.Opcode.Mod;
- } else SynErr(168);
+ } else SynErr(169);
}
void NegOp() {
- if (la.kind == 83) {
+ if (la.kind == 84) {
Get();
- } else if (la.kind == 91) {
+ } else if (la.kind == 92) {
Get();
- } else SynErr(169);
+ } else SynErr(170);
}
void EndlessExpression(out Expression e) {
@@ -2061,22 +2076,22 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<BoundVar> letVars; List<Expression> letRHSs;
switch (la.kind) {
- case 58: {
+ case 59: {
Get();
x = t;
Expression(out e);
- Expect(99);
+ Expect(100);
Expression(out e0);
- Expect(59);
+ Expect(60);
Expression(out e1);
e = new ITEExpr(x, e, e0, e1);
break;
}
- case 64: {
+ case 65: {
MatchExpression(out e);
break;
}
- case 101: case 102: case 103: case 104: {
+ case 102: case 103: case 104: case 105: {
QuantifierGuts(out e);
break;
}
@@ -2084,7 +2099,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo ComprehensionExpr(out e);
break;
}
- case 65: {
+ case 66: {
Get();
x = t;
Expression(out e0);
@@ -2093,7 +2108,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new AssertExpr(x, e0, e1);
break;
}
- case 66: {
+ case 67: {
Get();
x = t;
Expression(out e0);
@@ -2114,7 +2129,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo IdentTypeOptional(out d);
letVars.Add(d);
}
- Expect(51);
+ Expect(52);
Expression(out e);
letRHSs.Add(e);
while (la.kind == 21) {
@@ -2127,7 +2142,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new LetExpr(x, letVars, letRHSs, e);
break;
}
- default: SynErr(170); break;
+ default: SynErr(171); break;
}
}
@@ -2138,7 +2153,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Ident(out id);
idents.Add(id);
- while (la.kind == 56) {
+ while (la.kind == 57) {
Get();
Ident(out id);
idents.Add(id);
@@ -2160,7 +2175,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo List<Expression> multipleIndices = null;
bool func = false;
- if (la.kind == 56) {
+ if (la.kind == 57) {
Get();
Ident(out id);
if (la.kind == 34) {
@@ -2173,24 +2188,24 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new FunctionCallExpr(id, id.val, e, openParen, args);
}
if (!func) { e = new ExprDotName(id, e, id.val); }
- } else if (la.kind == 54) {
+ } else if (la.kind == 55) {
Get();
x = t;
if (StartOf(9)) {
Expression(out ee);
e0 = ee;
- if (la.kind == 100) {
+ if (la.kind == 101) {
Get();
anyDots = true;
if (StartOf(9)) {
Expression(out ee);
e1 = ee;
}
- } else if (la.kind == 51) {
+ } else if (la.kind == 52) {
Get();
Expression(out ee);
e1 = ee;
- } else if (la.kind == 21 || la.kind == 55) {
+ } else if (la.kind == 21 || la.kind == 56) {
while (la.kind == 21) {
Get();
Expression(out ee);
@@ -2201,15 +2216,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo multipleIndices.Add(ee);
}
- } else SynErr(171);
- } else if (la.kind == 100) {
+ } else SynErr(172);
+ } else if (la.kind == 101) {
Get();
anyDots = true;
if (StartOf(9)) {
Expression(out ee);
e1 = ee;
}
- } else SynErr(172);
+ } else SynErr(173);
if (multipleIndices != null) {
e = new MultiSelectExpr(x, e, multipleIndices);
// make sure an array class with this dimensionality exists
@@ -2232,8 +2247,8 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
}
- Expect(55);
- } else SynErr(173);
+ Expect(56);
+ } else SynErr(174);
}
void DisplayExpr(out Expression e) {
@@ -2249,15 +2264,15 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
e = new SetDisplayExpr(x, elements);
Expect(7);
- } else if (la.kind == 54) {
+ } else if (la.kind == 55) {
Get();
x = t; elements = new List<Expression/*!*/>();
if (StartOf(9)) {
Expressions(elements);
}
e = new SeqDisplayExpr(x, elements);
- Expect(55);
- } else SynErr(174);
+ Expect(56);
+ } else SynErr(175);
}
void MultiSetExpr(out Expression e) {
@@ -2283,7 +2298,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Expect(35);
} else if (StartOf(19)) {
SemErr("multiset must be followed by multiset literal or expression to coerce in parentheses.");
- } else SynErr(175);
+ } else SynErr(176);
+ }
+
+ void MapExpr(out Expression e) {
+ Contract.Ensures(Contract.ValueAtReturn(out e) != null);
+ IToken/*!*/ x = null; List<ExpressionPair/*!*/>/*!*/ elements;
+ e = dummyExpr;
+
+ Expect(42);
+ x = t;
+ if (la.kind == 6) {
+ Get();
+ elements = new List<ExpressionPair/*!*/>();
+ if (StartOf(9)) {
+ MapLiteralExpressions(out elements);
+ }
+ e = new MapDisplayExpr(x, elements);
+ Expect(7);
+ } else if (StartOf(19)) {
+ SemErr("map must be followed by braces.");
+ } else SynErr(177);
}
void ConstAtomExpression(out Expression/*!*/ e) {
@@ -2292,17 +2327,17 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = dummyExpr;
switch (la.kind) {
- case 92: {
+ case 93: {
Get();
e = new LiteralExpr(t, false);
break;
}
- case 93: {
+ case 94: {
Get();
e = new LiteralExpr(t, true);
break;
}
- case 94: {
+ case 95: {
Get();
e = new LiteralExpr(t);
break;
@@ -2312,12 +2347,12 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new LiteralExpr(t, n);
break;
}
- case 95: {
+ case 96: {
Get();
e = new ThisExpr(t);
break;
}
- case 96: {
+ case 97: {
Get();
x = t;
Expect(34);
@@ -2326,7 +2361,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new FreshExpr(x, e);
break;
}
- case 97: {
+ case 98: {
Get();
x = t;
Expect(34);
@@ -2335,7 +2370,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo e = new AllocatedExpr(x, e);
break;
}
- case 98: {
+ case 99: {
Get();
x = t;
Expect(34);
@@ -2360,7 +2395,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Expect(35);
break;
}
- default: SynErr(176); break;
+ default: SynErr(178); break;
}
}
@@ -2375,14 +2410,30 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
+ void MapLiteralExpressions(out List<ExpressionPair> elements) {
+ Expression/*!*/ d, r;
+ elements = new List<ExpressionPair/*!*/>();
+ Expression(out d);
+ Expect(52);
+ Expression(out r);
+ elements.Add(new ExpressionPair(d,r));
+ while (la.kind == 21) {
+ Get();
+ Expression(out d);
+ Expect(52);
+ Expression(out r);
+ elements.Add(new ExpressionPair(d,r));
+ }
+ }
+
void MatchExpression(out Expression/*!*/ e) {
Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x; MatchCaseExpr/*!*/ c;
List<MatchCaseExpr/*!*/> cases = new List<MatchCaseExpr/*!*/>();
- Expect(64);
+ Expect(65);
x = t;
Expression(out e);
- while (la.kind == 60) {
+ while (la.kind == 61) {
CaseExpression(out c);
cases.Add(c);
}
@@ -2397,13 +2448,13 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo Expression range;
Expression/*!*/ body;
- if (la.kind == 101 || la.kind == 102) {
+ if (la.kind == 102 || la.kind == 103) {
Forall();
x = t; univ = true;
- } else if (la.kind == 103 || la.kind == 104) {
+ } else if (la.kind == 104 || la.kind == 105) {
Exists();
x = t;
- } else SynErr(177);
+ } else SynErr(179);
QuantifierDomain(out bvars, out attrs, out range);
QSep();
Expression(out body);
@@ -2434,7 +2485,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
Expect(18);
Expression(out range);
- if (la.kind == 105 || la.kind == 106) {
+ if (la.kind == 106 || la.kind == 107) {
QSep();
Expression(out body);
}
@@ -2449,7 +2500,7 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo BoundVar/*!*/ bv;
Expression/*!*/ body;
- Expect(60);
+ Expect(61);
x = t;
Ident(out id);
if (la.kind == 34) {
@@ -2463,33 +2514,33 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
Expect(35);
}
- Expect(61);
+ Expect(62);
Expression(out body);
c = new MatchCaseExpr(x, id.val, arguments, body);
}
void Forall() {
- if (la.kind == 101) {
+ if (la.kind == 102) {
Get();
- } else if (la.kind == 102) {
+ } else if (la.kind == 103) {
Get();
- } else SynErr(178);
+ } else SynErr(180);
}
void Exists() {
- if (la.kind == 103) {
+ if (la.kind == 104) {
Get();
- } else if (la.kind == 104) {
+ } else if (la.kind == 105) {
Get();
- } else SynErr(179);
+ } else SynErr(181);
}
void QSep() {
- if (la.kind == 105) {
+ if (la.kind == 106) {
Get();
- } else if (la.kind == 106) {
+ } else if (la.kind == 107) {
Get();
- } else SynErr(180);
+ } else SynErr(182);
}
void AttributeBody(ref Attributes attrs) {
@@ -2525,27 +2576,27 @@ List<Expression/*!*/>/*!*/ decreases, ref Attributes decAttrs, ref Attributes mo }
static readonly bool[,]/*!*/ set = {
- {T,T,T,x, x,x,T,x, T,x,x,x, T,x,x,T, T,x,T,T, T,x,x,x, x,T,T,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,x, x,x,T,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, T,x,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,T, x,T,T,x, x,x,x,T, T,T,T,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
- {x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,x, x,x,T,x, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
- {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
- {T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,x, x,x,T,x, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,T,x, x,T,T,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x},
- {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x},
- {x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,x,x,T, x,x,x,T, T,T,x,x, x,x,x,x, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,T,x, x},
- {x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x}
+ {T,T,T,x, x,x,T,x, T,x,x,x, T,x,x,T, T,x,T,T, T,x,x,x, x,T,T,x, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, x,x,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, T,x,x,x, T,T,T,T, T,x,x,x, T,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {T,x,x,x, x,x,T,T, T,T,x,x, T,T,T,T, T,x,x,x, T,x,T,T, x,T,T,x, x,x,x,T, T,T,T,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
+ {x,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
+ {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,T, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
+ {T,T,T,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,T,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,T, x,x,x,x, x,x,T,T, x,x,T,T, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x},
+ {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},
+ {x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,x,x, T,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,T,T, x,x},
+ {x,T,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, T,T,T,T, T,T,T,T, x,x,T,T, T,T,x,x, x,x}
};
} // end Parser
@@ -2612,145 +2663,147 @@ public class Errors { case 39: s = "\"set\" expected"; break;
case 40: s = "\"multiset\" expected"; break;
case 41: s = "\"seq\" expected"; break;
- case 42: s = "\"object\" expected"; break;
- case 43: s = "\"function\" expected"; break;
- case 44: s = "\"predicate\" expected"; break;
- case 45: s = "\"reads\" expected"; break;
- case 46: s = "\"*\" expected"; break;
- case 47: s = "\"`\" expected"; break;
- case 48: s = "\"label\" expected"; break;
- case 49: s = "\"break\" expected"; break;
- case 50: s = "\"return\" expected"; break;
- case 51: s = "\":=\" expected"; break;
- case 52: s = "\":|\" expected"; break;
- case 53: s = "\"new\" expected"; break;
- case 54: s = "\"[\" expected"; break;
- case 55: s = "\"]\" expected"; break;
- case 56: s = "\".\" expected"; break;
- case 57: s = "\"choose\" expected"; break;
- case 58: s = "\"if\" expected"; break;
- case 59: s = "\"else\" expected"; break;
- case 60: s = "\"case\" expected"; break;
- case 61: s = "\"=>\" expected"; break;
- case 62: s = "\"while\" expected"; break;
- case 63: s = "\"invariant\" expected"; break;
- case 64: s = "\"match\" expected"; break;
- case 65: s = "\"assert\" expected"; break;
- case 66: s = "\"assume\" expected"; break;
- case 67: s = "\"print\" expected"; break;
- case 68: s = "\"parallel\" expected"; break;
- case 69: s = "\"<==>\" expected"; break;
- case 70: s = "\"\\u21d4\" expected"; break;
- case 71: s = "\"==>\" expected"; break;
- case 72: s = "\"\\u21d2\" expected"; break;
- case 73: s = "\"&&\" expected"; break;
- case 74: s = "\"\\u2227\" expected"; break;
- case 75: s = "\"||\" expected"; break;
- case 76: s = "\"\\u2228\" expected"; break;
- case 77: s = "\"==\" expected"; break;
- case 78: s = "\"<=\" expected"; break;
- case 79: s = "\">=\" expected"; break;
- case 80: s = "\"!=\" expected"; break;
- case 81: s = "\"!!\" expected"; break;
- case 82: s = "\"in\" expected"; break;
- case 83: s = "\"!\" expected"; break;
- case 84: s = "\"\\u2260\" expected"; break;
- case 85: s = "\"\\u2264\" expected"; break;
- case 86: s = "\"\\u2265\" expected"; break;
- case 87: s = "\"+\" expected"; break;
- case 88: s = "\"-\" expected"; break;
- case 89: s = "\"/\" expected"; break;
- case 90: s = "\"%\" expected"; break;
- case 91: s = "\"\\u00ac\" expected"; break;
- case 92: s = "\"false\" expected"; break;
- case 93: s = "\"true\" expected"; break;
- case 94: s = "\"null\" expected"; break;
- case 95: s = "\"this\" expected"; break;
- case 96: s = "\"fresh\" expected"; break;
- case 97: s = "\"allocated\" expected"; break;
- case 98: s = "\"old\" expected"; break;
- case 99: s = "\"then\" expected"; break;
- case 100: s = "\"..\" expected"; break;
- case 101: s = "\"forall\" expected"; break;
- case 102: s = "\"\\u2200\" expected"; break;
- case 103: s = "\"exists\" expected"; break;
- case 104: s = "\"\\u2203\" expected"; break;
- case 105: s = "\"::\" expected"; break;
- case 106: s = "\"\\u2022\" expected"; break;
- case 107: s = "??? expected"; break;
- case 108: s = "invalid Dafny"; break;
- case 109: s = "this symbol not expected in ClassDecl"; break;
- case 110: s = "this symbol not expected in DatatypeDecl"; break;
- case 111: s = "invalid DatatypeDecl"; break;
- case 112: s = "this symbol not expected in DatatypeDecl"; break;
- case 113: s = "this symbol not expected in ArbitraryTypeDecl"; break;
- case 114: s = "invalid ClassMemberDecl"; break;
- case 115: s = "this symbol not expected in FieldDecl"; break;
+ case 42: s = "\"map\" expected"; break;
+ case 43: s = "\"object\" expected"; break;
+ case 44: s = "\"function\" expected"; break;
+ case 45: s = "\"predicate\" expected"; break;
+ case 46: s = "\"reads\" expected"; break;
+ case 47: s = "\"*\" expected"; break;
+ case 48: s = "\"`\" expected"; break;
+ case 49: s = "\"label\" expected"; break;
+ case 50: s = "\"break\" expected"; break;
+ case 51: s = "\"return\" expected"; break;
+ case 52: s = "\":=\" expected"; break;
+ case 53: s = "\":|\" expected"; break;
+ case 54: s = "\"new\" expected"; break;
+ case 55: s = "\"[\" expected"; break;
+ case 56: s = "\"]\" expected"; break;
+ case 57: s = "\".\" expected"; break;
+ case 58: s = "\"choose\" expected"; break;
+ case 59: s = "\"if\" expected"; break;
+ case 60: s = "\"else\" expected"; break;
+ case 61: s = "\"case\" expected"; break;
+ case 62: s = "\"=>\" expected"; break;
+ case 63: s = "\"while\" expected"; break;
+ case 64: s = "\"invariant\" expected"; break;
+ case 65: s = "\"match\" expected"; break;
+ case 66: s = "\"assert\" expected"; break;
+ case 67: s = "\"assume\" expected"; break;
+ case 68: s = "\"print\" expected"; break;
+ case 69: s = "\"parallel\" expected"; break;
+ case 70: s = "\"<==>\" expected"; break;
+ case 71: s = "\"\\u21d4\" expected"; break;
+ case 72: s = "\"==>\" expected"; break;
+ case 73: s = "\"\\u21d2\" expected"; break;
+ case 74: s = "\"&&\" expected"; break;
+ case 75: s = "\"\\u2227\" expected"; break;
+ case 76: s = "\"||\" expected"; break;
+ case 77: s = "\"\\u2228\" expected"; break;
+ case 78: s = "\"==\" expected"; break;
+ case 79: s = "\"<=\" expected"; break;
+ case 80: s = "\">=\" expected"; break;
+ case 81: s = "\"!=\" expected"; break;
+ case 82: s = "\"!!\" expected"; break;
+ case 83: s = "\"in\" expected"; break;
+ case 84: s = "\"!\" expected"; break;
+ case 85: s = "\"\\u2260\" expected"; break;
+ case 86: s = "\"\\u2264\" expected"; break;
+ case 87: s = "\"\\u2265\" expected"; break;
+ case 88: s = "\"+\" expected"; break;
+ case 89: s = "\"-\" expected"; break;
+ case 90: s = "\"/\" expected"; break;
+ case 91: s = "\"%\" expected"; break;
+ case 92: s = "\"\\u00ac\" expected"; break;
+ case 93: s = "\"false\" expected"; break;
+ case 94: s = "\"true\" expected"; break;
+ case 95: s = "\"null\" expected"; break;
+ case 96: s = "\"this\" expected"; break;
+ case 97: s = "\"fresh\" expected"; break;
+ case 98: s = "\"allocated\" expected"; break;
+ case 99: s = "\"old\" expected"; break;
+ case 100: s = "\"then\" expected"; break;
+ case 101: s = "\"..\" expected"; break;
+ case 102: s = "\"forall\" expected"; break;
+ case 103: s = "\"\\u2200\" expected"; break;
+ case 104: s = "\"exists\" expected"; break;
+ case 105: s = "\"\\u2203\" expected"; break;
+ case 106: s = "\"::\" expected"; break;
+ case 107: s = "\"\\u2022\" expected"; break;
+ case 108: s = "??? expected"; break;
+ case 109: s = "invalid Dafny"; break;
+ case 110: s = "this symbol not expected in ClassDecl"; break;
+ case 111: s = "this symbol not expected in DatatypeDecl"; break;
+ case 112: s = "invalid DatatypeDecl"; break;
+ case 113: s = "this symbol not expected in DatatypeDecl"; break;
+ case 114: s = "this symbol not expected in ArbitraryTypeDecl"; break;
+ case 115: s = "invalid ClassMemberDecl"; break;
case 116: s = "this symbol not expected in FieldDecl"; break;
- case 117: s = "invalid FunctionDecl"; break;
+ case 117: s = "this symbol not expected in FieldDecl"; break;
case 118: s = "invalid FunctionDecl"; break;
case 119: s = "invalid FunctionDecl"; break;
- case 120: s = "this symbol not expected in MethodDecl"; break;
- case 121: s = "invalid MethodDecl"; break;
+ case 120: s = "invalid FunctionDecl"; break;
+ case 121: s = "this symbol not expected in MethodDecl"; break;
case 122: s = "invalid MethodDecl"; break;
- case 123: s = "invalid TypeAndToken"; break;
- case 124: s = "this symbol not expected in MethodSpec"; break;
+ case 123: s = "invalid MethodDecl"; break;
+ case 124: s = "invalid TypeAndToken"; break;
case 125: s = "this symbol not expected in MethodSpec"; break;
case 126: s = "this symbol not expected in MethodSpec"; break;
case 127: s = "this symbol not expected in MethodSpec"; break;
- case 128: s = "invalid MethodSpec"; break;
- case 129: s = "this symbol not expected in MethodSpec"; break;
- case 130: s = "invalid MethodSpec"; break;
- case 131: s = "invalid ReferenceType"; break;
- case 132: s = "this symbol not expected in FunctionSpec"; break;
+ case 128: s = "this symbol not expected in MethodSpec"; break;
+ case 129: s = "invalid MethodSpec"; break;
+ case 130: s = "this symbol not expected in MethodSpec"; break;
+ case 131: s = "invalid MethodSpec"; break;
+ case 132: s = "invalid ReferenceType"; break;
case 133: s = "this symbol not expected in FunctionSpec"; break;
case 134: s = "this symbol not expected in FunctionSpec"; break;
case 135: s = "this symbol not expected in FunctionSpec"; break;
case 136: s = "this symbol not expected in FunctionSpec"; break;
- case 137: s = "invalid FunctionSpec"; break;
- case 138: s = "invalid PossiblyWildFrameExpression"; break;
- case 139: s = "invalid PossiblyWildExpression"; break;
- case 140: s = "this symbol not expected in OneStmt"; break;
- case 141: s = "invalid OneStmt"; break;
- case 142: s = "this symbol not expected in OneStmt"; break;
- case 143: s = "invalid OneStmt"; break;
- case 144: s = "invalid AssertStmt"; break;
- case 145: s = "invalid UpdateStmt"; break;
+ case 137: s = "this symbol not expected in FunctionSpec"; break;
+ case 138: s = "invalid FunctionSpec"; break;
+ case 139: s = "invalid PossiblyWildFrameExpression"; break;
+ case 140: s = "invalid PossiblyWildExpression"; break;
+ case 141: s = "this symbol not expected in OneStmt"; break;
+ case 142: s = "invalid OneStmt"; break;
+ case 143: s = "this symbol not expected in OneStmt"; break;
+ case 144: s = "invalid OneStmt"; break;
+ case 145: s = "invalid AssertStmt"; break;
case 146: s = "invalid UpdateStmt"; break;
- case 147: s = "invalid IfStmt"; break;
+ case 147: s = "invalid UpdateStmt"; break;
case 148: s = "invalid IfStmt"; break;
- case 149: s = "invalid WhileStmt"; break;
+ case 149: s = "invalid IfStmt"; break;
case 150: s = "invalid WhileStmt"; break;
- case 151: s = "invalid Rhs"; break;
- case 152: s = "invalid Lhs"; break;
- case 153: s = "invalid Guard"; break;
- case 154: s = "this symbol not expected in LoopSpec"; break;
+ case 151: s = "invalid WhileStmt"; break;
+ case 152: s = "invalid Rhs"; break;
+ case 153: s = "invalid Lhs"; break;
+ case 154: s = "invalid Guard"; break;
case 155: s = "this symbol not expected in LoopSpec"; break;
case 156: s = "this symbol not expected in LoopSpec"; break;
case 157: s = "this symbol not expected in LoopSpec"; break;
case 158: s = "this symbol not expected in LoopSpec"; break;
- case 159: s = "this symbol not expected in Invariant"; break;
- case 160: s = "invalid AttributeArg"; break;
- case 161: s = "invalid EquivOp"; break;
- case 162: s = "invalid ImpliesOp"; break;
- case 163: s = "invalid AndOp"; break;
- case 164: s = "invalid OrOp"; break;
- case 165: s = "invalid RelOp"; break;
- case 166: s = "invalid AddOp"; break;
- case 167: s = "invalid UnaryExpression"; break;
- case 168: s = "invalid MulOp"; break;
- case 169: s = "invalid NegOp"; break;
- case 170: s = "invalid EndlessExpression"; break;
- case 171: s = "invalid Suffix"; break;
+ case 159: s = "this symbol not expected in LoopSpec"; break;
+ case 160: s = "this symbol not expected in Invariant"; break;
+ case 161: s = "invalid AttributeArg"; break;
+ case 162: s = "invalid EquivOp"; break;
+ case 163: s = "invalid ImpliesOp"; break;
+ case 164: s = "invalid AndOp"; break;
+ case 165: s = "invalid OrOp"; break;
+ case 166: s = "invalid RelOp"; break;
+ case 167: s = "invalid AddOp"; break;
+ case 168: s = "invalid UnaryExpression"; break;
+ case 169: s = "invalid MulOp"; break;
+ case 170: s = "invalid NegOp"; break;
+ case 171: s = "invalid EndlessExpression"; break;
case 172: s = "invalid Suffix"; break;
case 173: s = "invalid Suffix"; break;
- case 174: s = "invalid DisplayExpr"; break;
- case 175: s = "invalid MultiSetExpr"; break;
- case 176: s = "invalid ConstAtomExpression"; break;
- case 177: s = "invalid QuantifierGuts"; break;
- case 178: s = "invalid Forall"; break;
- case 179: s = "invalid Exists"; break;
- case 180: s = "invalid QSep"; break;
+ case 174: s = "invalid Suffix"; break;
+ case 175: s = "invalid DisplayExpr"; break;
+ case 176: s = "invalid MultiSetExpr"; break;
+ case 177: s = "invalid MapExpr"; break;
+ case 178: s = "invalid ConstAtomExpression"; break;
+ case 179: s = "invalid QuantifierGuts"; break;
+ case 180: s = "invalid Forall"; break;
+ case 181: s = "invalid Exists"; break;
+ case 182: s = "invalid QSep"; break;
default: s = "error " + n; break;
}
diff --git a/Dafny/RefinementTransformer.cs b/Dafny/RefinementTransformer.cs index c73ffda8..29a4943a 100644 --- a/Dafny/RefinementTransformer.cs +++ b/Dafny/RefinementTransformer.cs @@ -193,6 +193,9 @@ namespace Microsoft.Dafny { } else if (t is MultiSetType) {
var tt = (MultiSetType)t;
return new MultiSetType(tt.Arg);
+ } else if (t is MapType) {
+ var tt = (MapType)t;
+ return new MapType(tt.Domain, tt.Range);
} else if (t is UserDefinedType) {
var tt = (UserDefinedType)t;
return new UserDefinedType(Tok(tt.tok), tt.Name, tt.TypeArgs.ConvertAll(CloneType));
@@ -277,6 +280,13 @@ namespace Microsoft.Dafny { return new SeqDisplayExpr(Tok(e.tok), e.Elements.ConvertAll(CloneExpr));
}
+ } else if (expr is MapDisplayExpr) {
+ MapDisplayExpr e = (MapDisplayExpr)expr;
+ List<ExpressionPair> pp = new List<ExpressionPair>();
+ foreach(ExpressionPair p in e.Elements) {
+ pp.Add(new ExpressionPair(CloneExpr(p.A),CloneExpr(p.B)));
+ }
+ return new MapDisplayExpr(Tok(expr.tok), pp);
} else if (expr is ExprDotName) {
var e = (ExprDotName)expr;
return new ExprDotName(Tok(e.tok), CloneExpr(e.Obj), e.SuffixName);
diff --git a/Dafny/Resolver.cs b/Dafny/Resolver.cs index 26d045fa..6688a0a4 100644 --- a/Dafny/Resolver.cs +++ b/Dafny/Resolver.cs @@ -915,6 +915,13 @@ namespace Microsoft.Dafny { Contract.Requires(type != null);
if (type is BasicType) {
// nothing to resolve
+ } else if (type is MapType) {
+ MapType mt = (MapType)type;
+ ResolveType(tok, mt.Domain, defaultTypeArguments, allowAutoTypeArguments);
+ ResolveType(tok, mt.Range, defaultTypeArguments, allowAutoTypeArguments);
+ if (mt.Domain.IsSubrangeType || mt.Range.IsSubrangeType) {
+ Error(tok, "sorry, cannot instantiate collection type with a subrange type");
+ }
} else if (type is CollectionType) {
var t = (CollectionType)type;
var argType = t.Arg;
@@ -922,7 +929,7 @@ namespace Microsoft.Dafny { if (argType.IsSubrangeType) {
Error(tok, "sorry, cannot instantiate collection type with a subrange type");
}
- } else if (type is UserDefinedType) {
+ } else if (type is UserDefinedType) {
UserDefinedType t = (UserDefinedType)type;
foreach (Type tt in t.TypeArgs) {
ResolveType(t.tok, tt, defaultTypeArguments, allowAutoTypeArguments);
@@ -1039,6 +1046,8 @@ namespace Microsoft.Dafny { return b is SetType && UnifyTypes(((SetType)a).Arg, ((SetType)b).Arg);
} else if (a is MultiSetType) {
return b is MultiSetType && UnifyTypes(((MultiSetType)a).Arg, ((MultiSetType)b).Arg);
+ }else if (a is MapType) {
+ return b is MapType && UnifyTypes(((MapType)a).Domain, ((MapType)b).Domain) && UnifyTypes(((MapType)a).Range, ((MapType)b).Range);
} else if (a is SeqType) {
return b is SeqType && UnifyTypes(((SeqType)a).Arg, ((SeqType)b).Arg);
} else if (a is UserDefinedType) {
@@ -1148,11 +1157,24 @@ namespace Microsoft.Dafny { if (!UnifyTypes(iProxy.Arg, ((SeqType)t).Arg)) {
return false;
}
+ if (!UnifyTypes(iProxy.Domain, Type.Int)) {
+ return false;
+ }
} else if (t.IsArrayType && (t.AsArrayType).Dims == 1) {
Type elType = UserDefinedType.ArrayElementType(t);
if (!UnifyTypes(iProxy.Arg, elType)) {
return false;
}
+ if (!UnifyTypes(iProxy.Domain, Type.Int)) {
+ return false;
+ }
+ } else if (t is MapType) {
+ if (!UnifyTypes(iProxy.Arg, ((MapType)t).Range)) {
+ return false;
+ }
+ if (!UnifyTypes(iProxy.Domain, ((MapType)t).Domain)) {
+ return false;
+ }
} else {
return false;
}
@@ -1227,8 +1249,8 @@ namespace Microsoft.Dafny { } else if (b is IndexableTypeProxy) {
IndexableTypeProxy pb = (IndexableTypeProxy)b;
// the intersection of ObjectsTypeProxy and IndexableTypeProxy is
- // EITHER a sequence of ObjectTypeProxy OR an array of anything
- // TODO: here, only the first of the two cases is supported
+ // EITHER a sequence of ObjectTypeProxy OR an array of anything OR map of ObjectTypeProxy in either domain or range.
+ // TODO: here, only the first of the three cases is supported
b.T = new SeqType(pb.Arg);
a.T = b.T;
return UnifyTypes(pb.Arg, new ObjectTypeProxy());
@@ -1252,10 +1274,8 @@ namespace Microsoft.Dafny { } else if (b is IndexableTypeProxy) {
CollectionTypeProxy pa = (CollectionTypeProxy)a;
IndexableTypeProxy pb = (IndexableTypeProxy)b;
- // strengthen a and b to a sequence type
- a.T = new SeqType(pa.Arg);
- b.T = new SeqType(pb.Arg);
- return UnifyTypes(pa.Arg, pb.Arg);
+ // a and b could be a map or a sequence
+ return true;
} else {
Contract.Assert(false); throw new cce.UnreachableException(); // unexpected restricted-proxy type
}
@@ -2396,6 +2416,9 @@ namespace Microsoft.Dafny { if (type is BasicType) {
return type;
+ } else if (type is MapType) {
+ MapType t = (MapType)type;
+ return new MapType(SubstType(t.Domain, subst), SubstType(t.Range, subst));
} else if (type is CollectionType) {
CollectionType t = (CollectionType)type;
Type arg = SubstType(t.Arg, subst);
@@ -2616,7 +2639,23 @@ namespace Microsoft.Dafny { } else {
expr.Type = new SeqType(elementType);
}
-
+ } else if (expr is MapDisplayExpr) {
+ MapDisplayExpr e = (MapDisplayExpr)expr;
+ Type domainType = new InferredTypeProxy();
+ Type rangeType = new InferredTypeProxy();
+ foreach (ExpressionPair p in e.Elements) {
+ ResolveExpression(p.A, twoState);
+ Contract.Assert(p.A.Type != null); // follows from postcondition of ResolveExpression
+ if (!UnifyTypes(domainType, p.A.Type)) {
+ Error(p.A, "All elements of display must be of the same type (got {0}, but type of previous elements is {1})", p.A.Type, domainType);
+ }
+ ResolveExpression(p.B, twoState);
+ Contract.Assert(p.B.Type != null); // follows from postcondition of ResolveExpression
+ if (!UnifyTypes(rangeType, p.B.Type)) {
+ Error(p.B, "All elements of display must be of the same type (got {0}, but type of previous elements is {1})", p.B.Type, rangeType);
+ }
+ }
+ expr.Type = new MapType(domainType, rangeType);
} else if (expr is ExprDotName) {
var e = (ExprDotName)expr;
// The following call to ResolveExpression is just preliminary. If it succeeds, it is redone below on the resolved expression. Thus,
@@ -2688,28 +2727,38 @@ namespace Microsoft.Dafny { } else if (expr is SeqUpdateExpr) {
SeqUpdateExpr e = (SeqUpdateExpr)expr;
- bool seqErr = false;
ResolveExpression(e.Seq, twoState);
Contract.Assert(e.Seq.Type != null); // follows from postcondition of ResolveExpression
Type elementType = new InferredTypeProxy();
- if (!UnifyTypes(e.Seq.Type, new SeqType(elementType))) {
- Error(expr, "sequence update requires a sequence (got {0})", e.Seq.Type);
- seqErr = true;
- }
- ResolveExpression(e.Index, twoState);
- Contract.Assert(e.Index.Type != null); // follows from postcondition of ResolveExpression
- if (!UnifyTypes(e.Index.Type, Type.Int)) {
- Error(e.Index, "sequence update requires integer index (got {0})", e.Index.Type);
- }
- ResolveExpression(e.Value, twoState);
- Contract.Assert(e.Value.Type != null); // follows from postcondition of ResolveExpression
- if (!UnifyTypes(e.Value.Type, elementType)) {
- Error(e.Value, "sequence update requires the value to have the element type of the sequence (got {0})", e.Value.Type);
- }
- if (!seqErr) {
+ Type domainType = new InferredTypeProxy();
+ Type rangeType = new InferredTypeProxy();
+ if (UnifyTypes(e.Seq.Type, new SeqType(elementType))) {
+ ResolveExpression(e.Index, twoState);
+ Contract.Assert(e.Index.Type != null); // follows from postcondition of ResolveExpression
+ if (!UnifyTypes(e.Index.Type, Type.Int)) {
+ Error(e.Index, "sequence update requires integer index (got {0})", e.Index.Type);
+ }
+ ResolveExpression(e.Value, twoState);
+ Contract.Assert(e.Value.Type != null); // follows from postcondition of ResolveExpression
+ if (!UnifyTypes(e.Value.Type, elementType)) {
+ Error(e.Value, "sequence update requires the value to have the element type of the sequence (got {0})", e.Value.Type);
+ }
expr.Type = e.Seq.Type;
+ } else if (UnifyTypes(e.Seq.Type, new MapType(domainType, rangeType))) {
+ ResolveExpression(e.Index, twoState);
+ if (!UnifyTypes(e.Index.Type, domainType)) {
+ Error(e.Index, "map update requires domain element to be of type {0} (got {1})", domainType, e.Index.Type);
+ }
+ ResolveExpression(e.Value, twoState);
+ if (!UnifyTypes(e.Value.Type, rangeType)) {
+ Error(e.Value, "map update requires the value to have the range type {0} (got {1})", rangeType, e.Value.Type);
+ }
+ expr.Type = e.Seq.Type;
+ } else {
+ Error(expr, "update requires a sequence or map (got {0})", e.Seq.Type);
}
+
} else if (expr is FunctionCallExpr) {
FunctionCallExpr e = (FunctionCallExpr)expr;
ResolveFunctionCallExpr(e, twoState, false);
@@ -2817,8 +2866,10 @@ namespace Microsoft.Dafny { if (!UnifyTypes(e.E0.Type, e.E1.Type)) {
Error(expr, "arguments must have the same type (got {0} and {1})", e.E0.Type, e.E1.Type);
}
- if (!UnifyTypes(e.E0.Type, new SetType(new InferredTypeProxy())) && !UnifyTypes(e.E0.Type, new MultiSetType(new InferredTypeProxy()))) {
- Error(expr, "arguments must be of a [multi]set type (got {0})", e.E0.Type);
+ if (!UnifyTypes(e.E0.Type, new SetType(new InferredTypeProxy())) &&
+ !UnifyTypes(e.E0.Type, new MultiSetType(new InferredTypeProxy())) &&
+ !UnifyTypes(e.E0.Type, new MapType(new InferredTypeProxy(), new InferredTypeProxy()))) {
+ Error(expr, "arguments must be of a [multi]set or map type (got {0})", e.E0.Type);
}
expr.Type = Type.Bool;
break;
@@ -2888,7 +2939,7 @@ namespace Microsoft.Dafny { case BinaryExpr.Opcode.In:
case BinaryExpr.Opcode.NotIn:
if (!UnifyTypes(e.E1.Type, new CollectionTypeProxy(e.E0.Type))) {
- Error(expr, "second argument to {0} must be a set or sequence of type {1} (instead got {2})", BinaryExpr.OpcodeString(e.Op), e.E0.Type, e.E1.Type);
+ Error(expr, "second argument to \"{0}\" must be a set or sequence with elements of type {1}, or a map with domain {1} (instead got {2})", BinaryExpr.OpcodeString(e.Op), e.E0.Type, e.E1.Type);
}
expr.Type = Type.Bool;
break;
@@ -3579,6 +3630,12 @@ namespace Microsoft.Dafny { goto CHECK_NEXT_BOUND_VARIABLE;
}
break;
+ case BinaryExpr.ResolvedOpcode.InMap:
+ if (whereIsBv == 0) {
+ bounds.Add(new QuantifierExpr.SetBoundedPool(e1));
+ goto CHECK_NEXT_BOUND_VARIABLE;
+ }
+ break;
case BinaryExpr.ResolvedOpcode.EqCommon:
if (bv.Type is IntType) {
var otherOperand = whereIsBv == 0 ? e1 : e0;
@@ -3942,28 +3999,37 @@ namespace Microsoft.Dafny { ResolveExpression(e.Seq, twoState);
Contract.Assert(e.Seq.Type != null); // follows from postcondition of ResolveExpression
Type elementType = new InferredTypeProxy();
- Type expectedType;
- if (e.SelectOne || allowNonUnitArraySelection) {
- expectedType = new IndexableTypeProxy(elementType);
- } else {
- expectedType = new SeqType(elementType);
- }
+ Type domainType = new InferredTypeProxy();
+ IndexableTypeProxy expectedType = new IndexableTypeProxy(elementType, domainType);
if (!UnifyTypes(e.Seq.Type, expectedType)) {
- Error(e, "sequence/array selection requires a sequence or array (got {0})", e.Seq.Type);
+ Error(e, "sequence/array/map selection requires a sequence, array or map (got {0})", e.Seq.Type);
seqErr = true;
}
+ if (!e.SelectOne) // require sequence or array
+ {
+ if (!allowNonUnitArraySelection) {
+ // require seq
+ if (!UnifyTypes(expectedType, new SeqType(new InferredTypeProxy()))) {
+ Error(e, "selection requires a sequence (got {0})", e.Seq.Type);
+ }
+ } else {
+ if (UnifyTypes(expectedType, new MapType(new InferredTypeProxy(), new InferredTypeProxy()))) {
+ Error(e, "cannot multiselect a map (got {0} as map type)", e.Seq.Type);
+ }
+ }
+ }
if (e.E0 != null) {
ResolveExpression(e.E0, twoState);
Contract.Assert(e.E0.Type != null); // follows from postcondition of ResolveExpression
- if (!UnifyTypes(e.E0.Type, Type.Int)) {
- Error(e.E0, "sequence/array selection requires integer indices (got {0})", e.E0.Type);
+ if (!UnifyTypes(e.E0.Type, domainType)) {
+ Error(e.E0, "sequence/array/map selection requires {1} indices (got {0})", e.E0.Type, domainType);
}
}
if (e.E1 != null) {
ResolveExpression(e.E1, twoState);
Contract.Assert(e.E1.Type != null); // follows from postcondition of ResolveExpression
- if (!UnifyTypes(e.E1.Type, Type.Int)) {
- Error(e.E1, "sequence/array selection requires integer indices (got {0})", e.E1.Type);
+ if (!UnifyTypes(e.E1.Type, domainType)) {
+ Error(e.E1, "sequence/array/map selection requires {1} indices (got {0})", e.E1.Type, domainType);
}
}
if (!seqErr) {
@@ -3993,6 +4059,8 @@ namespace Microsoft.Dafny { return BinaryExpr.ResolvedOpcode.MultiSetEq;
} else if (operandType is SeqType) {
return BinaryExpr.ResolvedOpcode.SeqEq;
+ } else if (operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.MapEq;
} else {
return BinaryExpr.ResolvedOpcode.EqCommon;
}
@@ -4003,13 +4071,18 @@ namespace Microsoft.Dafny { return BinaryExpr.ResolvedOpcode.MultiSetNeq;
} else if (operandType is SeqType) {
return BinaryExpr.ResolvedOpcode.SeqNeq;
+ } else if (operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.MapNeq;
} else {
return BinaryExpr.ResolvedOpcode.NeqCommon;
}
case BinaryExpr.Opcode.Disjoint:
if (operandType is MultiSetType) {
return BinaryExpr.ResolvedOpcode.MultiSetDisjoint;
+ } else if(operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.MapDisjoint;
} else {
+ Contract.Assert(operandType is SetType);
return BinaryExpr.ResolvedOpcode.Disjoint;
}
case BinaryExpr.Opcode.Lt:
@@ -4039,6 +4112,8 @@ namespace Microsoft.Dafny { return BinaryExpr.ResolvedOpcode.Union;
} else if (operandType is MultiSetType) {
return BinaryExpr.ResolvedOpcode.MultiSetUnion;
+ } else if (operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.MapUnion;
} else if (operandType is SeqType) {
return BinaryExpr.ResolvedOpcode.Concat;
} else {
@@ -4083,7 +4158,10 @@ namespace Microsoft.Dafny { return BinaryExpr.ResolvedOpcode.InSet;
} else if (operandType is MultiSetType) {
return BinaryExpr.ResolvedOpcode.InMultiSet;
+ } else if (operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.InMap;
} else {
+ Contract.Assert(operandType is SeqType);
return BinaryExpr.ResolvedOpcode.InSeq;
}
case BinaryExpr.Opcode.NotIn:
@@ -4091,7 +4169,10 @@ namespace Microsoft.Dafny { return BinaryExpr.ResolvedOpcode.NotInSet;
} else if (operandType is MultiSetType) {
return BinaryExpr.ResolvedOpcode.NotInMultiSet;
+ } else if (operandType is MapType) {
+ return BinaryExpr.ResolvedOpcode.NotInMap;
} else {
+ Contract.Assert(operandType is SeqType);
return BinaryExpr.ResolvedOpcode.NotInSeq;
}
case BinaryExpr.Opcode.Div: return BinaryExpr.ResolvedOpcode.Div;
diff --git a/Dafny/Scanner.cs b/Dafny/Scanner.cs index ffc6f4b0..0c91c68c 100644 --- a/Dafny/Scanner.cs +++ b/Dafny/Scanner.cs @@ -211,8 +211,8 @@ public class UTF8Buffer: Buffer { public class Scanner {
const char EOL = '\n';
const int eofSym = 0; /* pdt */
- const int maxT = 107;
- const int noSym = 107;
+ const int maxT = 108;
+ const int noSym = 108;
[ContractInvariantMethod]
@@ -513,36 +513,37 @@ public class Scanner { case "set": t.kind = 39; break;
case "multiset": t.kind = 40; break;
case "seq": t.kind = 41; break;
- case "object": t.kind = 42; break;
- case "function": t.kind = 43; break;
- case "predicate": t.kind = 44; break;
- case "reads": t.kind = 45; break;
- case "label": t.kind = 48; break;
- case "break": t.kind = 49; break;
- case "return": t.kind = 50; break;
- case "new": t.kind = 53; break;
- case "choose": t.kind = 57; break;
- case "if": t.kind = 58; break;
- case "else": t.kind = 59; break;
- case "case": t.kind = 60; break;
- case "while": t.kind = 62; break;
- case "invariant": t.kind = 63; break;
- case "match": t.kind = 64; break;
- case "assert": t.kind = 65; break;
- case "assume": t.kind = 66; break;
- case "print": t.kind = 67; break;
- case "parallel": t.kind = 68; break;
- case "in": t.kind = 82; break;
- case "false": t.kind = 92; break;
- case "true": t.kind = 93; break;
- case "null": t.kind = 94; break;
- case "this": t.kind = 95; break;
- case "fresh": t.kind = 96; break;
- case "allocated": t.kind = 97; break;
- case "old": t.kind = 98; break;
- case "then": t.kind = 99; break;
- case "forall": t.kind = 101; break;
- case "exists": t.kind = 103; break;
+ case "map": t.kind = 42; break;
+ case "object": t.kind = 43; break;
+ case "function": t.kind = 44; break;
+ case "predicate": t.kind = 45; break;
+ case "reads": t.kind = 46; break;
+ case "label": t.kind = 49; break;
+ case "break": t.kind = 50; break;
+ case "return": t.kind = 51; break;
+ case "new": t.kind = 54; break;
+ case "choose": t.kind = 58; break;
+ case "if": t.kind = 59; break;
+ case "else": t.kind = 60; break;
+ case "case": t.kind = 61; break;
+ case "while": t.kind = 63; break;
+ case "invariant": t.kind = 64; break;
+ case "match": t.kind = 65; break;
+ case "assert": t.kind = 66; break;
+ case "assume": t.kind = 67; break;
+ case "print": t.kind = 68; break;
+ case "parallel": t.kind = 69; break;
+ case "in": t.kind = 83; break;
+ case "false": t.kind = 93; break;
+ case "true": t.kind = 94; break;
+ case "null": t.kind = 95; break;
+ case "this": t.kind = 96; break;
+ case "fresh": t.kind = 97; break;
+ case "allocated": t.kind = 98; break;
+ case "old": t.kind = 99; break;
+ case "then": t.kind = 100; break;
+ case "forall": t.kind = 102; break;
+ case "exists": t.kind = 104; break;
default: break;
}
}
@@ -658,71 +659,71 @@ public class Scanner { case 23:
{t.kind = 35; break;}
case 24:
- {t.kind = 46; break;}
- case 25:
{t.kind = 47; break;}
+ case 25:
+ {t.kind = 48; break;}
case 26:
- {t.kind = 51; break;}
- case 27:
{t.kind = 52; break;}
+ case 27:
+ {t.kind = 53; break;}
case 28:
- {t.kind = 54; break;}
- case 29:
{t.kind = 55; break;}
+ case 29:
+ {t.kind = 56; break;}
case 30:
- {t.kind = 61; break;}
+ {t.kind = 62; break;}
case 31:
if (ch == '>') {AddCh(); goto case 32;}
else {goto case 0;}
case 32:
- {t.kind = 69; break;}
- case 33:
{t.kind = 70; break;}
- case 34:
+ case 33:
{t.kind = 71; break;}
- case 35:
+ case 34:
{t.kind = 72; break;}
+ case 35:
+ {t.kind = 73; break;}
case 36:
if (ch == '&') {AddCh(); goto case 37;}
else {goto case 0;}
case 37:
- {t.kind = 73; break;}
- case 38:
{t.kind = 74; break;}
- case 39:
+ case 38:
{t.kind = 75; break;}
- case 40:
+ case 39:
{t.kind = 76; break;}
+ case 40:
+ {t.kind = 77; break;}
case 41:
- {t.kind = 79; break;}
- case 42:
{t.kind = 80; break;}
- case 43:
+ case 42:
{t.kind = 81; break;}
+ case 43:
+ {t.kind = 82; break;}
case 44:
- {t.kind = 84; break;}
- case 45:
{t.kind = 85; break;}
- case 46:
+ case 45:
{t.kind = 86; break;}
- case 47:
+ case 46:
{t.kind = 87; break;}
- case 48:
+ case 47:
{t.kind = 88; break;}
- case 49:
+ case 48:
{t.kind = 89; break;}
- case 50:
+ case 49:
{t.kind = 90; break;}
- case 51:
+ case 50:
{t.kind = 91; break;}
+ case 51:
+ {t.kind = 92; break;}
case 52:
- {t.kind = 102; break;}
+ {t.kind = 103; break;}
case 53:
- {t.kind = 104; break;}
- case 54:
{t.kind = 105; break;}
- case 55:
+ case 54:
{t.kind = 106; break;}
+ case 55:
+ {t.kind = 107; break;}
case 56:
recEnd = pos; recKind = 5;
if (ch == '=') {AddCh(); goto case 26;}
@@ -747,26 +748,26 @@ public class Scanner { if (ch == '=') {AddCh(); goto case 41;}
else {t.kind = 24; break;}
case 61:
- recEnd = pos; recKind = 56;
+ recEnd = pos; recKind = 57;
if (ch == '.') {AddCh(); goto case 65;}
- else {t.kind = 56; break;}
+ else {t.kind = 57; break;}
case 62:
- recEnd = pos; recKind = 83;
+ recEnd = pos; recKind = 84;
if (ch == '=') {AddCh(); goto case 42;}
else if (ch == '!') {AddCh(); goto case 43;}
- else {t.kind = 83; break;}
+ else {t.kind = 84; break;}
case 63:
- recEnd = pos; recKind = 77;
+ recEnd = pos; recKind = 78;
if (ch == '>') {AddCh(); goto case 34;}
- else {t.kind = 77; break;}
+ else {t.kind = 78; break;}
case 64:
- recEnd = pos; recKind = 78;
+ recEnd = pos; recKind = 79;
if (ch == '=') {AddCh(); goto case 31;}
- else {t.kind = 78; break;}
+ else {t.kind = 79; break;}
case 65:
- recEnd = pos; recKind = 100;
+ recEnd = pos; recKind = 101;
if (ch == '.') {AddCh(); goto case 21;}
- else {t.kind = 100; break;}
+ else {t.kind = 101; break;}
}
t.val = new String(tval, 0, tlen);
diff --git a/Dafny/Translator.cs b/Dafny/Translator.cs index 2caab95f..3f3d89f1 100644 --- a/Dafny/Translator.cs +++ b/Dafny/Translator.cs @@ -45,6 +45,7 @@ namespace Microsoft.Dafny { public readonly Bpl.Type TickType;
private readonly Bpl.TypeSynonymDecl setTypeCtor;
private readonly Bpl.TypeSynonymDecl multiSetTypeCtor;
+ private readonly Bpl.TypeCtorDecl mapTypeCtor;
public readonly Bpl.Function ArrayLength;
private readonly Bpl.TypeCtorDecl seqTypeCtor;
readonly Bpl.TypeCtorDecl fieldName;
@@ -92,6 +93,13 @@ namespace Microsoft.Dafny { return new Bpl.TypeSynonymAnnotation(Token.NoToken, multiSetTypeCtor, new Bpl.TypeSeq(ty));
}
+ public Bpl.Type MapType(IToken tok, Bpl.Type tya, Bpl.Type tyb) {
+ Contract.Requires(tok != null);
+ Contract.Requires(tya != null && tyb != null);
+ Contract.Ensures(Contract.Result<Bpl.Type>() != null);
+
+ return new Bpl.CtorType(Token.NoToken, mapTypeCtor, new Bpl.TypeSeq(tya, tyb));
+ }
public Bpl.Type SeqType(IToken tok, Bpl.Type ty) {
Contract.Requires(tok != null);
@@ -116,7 +124,7 @@ namespace Microsoft.Dafny { }
public PredefinedDecls(Bpl.TypeCtorDecl refType, Bpl.TypeCtorDecl boxType, Bpl.TypeCtorDecl tickType,
- Bpl.TypeSynonymDecl setTypeCtor, Bpl.TypeSynonymDecl multiSetTypeCtor, Bpl.Function arrayLength, Bpl.TypeCtorDecl seqTypeCtor, Bpl.TypeCtorDecl fieldNameType,
+ Bpl.TypeSynonymDecl setTypeCtor, Bpl.TypeSynonymDecl multiSetTypeCtor, Bpl.TypeCtorDecl mapTypeCtor, Bpl.Function arrayLength, Bpl.TypeCtorDecl seqTypeCtor, Bpl.TypeCtorDecl fieldNameType,
Bpl.GlobalVariable heap, Bpl.TypeCtorDecl classNameType,
Bpl.TypeCtorDecl datatypeType, Bpl.TypeCtorDecl dtCtorId,
Bpl.Constant allocField, Bpl.Constant classDotArray) {
@@ -142,6 +150,7 @@ namespace Microsoft.Dafny { this.TickType = new Bpl.CtorType(Token.NoToken, tickType, new Bpl.TypeSeq());
this.setTypeCtor = setTypeCtor;
this.multiSetTypeCtor = multiSetTypeCtor;
+ this.mapTypeCtor = mapTypeCtor;
this.ArrayLength = arrayLength;
this.seqTypeCtor = seqTypeCtor;
this.fieldName = fieldNameType;
@@ -174,6 +183,7 @@ namespace Microsoft.Dafny { Bpl.TypeCtorDecl dtCtorId = null;
Bpl.TypeCtorDecl boxType = null;
Bpl.TypeCtorDecl tickType = null;
+ Bpl.TypeCtorDecl mapTypeCtor = null;
Bpl.GlobalVariable heap = null;
Bpl.Constant allocField = null;
Bpl.Constant classDotArray = null;
@@ -196,6 +206,8 @@ namespace Microsoft.Dafny { boxType = dt;
} else if (dt.Name == "TickType") {
tickType = dt;
+ } else if (dt.Name == "Map") {
+ mapTypeCtor = dt;
}
} else if (d is Bpl.TypeSynonymDecl) {
Bpl.TypeSynonymDecl dt = (Bpl.TypeSynonymDecl)d;
@@ -229,6 +241,8 @@ namespace Microsoft.Dafny { Console.WriteLine("Error: Dafny prelude is missing declaration of type Set");
} else if (multiSetTypeCtor == null) {
Console.WriteLine("Error: Dafny prelude is missing declaration of type MultiSet");
+ } else if (mapTypeCtor == null) {
+ Console.WriteLine("Error: Dafny prelude is missing declaration of type Map");
} else if (arrayLength == null) {
Console.WriteLine("Error: Dafny prelude is missing declaration of function _System.array.Length");
} else if (fieldNameType == null) {
@@ -253,7 +267,7 @@ namespace Microsoft.Dafny { Console.WriteLine("Error: Dafny prelude is missing declaration of class._System.array");
} else {
return new PredefinedDecls(refType, boxType, tickType,
- setTypeCtor, multiSetTypeCtor, arrayLength, seqTypeCtor, fieldNameType, heap, classNameType, datatypeType, dtCtorId,
+ setTypeCtor, multiSetTypeCtor, mapTypeCtor, arrayLength, seqTypeCtor, fieldNameType, heap, classNameType, datatypeType, dtCtorId,
allocField, classDotArray);
}
return null;
@@ -1906,6 +1920,13 @@ namespace Microsoft.Dafny { } else if (expr is DisplayExpression) {
DisplayExpression e = (DisplayExpression)expr;
return CanCallAssumption(e.Elements, etran);
+ } else if (expr is MapDisplayExpr) {
+ MapDisplayExpr e = (MapDisplayExpr)expr;
+ List<Expression> l = new List<Expression>();
+ foreach (ExpressionPair p in e.Elements) {
+ l.Add(p.A); l.Add(p.B);
+ }
+ return CanCallAssumption(l, etran);
} else if (expr is FieldSelectExpr) {
FieldSelectExpr e = (FieldSelectExpr)expr;
if (e.Obj is ThisExpr) {
@@ -2181,6 +2202,12 @@ namespace Microsoft.Dafny { foreach (Expression el in e.Elements) {
CheckWellformed(el, options, locals, builder, etran);
}
+ } else if (expr is MapDisplayExpr) {
+ MapDisplayExpr e = (MapDisplayExpr)expr;
+ foreach (ExpressionPair p in e.Elements) {
+ CheckWellformed(p.A, options, locals, builder, etran);
+ CheckWellformed(p.B, options, locals, builder, etran);
+ }
} else if (expr is FieldSelectExpr) {
FieldSelectExpr e = (FieldSelectExpr)expr;
CheckWellformed(e.Obj, options, locals, builder, etran);
@@ -2209,14 +2236,23 @@ namespace Microsoft.Dafny { builder.Add(Assert(e.Seq.tok, Bpl.Expr.Neq(seq, predef.Null), "array may be null"));
}
Bpl.Expr e0 = null;
- if (e.E0 != null) {
+ if (e.Seq.Type is MapType) {
e0 = etran.TrExpr(e.E0);
CheckWellformed(e.E0, options, locals, builder, etran);
- builder.Add(Assert(expr.tok, InSeqRange(expr.tok, e0, seq, isSequence, null, !e.SelectOne), e.SelectOne ? "index out of range" : "lower bound out of range", options.AssertKv));
- }
- if (e.E1 != null) {
- CheckWellformed(e.E1, options, locals, builder, etran);
- builder.Add(Assert(expr.tok, InSeqRange(expr.tok, etran.TrExpr(e.E1), seq, isSequence, e0, true), "upper bound " + (e.E0 == null ? "" : "below lower bound or ") + "above length of " + (isSequence ? "sequence" : "array"), options.AssertKv));
+ Bpl.Expr inDomain = FunctionCall(expr.tok, BuiltinFunction.MapDomain, predef.MapType(e.tok, predef.BoxType, predef.BoxType), seq);
+ inDomain = Bpl.Expr.Select(inDomain, etran.BoxIfNecessary(e.tok, e0, e.E0.Type));
+ builder.Add(Assert(expr.tok, inDomain, "element may not be in domain", options.AssertKv));
+
+ } else {
+ if (e.E0 != null) {
+ e0 = etran.TrExpr(e.E0);
+ CheckWellformed(e.E0, options, locals, builder, etran);
+ builder.Add(Assert(expr.tok, InSeqRange(expr.tok, e0, seq, isSequence, null, !e.SelectOne), e.SelectOne ? "index out of range" : "lower bound out of range", options.AssertKv));
+ }
+ if (e.E1 != null) {
+ CheckWellformed(e.E1, options, locals, builder, etran);
+ builder.Add(Assert(expr.tok, InSeqRange(expr.tok, etran.TrExpr(e.E1), seq, isSequence, e0, true), "upper bound " + (e.E0 == null ? "" : "below lower bound or ") + "above length of " + (isSequence ? "sequence" : "array"), options.AssertKv));
+ }
}
if (options.DoReadsChecks && cce.NonNull(e.Seq.Type).IsArrayType) {
if (e.SelectOne) {
@@ -2258,7 +2294,12 @@ namespace Microsoft.Dafny { Bpl.Expr seq = etran.TrExpr(e.Seq);
Bpl.Expr index = etran.TrExpr(e.Index);
CheckWellformed(e.Index, options, locals, builder, etran);
- builder.Add(Assert(expr.tok, InSeqRange(expr.tok, index, seq, true, null, false), "index out of range", options.AssertKv));
+ if (e.Seq.Type is SeqType) {
+ builder.Add(Assert(expr.tok, InSeqRange(expr.tok, index, seq, true, null, false), "index out of range", options.AssertKv));
+ } else {
+ Contract.Assert(e.Seq.Type is MapType);
+ // updates add to maps, so are always valid if the values are well formed.
+ }
CheckWellformed(e.Value, options, locals, builder, etran);
} else if (expr is FunctionCallExpr) {
FunctionCallExpr e = (FunctionCallExpr)expr;
@@ -2273,13 +2314,13 @@ namespace Microsoft.Dafny { CheckWellformed(arg, options, locals, builder, etran);
}
// create a local variable for each formal parameter, and assign each actual parameter to the corresponding local
- Dictionary<IVariable,Expression> substMap = new Dictionary<IVariable,Expression>();
+ Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
for (int i = 0; i < e.Function.Formals.Count; i++) {
Formal p = e.Function.Formals[i];
VarDecl local = new VarDecl(p.tok, p.Name, p.Type, p.IsGhost);
local.type = local.OptionalType; // resolve local here
IdentifierExpr ie = new IdentifierExpr(local.Tok, local.UniqueName);
- ie.Var = local; ie.Type = ie.Var.Type; // resolve ie here
+ ie.Var = local; ie.Type = ie.Var.Type; // resolve ie here
substMap.Add(p, ie);
locals.Add(new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.UniqueName, TrType(local.Type))));
Bpl.IdentifierExpr lhs = (Bpl.IdentifierExpr)etran.TrExpr(ie); // TODO: is this cast always justified?
@@ -2402,15 +2443,13 @@ namespace Microsoft.Dafny { CheckWellformed(e.E0, options, locals, builder, etran);
switch (e.ResolvedOp) {
case BinaryExpr.ResolvedOpcode.And:
- case BinaryExpr.ResolvedOpcode.Imp:
- {
+ case BinaryExpr.ResolvedOpcode.Imp: {
Bpl.StmtListBuilder b = new Bpl.StmtListBuilder();
CheckWellformed(e.E1, options, locals, b, etran);
builder.Add(new Bpl.IfCmd(expr.tok, etran.TrExpr(e.E0), b.Collect(expr.tok), null, null));
}
break;
- case BinaryExpr.ResolvedOpcode.Or:
- {
+ case BinaryExpr.ResolvedOpcode.Or: {
Bpl.StmtListBuilder b = new Bpl.StmtListBuilder();
CheckWellformed(e.E1, options, locals, b, etran);
builder.Add(new Bpl.IfCmd(expr.tok, Bpl.Expr.Not(etran.TrExpr(e.E0)), b.Collect(expr.tok), null, null));
@@ -3167,6 +3206,8 @@ namespace Microsoft.Dafny { return predef.SetType(Token.NoToken, predef.BoxType);
} else if (type is MultiSetType) {
return predef.MultiSetType(Token.NoToken, predef.BoxType);
+ } else if (type is MapType) {
+ return predef.MapType(Token.NoToken, predef.BoxType, predef.BoxType);
} else if (type is SeqType) {
return predef.SeqType(Token.NoToken, predef.BoxType);
} else {
@@ -4582,6 +4623,8 @@ namespace Microsoft.Dafny { return u.IsDatatype;
} else if (t.IsRefType) {
return u.IsRefType;
+ } else if (t is MapType) {
+ return false;
} else {
Contract.Assert(t.IsTypeParameter);
return false; // don't consider any type parameters to be the same (since we have no comparison function for them anyway)
@@ -4729,6 +4772,39 @@ namespace Microsoft.Dafny { return new Bpl.ForallExpr(tok, new Bpl.VariableSeq(iVar), tr, Bpl.Expr.Imp(range, c));
}
+ } else if (type is MapType) {
+ MapType mt = (MapType)type;
+ Bpl.Type maptype = predef.MapType(tok, predef.BoxType, predef.BoxType);
+ Bpl.Expr clause = null;
+ // (forall i: BoxType :: { Map#Domain(x)[i] }
+ // Map#Domain(x)[i] ==> Unbox(i)-has-the-expected-type)
+ // (forall i: BoxType :: { Map#Elements(x)[i] }
+ // Map#Domain(x)[i] ==> Unbox(Map#Elements(x)[i])-has-the-expected-type)
+ Bpl.BoundVariable tVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$t#" + otherTmpVarCount, predef.BoxType));
+ otherTmpVarCount++;
+ Bpl.Expr t = new Bpl.IdentifierExpr(tok, tVar);
+ Bpl.Expr xSubT = Bpl.Expr.SelectTok(tok, FunctionCall(tok, BuiltinFunction.MapDomain, maptype, x), t);
+ Bpl.Expr xElemSubT = Bpl.Expr.SelectTok(tok, FunctionCall(tok, BuiltinFunction.MapElements, maptype, x), t);
+ Bpl.Expr unboxT = ExpressionTranslator.ModeledAsBoxType(mt.Domain) ? t : FunctionCall(tok, BuiltinFunction.Unbox, TrType(mt.Domain), t);
+ Bpl.Expr unboxElemT = ExpressionTranslator.ModeledAsBoxType(mt.Domain) ? xElemSubT : FunctionCall(tok, BuiltinFunction.Unbox, TrType(mt.Domain), xElemSubT);
+
+ Bpl.Expr wh = GetWhereClause(tok, unboxT, mt.Domain, etran);
+ if (wh != null) {
+ Bpl.Trigger tr = new Bpl.Trigger(tok, true, new Bpl.ExprSeq(xSubT));
+ clause = new Bpl.ForallExpr(tok, new Bpl.VariableSeq(tVar), tr, Bpl.Expr.Imp(xSubT, wh));
+ }
+
+ Bpl.Expr wh2 = GetWhereClause(tok, xElemSubT, mt.Range, etran);
+ if (wh2 != null) {
+ Bpl.Trigger tr = new Bpl.Trigger(tok, true, new Bpl.ExprSeq(xElemSubT));
+ Bpl.Expr forall = new Bpl.ForallExpr(tok, new Bpl.VariableSeq(tVar), tr, Bpl.Expr.Imp(xSubT, wh));
+ if (clause == null) {
+ clause = forall;
+ } else {
+ clause = Bpl.Expr.And(clause, forall);
+ }
+ }
+ return clause;
} else if (type.IsRefType) {
// reference type:
// x == null || ($Heap[x,alloc] && dtype(x) == ...)
@@ -5340,11 +5416,20 @@ namespace Microsoft.Dafny { } else if (expr is SeqDisplayExpr) {
SeqDisplayExpr e = (SeqDisplayExpr)expr;
Bpl.Expr s = translator.FunctionCall(expr.tok, BuiltinFunction.SeqEmpty, predef.BoxType);
- int i = 0;
foreach (Expression ee in e.Elements) {
Bpl.Expr elt = BoxIfNecessary(expr.tok, TrExpr(ee), cce.NonNull(ee.Type));
s = translator.FunctionCall(expr.tok, BuiltinFunction.SeqBuild, predef.BoxType, s, elt);
- i++;
+ }
+ return s;
+
+ } else if (expr is MapDisplayExpr) {
+ MapDisplayExpr e = (MapDisplayExpr)expr;
+ Bpl.Type maptype = predef.MapType(expr.tok, predef.BoxType, predef.BoxType);
+ Bpl.Expr s = translator.FunctionCall(expr.tok, "Map#Empty", maptype);
+ foreach (ExpressionPair p in e.Elements) {
+ Bpl.Expr elt = BoxIfNecessary(expr.tok, TrExpr(p.A), cce.NonNull(p.A.Type));
+ Bpl.Expr elt2 = BoxIfNecessary(expr.tok, TrExpr(p.B), cce.NonNull(p.B.Type));
+ s = translator.FunctionCall(expr.tok, "Map#Build", maptype, s, elt, elt2);
}
return s;
@@ -5363,14 +5448,21 @@ namespace Microsoft.Dafny { } else if (expr is SeqSelectExpr) {
SeqSelectExpr e = (SeqSelectExpr)expr;
Bpl.Expr seq = TrExpr(e.Seq);
- Type elmtType;
+ Type elmtType = null;
+ Type domainType = null;
Contract.Assert(e.Seq.Type != null); // the expression has been successfully resolved
if (e.Seq.Type.IsArrayType) {
+ domainType = Type.Int;
elmtType = UserDefinedType.ArrayElementType(e.Seq.Type);
- } else {
+ } else if (e.Seq.Type is SeqType) {
+ domainType = Type.Int;
elmtType = ((SeqType)e.Seq.Type).Arg;
- }
+ } else if (e.Seq.Type is MapType) {
+ domainType = ((MapType)e.Seq.Type).Domain;
+ elmtType = ((MapType)e.Seq.Type).Range;
+ } else { Contract.Assert(false); }
Bpl.Type elType = translator.TrType(elmtType);
+ Bpl.Type dType = translator.TrType(domainType);
Bpl.Expr e0 = e.E0 == null ? null : TrExpr(e.E0);
Bpl.Expr e1 = e.E1 == null ? null : TrExpr(e.E1);
if (e.SelectOne) {
@@ -5379,9 +5471,12 @@ namespace Microsoft.Dafny { if (e.Seq.Type.IsArrayType) {
Bpl.Expr fieldName = translator.FunctionCall(expr.tok, BuiltinFunction.IndexField, null, e0);
x = ReadHeap(expr.tok, HeapExpr, TrExpr(e.Seq), fieldName);
- } else {
+ } else if(e.Seq.Type is SeqType) {
x = translator.FunctionCall(expr.tok, BuiltinFunction.SeqIndex, predef.BoxType, seq, e0);
- }
+ } else if (e.Seq.Type is MapType) {
+ x = translator.FunctionCall(expr.tok, BuiltinFunction.MapElements, predef.MapType(e.tok, predef.BoxType, predef.BoxType), seq);
+ x = Bpl.Expr.Select(x, translator.FunctionCall(e.tok, BuiltinFunction.Box, null, e0));
+ } else { Contract.Assert(false); x = null; }
if (!ModeledAsBoxType(elmtType)) {
x = translator.FunctionCall(expr.tok, BuiltinFunction.Unbox, elType, x);
}
@@ -5403,11 +5498,19 @@ namespace Microsoft.Dafny { } else if (expr is SeqUpdateExpr) {
SeqUpdateExpr e = (SeqUpdateExpr)expr;
Bpl.Expr seq = TrExpr(e.Seq);
- Type elmtType = cce.NonNull((SeqType)e.Seq.Type).Arg;
- Bpl.Expr index = TrExpr(e.Index);
- Bpl.Expr val = BoxIfNecessary(expr.tok, TrExpr(e.Value), elmtType);
- return translator.FunctionCall(expr.tok, BuiltinFunction.SeqUpdate, predef.BoxType, seq, index, val);
-
+ if (e.Seq.Type is SeqType) {
+ Type elmtType = cce.NonNull((SeqType)e.Seq.Type).Arg;
+ Bpl.Expr index = TrExpr(e.Index);
+ Bpl.Expr val = BoxIfNecessary(expr.tok, TrExpr(e.Value), elmtType);
+ return translator.FunctionCall(expr.tok, BuiltinFunction.SeqUpdate, predef.BoxType, seq, index, val);
+ } else {
+ Contract.Assert(e.Seq.Type is MapType);
+ MapType mt = (MapType)e.Seq.Type;
+ Bpl.Type maptype = predef.MapType(expr.tok, predef.BoxType, predef.BoxType);
+ Bpl.Expr index = BoxIfNecessary(expr.tok, TrExpr(e.Index), mt.Domain);
+ Bpl.Expr val = BoxIfNecessary(expr.tok, TrExpr(e.Value), mt.Range);
+ return translator.FunctionCall(expr.tok, "Map#Build", maptype, seq, index, val);
+ }
} else if (expr is MultiSelectExpr) {
MultiSelectExpr e = (MultiSelectExpr)expr;
Type elmtType = UserDefinedType.ArrayElementType(e.Array.Type);;
@@ -5608,6 +5711,10 @@ namespace Microsoft.Dafny { return translator.FunctionCall(expr.tok, BuiltinFunction.MultiSetEqual, null, e0, e1);
case BinaryExpr.ResolvedOpcode.MultiSetNeq:
return Bpl.Expr.Unary(expr.tok, UnaryOperator.Opcode.Not, translator.FunctionCall(expr.tok, BuiltinFunction.MultiSetEqual, null, e0, e1));
+ case BinaryExpr.ResolvedOpcode.MapEq:
+ return translator.FunctionCall(expr.tok, BuiltinFunction.MapEqual, null, e0, e1);
+ case BinaryExpr.ResolvedOpcode.MapNeq:
+ return Bpl.Expr.Unary(expr.tok, UnaryOperator.Opcode.Not, translator.FunctionCall(expr.tok, BuiltinFunction.MapEqual, null, e0, e1));
case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
return Bpl.Expr.Binary(expr.tok, BinaryOperator.Opcode.And,
translator.FunctionCall(expr.tok, BuiltinFunction.MultiSetSubset, null, e0, e1),
@@ -5656,7 +5763,15 @@ namespace Microsoft.Dafny { Bpl.Expr arg = translator.FunctionCall(expr.tok, BuiltinFunction.SeqContains, null, e1,
BoxIfNecessary(expr.tok, e0, cce.NonNull(e.E0.Type)));
return Bpl.Expr.Unary(expr.tok, UnaryOperator.Opcode.Not, arg);
-
+ case BinaryExpr.ResolvedOpcode.InMap:
+ return Bpl.Expr.Select(translator.FunctionCall(expr.tok, BuiltinFunction.MapDomain, predef.MapType(e.tok, predef.BoxType, predef.BoxType), e1),
+ BoxIfNecessary(expr.tok, e0, e.E0.Type));
+ case BinaryExpr.ResolvedOpcode.NotInMap:
+ return Bpl.Expr.Not(Bpl.Expr.Select(translator.FunctionCall(expr.tok, BuiltinFunction.MapDomain, predef.MapType(e.tok, predef.BoxType, predef.BoxType), e1),
+ BoxIfNecessary(expr.tok, e0, e.E0.Type)));
+ case BinaryExpr.ResolvedOpcode.MapDisjoint:
+ return translator.FunctionCall(expr.tok, BuiltinFunction.MapDisjoint, null, e0, e1);
+
case BinaryExpr.ResolvedOpcode.RankLt:
return Bpl.Expr.Binary(expr.tok, BinaryOperator.Opcode.Lt,
translator.FunctionCall(expr.tok, BuiltinFunction.DtRank, null, e0),
@@ -6143,7 +6258,8 @@ namespace Microsoft.Dafny { }
}
- enum BuiltinFunction {
+ enum BuiltinFunction
+ {
SetEmpty,
SetUnionOne,
SetUnion,
@@ -6179,6 +6295,13 @@ namespace Microsoft.Dafny { SeqSameUntil,
SeqFromArray,
+ MapDomain,
+ MapElements,
+ MapEqual,
+ MapBuild,
+ MapDisjoint,
+ MapUnion,
+
IndexField,
MultiIndexField,
@@ -6201,7 +6324,7 @@ namespace Microsoft.Dafny { DtRank,
DtAlloc,
- GenericAlloc,
+ GenericAlloc
}
// The "typeInstantiation" argument is passed in to help construct the result type of the function.
@@ -6356,6 +6479,25 @@ namespace Microsoft.Dafny { Contract.Assert(typeInstantiation != null);
return FunctionCall(tok, "Seq#FromArray", typeInstantiation, args);
+ case BuiltinFunction.MapDomain:
+ Contract.Assert(args.Length == 1);
+ return FunctionCall(tok, "Map#Domain", typeInstantiation, args);
+ case BuiltinFunction.MapElements:
+ Contract.Assert(args.Length == 1);
+ return FunctionCall(tok, "Map#Elements", typeInstantiation, args);
+ case BuiltinFunction.MapEqual:
+ Contract.Assert(args.Length == 2);
+ Contract.Assert(typeInstantiation == null);
+ return FunctionCall(tok, "Map#Equal", Bpl.Type.Bool, args);
+ case BuiltinFunction.MapDisjoint:
+ Contract.Assert(args.Length == 2);
+ Contract.Assert(typeInstantiation == null);
+ return FunctionCall(tok, "Map#Disjoint", Bpl.Type.Bool, args);
+ case BuiltinFunction.MapUnion:
+ Contract.Assert(args.Length == 2);
+ Contract.Assert(typeInstantiation == null);
+ return FunctionCall(tok, "Map#Disjoint", typeInstantiation, args);
+
case BuiltinFunction.IndexField:
Contract.Assert(args.Length == 1);
Contract.Assert(typeInstantiation == null);
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs index 012058f6..635115fb 100644 --- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs +++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs @@ -26,7 +26,7 @@ namespace Demo "bool", "nat", "int", "false", "true", "null",
"function", "predicate", "free",
"in", "forall", "exists",
- "seq", "set", "multiset", "array", "array2", "array3",
+ "seq", "set", "map", "multiset", "array", "array2", "array3",
"match", "case",
"fresh", "allocated", "old", "choose"
);
@@ -309,6 +309,7 @@ namespace Demo | "exists"
| "seq"
| "set"
+ | "map"
| "multiset"
| "array"
| "array2"
|