Boogie:

* Updated Parser.cs/Scanner.cs to use new .frame files from boogiepartners.
* It changes, for example, "syntax error:" to just "error:", so adjusted expected Test outputs.
Dafny:
* Ditto for its Parser.cs/Scanner.cs.
* Added ability to provide a custom Errors handler for scanner/parser.
* Added Test/dafny1/Cubes.dfy

1 files changed, 2 insertions, 2 deletions

diff --git a/Dafny/Scanner.cs b/Dafny/Scanner.cs
index 75d301a4..de87c6ad 100644
--- a/Dafny/Scanner.cs
+++ b/Dafny/Scanner.cs
@@ -375,7 +375,7 @@ void objectInvariant(){
 				// eol handling uniform across Windows, Unix and Mac

 				if (ch == '\r' && buffer.Peek() != '\n') ch = EOL;

 				if (ch == EOL) {

-					line++; col = 0;
+					line++; col = 0;

 				} else if (ch == '#' && col == 1) {

 				  int prLine = line;

 				  int prColumn = 0;

@@ -552,7 +552,7 @@ void objectInvariant(){
 		int recKind = noSym;

 		int recEnd = pos;

 		t = new Token();

-		t.pos = pos; t.col = col; t.line = line;
+		t.pos = pos; t.col = col; t.line = line;

 		t.filename = this.Filename;

 		int state;

 		if (start.ContainsKey(ch)) { state = (int) cce.NonNull( start[ch]); }