Dafny: removed the defunct "havoc" keyword from various source-code highlighters

5 files changed, 4 insertions, 6 deletions

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index 4f47f9c3..e658bfe9 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -37,7 +37,7 @@
         "invariant" "decreases"

         )) . font-lock-builtin-face)

    `(,(dafny-regexp-opt '(

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

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

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

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

    `(,(dafny-regexp-opt '("array" "array2" "array3" "bool" "multiset" "map" "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 7a124b74..81dd0dd1 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
@@ -21,7 +21,7 @@ namespace Demo
           "assert", "assume", "new", "this", "object", "refines",

           "module", "import", "as", "default", "opened",

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

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

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

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

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

           "function", "predicate", "copredicate", "free",

@@ -289,7 +289,6 @@ namespace Demo
           | "label"

           | "return"

           | "parallel"

-          | "havoc"

           | "print"

           | "returns"

           | "requires"

diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index e7ce830e..3e6d944f 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -257,7 +257,6 @@ namespace DafnyLanguage
                 case "fresh":

                 case "function":

                 case "ghost":

-                case "havoc":

                 case "if":

                 case "imports":

                 case "in":

diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 9ce6c3e1..36b5bf4a 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -13,7 +13,7 @@
       % expressions

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

       % statements

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

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

       },

   literate=%

     {:}{$\colon$}1

diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim
index 6023830c..c61e5ebc 100644
--- a/Util/vim/syntax/dafny.vim
+++ b/Util/vim/syntax/dafny.vim
@@ -9,7 +9,7 @@ syntax keyword dafnyFunction function predicate copredicate method constructor
 syntax keyword dafnyTypeDef class datatype codatatype type module import opened as default
 syntax keyword dafnyConditional if then else match case 
 syntax keyword dafnyRepeat while parallel
-syntax keyword dafnyStatement havoc assume assert return new print break label where
+syntax keyword dafnyStatement assume assert return new print break label where
 syntax keyword dafnyKeyword var ghost returns null static this refines
 syntax keyword dafnyType bool nat int seq set multiset object array array2 array3 map
 syntax keyword dafnyLogic requires ensures modifies reads decreases invariant