summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAlasdair Armstrong2017-10-09 19:01:36 +0100
committerAlasdair Armstrong2017-10-09 19:01:36 +0100
commit34d76d1234bfd3ecae1e3e39687d0d202c0fb02c (patch)
tree2c7d7cc1d13dde878f0c60a3d3b71169e901db67 /editors
parentd3604c52e19e4e71965b5d96d6fab879bac7effc (diff)
Improvements to menhir pretty printer and ocaml backend
Menhir pretty printer can now print enough sail to be useful with ASL parser Fixity declarations are now preserved in the AST Menhir parser now runs without the Pre-lexer Ocaml backend now supports variant typedefs, as the machinery to generate arbitrary instances of variant types has been added to the -undefined_gen flag
Diffstat (limited to 'editors')
-rw-r--r--editors/sail2-mode.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/sail2-mode.el b/editors/sail2-mode.el
index e780695d..c2f77801 100644
--- a/editors/sail2-mode.el
+++ b/editors/sail2-mode.el
@@ -5,9 +5,9 @@
(defconst sail2-keywords
'("val" "function" "type" "struct" "union" "enum" "let" "if" "then"
- "else" "match" "in" "return" "register" "forall" "op" "effect"
+ "else" "match" "in" "return" "register" "forall" "operator" "effect"
"overload" "cast" "sizeof" "constraint" "default" "assert"
- "pure" "infixl" "infixr" "infix" "scattered" "end" "try" "catch"
+ "pure" "infixl" "infixr" "infix" "scattered" "end" "try" "catch" "and"
"throw" "clause" "as"))
(defconst sail2-kinds
@@ -16,7 +16,7 @@
"exmem" "undef" "unspec" "nondet" "escape"))
(defconst sail2-types
- '("vector" "int" "nat" "atom" "range" "unit" "bit" "real" "list" "bool" "string"))
+ '("vector" "int" "nat" "atom" "range" "unit" "bit" "real" "list" "bool" "string" "bits"))
(defconst sail2-special
'("_prove"))