FUEL: Fix for float highlight (+ en exp) and small tweaks.

extra/fuel/fuel.factor

@@ -6,7 +6,8 @@ compiler.units continuations debugger definitions help help.crossref
 help.markup help.topics io io.pathnames io.streams.string kernel lexer
 make math math.order memoize namespaces parser quotations prettyprint
 sequences sets sorting source-files strings summary tools.crossref
-tools.vocabs tools.vocabs.browser vectors vocabs vocabs.parser words ;
+tools.vocabs tools.vocabs.browser vectors vocabs vocabs.parser
+vocabs.loader words ;
 
 IN: fuel
 
@@ -330,7 +331,7 @@ SYMBOL: vocab-list
     [ describe-words ] with-string-writer \ describe-words swap 2array ; inline
 
 : (fuel-vocab-help) ( name -- element )
-    \ article swap dup >vocab-link
+    dup require \ article swap dup >vocab-link
     [
         {
             [ vocab-authors [ \ $authors prefix , ] when* ]
@@ -360,12 +361,12 @@ MEMO: (fuel-get-vocabs/author) ( author -- element )
 : fuel-get-vocabs/author ( author -- )
     (fuel-get-vocabs/author) fuel-eval-set-result ;
 
-MEMO: (fuel-get-vocabs/tag ( tag -- element )
+MEMO: (fuel-get-vocabs/tag) ( tag -- element )
     [ "Vocabularies tagged " prepend \ $heading swap 2array ]
     [ tagged fuel-vocab-list ] bi 2array ;
 
 : fuel-get-vocabs/tag ( tag -- )
-    (fuel-get-vocabs/tag fuel-eval-set-result ;
+    (fuel-get-vocabs/tag) fuel-eval-set-result ;
 
 
 ! -run=fuel support

misc/fuel/factor-mode.el

@@ -239,7 +239,7 @@ code in the buffer."
 ;;; Keymap:
 
 (defun factor-mode-insert-and-indent (n)
-  (interactive "p")
+  (interactive "*p")
   (self-insert-command n)
   (indent-according-to-mode))
 

misc/fuel/fuel-eval.el

@@ -42,7 +42,7 @@
          (factor (case sexp
                    (:rs 'fuel-eval-restartable)
                    (:nrs 'fuel-eval-non-restartable)
-                   (:in (fuel-syntax--current-vocab))
+                   (:in (or (fuel-syntax--current-vocab) "fuel"))
                    (:usings `(:array ,@(fuel-syntax--usings)))
                    (:get 'fuel-eval-set-result)
                    (:end '\;)
@@ -70,7 +70,7 @@
 (defsubst factor--fuel-in (in)
   (cond ((or (eq in :in) (null in)) :in)
         ((eq in 'f) 'f)
-        ((eq in 't) "fuel-scratchpad")
+        ((eq in 't) "fuel")
         ((stringp in) in)
         (t (error "Invalid 'in' (%s)" in))))
 

misc/fuel/fuel-syntax.el

@@ -91,7 +91,7 @@
   "\\_<-?\\([0-9]+\\+\\)?[0-9]+/-?[0-9]+\\_>")
 
 (defconst fuel-syntax--float-regex
-  "\\_<-?[0-9]+\\.[0-9]*\\([eE]-?[0-9]+\\)?\\_>")
+  "\\_<-?[0-9]+\\.[0-9]*\\([eE][+-]?[0-9]+\\)?\\_>")
 
 (defconst fuel-syntax--word-definition-regex
   (fuel-syntax--second-word-regex