summaryrefslogtreecommitdiff
path: root/Util
diff options
context:
space:
mode:
authorGravatar rustanleino <unknown>2010-02-04 22:14:26 +0000
committerGravatar rustanleino <unknown>2010-02-04 22:14:26 +0000
commitf7250b98f91a9e81069b0dc2c7b9c16b36633dfc (patch)
treedebfee9c44a08b59528d861f550b28a9036a2b1b /Util
parent1f481fb44bfce9fd0684e9d59e324db248b798ff (diff)
Dafny: Added if-then-else expressions (replacing and extending the previous boolean-only if-then-else expressions)
Dafny: Added 'class' functions and methods (i.e., functions and methods with a receiver parameter) Dafny grammar changes: Tthe 'use' keyword now goes before 'function' (akin to 'ghost' and 'class'), and quantifier triggers now go before the '::' Dafny: Check for division-by-zero for both '/' and '%'
Diffstat (limited to 'Util')
-rw-r--r--Util/Emacs/dafny-mode.el2
-rw-r--r--Util/latex/dafny.sty2
2 files changed, 2 insertions, 2 deletions
diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el
index d8fe3052..3b10c560 100644
--- a/Util/Emacs/dafny-mode.el
+++ b/Util/Emacs/dafny-mode.el
@@ -35,7 +35,7 @@
"invariant" "decreases"
)) . font-lock-builtin-face)
`(,(dafny-regexp-opt '(
- "assert" "assume" "break" "call" "else" "havoc" "if" "label" "return" "while"
+ "assert" "assume" "break" "call" "then" "else" "havoc" "if" "label" "return" "while"
"old" "forall" "exists" "new" "foreach" "in" "this" "fresh" "use"
"match" "case" "false" "true" "null")) . font-lock-keyword-face)
`(,(dafny-regexp-opt '("bool" "int" "object" "set" "seq")) . font-lock-type-face)
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty
index f88c3b54..23ea36fb 100644
--- a/Util/latex/dafny.sty
+++ b/Util/latex/dafny.sty
@@ -13,7 +13,7 @@
% expressions
match,case,false,true,null,old,fresh,this,
% statements
- assert,assume,new,havoc,call,if,else,while,invariant,break,return,foreach,
+ assert,assume,new,havoc,call,if,then,else,while,invariant,break,return,foreach,
},
literate=%
{:}{$\colon$}1