FUEL: Extract word refactoring.

extra/fuel/fuel.factor

@@ -269,7 +269,7 @@ MEMO: fuel-article-title ( name -- title/f )
     help-path [ dup article-title swap 2array ] map ; inline
 
 : (fuel-word-help) ( word -- element )
-    dup \ article swap article-title rot
+    \ article swap dup article-title swap
     [
         {
             [ fuel-parent-topics [ \ $doc-path prefix , ] unless-empty ]

misc/fuel/README

@@ -74,6 +74,8 @@ beast.
     - C-cM-<, C-cC-d< : show callers of word at point
     - C-cM->, C-cC-d> : show callees of word at point
 
+    - C-cC-xw : extract region as a separate word
+
 *** In the listener:
 
     - TAB : complete word at point

misc/fuel/fuel-mode.el

@@ -224,6 +224,8 @@ interacting with a factor listener is at your disposal.
 (fuel-mode--key ?e ?w 'fuel-edit-word)
 (fuel-mode--key ?e ?x 'fuel-eval-definition)
 
+(fuel-mode--key ?x ?w 'fuel-refactor-extract-word)
+
 (fuel-mode--key ?d ?> 'fuel-show-callees)
 (fuel-mode--key ?d ?< 'fuel-show-callers)
 (fuel-mode--key ?d ?a 'fuel-autodoc-mode)

misc/fuel/fuel-refactor.el

@@ -0,0 +1,45 @@
+;;; fuel-refactor.el -- code refactoring support
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+;; See http://factorcode.org/license.txt for BSD license.
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Keywords: languages, fuel, factor
+;; Start date: Thu Jan 08, 2009 00:57
+
+;;; Comentary:
+
+;; Utilities performing refactoring on factor code.
+
+;;; Code:
+
+(require 'fuel-stack)
+(require 'fuel-syntax)
+(require 'fuel-base)
+
+
+;;; Extract word:
+
+(defun fuel-refactor-extract-word (begin end)
+  "Extracts current region as a separate word."
+  (interactive "r")
+  (let* ((word (read-string "New word name: "))
+         (code (buffer-substring begin end))
+         (code-str (fuel--region-to-string begin end))
+         (stack-effect (or (fuel-stack--infer-effect code-str)
+                           (read-string "Stack effect: "))))
+    (goto-char begin)
+    (delete-region begin end)
+    (insert word)
+    (indent-region begin (point))
+    (set-mark (point))
+    (fuel-syntax--beginning-of-defun)
+    (open-line 1)
+    (let ((start (point)))
+      (insert ": " word " " stack-effect "\n" code " ;\n")
+      (indent-region start (point)))
+    (goto-char (mark))))
+
+
+(provide 'fuel-refactor)
+;;; fuel-refactor.el ends here