Add an infinite set collection type.

1 files changed, 156 insertions, 144 deletions

diff --git a/Source/Dafny/Scanner.cs b/Source/Dafny/Scanner.cs
index 3427477b..4c5eedb4 100644
--- a/Source/Dafny/Scanner.cs
+++ b/Source/Dafny/Scanner.cs
@@ -211,13 +211,13 @@ public class UTF8Buffer: Buffer {
 public class Scanner {

 	const char EOL = '\n';

 	const int eofSym = 0; /* pdt */

-	const int maxT = 136;

-	const int noSym = 136;

+	const int maxT = 137;

+	const int noSym = 137;

 

 

 	[ContractInvariantMethod]

 	void objectInvariant(){

-		Contract.Invariant(buffer!=null);

+		Contract.Invariant(this._buffer != null);

 		Contract.Invariant(t != null);

 		Contract.Invariant(start != null);

 		Contract.Invariant(tokens != null);

@@ -227,7 +227,18 @@ public class Scanner {
 		Contract.Invariant(errorHandler != null);

 	}

 

-	public Buffer/*!*/ buffer; // scanner buffer

+	private Buffer/*!*/ _buffer; // scanner buffer

+

+	public Buffer/*!*/ buffer {

+		get {

+			Contract.Ensures(Contract.Result<Buffer>() != null);

+			return this._buffer;

+		}

+		set {

+			Contract.Requires(value != null);

+			this._buffer = value;

+		}

+	}

 

 	Token/*!*/ t;          // current token

 	int ch;           // current input character

@@ -307,7 +318,7 @@ public class Scanner {
 		t = new Token(); // dummy because t is a non-null field

 		try {

 			Stream stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);

-			buffer = new Buffer(stream, false);

+			this._buffer = new Buffer(stream, false);

 			Filename = useBaseName? GetBaseName(fileName): fileName;

 			Init();

 		} catch (IOException) {

@@ -322,7 +333,7 @@ public class Scanner {
 	  Contract.Requires(fileName != null);

 		pt = tokens = new Token();  // first token is a dummy

 		t = new Token(); // dummy because t is a non-null field

-		buffer = new Buffer(s, true);

+		this._buffer = new Buffer(s, true);

 		this.errorHandler = errorHandler;

 		this.Filename = useBaseName? GetBaseName(fileName) : fileName;

 		Init();

@@ -503,75 +514,76 @@ public class Scanner {
 			case "object": t.kind = 11; break;

 			case "string": t.kind = 12; break;

 			case "set": t.kind = 13; break;

-			case "multiset": t.kind = 14; break;

-			case "seq": t.kind = 15; break;

-			case "map": t.kind = 16; break;

-			case "imap": t.kind = 17; break;

-			case "assume": t.kind = 29; break;

-			case "calc": t.kind = 30; break;

-			case "case": t.kind = 31; break;

-			case "then": t.kind = 32; break;

-			case "else": t.kind = 33; break;

-			case "decreases": t.kind = 34; break;

-			case "invariant": t.kind = 35; break;

-			case "function": t.kind = 36; break;

-			case "predicate": t.kind = 37; break;

-			case "inductive": t.kind = 38; break;

-			case "lemma": t.kind = 39; break;

-			case "copredicate": t.kind = 40; break;

-			case "modifies": t.kind = 41; break;

-			case "reads": t.kind = 42; break;

-			case "requires": t.kind = 43; break;

-			case "include": t.kind = 58; break;

-			case "abstract": t.kind = 59; break;

-			case "module": t.kind = 60; break;

-			case "refines": t.kind = 61; break;

-			case "import": t.kind = 62; break;

-			case "opened": t.kind = 63; break;

-			case "as": t.kind = 65; break;

-			case "default": t.kind = 66; break;

-			case "class": t.kind = 67; break;

-			case "extends": t.kind = 68; break;

-			case "trait": t.kind = 69; break;

-			case "ghost": t.kind = 70; break;

-			case "static": t.kind = 71; break;

-			case "protected": t.kind = 72; break;

-			case "datatype": t.kind = 73; break;

-			case "codatatype": t.kind = 74; break;

-			case "var": t.kind = 75; break;

-			case "newtype": t.kind = 76; break;

-			case "type": t.kind = 77; break;

-			case "iterator": t.kind = 78; break;

-			case "yields": t.kind = 79; break;

-			case "returns": t.kind = 80; break;

-			case "method": t.kind = 81; break;

-			case "colemma": t.kind = 82; break;

-			case "comethod": t.kind = 83; break;

-			case "constructor": t.kind = 84; break;

-			case "free": t.kind = 85; break;

-			case "ensures": t.kind = 86; break;

-			case "yield": t.kind = 87; break;

-			case "label": t.kind = 89; break;

-			case "break": t.kind = 90; break;

-			case "where": t.kind = 91; break;

-			case "return": t.kind = 93; break;

-			case "new": t.kind = 95; break;

-			case "if": t.kind = 96; break;

-			case "while": t.kind = 97; break;

-			case "match": t.kind = 98; break;

-			case "assert": t.kind = 99; break;

-			case "print": t.kind = 100; break;

-			case "forall": t.kind = 101; break;

-			case "parallel": t.kind = 102; break;

-			case "modify": t.kind = 103; break;

-			case "exists": t.kind = 122; break;

-			case "in": t.kind = 124; break;

-			case "false": t.kind = 129; break;

-			case "true": t.kind = 130; break;

-			case "null": t.kind = 131; break;

-			case "this": t.kind = 132; break;

-			case "fresh": t.kind = 133; break;

-			case "old": t.kind = 134; break;

+			case "iset": t.kind = 14; break;

+			case "multiset": t.kind = 15; break;

+			case "seq": t.kind = 16; break;

+			case "map": t.kind = 17; break;

+			case "imap": t.kind = 18; break;

+			case "assume": t.kind = 30; break;

+			case "calc": t.kind = 31; break;

+			case "case": t.kind = 32; break;

+			case "then": t.kind = 33; break;

+			case "else": t.kind = 34; break;

+			case "decreases": t.kind = 35; break;

+			case "invariant": t.kind = 36; break;

+			case "function": t.kind = 37; break;

+			case "predicate": t.kind = 38; break;

+			case "inductive": t.kind = 39; break;

+			case "lemma": t.kind = 40; break;

+			case "copredicate": t.kind = 41; break;

+			case "modifies": t.kind = 42; break;

+			case "reads": t.kind = 43; break;

+			case "requires": t.kind = 44; break;

+			case "include": t.kind = 59; break;

+			case "abstract": t.kind = 60; break;

+			case "module": t.kind = 61; break;

+			case "refines": t.kind = 62; break;

+			case "import": t.kind = 63; break;

+			case "opened": t.kind = 64; break;

+			case "as": t.kind = 66; break;

+			case "default": t.kind = 67; break;

+			case "class": t.kind = 68; break;

+			case "extends": t.kind = 69; break;

+			case "trait": t.kind = 70; break;

+			case "ghost": t.kind = 71; break;

+			case "static": t.kind = 72; break;

+			case "protected": t.kind = 73; break;

+			case "datatype": t.kind = 74; break;

+			case "codatatype": t.kind = 75; break;

+			case "var": t.kind = 76; break;

+			case "newtype": t.kind = 77; break;

+			case "type": t.kind = 78; break;

+			case "iterator": t.kind = 79; break;

+			case "yields": t.kind = 80; break;

+			case "returns": t.kind = 81; break;

+			case "method": t.kind = 82; break;

+			case "colemma": t.kind = 83; break;

+			case "comethod": t.kind = 84; break;

+			case "constructor": t.kind = 85; break;

+			case "free": t.kind = 86; break;

+			case "ensures": t.kind = 87; break;

+			case "yield": t.kind = 88; break;

+			case "label": t.kind = 90; break;

+			case "break": t.kind = 91; break;

+			case "where": t.kind = 92; break;

+			case "return": t.kind = 94; break;

+			case "new": t.kind = 96; break;

+			case "if": t.kind = 97; break;

+			case "while": t.kind = 98; break;

+			case "match": t.kind = 99; break;

+			case "assert": t.kind = 100; break;

+			case "print": t.kind = 101; break;

+			case "forall": t.kind = 102; break;

+			case "parallel": t.kind = 103; break;

+			case "modify": t.kind = 104; break;

+			case "exists": t.kind = 123; break;

+			case "in": t.kind = 125; break;

+			case "false": t.kind = 130; break;

+			case "true": t.kind = 131; break;

+			case "null": t.kind = 132; break;

+			case "this": t.kind = 133; break;

+			case "fresh": t.kind = 134; break;

+			case "old": t.kind = 135; break;

 			default: break;

 		}

 	}

@@ -674,7 +686,7 @@ public class Scanner {
 				if (ch >= '0' && ch <= '9' || ch >= 'A' && ch <= 'F' || ch >= 'a' && ch <= 'f') {AddCh(); goto case 15;}

 				else {goto case 0;}

 			case 20:

-				{t.kind = 18; break;}

+				{t.kind = 19; break;}

 			case 21:

 				if (ch <= 9 || ch >= 11 && ch <= 12 || ch >= 14 && ch <= '!' || ch >= '#' && ch <= '[' || ch >= ']' && ch <= 65535) {AddCh(); goto case 21;}

 				else if (ch == '"') {AddCh(); goto case 28;}

@@ -700,37 +712,37 @@ public class Scanner {
 				else if (ch == '"') {AddCh(); goto case 55;}

 				else {goto case 0;}

 			case 28:

-				{t.kind = 19; break;}

+				{t.kind = 20; break;}

 			case 29:

-				{t.kind = 21; break;}

+				{t.kind = 22; break;}

 			case 30:

-				{t.kind = 23; break;}

-			case 31:

 				{t.kind = 24; break;}

+			case 31:

+				{t.kind = 25; break;}

 			case 32:

-				{t.kind = 26; break;}

-			case 33:

 				{t.kind = 27; break;}

-			case 34:

+			case 33:

 				{t.kind = 28; break;}

+			case 34:

+				{t.kind = 29; break;}

 			case 35:

-				{t.kind = 44; break;}

-			case 36:

 				{t.kind = 45; break;}

-			case 37:

+			case 36:

 				{t.kind = 46; break;}

-			case 38:

+			case 37:

 				{t.kind = 47; break;}

-			case 39:

+			case 38:

 				{t.kind = 48; break;}

-			case 40:

+			case 39:

 				{t.kind = 49; break;}

+			case 40:

+				{t.kind = 50; break;}

 			case 41:

-				{t.kind = 53; break;}

-			case 42:

 				{t.kind = 54; break;}

-			case 43:

+			case 42:

 				{t.kind = 55; break;}

+			case 43:

+				{t.kind = 56; break;}

 			case 44:

 				if (ch == 'n') {AddCh(); goto case 45;}

 				else {goto case 0;}

@@ -741,9 +753,9 @@ public class Scanner {
 				{

 					tlen -= apx;

 					SetScannerBehindT();

-					t.kind = 56; break;}

+					t.kind = 57; break;}

 			case 47:

-				{t.kind = 57; break;}

+				{t.kind = 58; break;}

 			case 48:

 				recEnd = pos; recKind = 2;

 				if (ch >= '0' && ch <= '9') {AddCh(); goto case 48;}

@@ -782,9 +794,9 @@ public class Scanner {
 				else if (ch == 'u') {AddCh(); goto case 22;}

 				else {goto case 0;}

 			case 55:

-				recEnd = pos; recKind = 19;

+				recEnd = pos; recKind = 20;

 				if (ch == '"') {AddCh(); goto case 27;}

-				else {t.kind = 19; break;}

+				else {t.kind = 20; break;}

 			case 56:

 				if (ch >= '0' && ch <= '9') {AddCh(); goto case 48;}

 				else {goto case 0;}

@@ -813,9 +825,9 @@ public class Scanner {
 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 8;}

 				else {t.kind = 1; t.val = new String(tval, 0, tlen); CheckLiteral(); return t;}

 			case 62:

-				recEnd = pos; recKind = 18;

+				recEnd = pos; recKind = 19;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == '_' || ch >= 'a' && ch <= 'z') {AddCh(); goto case 8;}

-				else {t.kind = 18; break;}

+				else {t.kind = 19; break;}

 			case 63:

 				recEnd = pos; recKind = 1;

 				if (ch == 39 || ch >= '0' && ch <= '9' || ch == '?' || ch >= 'A' && ch <= 'Z' || ch == '_' || ch >= 'a' && ch <= 'x' || ch == 'z') {AddCh(); goto case 5;}

@@ -832,104 +844,104 @@ public class Scanner {
 				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 65;}

 				else {t.kind = 5; break;}

 			case 66:

-				{t.kind = 88; break;}

+				{t.kind = 89; break;}

 			case 67:

-				{t.kind = 92; break;}

+				{t.kind = 93; break;}

 			case 68:

-				{t.kind = 94; break;}

+				{t.kind = 95; break;}

 			case 69:

-				{t.kind = 104; break;}

+				{t.kind = 105; break;}

 			case 70:

-				{t.kind = 106; break;}

-			case 71:

 				{t.kind = 107; break;}

-			case 72:

+			case 71:

 				{t.kind = 108; break;}

-			case 73:

+			case 72:

 				{t.kind = 109; break;}

-			case 74:

+			case 73:

 				{t.kind = 110; break;}

-			case 75:

+			case 74:

 				{t.kind = 111; break;}

-			case 76:

+			case 75:

 				{t.kind = 112; break;}

+			case 76:

+				{t.kind = 113; break;}

 			case 77:

-				{t.kind = 114; break;}

+				{t.kind = 115; break;}

 			case 78:

 				if (ch == '&') {AddCh(); goto case 79;}

 				else {goto case 0;}

 			case 79:

-				{t.kind = 115; break;}

-			case 80:

 				{t.kind = 116; break;}

-			case 81:

+			case 80:

 				{t.kind = 117; break;}

-			case 82:

+			case 81:

 				{t.kind = 118; break;}

+			case 82:

+				{t.kind = 119; break;}

 			case 83:

-				{t.kind = 120; break;}

-			case 84:

 				{t.kind = 121; break;}

+			case 84:

+				{t.kind = 122; break;}

 			case 85:

-				{t.kind = 123; break;}

+				{t.kind = 124; break;}

 			case 86:

-				{t.kind = 125; break;}

+				{t.kind = 126; break;}

 			case 87:

-				{t.kind = 127; break;}

-			case 88:

 				{t.kind = 128; break;}

+			case 88:

+				{t.kind = 129; break;}

 			case 89:

-				recEnd = pos; recKind = 20;

+				recEnd = pos; recKind = 21;

 				if (ch == ':') {AddCh(); goto case 30;}

 				else if (ch == '=') {AddCh(); goto case 67;}

 				else if (ch == '|') {AddCh(); goto case 68;}

-				else {t.kind = 20; break;}

+				else {t.kind = 21; break;}

 			case 90:

-				recEnd = pos; recKind = 22;

+				recEnd = pos; recKind = 23;

 				if (ch == '|') {AddCh(); goto case 81;}

-				else {t.kind = 22; break;}

+				else {t.kind = 23; break;}

 			case 91:

-				recEnd = pos; recKind = 25;

+				recEnd = pos; recKind = 26;

 				if (ch == '.') {AddCh(); goto case 97;}

-				else {t.kind = 25; break;}

+				else {t.kind = 26; break;}

 			case 92:

-				recEnd = pos; recKind = 64;

+				recEnd = pos; recKind = 65;

 				if (ch == '>') {AddCh(); goto case 33;}

 				else if (ch == '=') {AddCh(); goto case 98;}

-				else {t.kind = 64; break;}

+				else {t.kind = 65; break;}

 			case 93:

-				recEnd = pos; recKind = 126;

+				recEnd = pos; recKind = 127;

 				if (ch == '>') {AddCh(); goto case 34;}

-				else {t.kind = 126; break;}

+				else {t.kind = 127; break;}

 			case 94:

-				recEnd = pos; recKind = 50;

+				recEnd = pos; recKind = 51;

 				if (ch == '=') {AddCh(); goto case 99;}

-				else {t.kind = 50; break;}

+				else {t.kind = 51; break;}

 			case 95:

-				recEnd = pos; recKind = 51;

+				recEnd = pos; recKind = 52;

 				if (ch == '=') {AddCh(); goto case 70;}

-				else {t.kind = 51; break;}

+				else {t.kind = 52; break;}

 			case 96:

-				recEnd = pos; recKind = 119;

+				recEnd = pos; recKind = 120;

 				if (ch == '=') {AddCh(); goto case 41;}

 				else if (ch == 'i') {AddCh(); goto case 44;}

-				else {t.kind = 119; break;}

+				else {t.kind = 120; break;}

 			case 97:

-				recEnd = pos; recKind = 135;

+				recEnd = pos; recKind = 136;

 				if (ch == '.') {AddCh(); goto case 47;}

-				else {t.kind = 135; break;}

+				else {t.kind = 136; break;}

 			case 98:

-				recEnd = pos; recKind = 52;

+				recEnd = pos; recKind = 53;

 				if (ch == '>') {AddCh(); goto case 75;}

-				else {t.kind = 52; break;}

+				else {t.kind = 53; break;}

 			case 99:

-				recEnd = pos; recKind = 105;

+				recEnd = pos; recKind = 106;

 				if (ch == '=') {AddCh(); goto case 100;}

-				else {t.kind = 105; break;}

+				else {t.kind = 106; break;}

 			case 100:

-				recEnd = pos; recKind = 113;

+				recEnd = pos; recKind = 114;

 				if (ch == '>') {AddCh(); goto case 73;}

-				else {t.kind = 113; break;}

+				else {t.kind = 114; break;}

 

 		}

 		t.val = new String(tval, 0, tlen);