From 69dcc28b25d0ad6b3f62a692684581b4f266aa03 Mon Sep 17 00:00:00 2001
From: Alasdair Armstrong
Date: Wed, 4 Oct 2017 18:08:16 +0100
Subject: 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
---
 editors/sail2-mode.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'editors')

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)))
 
-- 
cgit v1.2.3