Factored out the ParserHelper class into a separate project and updated the files generated by Coco/R.

This was done to support sharing of the Coco/R .frame files with Spec#.

5 files changed, 85 insertions, 325 deletions

diff --git a/Source/Core/Core.csproj b/Source/Core/Core.csproj
index 625ab9b6..145d56e3 100644
--- a/Source/Core/Core.csproj
+++ b/Source/Core/Core.csproj
@@ -118,7 +118,6 @@
     <Compile Include="LoopUnroll.cs" />

     <Compile Include="OOLongUtil.cs" />

     <Compile Include="Parser.cs" />

-    <Compile Include="ParserHelper.cs" />

     <Compile Include="PureCollections.cs" />

     <Compile Include="ResolutionContext.cs" />

     <Compile Include="Scanner.cs" />

@@ -146,6 +145,10 @@
       <Project>{69A2B0B8-BCAC-4101-AE7A-556FCC58C06E}</Project>

       <Name>Graph</Name>

     </ProjectReference>

+    <ProjectReference Include="..\ParserHelper\ParserHelper.csproj">

+      <Project>{FCD3AC7F-9DFD-46C8-AB1E-09F0B0F16DC5}</Project>

+      <Name>ParserHelper</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

diff --git a/Source/Core/Makefile b/Source/Core/Makefile
index a5061138..192a16db 100644
--- a/Source/Core/Makefile
+++ b/Source/Core/Makefile
@@ -1,11 +1,11 @@
-COCO = ..\..\Binaries\Coco.exe

+COCO = Coco.exe

 

 # ###############################################################################

 # The frame files are no longer in this directory. They must be downloaded

 # from http://boogiepartners.codeplex.com/. Update the FRAME_DIR variable to

 # point to whatever directory you install that into.

 # ###############################################################################

-FRAME_DIR = c:\BoogiePartners\CocoR\Modified

+FRAME_DIR = ..\..\..\boogiepartners\CocoR\Modified

 

 # "all" depends on 2 files, really (Parser.cs and Scanner.cs), but they

 # are both generated in one go and I don't know a better way to tell

diff --git a/Source/Core/Parser.cs b/Source/Core/Parser.cs
index 0d906de4..7898e26f 100644
--- a/Source/Core/Parser.cs
+++ b/Source/Core/Parser.cs
@@ -30,7 +30,7 @@ public class Parser {
 	const bool T = true;

 	const bool x = false;

 	const int minErrDist = 2;

-	

+

 	public Scanner/*!*/ scanner;

 	public Errors/*!*/  errors;

 

@@ -140,10 +140,10 @@ private class BvBounds : Expr {
 		if (errDist >= minErrDist) errors.SemErr(t, msg);

 		errDist = 0;

 	}

-	

-    public void SemErr(IToken/*!*/ tok, string/*!*/ msg) {

-      Contract.Requires(tok != null);

-      Contract.Requires(msg != null);

+

+	public void SemErr(IToken/*!*/ tok, string/*!*/ msg) {

+	  Contract.Requires(tok != null);

+	  Contract.Requires(msg != null);

 	  errors.SemErr(tok, msg);

 	}

 

@@ -156,15 +156,15 @@ private class BvBounds : Expr {
 			la = t;

 		}

 	}

-	

+

 	void Expect (int n) {

 		if (la.kind==n) Get(); else { SynErr(n); }

 	}

-	

+

 	bool StartOf (int s) {

 		return set[s, la.kind];

 	}

-	

+

 	void ExpectWeak (int n, int follow) {

 		if (la.kind == n) Get();

 		else {

@@ -188,7 +188,7 @@ private class BvBounds : Expr {
 		}

 	}

 

-	

+

 	void BoogiePL() {

 		VariableSeq/*!*/ vs;

 		DeclarationSeq/*!*/ ds;

@@ -2004,13 +2004,13 @@ out QKeyValue kv, out Trigger trig, out Expr/*!*/ body) {
 

 	public void Parse() {

 		la = new Token();

-		la.val = "";		

+		la.val = "";

 		Get();

 		BoogiePL();

 

-    Expect(0);

+		Expect(0);

 	}

-	

+

 	static readonly bool[,]/*!*/ set = {

 		{T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},

 		{x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,T, T,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},

@@ -2035,18 +2035,20 @@ out QKeyValue kv, out Trigger trig, out Expr/*!*/ body) {
 public class Errors {

 	public int count = 0;                                    // number of errors detected

 	public System.IO.TextWriter/*!*/ errorStream = Console.Out;   // error messages go to this stream

-  public string errMsgFormat = "{0}({1},{2}): error: {3}"; // 0=filename, 1=line, 2=column, 3=text

-  public string warningMsgFormat = "{0}({1},{2}): warning: {3}"; // 0=filename, 1=line, 2=column, 3=text

-  

+	public string errMsgFormat = "{0}({1},{2}): error: {3}"; // 0=filename, 1=line, 2=column, 3=text

+	public string warningMsgFormat = "{0}({1},{2}): warning: {3}"; // 0=filename, 1=line, 2=column, 3=text

+

 	public void SynErr(string filename, int line, int col, int n) {

-    SynErr(filename, line, col, GetSyntaxErrorString(n));

-  }

-	public virtual void SynErr(string filename, int line, int col, string msg) {

-	  Contract.Requires(msg != null);

+		SynErr(filename, line, col, GetSyntaxErrorString(n));

+	}

+

+	public virtual void SynErr(string filename, int line, int col, string/*!*/ msg) {

+		Contract.Requires(msg != null);

 		errorStream.WriteLine(errMsgFormat, filename, line, col, msg);

 		count++;

-  }

-  string GetSyntaxErrorString(int n) {

+	}

+

+	string GetSyntaxErrorString(int n) {

 		string s;

 		switch (n) {

 			case 0: s = "EOF expected"; break;

@@ -2181,7 +2183,7 @@ public class Errors {
 

 			default: s = "error " + n; break;

 		}

-    return s;

+		return s;

 	}

 

 	public void SemErr(IToken/*!*/ tok, string/*!*/ msg) {  // semantic errors

@@ -2189,8 +2191,9 @@ public class Errors {
 		Contract.Requires(msg != null);

 		SemErr(tok.filename, tok.line, tok.col, msg);

 	}

+

 	public virtual void SemErr(string filename, int line, int col, string/*!*/ msg) {

-	  Contract.Requires(msg != null);

+		Contract.Requires(msg != null);

 		errorStream.WriteLine(errMsgFormat, filename, line, col, msg);

 		count++;

 	}

diff --git a/Source/Core/ParserHelper.cs b/Source/Core/ParserHelper.cs
deleted file mode 100644
index 465b9245..00000000
--- a/Source/Core/ParserHelper.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using System.Text;

-using System.Collections.Generic;

-using System.IO;

-using System.Diagnostics.Contracts;

-

-namespace Microsoft.Boogie {

-

-  [Immutable]

-  public interface IToken {

-    int kind {

-      get;

-      set;

-    }         // token kind

-    string filename {

-      get;

-      set;

-    }  // token file

-    int pos {

-      get;

-      set;

-    }          // token position in the source text (starting at 0)

-    int col {

-      get;

-      set;

-    }          // token column (starting at 0)

-    int line {

-      get;

-      set;

-    }         // token line (starting at 1)

-    string/*!*/ val {

-      get;

-      set;

-    }  // token value

-

-    bool IsValid {

-      get;

-    }

-  }

-

-  [Immutable]

-  public class Token : IToken {

-    public int _kind;    // token kind

-    string _filename;  // token file

-    public int _pos;     // token position in the source text (starting at 0)

-    public int _col;     // token column (starting at 1)

-    public int _line;    // token line (starting at 1)

-    public string/*!*/ _val;  // token value

-    public Token next;  // ML 2005-03-11 Tokens are kept in linked list

-

-    public static IToken/*!*/ NoToken = new Token();

-    [ContractInvariantMethod]

-    void ObjectInvariant() {

-      Contract.Invariant(NoToken != null);

-    }

-

-

-    public Token() {

-      this._val = "anything so that it is nonnull";

-    }

-    public Token(int linenum, int colnum)

-      : base() {//BASEMOVE DANGER

-      this._line = linenum;

-      this._col = colnum;

-      this._val = "anything so that it is nonnull";

-      //:base();

-    }

-

-    public int kind {

-      get {

-        return this._kind;

-      }

-      set {

-        this._kind = value;

-      }

-    }

-

-    public string filename {

-      get {

-        return this._filename;

-      }

-      set {

-        this._filename = value;

-      }

-    }

-

-    public int pos {

-      get {

-        return this._pos;

-      }

-      set {

-        this._pos = value;

-      }

-    }

-

-    public int col {

-      get {

-        return this._col;

-      }

-      set {

-        this._col = value;

-      }

-    }

-

-    public int line {

-      get {

-        return this._line;

-      }

-      set {

-        this._line = value;

-      }

-    }

-

-    public string/*!*/ val {

-      get {

-        return this._val;

-      }

-      set {

-        this._val = value;

-      }

-    }

-

-    public bool IsValid {

-      get {

-        return this._filename != null;

-      }

-    }

-

-

-  }

-

-  public static class ParserHelper {

-    struct ReadState {

-      public bool hasSeenElse;

-      public bool mayStillIncludeAnotherAlternative;

-      public ReadState(bool hasSeenElse, bool mayStillIncludeAnotherAlternative) {

-        this.hasSeenElse = hasSeenElse;

-        this.mayStillIncludeAnotherAlternative = mayStillIncludeAnotherAlternative;

-      }

-    }

-    // "arg" is assumed to be trimmed

-    private static bool IfdefConditionSaysToInclude(string arg, List<string/*!*/>/*!*/ defines) {

-      Contract.Requires(arg != null);

-      Contract.Requires(cce.NonNullElements(defines));

-      bool sense = true;

-      while (arg.StartsWith("!")) {

-        sense = !sense;

-        arg = arg.Substring(1).TrimStart();

-      }

-      return defines.Contains(arg) == sense;

-    }

-

-    public static string Fill(Stream stream, List<string/*!*/>/*!*/ defines) {

-      Contract.Requires(stream != null);

-      Contract.Requires(cce.NonNullElements(defines));

-      Contract.Ensures(Contract.Result<string>() != null);

-      StreamReader/*!*/ reader = new StreamReader(stream);

-      return Fill(reader, defines);

-    }

-    public static string Fill(TextReader reader, List<string/*!*/>/*!*/ defines) {

-      Contract.Requires(reader != null);

-      Contract.Requires(cce.NonNullElements(defines));

-      Contract.Ensures(Contract.Result<string>() != null);

-      StringBuilder sb = new StringBuilder();

-      List<ReadState>/*!*/ readState = new List<ReadState>();  // readState.Count is the current nesting level of #if's

-      int ignoreCutoff = -1;  // -1 means we're not ignoring; for 0<=n, n means we're ignoring because of something at nesting level n

-      while (true)

-      //invariant -1 <= ignoreCutoff && ignoreCutoff < readState.Count;

-    {

-        string s = reader.ReadLine();

-        if (s == null) {

-          if (readState.Count != 0) {

-            sb.AppendLine("#MalformedInput: missing #endif");

-          }

-          break;

-        }

-        string t = s.Trim();

-        if (t.StartsWith("#if")) {

-          ReadState rs = new ReadState(false, false);

-          if (ignoreCutoff != -1) {

-            // we're already in a state of ignoring, so continue to ignore

-          } else if (IfdefConditionSaysToInclude(t.Substring(3).TrimStart(), defines)) {

-            // include this branch

-          } else {

-            ignoreCutoff = readState.Count;  // start ignoring

-            rs.mayStillIncludeAnotherAlternative = true;  // allow some later "elsif" or "else" branch to be included

-          }

-          readState.Add(rs);

-          sb.AppendLine();  // ignore the #if line

-

-        } else if (t.StartsWith("#elsif")) {

-          ReadState rs;

-          if (readState.Count == 0 || (rs = readState[readState.Count - 1]).hasSeenElse) {

-            sb.AppendLine("#MalformedInput: misplaced #elsif");  // malformed input

-            break;

-          }

-          if (ignoreCutoff == -1) {

-            // we had included the previous branch

-            //Contract.Assert(!rs.mayStillIncludeAnotherAlternative);

-            ignoreCutoff = readState.Count - 1;  // start ignoring

-          } else if (rs.mayStillIncludeAnotherAlternative && IfdefConditionSaysToInclude(t.Substring(6).TrimStart(), defines)) {

-            // include this branch, but no subsequent branch at this level

-            ignoreCutoff = -1;

-            rs.mayStillIncludeAnotherAlternative = false;

-            readState[readState.Count - 1] = rs;

-          }

-          sb.AppendLine();  // ignore the #elsif line

-

-        } else if (t == "#else") {

-          ReadState rs;

-          if (readState.Count == 0 || (rs = readState[readState.Count - 1]).hasSeenElse) {

-            sb.AppendLine("#MalformedInput: misplaced #else");  // malformed input

-            break;

-          }

-          rs.hasSeenElse = true;

-          if (ignoreCutoff == -1) {

-            // we had included the previous branch

-            //Contract.Assert(!rs.mayStillIncludeAnotherAlternative);

-            ignoreCutoff = readState.Count - 1;  // start ignoring

-          } else if (rs.mayStillIncludeAnotherAlternative) {

-            // include this branch

-            ignoreCutoff = -1;

-            rs.mayStillIncludeAnotherAlternative = false;

-          }

-          readState[readState.Count - 1] = rs;

-          sb.AppendLine();  // ignore the #else line

-

-        } else if (t == "#endif") {

-          if (readState.Count == 0) {

-            sb.AppendLine("#MalformedInput: misplaced #endif");  // malformed input

-            break;

-          }

-          readState.RemoveAt(readState.Count - 1);  // pop

-          if (ignoreCutoff == readState.Count) {

-            // we had ignored the branch that ends here; so, now we start including again

-            ignoreCutoff = -1;

-          }

-          sb.AppendLine();  // ignore the #endif line

-

-        } else if (ignoreCutoff == -1) {

-          sb.AppendLine(s);  // included line

-

-        } else {

-          sb.AppendLine();  // ignore the line

-        }

-      }

-

-      return sb.ToString();

-    }

-  }

-}
\ No newline at end of file
diff --git a/Source/Core/Scanner.cs b/Source/Core/Scanner.cs
index faab5837..7c3522ca 100644
--- a/Source/Core/Scanner.cs
+++ b/Source/Core/Scanner.cs
@@ -19,7 +19,7 @@ public class Buffer {
 	//    a) whole stream in buffer

 	//    b) part of stream in buffer

 	// 2) non seekable stream (network, console)

-  

+

 	public const int EOF = 65535 + 1; // char.MaxValue + 1;

 	const int MIN_BUFFER_LENGTH = 1024; // 1KB

 	const int MAX_BUFFER_LENGTH = MIN_BUFFER_LENGTH * 64; // 64KB

@@ -31,15 +31,17 @@ public class Buffer {
 	Stream/*!*/ stream;      // input stream (seekable)

 	bool isUserStream;  // was the stream opened by the user?

 

-[ContractInvariantMethod]

-void ObjectInvariant(){

-  Contract.Invariant(buf != null);

-  Contract.Invariant(stream != null);}

-    [NotDelayed]

-	public Buffer (Stream/*!*/ s, bool isUserStream) :base() {

+	[ContractInvariantMethod]

+	void ObjectInvariant(){

+		Contract.Invariant(buf != null);

+		Contract.Invariant(stream != null);

+	}

+

+//  [NotDelayed]

+	public Buffer (Stream/*!*/ s, bool isUserStream) : base() {

 	  Contract.Requires(s != null);

 		stream = s; this.isUserStream = isUserStream;

-		

+

 		int fl, bl;

 		if (s.CanSeek) {

 			fl = (int) s.Length;

@@ -51,12 +53,12 @@ void ObjectInvariant(){
 

 		buf = new byte[(bl>0) ? bl : MIN_BUFFER_LENGTH];

 		fileLen = fl;  bufLen = bl;

-		

+

 		if (fileLen > 0) Pos = 0; // setup buffer to position 0 (start)

 		else bufPos = 0; // index 0 is already after the file, thus Pos = 0 is invalid

 		if (bufLen == fileLen && s.CanSeek) Close();

 	}

-	

+

 	protected Buffer(Buffer/*!*/ b) { // called in UTF8Buffer constructor

 	  Contract.Requires(b != null);

 		buf = b.buf;

@@ -73,14 +75,14 @@ void ObjectInvariant(){
 	}

 

 	~Buffer() { Close(); }

-	

+

 	protected void Close() {

 		if (!isUserStream && stream != null) {

 			stream.Close();

 			//stream = null;

 		}

 	}

-	

+

 	public virtual int Read () {

 		if (bufPos < bufLen) {

 			return buf[bufPos++];

@@ -100,7 +102,7 @@ void ObjectInvariant(){
 		Pos = curPos;

 		return ch;

 	}

-	

+

 	public string/*!*/ GetString (int beg, int end) {

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

 		int len = 0;

@@ -139,7 +141,7 @@ void ObjectInvariant(){
 			}

 		}

 	}

-	

+

 	// Read the next chunk of bytes from the stream, increases the buffer

 	// if needed and updates the fields fileLen and bufLen.

 	// Returns the number of bytes read.

@@ -213,19 +215,20 @@ public class Scanner {
 	const int noSym = 88;

 

 

-[ContractInvariantMethod]

-void objectInvariant(){

-  Contract.Invariant(buffer!=null);

-  Contract.Invariant(t != null);

-  Contract.Invariant(start != null);

-  Contract.Invariant(tokens != null);

-  Contract.Invariant(pt != null);

-  Contract.Invariant(tval != null);

-  Contract.Invariant(Filename != null);

-  Contract.Invariant(errorHandler != null);

-}

+	[ContractInvariantMethod]

+	void objectInvariant(){

+		Contract.Invariant(buffer!=null);

+		Contract.Invariant(t != null);

+		Contract.Invariant(start != null);

+		Contract.Invariant(tokens != null);

+		Contract.Invariant(pt != null);

+		Contract.Invariant(tval != null);

+		Contract.Invariant(Filename != null);

+		Contract.Invariant(errorHandler != null);

+	}

+

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

-	

+

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

 	int ch;           // current input character

 	int pos;          // byte position of current character

@@ -236,13 +239,13 @@ void objectInvariant(){
 

 	Token/*!*/ tokens;     // list of tokens already peeked (first token is a dummy)

 	Token/*!*/ pt;         // current peek token

-	

+

 	char[]/*!*/ tval = new char[128]; // text of current token

 	int tlen;         // length of current token

-	

+

 	private string/*!*/ Filename;

 	private Errors/*!*/ errorHandler;

-	

+

 	static Scanner() {

 		start = new Hashtable(128);

 		for (int i = 35; i <= 36; ++i) start[i] = 2;

@@ -291,9 +294,9 @@ void objectInvariant(){
 		start[Buffer.EOF] = -1;

 

 	}

-	

-	[NotDelayed]

-	public Scanner (string/*!*/ fileName, Errors/*!*/ errorHandler) :base(){

+

+//	[NotDelayed]

+	public Scanner (string/*!*/ fileName, Errors/*!*/ errorHandler) : base() {

 	  Contract.Requires(fileName != null);

 	  Contract.Requires(errorHandler != null);

 		this.errorHandler = errorHandler;

@@ -303,15 +306,14 @@ void objectInvariant(){
 			Stream stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);

 			buffer = new Buffer(stream, false);

 			Filename = fileName;

-			

 			Init();

 		} catch (IOException) {

 			throw new FatalError("Cannot open file " + fileName);

 		}

 	}

-	

-	[NotDelayed]

-	public Scanner (Stream/*!*/ s, Errors/*!*/ errorHandler, string/*!*/ fileName) :base(){

+

+//	[NotDelayed]

+	public Scanner (Stream/*!*/ s, Errors/*!*/ errorHandler, string/*!*/ fileName) : base() {

 	  Contract.Requires(s != null);

 	  Contract.Requires(errorHandler != null);

 	  Contract.Requires(fileName != null);

@@ -320,10 +322,9 @@ void objectInvariant(){
 		buffer = new Buffer(s, true);

 		this.errorHandler = errorHandler;

 		this.Filename = fileName;

-		

 		Init();

 	}

-	

+

 	void Init() {

 		pos = -1; line = 1; col = 0;

 		oldEols = 0;

@@ -344,11 +345,11 @@ void objectInvariant(){
 	Contract.Ensures(Contract.Result<string>() != null);

 	  int p = buffer.Pos;

 	  int ch = buffer.Read();

-      // replace isolated '\r' by '\n' in order to make

+	  // replace isolated '\r' by '\n' in order to make

 	  // eol handling uniform across Windows, Unix and Mac

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

 	  while (ch != EOL && ch != Buffer.EOF){

-	    ch = buffer.Read();

+		ch = buffer.Read();

 		// replace isolated '\r' by '\n' in order to make

 		// eol handling uniform across Windows, Unix and Mac

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

@@ -359,7 +360,7 @@ void objectInvariant(){
 	}

 

 	void NextCh() {

-		if (oldEols > 0) { ch = EOL; oldEols--; } 

+		if (oldEols > 0) { ch = EOL; oldEols--; }

 		else {

 //			pos = buffer.Pos;

 //			ch = buffer.Read(); col++;

@@ -367,9 +368,9 @@ void objectInvariant(){
 //			// eol handling uniform across Windows, Unix and Mac

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

 //			if (ch == EOL) { line++; col = 0; }

-			

+

 			while (true) {

-			    pos = buffer.Pos;

+				pos = buffer.Pos;

 				ch = buffer.Read(); col++;

 				// replace isolated '\r' by '\n' in order to make

 				// eol handling uniform across Windows, Unix and Mac

@@ -419,7 +420,7 @@ void objectInvariant(){
 				return;

 			  }

 

-			

+

 		}

 

 	}

@@ -539,10 +540,13 @@ void objectInvariant(){
 		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]); }

+		if (start.ContainsKey(ch)) {

+			Contract.Assert(start[ch] != null);

+			state = (int) start[ch];

+		}

 		else { state = 0; }

 		tlen = 0; AddCh();

-		

+

 		switch (state) {

 			case -1: { t.kind = eofSym; break; } // NextCh already done

 			case 0: {

@@ -711,14 +715,14 @@ void objectInvariant(){
 		t.val = new String(tval, 0, tlen);

 		return t;

 	}

-	

+

 	private void SetScannerBehindT() {

 		buffer.Pos = t.pos;

 		NextCh();

 		line = t.line; col = t.col;

 		for (int i = 0; i < tlen; i++) NextCh();

 	}

-	

+

 	// get the next token (possibly a token already seen during peeking)

 	public Token/*!*/ Scan () {

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

@@ -739,7 +743,7 @@ void objectInvariant(){
 			}

 			pt = pt.next;

 		} while (pt.kind > maxT); // skip pragmas

-	

+

 		return pt;

 	}