diff options
| author |  rustanleino <unknown> | 2010-09-17 01:26:47 +0000 |
|---|---|---|
| committer | rustanleino <unknown> | 2010-09-17 01:26:47 +0000 |
| commit | 4744c729d2fa83f324ffa84dc619ad0a321a9c98 (patch) | |
| tree | 20f6e9d48144fc0ca96a2db53ee9f0db81e4861f /Util | |
| parent | 94087bfa24bd34a5cfcb6c8b361439c6de3135a9 (diff) | |
Dafny:
* Added full support for multi-dimensional arrays (except for one issue that still needs to be added in compilation)
* Changed syntax of array length from |a| to a.Length (for one-dimensional arrays). The syntax for either dimensions is, for example, b.Length0 and b.Length1 for 2-dimensional arrays.
* Internally, this meant adding support for built-in classes and readonly fields
Diffstat (limited to 'Util')
| -rw-r--r-- | Util/Emacs/dafny-mode.el | 2 | ||||
| -rw-r--r-- | Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs | 4 | ||||
| -rw-r--r-- | Util/latex/dafny.sty | 2 | ||||
| -rw-r--r-- | Util/vim/syntax/dafny.vim | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el index 2f5fc467..82490ae7 100644 --- a/Util/Emacs/dafny-mode.el +++ b/Util/Emacs/dafny-mode.el @@ -39,7 +39,7 @@ "assert" "assume" "break" "call" "then" "else" "havoc" "if" "label" "return" "while" "print"
"old" "forall" "exists" "new" "foreach" "in" "this" "fresh" "use"
"match" "case" "false" "true" "null")) . font-lock-keyword-face)
- `(,(dafny-regexp-opt '("array" "bool" "int" "object" "set" "seq")) . font-lock-type-face)
+ `(,(dafny-regexp-opt '("array" "array2" "array3" "bool" "int" "object" "set" "seq")) . font-lock-type-face)
)
"Minimal highlighting for Dafny mode")
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs index 12d433b1..48841c43 100644 --- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs +++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs @@ -25,7 +25,7 @@ namespace Demo "int", "bool", "false", "true", "null",
"function", "free",
"in", "forall", "exists",
- "seq", "set", "array",
+ "seq", "set", "array", "array2", "array3",
"match", "case",
"fresh", "old"
);
@@ -330,6 +330,8 @@ namespace Demo | "seq"
| "set"
| "array"
+ | "array2"
+ | "array3"
| "match"
| "case"
| "fresh"
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty index 5551cec0..9eb941de 100644 --- a/Util/latex/dafny.sty +++ b/Util/latex/dafny.sty @@ -5,7 +5,7 @@ \usepackage{listings}
\lstdefinelanguage{dafny}{
- morekeywords={class,datatype,bool,int,object,set,seq,array,%
+ morekeywords={class,datatype,bool,int,object,set,seq,array,array2,array3,%
function,unlimited,
ghost,var,static,refines,replaces,by,
method,returns,module,imports,in,
diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim index 91166eb0..df2666c3 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 foreach while syntax keyword dafnyStatement havoc assume assert return call new print break label syntax keyword dafnyKeyword var ghost returns null static this refines replaces by -syntax keyword dafnyType int bool seq set object +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 syntax keyword dafnyBoolean true false |