Dafny:

* Added "decreases" clauses to methods.
* Interpret the filename stdin.dfy as an indication to read the program from standard input.

2 files changed, 4 insertions, 4 deletions

diff --git a/Source/Core/Scanner.ssc b/Source/Core/Scanner.ssc
index 2d977e79..a6f2c0a4 100644
--- a/Source/Core/Scanner.ssc
+++ b/Source/Core/Scanner.ssc
@@ -83,7 +83,7 @@ public class Buffer {
   static int pos;

   public const int eof = '\uffff';

   

-  public static void Fill(StreamReader! reader) {

+  public static void Fill(TextReader! reader) {

     List<string!> defines = new List<string!>();

     Fill(reader, defines);

   }

@@ -97,7 +97,7 @@ public class Buffer {
     }

   }

   

-  public static void Fill(StreamReader! reader, List<string!>! defines) {

+  public static void Fill(TextReader! reader, List<string!>! defines) {

     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

diff --git a/Source/Core/scanner.frame b/Source/Core/scanner.frame
index 3753c6e9..b9a2ce02 100644
--- a/Source/Core/scanner.frame
+++ b/Source/Core/scanner.frame
@@ -83,7 +83,7 @@ public class Buffer {
   static int pos;

   public const int eof = '\uffff';

   

-  public static void Fill(StreamReader! reader) {

+  public static void Fill(TextReader! reader) {

     List<string!> defines = new List<string!>();

     Fill(reader, defines);

   }

@@ -97,7 +97,7 @@ public class Buffer {
     }

   }

   

-  public static void Fill(StreamReader! reader, List<string!>! defines) {

+  public static void Fill(TextReader! reader, List<string!>! defines) {

     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