FUEL: In word extraction, ask for word name before stack effect.

db4
Jose A. Ortega Ruiz 2009-01-21 02:46:50 +01:00
parent f34f7298ee
commit 5b785d2f38
2 changed files with 7 additions and 5 deletions

View File

@ -177,9 +177,7 @@ PRIVATE>
! Remote connection ! Remote connection
: fuel-start-remote-listener ( port/f -- ) : fuel-start-server ( port -- )
"Starting server. Connect with 'M-x connect-to-factor' in Emacs"
write nl flush number? [ 9000 ] unless*
<threaded-server> <threaded-server>
"tty-server" >>name "tty-server" >>name
utf8 >>encoding utf8 >>encoding
@ -188,6 +186,10 @@ PRIVATE>
f >>timeout f >>timeout
start-server ; start-server ;
: fuel-start-remote-listener ( port/f -- )
"Starting server. Connect with 'M-x connect-to-factor' in Emacs"
write nl flush number? [ 9000 ] unless* fuel-start-server ;
: fuel-start-remote-listener* ( -- ) f fuel-start-remote-listener ; : fuel-start-remote-listener* ( -- ) f fuel-start-remote-listener ;
MAIN: fuel-start-remote-listener* MAIN: fuel-start-remote-listener*

View File

@ -103,10 +103,10 @@
(let* ((code (buffer-substring begin end)) (let* ((code (buffer-substring begin end))
(existing (fuel-refactor--reuse-existing code)) (existing (fuel-refactor--reuse-existing code))
(code-str (or existing (fuel--region-to-string begin end))) (code-str (or existing (fuel--region-to-string begin end)))
(word (or (car existing) (read-string "New word name: ")))
(stack-effect (or existing (stack-effect (or existing
(fuel-stack--infer-effect code-str) (fuel-stack--infer-effect code-str)
(read-string "Stack effect: "))) (read-string "Stack effect: "))))
(word (or (car existing) (read-string "New word name: "))))
(goto-char begin) (goto-char begin)
(delete-region begin end) (delete-region begin end)
(insert word) (insert word)