Dafny: added "choose" operator on sets

5 files changed, 6 insertions, 4 deletions

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index cc3d6fb2..a0f5f34c 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -36,7 +36,7 @@
         "invariant" "decreases"

         )) . font-lock-builtin-face)

    `(,(dafny-regexp-opt '(

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

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

         "old" "forall" "exists" "new" "foreach" "in" "this" "fresh" "allocated" "use"

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

    `(,(dafny-regexp-opt '("array" "array2" "array3" "bool" "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 26d4f45a..80082ec9 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
@@ -27,7 +27,7 @@ namespace Demo
           "in", "forall", "exists",

           "seq", "set", "array", "array2", "array3",

           "match", "case",

-          "fresh", "allocated", "old"

+          "fresh", "allocated", "old", "choose"

           );

 

         StringLiteral s = new StringLiteral("String", "'", StringFlags.AllowsDoubledQuote);

@@ -337,6 +337,7 @@ namespace Demo
           | "fresh"

           | "allocated"

           | "old"

+          | "choose"

           | ident

           | "}"

           | "{"

diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index a4d67f0b..30e44a90 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -242,6 +242,7 @@ namespace DafnyLanguage
                 case "by":

                 case "call":

                 case "case":

+                case "choose":

                 case "class":

                 case "datatype":

                 case "decreases":

diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 11af30d4..4a98fa4c 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -11,7 +11,7 @@
       method,returns,module,imports,in,

       requires,modifies,ensures,reads,decreases,free,

       % expressions

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

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

       % statements

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

       },

diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim
index 5c492a31..bdf35f2e 100644
--- a/Util/vim/syntax/dafny.vim
+++ b/Util/vim/syntax/dafny.vim
@@ -13,7 +13,7 @@ syntax keyword dafnyStatement havoc assume assert return call new print break la
 syntax keyword dafnyKeyword var ghost returns null static this refines replaces by
 syntax keyword dafnyType int bool seq set object array array2 array3
 syntax keyword dafnyLogic requires ensures modifies reads decreases invariant 
-syntax keyword dafnyOperator forall exists old fresh allocated
+syntax keyword dafnyOperator forall exists old fresh allocated choose
 syntax keyword dafnyBoolean true false
   
 syntax region dafnyString start=/"/ skip=/\\"/ end=/"/