diff options
| author | Alasdair Armstrong | 2017-10-04 18:08:16 +0100 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-10-04 18:08:16 +0100 |
| commit | 69dcc28b25d0ad6b3f62a692684581b4f266aa03 (patch) | |
| tree | ee10d66d34b1d12815eccd03232f6a4252c8a166 /editors | |
| parent | 4feedbf27c5a204806bb5f1297bd9cd2505e3c26 (diff) | |
Fixed a bug in vector concatenation l-expressions
The code for these is now rather ugly though... it needs to be cleaned up at some point
Also various improvements to new menhir parser
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/sail2-mode.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/editors/sail2-mode.el b/editors/sail2-mode.el index 4e536ef0..e780695d 100644 --- a/editors/sail2-mode.el +++ b/editors/sail2-mode.el @@ -8,7 +8,7 @@ "else" "match" "in" "return" "register" "forall" "op" "effect" "overload" "cast" "sizeof" "constraint" "default" "assert" "pure" "infixl" "infixr" "infix" "scattered" "end" "try" "catch" - "throw" "clause")) + "throw" "clause" "as")) (defconst sail2-kinds '("Int" "Type" "Order" "inc" "dec" @@ -16,12 +16,16 @@ "exmem" "undef" "unspec" "nondet" "escape")) (defconst sail2-types - '("vector" "int" "atom" "range" "unit" "bit" "real" "list" "bool" "string")) + '("vector" "int" "nat" "atom" "range" "unit" "bit" "real" "list" "bool" "string")) + +(defconst sail2-special + '("_prove")) (defconst sail2-font-lock-keywords `((,(regexp-opt sail2-keywords 'symbols) . font-lock-keyword-face) (,(regexp-opt sail2-kinds 'symbols) . font-lock-builtin-face) (,(regexp-opt sail2-types 'symbols) . font-lock-type-face) + (,(regexp-opt sail2-special 'symbols) . font-lock-preprocessor-face) ("\'[a-zA-z_]+" . font-lock-variable-name-face) ("\\_<\\([0-9]+\\|0b[0-9]+\\|0x[0-9a-fA-F]+\\|true\\|false\\|bitone\\|bitzero\\)\\_>\\|()" . font-lock-constant-face))) |