FUEL: Better, if hackish, to fix the f problem.

diff --git a/extra/fuel/pprint/pprint.factor b/extra/fuel/pprint/pprint.factor
index 6067bd4b49456fccd90534ab20656160f1223b98..25f3aec14dd00025137feb45b5652feaf52d1570 100644 (file)
--- a/extra/fuel/pprint/pprint.factor
+++ b/extra/fuel/pprint/pprint.factor
@@ -29,7 +29,7 @@ M: object fuel-pprint pprint ; inline
 M: word fuel-pprint
     name>> V{ } clone [ fuel-maybe-scape append ] reduce >string write ;
 
-M: f fuel-pprint drop "f" write ; inline
+M: f fuel-pprint drop "nil" write ; inline
 
 M: integer fuel-pprint pprint ; inline
 

diff --git a/misc/fuel/fuel-eval.el b/misc/fuel/fuel-eval.el
index a4d51241366b48aedebf2db5cec5c2f3d14e2bf9..9e8210a3e3e89983672704752e8fc1952f4d83c4 100644 (file)
--- a/misc/fuel/fuel-eval.el
+++ b/misc/fuel/fuel-eval.el
@@ -32,6 +32,7 @@
          (case (car sexp)
            (:array (factor--seq 'V{ '} (cdr sexp)))
            (:seq (factor--seq '{ '} (cdr sexp)))
+           (:tuple (factor--seq 'T{ '} (cdr sexp)))
            (:quote (format "\\ %s" (factor `(:factor ,(cadr sexp)))))
            (:quotation (factor--seq '\[ '\] (cdr sexp)))
            (:using (factor `(USING: ,@(cdr sexp) :end)))
@@ -116,8 +117,7 @@
 (defsubst fuel-eval--retort-make (err result &optional output)
   (list err result output))
 
-(defsubst fuel-eval--retort-error (ret)
-  (and (not (eq (nth 0 ret) 'f)) (nth 0 ret)))
+(defsubst fuel-eval--retort-error (ret) (nth 0 ret))
 (defsubst fuel-eval--retort-result (ret) (nth 1 ret))
 (defsubst fuel-eval--retort-output (ret) (nth 2 ret))
 

diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el
index 6a374cd5c88bbfea445e13dc05e72fff4ba88e29..173248feb7739a20dfa25b6a5a591170c0371fc2 100644 (file)
--- a/misc/fuel/fuel-markup.el
+++ b/misc/fuel/fuel-markup.el
@@ -285,7 +285,7 @@
   (fuel-markup--snippet (cons '$snippet (cdr e))))
 
 (defun fuel-markup--link (e)
-  (let* ((link (nth 1 e))
+  (let* ((link (or (nth 1 e) 'f))
          (type (or (nth 3 e) (if (symbolp link) 'word 'article)))
          (label (or (nth 2 e)
                     (and (eq type 'article)