Dafny: changed local "var" introductions to use new VarDeclStmt instead of parsing as the old VarDecl's with RHS's

To-do: automatically make some variables introduce ghost variables, depending on RHS of initial assignment

1 files changed, 56 insertions, 54 deletions

diff --git a/Dafny/Scanner.cs b/Dafny/Scanner.cs
index 393d0c0c..3f9106f8 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 = 109;

+	const int noSym = 109;

 

 

 	[ContractInvariantMethod]

@@ -522,27 +522,29 @@ public class Scanner {
 			case "new": t.kind = 52; break;

 			case "choose": t.kind = 56; break;

 			case "havoc": t.kind = 57; break;

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

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

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

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

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

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

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

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

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

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

-			case "print": t.kind = 68; 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 "ghostXYZXYZ": t.kind = 58; break;

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

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

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

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

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

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

+			case "foreach": t.kind = 65; break;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 			default: break;

 		}

 	}

@@ -671,61 +673,61 @@ public class Scanner {
 				if (ch == '>') {AddCh(); goto case 30;}

 				else {goto case 0;}

 			case 30:

-				{t.kind = 69; break;}

+				{t.kind = 71; break;}

 			case 31:

-				{t.kind = 70; break;}

+				{t.kind = 72; break;}

 			case 32:

-				{t.kind = 71; break;}

+				{t.kind = 73; break;}

 			case 33:

-				{t.kind = 72; break;}

+				{t.kind = 74; break;}

 			case 34:

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

 				else {goto case 0;}

 			case 35:

-				{t.kind = 73; break;}

+				{t.kind = 75; break;}

 			case 36:

-				{t.kind = 74; break;}

+				{t.kind = 76; break;}

 			case 37:

-				{t.kind = 75; break;}

+				{t.kind = 77; break;}

 			case 38:

-				{t.kind = 76; break;}

+				{t.kind = 78; break;}

 			case 39:

-				{t.kind = 79; break;}

+				{t.kind = 81; break;}

 			case 40:

-				{t.kind = 80; break;}

+				{t.kind = 82; break;}

 			case 41:

-				{t.kind = 81; break;}

+				{t.kind = 83; break;}

 			case 42:

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

 				else {goto case 0;}

 			case 43:

-				{t.kind = 82; break;}

+				{t.kind = 84; break;}

 			case 44:

-				{t.kind = 83; break;}

+				{t.kind = 85; break;}

 			case 45:

-				{t.kind = 84; break;}

+				{t.kind = 86; break;}

 			case 46:

-				{t.kind = 85; break;}

+				{t.kind = 87; break;}

 			case 47:

-				{t.kind = 86; break;}

+				{t.kind = 88; break;}

 			case 48:

-				{t.kind = 87; break;}

+				{t.kind = 89; break;}

 			case 49:

-				{t.kind = 88; break;}

+				{t.kind = 90; break;}

 			case 50:

-				{t.kind = 89; break;}

-			case 51:

 				{t.kind = 91; break;}

+			case 51:

+				{t.kind = 93; break;}

 			case 52:

-				{t.kind = 100; break;}

-			case 53:

 				{t.kind = 102; break;}

-			case 54:

+			case 53:

 				{t.kind = 104; break;}

+			case 54:

+				{t.kind = 106; break;}

 			case 55:

-				{t.kind = 105; break;}

+				{t.kind = 107; break;}

 			case 56:

-				{t.kind = 106; break;}

+				{t.kind = 108; break;}

 			case 57:

 				recEnd = pos; recKind = 16;

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

@@ -753,19 +755,19 @@ public class Scanner {
 				if (ch == '.') {AddCh(); goto case 52;}

 				else {t.kind = 55; break;}

 			case 63:

-				recEnd = pos; recKind = 90;

+				recEnd = pos; recKind = 92;

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

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

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

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

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

 			case 64:

-				recEnd = pos; recKind = 77;

+				recEnd = pos; recKind = 79;

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

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

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

 			case 65:

-				recEnd = pos; recKind = 78;

+				recEnd = pos; recKind = 80;

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

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

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

 

 		}

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