FUEL: improve highlighting and indentation for ERROR:

diff --git a/misc/fuel/fuel-font-lock.el b/misc/fuel/fuel-font-lock.el
index 8ccf50d0e04b799bab1f8a9ab3d8e31a119f565d..d54b0cd337972cfd09f955e1e6f90373e24c0032 100644 (file)
--- a/misc/fuel/fuel-font-lock.el
+++ b/misc/fuel/fuel-font-lock.el
@@ -59,6 +59,7 @@
   (ratio constant  "ratios")
   (declaration keyword "declaration words")
   (ebnf-form constant "EBNF: ... ;EBNF form")
+  (error-form warning "ERROR: ... ; form")
   (parsing-word keyword  "parsing words")
   (postpone-body comment "postponed form")
   (setter-word function-name "setter words (>>foo)")
@@ -132,6 +133,7 @@
     (,fuel-syntax--float-regex . 'factor-font-lock-number)
     (,fuel-syntax--ratio-regex . 'factor-font-lock-ratio)
     (,fuel-syntax--type-definition-regex 2 'factor-font-lock-type-name)
+    (,fuel-syntax--error-regex 2 'factor-font-lock-error-form)
     (,fuel-syntax--method-definition-regex (1 'factor-font-lock-type-name)
                                            (2 'factor-font-lock-word))
     (,fuel-syntax--before-definition-regex (1 'factor-font-lock-type-name)

diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el
index 0d77d9cc13277de5a2eba2f0c9c8708e56f16c7e..e2db30db3d0b1a5487d2477deb9e679541054643 100644 (file)
--- a/misc/fuel/fuel-syntax.el
+++ b/misc/fuel/fuel-syntax.el
@@ -135,6 +135,9 @@
   (fuel-syntax--second-word-regex\r
    '("C-STRUCT:" "C-UNION:" "COM-INTERFACE:" "MIXIN:" "TUPLE:" "SINGLETON:" "SPECIALIZED-ARRAY:" "STRUCT:" "UNION:" "UNION-STRUCT:")))\r
 \r
+(defconst fuel-syntax--error-regex\r
+  (fuel-syntax--second-word-regex '("ERROR:")))\r
+\r
 (defconst fuel-syntax--tuple-decl-regex\r
   "^TUPLE: +\\([^ \n]+\\) +< +\\([^ \n]+\\)\\_>")\r
 \r
@@ -168,7 +171,8 @@
 \r
 (defconst fuel-syntax--indent-def-starts '("" ":"\r
                                            "AFTER" "BEFORE"\r
-                                           "ENUM" "COM-INTERFACE" "CONSULT"\r
+                                           "COM-INTERFACE" "CONSULT"\r
+                                           "ENUM" "ERROR"\r
                                            "FROM" "FUNCTION:" "FUNCTION-ALIAS:"\r
                                            "INTERSECTION:"\r
                                            "M" "M:" "MACRO" "MACRO:"\r