summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorKathy Gray2016-07-26 16:51:34 +0100
committerKathy Gray2016-07-26 16:51:44 +0100
commit9fcf30e1708acbb517a02a8791bf3f8275d605b3 (patch)
tree884da6e186fd98a3e7affeec99728a40585a0dbe /editors
parent81fc54b2ee0bd955aaa3ad9ea0e97e1eb02983e2 (diff)
Fix type abbreviation support oversight
Diffstat (limited to 'editors')
-rw-r--r--editors/sail.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/sail.el b/editors/sail.el
index 03b87f25..5fd4b3ff 100644
--- a/editors/sail.el
+++ b/editors/sail.el
@@ -643,7 +643,7 @@ though, if you also have `sail-electric-indent' on."
"alias" "union" "member" "clause" "extern" "effect"
"rec" "and" "switch" "case" "exit" "foreach" "from" "else"
"to" "end" "downto" "in" "then" "with" "if" "nondet" "as"
- "undefined" "const" "struct" "IN" "deinfix"))
+ "undefined" "const" "struct" "IN" "deinfix" "return" "sizeof"))
(setq abbrevs-changed nil))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -711,13 +711,13 @@ Based on Tuareg mode. See Tuareg mode for usage"
`(("\\<\\(extern\\|function\\|scattered\\|clause\\|effect\\|default\\|struct\\|const\\|union\\|val\\|typedef\\|in\\|let\\|rec\\|and\\|end\\|register\\|alias\\|member\\|enumerate\\)\\>"
0 sail-font-lock-governing-face nil nil)
("\\<\\(false\\|true\\|bitzero\\|bitone\\|0x[:xdigit:]\\|[:digit:]\\)\\>" 0 font-lock-constant-face nil nil)
- ("\\<\\(as\\|downto\\|else\\|foreach\\|if\\|t\\(hen\\|o\\)\\|when\\|switch\\|with\\|case\\|exit\\|nondet\\|from\\|by\\)\\>"
+ ("\\<\\(as\\|downto\\|else\\|foreach\\|if\\|t\\(hen\\|o\\)\\|when\\|switch\\|with\\|case\\|exit\\|sizeof\\|nondet\\|from\\|by\\|return\\)\\>"
0 font-lock-keyword-face nil nil)
("\\<\\(clause\\)\\>[ \t\n]*\\(\\(\\w\\|[_ \t()*,]\\)+\\)"
2 font-lock-variable-name-face keep nil)
("\\<\\(typedef\\|union\\)\\>[ \t\n]*\\(\\(\\w\\|[_ \t()*,]\\)+\\)"
2 font-lock-type-face keep nil)
- ("\\<\\(Type\\|Nat\\|Order\\|Effect\\|inc\\|dec\\|rreg\\|wreg\\|rmem\\|wmem\\|barr\\|undef\\|unspec\\|nondet\\|pure\\|effect\\|IN\\|forall\\|bit\\|nat\\|int\\)\\>"
+ ("\\<\\(Type\\|Nat\\|Order\\|Effect\\|inc\\|dec\\|implicit\\|vector\\|rreg\\|wreg\\|rmem\\|wmem\\|barr\\|undef\\|escape\\|unspec\\|nondet\\|pure\\|effect\\|IN\\|forall\\|bit\\|unit\\|bool\\|nat\\|int\\)\\>"
0 font-lock-type-face keep nil)
("\\<\\(val\\|extern\\|clause\\|and\\||let\\|rec\\>[ \t\n]*\\(\\(\\w\\|[_,?~.]\\)*\\)"
2 font-lock-variable-name-face keep nil)
@@ -772,9 +772,9 @@ Based on Tuareg mode. See Tuareg mode for usage"
(defconst sail-keyword-regexp
(concat (sail-ro "scattered" "function" "typedef" "let" "default" "val" "register"
"alias" "union" "member" "clause" "extern" "effect"
- "rec" "and" "switch" "case" "exit" "foreach" "from" "else"
+ "rec" "and" "switch" "case" "exit" "return" "foreach" "from" "else"
"to" "end" "downto" "in" "then" "with" "if" "nondet" "as"
- "undefined" "const" "struct" "IN" "deinfix")
+ "undefined" "const" "struct" "IN" "deinfix" "sizeof")
"\\|->\\|[;,|]")
"Regexp for all recognized keywords.")