Language change: All functions and methods declared lexically outside any class are now

automatically static, and fields are no longer allowed to be declared there.  Stated
differently, all heap state must now be declared inside an explicitly declared class,
and functions and methods declared outside any class can be viewed as belonging to
the module.  The motivating benefit of this change is to no longer need the 'static'
keyword when declaring a module of functions and methods.

1 files changed, 6 insertions, 6 deletions

diff --git a/Test/dafny1/TreeDatatype.dfy b/Test/dafny1/TreeDatatype.dfy
index 763cef1b..beb1597e 100644
--- a/Test/dafny1/TreeDatatype.dfy
+++ b/Test/dafny1/TreeDatatype.dfy
@@ -7,13 +7,13 @@ datatype List<T> = Nil | Cons(T, List<T>);
 

 datatype Tree = Node(int, List<Tree>);

 

-static function Inc(t: Tree): Tree

+function Inc(t: Tree): Tree

 {

   match t

   case Node(n, children) => Tree.Node(n+1, ForestInc(children))

 }

 

-static function ForestInc(forest: List<Tree>): List<Tree>

+function ForestInc(forest: List<Tree>): List<Tree>

 {

   match forest

   case Nil => forest

@@ -24,13 +24,13 @@ static function ForestInc(forest: List<Tree>): List<Tree>
 

 datatype GTree<T> = Node(T, List<GTree<T>>);

 

-static function GInc(t: GTree<int>): GTree<int>

+function GInc(t: GTree<int>): GTree<int>

 {

   match t

   case Node(n, children) => GTree.Node(n+1, GForestInc(children))

 }

 

-static function GForestInc(forest: List<GTree<int>>): List<GTree<int>>

+function GForestInc(forest: List<GTree<int>>): List<GTree<int>>

 {

   match forest

   case Nil => forest

@@ -43,13 +43,13 @@ datatype TreeList = Nil | Cons(OneTree, TreeList);
 

 datatype OneTree = Node(int, TreeList);

 

-static function XInc(t: OneTree): OneTree

+function XInc(t: OneTree): OneTree

 {

   match t

   case Node(n, children) => OneTree.Node(n+1, XForestInc(children))

 }

 

-static function XForestInc(forest: TreeList): TreeList

+function XForestInc(forest: TreeList): TreeList

 {

   match forest

   case Nil => forest