From dc05120609a7dbdbb7df03934c6e553a825e7b0f Mon Sep 17 00:00:00 2001
From: Rustan Leino <leino@microsoft.com>
Date: Wed, 9 Nov 2011 10:26:47 -0800
Subject: Dafny: added "multiset" keyword to syntax highlighting in emacs, vim,
 latex, VSX

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

(limited to 'Util')

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index cf603751..7235303a 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -39,7 +39,7 @@
         "assert" "assume" "break" "choose" "then" "else" "havoc" "if" "label" "return" "while" "print"
         "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)
+   `(,(dafny-regexp-opt '("array" "array2" "array3" "bool" "multiset" "nat" "int" "object" "set" "seq")) . font-lock-type-face)
    )
   "Minimal highlighting for Dafny mode")
 
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
index f80acc26..e8e94e17 100644
--- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
+++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs
@@ -266,6 +266,7 @@ namespace DafnyLanguage
                 case "method":
                 case "modifies":
                 case "module":
+                case "multiset":
                 case "nat":
                 case "new":
                 case "null":
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 1bbab1b7..34ee3d1d 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -5,7 +5,7 @@
 \usepackage{listings}
 
 \lstdefinelanguage{dafny}{
-  morekeywords={class,datatype,bool,nat,int,object,set,seq,array,array2,array3,%
+  morekeywords={class,datatype,bool,nat,int,object,set,multiset,seq,array,array2,array3,%
       function,unlimited,
       ghost,var,static,refines,replaces,by,
       method,constructor,returns,module,imports,in,
diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim
index 2d0aeab3..b806fb0b 100644
--- a/Util/vim/syntax/dafny.vim
+++ b/Util/vim/syntax/dafny.vim
@@ -11,7 +11,7 @@ syntax keyword dafnyConditional if then else match case
 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
+syntax keyword dafnyType bool nat int seq set multiset object array array2 array3
 syntax keyword dafnyLogic requires ensures modifies reads decreases invariant 
 syntax keyword dafnyOperator forall exists old fresh allocated choose
 syntax keyword dafnyBoolean true false
-- 
cgit v1.2.3