Dafny: removed Dafny's "foreach" statements (replaced by the new "parallel" statement)

5 files changed, 4 insertions, 7 deletions

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index 98006cca..cf603751 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -37,7 +37,7 @@
         )) . font-lock-builtin-face)

    `(,(dafny-regexp-opt '(

         "assert" "assume" "break" "choose" "then" "else" "havoc" "if" "label" "return" "while" "print"

-        "old" "forall" "exists" "new" "foreach" "parallel" "in" "this" "fresh" "allocated"

+        "old" "forall" "exists" "new" "parallel" "in" "this" "fresh" "allocated"

         "match" "case" "false" "true" "null")) . font-lock-keyword-face)

    `(,(dafny-regexp-opt '("array" "array2" "array3" "bool" "nat" "int" "object" "set" "seq")) . font-lock-type-face)

    )

diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
index 8fc8bf4e..6f9ec810 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
@@ -20,7 +20,7 @@ namespace Demo
           "assert", "assume", "new", "this", "object", "refines", "replaces", "by",

           "unlimited", "module", "imports",

           "if", "then", "else", "while", "invariant",

-          "break", "label", "return", "foreach", "parallel", "havoc", "print",

+          "break", "label", "return", "parallel", "havoc", "print",

           "returns", "requires", "ensures", "modifies", "reads", "decreases",

           "bool", "nat", "int", "false", "true", "null",

           "function", "free",

@@ -238,7 +238,6 @@ namespace Demo
                         | "if" + Condition + Statement + PreferShiftHere() + "else" + Statement

                         | "while" + Condition + loopSpec.Star() + Statement

                         | "for" + LParen + expression.Q() + Semi + expression.Q() + Semi + expression.Q() + RParen + Statement

-                        | "foreach" + LParen + ident + "in" + expression + RParen + Statement

                         | blockStatement

                         | expression + Semi

                         | "break" + Semi

@@ -286,7 +285,6 @@ namespace Demo
           | "break"

           | "label"

           | "return"

-          | "foreach"

           | "parallel"

           | "havoc"

           | "print"

diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index 5e61d2d6..f80acc26 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -251,7 +251,6 @@ namespace DafnyLanguage
                 case "exists":

                 case "false":

                 case "forall":

-                case "foreach":

                 case "free":

                 case "fresh":

                 case "function":

diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 809c6fc4..1bbab1b7 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -13,7 +13,7 @@
       % expressions

       match,case,false,true,null,old,fresh,allocated,choose,this,

       % statements

-      assert,assume,print,new,havoc,if,then,else,while,invariant,break,label,return,foreach,parallel,

+      assert,assume,print,new,havoc,if,then,else,while,invariant,break,label,return,parallel,

       },

   literate=%

     {:}{$\colon$}1

diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim
index 4014e427..2d0aeab3 100644
--- a/Util/vim/syntax/dafny.vim
+++ b/Util/vim/syntax/dafny.vim
@@ -8,7 +8,7 @@ syntax case match
 syntax keyword dafnyFunction function method constructor
 syntax keyword dafnyTypeDef class datatype 
 syntax keyword dafnyConditional if then else match case 
-syntax keyword dafnyRepeat foreach while parallel
+syntax keyword dafnyRepeat while parallel
 syntax keyword dafnyStatement havoc assume assert return new print break label
 syntax keyword dafnyKeyword var ghost returns null static this refines replaces by
 syntax keyword dafnyType bool nat int seq set object array array2 array3