Start (some parsing and resolution) of adding algebraic datatypes to Dafny.

Included VSI-Benchmarks in standard tests.

2 files changed, 4 insertions, 4 deletions

diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index 508ffbaf..9d3ed5e0 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -30,14 +30,14 @@
 ]\\)*" . font-lock-comment-face)

 

    `(,(dafny-regexp-opt '(

-        "class" "function" "frame" "var" "method"

+        "class" "datatype" "function" "frame" "var" "method"

         "returns" "requires" "ensures" "modifies" "reads" "free"

         "invariant" "decreases"

         )) . font-lock-builtin-face)

    `(,(dafny-regexp-opt '(

         "assert" "assume" "break" "call" "else" "havoc" "if" "label" "return" "while"

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

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

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

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

    )

   "Minimal highlighting for Dafny mode")

diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index 69cd6b0a..f334e770 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -5,13 +5,13 @@
 \usepackage{listings}

 

 \lstdefinelanguage{dafny}{

-  morekeywords={class,bool,int,object,set,seq,%

+  morekeywords={class,datatype,bool,int,object,set,seq,%

       function,returns,

       var,

       method,in,

       requires,modifies,ensures,reads,free,

       % expressions

-      false,true,null,old,fresh,this,

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

       % statements

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

       },