Merge

1 files changed, 112 insertions, 110 deletions

diff --git a/Source/Dafny/Scanner.cs b/Source/Dafny/Scanner.cs
index 7d453d2d..30e4071c 100644
--- a/Source/Dafny/Scanner.cs
+++ b/Source/Dafny/Scanner.cs
@@ -211,8 +211,8 @@ public class UTF8Buffer: Buffer {
 public class Scanner {

 	const char EOL = '\n';

 	const int eofSym = 0; /* pdt */

-	const int maxT = 127;

-	const int noSym = 127;

+	const int maxT = 129;

+	const int noSym = 129;

 

 

 	[ContractInvariantMethod]

@@ -502,64 +502,66 @@ public class Scanner {
 			case "as": t.kind = 26; break;

 			case "default": t.kind = 27; break;

 			case "class": t.kind = 28; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-			case "bool": t.kind = 54; break;

-			case "nat": t.kind = 55; break;

-			case "int": t.kind = 56; break;

-			case "real": t.kind = 57; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+			case "bool": t.kind = 56; break;

+			case "nat": t.kind = 57; break;

+			case "int": t.kind = 58; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 			default: break;

 		}

 	}

@@ -710,68 +712,68 @@ public class Scanner {
 				else if (ch >= '0' && ch <= '9') {AddCh(); goto case 32;}

 				else {t.kind = 5; break;}

 			case 33:

-				{t.kind = 35; break;}

+				{t.kind = 37; break;}

 			case 34:

-				{t.kind = 41; break;}

+				{t.kind = 43; break;}

 			case 35:

-				{t.kind = 67; break;}

+				{t.kind = 69; break;}

 			case 36:

-				{t.kind = 71; break;}

-			case 37:

 				{t.kind = 73; break;}

+			case 37:

+				{t.kind = 75; break;}

 			case 38:

-				{t.kind = 76; break;}

+				{t.kind = 78; break;}

 			case 39:

-				{t.kind = 77; break;}

+				{t.kind = 79; break;}

 			case 40:

-				{t.kind = 90; break;}

-			case 41:

 				{t.kind = 92; break;}

+			case 41:

+				{t.kind = 94; break;}

 			case 42:

-				{t.kind = 93; break;}

+				{t.kind = 95; break;}

 			case 43:

-				{t.kind = 94; break;}

+				{t.kind = 96; break;}

 			case 44:

-				{t.kind = 95; break;}

+				{t.kind = 97; break;}

 			case 45:

-				{t.kind = 96; break;}

+				{t.kind = 98; break;}

 			case 46:

-				{t.kind = 97; break;}

+				{t.kind = 99; break;}

 			case 47:

-				{t.kind = 98; break;}

+				{t.kind = 100; break;}

 			case 48:

-				{t.kind = 99; break;}

+				{t.kind = 101; break;}

 			case 49:

-				{t.kind = 100; break;}

-			case 50:

 				{t.kind = 102; break;}

+			case 50:

+				{t.kind = 104; break;}

 			case 51:

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

 				else {goto case 0;}

 			case 52:

-				{t.kind = 103; break;}

+				{t.kind = 105; break;}

 			case 53:

-				{t.kind = 104; break;}

+				{t.kind = 106; break;}

 			case 54:

-				{t.kind = 105; break;}

+				{t.kind = 107; break;}

 			case 55:

-				{t.kind = 106; break;}

+				{t.kind = 108; break;}

 			case 56:

-				{t.kind = 109; break;}

-			case 57:

 				{t.kind = 111; break;}

+			case 57:

+				{t.kind = 113; break;}

 			case 58:

-				{t.kind = 112; break;}

+				{t.kind = 114; break;}

 			case 59:

-				{t.kind = 113; break;}

+				{t.kind = 115; break;}

 			case 60:

-				{t.kind = 122; break;}

-			case 61:

 				{t.kind = 124; break;}

+			case 61:

+				{t.kind = 126; break;}

 			case 62:

-				{t.kind = 125; break;}

+				{t.kind = 127; break;}

 			case 63:

-				{t.kind = 126; break;}

+				{t.kind = 128; break;}

 			case 64:

 				recEnd = pos; recKind = 7;

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

@@ -784,46 +786,46 @@ public class Scanner {
 				else if (ch == '=') {AddCh(); goto case 72;}

 				else {t.kind = 25; break;}

 			case 66:

-				recEnd = pos; recKind = 110;

+				recEnd = pos; recKind = 112;

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

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

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

 			case 67:

-				recEnd = pos; recKind = 108;

+				recEnd = pos; recKind = 110;

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

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

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

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

 			case 68:

-				recEnd = pos; recKind = 33;

+				recEnd = pos; recKind = 35;

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

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

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

 			case 69:

-				recEnd = pos; recKind = 63;

+				recEnd = pos; recKind = 65;

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

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

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

 			case 70:

-				recEnd = pos; recKind = 42;

+				recEnd = pos; recKind = 44;

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

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

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

 			case 71:

-				recEnd = pos; recKind = 43;

+				recEnd = pos; recKind = 45;

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

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

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

 			case 72:

-				recEnd = pos; recKind = 37;

+				recEnd = pos; recKind = 39;

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

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

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

 			case 73:

-				recEnd = pos; recKind = 121;

+				recEnd = pos; recKind = 123;

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

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

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

 			case 74:

-				recEnd = pos; recKind = 91;

+				recEnd = pos; recKind = 93;

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

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

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

 			case 75:

-				recEnd = pos; recKind = 101;

+				recEnd = pos; recKind = 103;

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

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

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

 

 		}

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