From 791adc9910560834c8159f892fad1b8acf0965dd Mon Sep 17 00:00:00 2001
From: Nadia Polikarpova <nadia.polikarpova@gmail.com>
Date: Sun, 16 Sep 2012 14:25:58 +0200
Subject: Added the new keyword (calc) to Util

---
 Util/Emacs/dafny-mode.el                                 | 2 +-
 Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs        | 3 ++-
 Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs | 1 +
 Util/latex/dafny.sty                                     | 2 +-
 Util/vim/syntax/dafny.vim                                | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Util')

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index e658bfe9..1e197644 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -38,7 +38,7 @@
         )) . font-lock-builtin-face)
    `(,(dafny-regexp-opt '(
         "assert" "assume" "break" "choose" "then" "else" "if" "label" "return" "while" "print" "where"
-        "old" "forall" "exists" "new" "parallel" "in" "this" "fresh"
+        "old" "forall" "exists" "new" "parallel" "calc" "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 81dd0dd1..8c3eee59 100644
--- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
+++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs
@@ -28,7 +28,7 @@ namespace Demo
           "in", "forall", "exists",
           "seq", "set", "map", "multiset", "array", "array2", "array3",
           "match", "case",
-          "fresh", "old", "choose", "where"
+          "fresh", "old", "choose", "where", "calc"
           );
 
         StringLiteral s = new StringLiteral("String", "'", StringFlags.AllowsDoubledQuote);
@@ -289,6 +289,7 @@ namespace Demo
           | "label"
           | "return"
           | "parallel"
+          | "calc"
           | "print"
           | "returns"
           | "requires"
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index 5853f180..19f98ff7 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -231,6 +231,7 @@ namespace DafnyLanguage
                 case "assume":
                 case "bool":
                 case "break":
+                case "calc":
                 case "case":
                 case "choose":
                 case "class":
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 81b04694..d60488d1 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,if,then,else,while,invariant,break,label,return,parallel,where
+      assert,assume,print,new,if,then,else,while,invariant,break,label,return,parallel,where,calc
       },
   literate=%
     {:}{$\colon$}1
diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim
index c61e5ebc..cc1c9d79 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 assume assert return new print break label where
+syntax keyword dafnyStatement assume assert return new print break label where calc
 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 
-- 
cgit v1.2.3