From 0557e6509f413fe48ee21f538b69bf72e52fc36e Mon Sep 17 00:00:00 2001 From: rustanleino Date: Tue, 26 Oct 2010 01:10:24 +0000 Subject: 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 --- Source/Core/Scanner.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Scanner.cs') diff --git a/Source/Core/Scanner.cs b/Source/Core/Scanner.cs index deb8b809..faab5837 100644 --- a/Source/Core/Scanner.cs +++ b/Source/Core/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; @@ -536,7 +536,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]); } -- cgit v1.2.3