diff options
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/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs | 2 | ||||
| -rw-r--r-- | Util/latex/dafny.sty | 2 | ||||
| -rw-r--r-- | Util/vim/syntax/dafny.vim | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/Util/Emacs/dafny-mode.el b/Util/Emacs/dafny-mode.el index 89974290..3811e2c0 100644 --- a/Util/Emacs/dafny-mode.el +++ b/Util/Emacs/dafny-mode.el @@ -31,7 +31,7 @@ `(,(dafny-regexp-opt '(
"class" "datatype" "type" "function" "ghost" "var" "method" "constructor" "unlimited"
- "module" "imports" "static" "refines" "replaces" "by"
+ "module" "imports" "static" "refines"
"returns" "requires" "ensures" "modifies" "reads" "free"
"invariant" "decreases"
)) . font-lock-builtin-face)
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs index f2924420..e35383b0 100644 --- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs +++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs @@ -18,7 +18,7 @@ namespace Demo this.MarkReservedWords( // NOTE: these keywords must also appear once more below
"class", "ghost", "static", "var", "method", "constructor", "datatype", "type",
- "assert", "assume", "new", "this", "object", "refines", "replaces", "by",
+ "assert", "assume", "new", "this", "object", "refines",
"unlimited", "module", "imports",
"if", "then", "else", "while", "invariant",
"break", "label", "return", "parallel", "havoc", "print",
@@ -274,8 +274,6 @@ namespace Demo | "this"
| "object"
| "refines"
- | "replaces"
- | "by"
| "unlimited"
| "module"
| "imports"
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs index 23c71d45..78c5f8d9 100644 --- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs +++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs @@ -239,7 +239,6 @@ namespace DafnyLanguage case "assume":
case "bool":
case "break":
- case "by":
case "case":
case "choose":
case "class":
@@ -276,7 +275,6 @@ namespace DafnyLanguage case "print":
case "reads":
case "refines":
- case "replaces":
case "requires":
case "result":
case "return":
diff --git a/Util/latex/dafny.sty b/Util/latex/dafny.sty index b829985a..28759fd4 100644 --- a/Util/latex/dafny.sty +++ b/Util/latex/dafny.sty @@ -7,7 +7,7 @@ \lstdefinelanguage{dafny}{
morekeywords={class,datatype,type,bool,nat,int,object,set,multiset,seq,array,array2,array3,%
function,unlimited,
- ghost,var,static,refines,replaces,by,
+ ghost,var,static,refines,
method,constructor,returns,module,imports,in,
requires,modifies,ensures,reads,decreases,free,
% expressions
diff --git a/Util/vim/syntax/dafny.vim b/Util/vim/syntax/dafny.vim index ab8f120d..faac0cbb 100644 --- a/Util/vim/syntax/dafny.vim +++ b/Util/vim/syntax/dafny.vim @@ -10,7 +10,7 @@ syntax keyword dafnyTypeDef class datatype type 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 dafnyKeyword var ghost returns null static this refines 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 |