From 209feb4cbbd353e1644b96b57d7e36dd086cef8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Thu, 24 Nov 2016 05:00:12 +0100
Subject: [PATCH] FUEL: fix smie indentation of some syntax words

---
 misc/fuel/factor-smie.el        | 16 ++++++++++++----
 misc/fuel/strange-syntax.factor |  8 +++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/misc/fuel/factor-smie.el b/misc/fuel/factor-smie.el
index 54371835e9..1aeb7e5f6d 100644
--- a/misc/fuel/factor-smie.el
+++ b/misc/fuel/factor-smie.el
@@ -16,18 +16,20 @@
   :safe 'integerp
   :group 'factor)
 
+;; These prefixes starts a definition and causes the indent-level to
+;; increase.
 (defconst factor-indent-def-starts
   '("" ":"
     "AFTER" "BEFORE"
     "COM-INTERFACE" "CONSULT"
     "ENUM" "ERROR"
-    "FROM" "FUNCTION:" "FUNCTION-ALIAS:"
+    "FROM"
     "IDENTITY-MEMO"
-    "INTERSECTION:"
+    "INTERSECTION"
     "M" "M:" "MACRO" "MACRO:"
     "MAIN-WINDOW" "MEMO" "MEMO:" "METHOD"
     "SYNTAX"
-    "PREDICATE" "PRIMITIVE" "PROTOCOL"
+    "PREDICATE" "PROTOCOL"
     "SINGLETONS"
     "STRUCT" "SYMBOLS" "TAG" "TUPLE"
     "TYPED" "TYPED:"
@@ -35,8 +37,14 @@
     "UNION-STRUCT" "UNION"
     "VARIANT" "VERTEX-FORMAT"))
 
+;; These prefixes starts a definition but does not cause the indent
+;; level to increase.
 (defconst factor-no-indent-def-starts
-  '("ARTICLE" "HELP" "SPECIALIZED-ARRAYS"))
+  '("ARTICLE"
+    "FUNCTION" "FUNCTION-ALIAS"
+    "HELP"
+    "PRIMITIVE"
+    "SPECIALIZED-ARRAYS"))
 
 (defconst factor-indent-def-regex
   (format "^\\(%s:\\)$" (regexp-opt factor-indent-def-starts)))
diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor
index cdd440026b..5c52c48ea9 100644
--- a/misc/fuel/strange-syntax.factor
+++ b/misc/fuel/strange-syntax.factor
@@ -89,9 +89,15 @@ STRUCT: timeval
     { sec long }
     { usec long } ;
 
-FUNCTION: int futimes ( int id, timeval[2] times )
+FUNCTION: int futimes ( int id,
+                        timeval[2] times,
+                        int x,
+                        int y )
 FUNCTION: int booyah ( int x )
 FUNCTION-ALIAS: test int bah ( int* ah, int[] eh )
 
 HEXCOLOR: ffffff COLOR: green NAN: 1234 CHAR: m ALIEN: 93
 2drop 2drop drop
+
+PRIMITIVE: one ( a -- b )
+PRIMITIVE: two ( c -- d )