From 3ad52dd85b3f371f8fdb4ad9924979a74596c6ec Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Wed, 28 Jan 2009 21:23:21 +0100 Subject: [PATCH 01/14] FUEL: New refactoring: extract region as ARTICLE: (C-cC-xa). --- misc/fuel/README | 1 + misc/fuel/fuel-mode.el | 1 + misc/fuel/fuel-refactor.el | 47 ++++++++++++++++++++++++++++++-------- misc/fuel/fuel-syntax.el | 7 +++--- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/misc/fuel/README b/misc/fuel/README index cf96e29f52..198c9bb275 100644 --- a/misc/fuel/README +++ b/misc/fuel/README @@ -129,6 +129,7 @@ beast. | | (fuel-refactor-extract-vocab) | | C-cC-xi | replace word by its definition (fuel-refactor-inline-word) | | C-cC-xw | rename all uses of a word (fuel-refactor-rename-word) | + | C-cC-xa | extract region as a separate ARTICLE: form | |-----------------+------------------------------------------------------------| *** In the listener: diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el index 88ad73864a..504308fccd 100644 --- a/misc/fuel/fuel-mode.el +++ b/misc/fuel/fuel-mode.el @@ -198,6 +198,7 @@ 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 ?a 'fuel-refactor-extract-article) (fuel-mode--key ?x ?i 'fuel-refactor-inline-word) (fuel-mode--key ?x ?r 'fuel-refactor-extract-region) (fuel-mode--key ?x ?s 'fuel-refactor-extract-sexp) diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index 061adbb82c..bd62227755 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -78,17 +78,19 @@ (when found (setq result (fuel-refactor--reuse-p (car found))))) (and result found)))) +(defsubst fuel-refactor--insertion-point () + (max (save-excursion (fuel-syntax--beginning-of-defun) (point)) + (save-excursion + (re-search-backward fuel-syntax--end-of-def-regex nil t) + (forward-line 1) + (skip-syntax-forward "-")))) + (defun fuel-refactor--insert-word (word stack-effect code) - (let ((beg (save-excursion (fuel-syntax--beginning-of-defun) (point))) - (end (save-excursion - (re-search-backward fuel-syntax--end-of-def-regex nil t) - (forward-line 1) - (skip-syntax-forward "-")))) - (let ((start (goto-char (max beg end)))) - (open-line 1) - (insert ": " word " " stack-effect "\n" code " ;\n") - (indent-region start (point)) - (move-overlay fuel-stack--overlay start (point))))) + (let ((start (goto-char (fuel-refactor--insertion-point)))) + (open-line 1) + (insert ": " word " " stack-effect "\n" code " ;\n") + (indent-region start (point)) + (move-overlay fuel-stack--overlay start (point)))) (defun fuel-refactor--extract-other (start end code) (unwind-protect @@ -233,5 +235,30 @@ The region is extended to the closest definition boundaries." (mark-defun) (mark)))) +;;; Extract article: + +(defun fuel-refactor-extract-article (begin end) + "Extracts region as a new ARTICLE form." + (interactive "r") + (let ((topic (read-string "Article topic: ")) + (title (read-string "Article title: "))) + (kill-region begin end) + (insert (format "{ $subsection %s }\n" topic)) + (end-of-line 0) + (save-excursion + (goto-char (fuel-refactor--insertion-point)) + (open-line 1) + (let ((start (point))) + (insert (format "ARTICLE: %S %S\n" topic title)) + (yank) + (when (looking-at "^ *$") (end-of-line 0)) + (insert " ;") + (unwind-protect + (progn + (move-overlay fuel-stack--overlay start (point)) + (sit-for fuel-stack-highlight-period)) + (delete-overlay fuel-stack--overlay)))))) + + (provide 'fuel-refactor) ;;; fuel-refactor.el ends here diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index ad5a025a88..80bfd0afcb 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -158,7 +158,9 @@ "PREDICATE" "PRIMITIVE" "UNION")) -(defconst fuel-syntax--no-indent-def-starts '("SINGLETONS" +(defconst fuel-syntax--no-indent-def-starts '("ARTICLE" + "HELP" + "SINGLETONS" "SYMBOLS" "TUPLE" "VARS")) @@ -179,13 +181,12 @@ (defconst fuel-syntax--single-liner-regex (regexp-opt '("ABOUT:" - "ARTICLE:" "ALIAS:" "CONSTANT:" "C:" "DEFER:" "FORGET:" "GENERIC:" "GENERIC#" - "HELP:" "HEX:" "HOOK:" + "HEX:" "HOOK:" "IN:" "INSTANCE:" "LIBRARY:" "MAIN:" "MATH:" "MIXIN:" From 3cd8fbc6835b73d849da5251956c6178d297a371 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Wed, 28 Jan 2009 21:32:19 +0100 Subject: [PATCH 02/14] FUEL: Note about .factor-boot-rc added. --- misc/fuel/README | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/misc/fuel/README b/misc/fuel/README index 198c9bb275..d712560b03 100644 --- a/misc/fuel/README +++ b/misc/fuel/README @@ -53,6 +53,14 @@ beast. factor image (overwriting the current one) with all the needed vocabs. + Alternatively, you can add the following line to your + .factor-boot-rc file: + + "fuel" require + + This will ensure that the image generated while bootstrapping + Factor contains fuel and the vocabularies it depends on. + *** Connecting to a running Factor 'run-factor' starts a new factor listener process managed by Emacs. From 2ea9d0bce1f401229f9b58bb1a1fac96f312a3bc Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 00:20:58 +0100 Subject: [PATCH 03/14] FUEL: Better handling of $see in help browser. --- extra/fuel/help/help.factor | 12 ++++++------ misc/fuel/fuel-markup.el | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor index e70327bd35..55183734b3 100644 --- a/extra/fuel/help/help.factor +++ b/extra/fuel/help/help.factor @@ -2,15 +2,15 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs combinators help help.crossref -help.markup help.topics io io.streams.string kernel make memoize -namespaces parser prettyprint sequences summary tools.vocabs -tools.vocabs.browser vocabs vocabs.loader words ; +help.markup help.topics io io.streams.string kernel make namespaces +parser prettyprint sequences summary tools.vocabs tools.vocabs.browser +vocabs vocabs.loader words ; IN: fuel.help > ] dip = ] curry all-words swap filter dup empty? not [ first ] [ drop f ] if ; @@ -102,11 +102,11 @@ PRIVATE> : (fuel-vocab-help) ( name -- str ) dup empty? [ fuel-vocab-children-help ] [ (fuel-vocab-element) ] if ; -MEMO: (fuel-get-vocabs/author) ( author -- element ) +: (fuel-get-vocabs/author) ( author -- element ) [ "Vocabularies by " prepend \ $heading swap 2array ] [ authored fuel-vocab-list ] bi 2array ; -MEMO: (fuel-get-vocabs/tag) ( tag -- element ) +: (fuel-get-vocabs/tag) ( tag -- element ) [ "Vocabularies tagged " prepend \ $heading swap 2array ] [ tagged fuel-vocab-list ] bi 2array ; diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 7a8fa0c234..2784335fbb 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -585,12 +585,13 @@ (defun fuel-markup--see (e) (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* (,(format "%s" word) fuel-word-see) "fuel" t))) - (res (and cmd - (fuel-eval--retort-result (fuel-eval--send/wait cmd 100))))) + (cmd (and word `(:fuel* ((:quote ,(format "%S" word)) see) "fuel"))) + (ret (and cmd (fuel-eval--send/wait cmd))) + (res (and (not (fuel-eval--retort-error ret)) + (fuel-eval--retort-output ret)))) (if res (fuel-markup--code (list '$code res)) - (fuel-markup--snippet (list '$snippet word))))) + (fuel-markup--snippet (list '$snippet " " word))))) (defun fuel-markup--null (e)) From a5cc358f196a1674aae07154c9cccbfb8e458d98 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 00:33:13 +0100 Subject: [PATCH 04/14] FUEL: Bug fix: escape ';' in fuel pretty print. --- extra/fuel/pprint/pprint.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/fuel/pprint/pprint.factor b/extra/fuel/pprint/pprint.factor index 25f3aec14d..9dcbd76368 100644 --- a/extra/fuel/pprint/pprint.factor +++ b/extra/fuel/pprint/pprint.factor @@ -12,7 +12,7 @@ GENERIC: fuel-pprint ( obj -- ) Date: Fri, 30 Jan 2009 00:40:17 +0100 Subject: [PATCH 05/14] FUEL: Even better $see handling in help browser. --- misc/fuel/fuel-markup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 2784335fbb..9e508b802d 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -585,7 +585,7 @@ (defun fuel-markup--see (e) (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* ((:quote ,(format "%S" word)) see) "fuel"))) + (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) see) "fuel"))) (ret (and cmd (fuel-eval--send/wait cmd))) (res (and (not (fuel-eval--retort-error ret)) (fuel-eval--retort-output ret)))) From 8d522caa82967e2d97bd50cf2a03cb7828528eea Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 00:44:15 +0100 Subject: [PATCH 06/14] FUEL: $synopsis markup implemented. --- misc/fuel/fuel-markup.el | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 9e508b802d..4a5df8e7ea 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -593,10 +593,17 @@ (fuel-markup--code (list '$code res)) (fuel-markup--snippet (list '$snippet " " word))))) -(defun fuel-markup--null (e)) - (defun fuel-markup--synopsis (e) - (insert (format " %S " e))) + (let* ((word (nth 1 e)) + (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) synopsis) "fuel"))) + (ret (and cmd (fuel-eval--send/wait cmd))) + (res (and (not (fuel-eval--retort-error ret)) + (fuel-eval--retort-output ret)))) + (if res + (fuel-markup--code (list '$code res)) + (fuel-markup--snippet (list '$snippet " " word))))) + +(defun fuel-markup--null (e)) (provide 'fuel-markup) From ba3c188b3cc1615dc5c95579ff3dab7de052b371 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 00:48:24 +0100 Subject: [PATCH 07/14] FUEL: Small refactoring. --- misc/fuel/fuel-markup.el | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 4a5df8e7ea..0c2fe91551 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -583,9 +583,9 @@ (defun fuel-markup--notes (e) (fuel-markup--elem-with-heading e "Notes")) -(defun fuel-markup--see (e) +(defun fuel-markup--word-info (e s) (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) see) "fuel"))) + (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) ,s) "fuel"))) (ret (and cmd (fuel-eval--send/wait cmd))) (res (and (not (fuel-eval--retort-error ret)) (fuel-eval--retort-output ret)))) @@ -593,15 +593,11 @@ (fuel-markup--code (list '$code res)) (fuel-markup--snippet (list '$snippet " " word))))) +(defun fuel-markup--see (e) + (fuel-markup--word-info e 'see)) + (defun fuel-markup--synopsis (e) - (let* ((word (nth 1 e)) - (cmd (and word `(:fuel* ((:quote ,(format "%s" word)) synopsis) "fuel"))) - (ret (and cmd (fuel-eval--send/wait cmd))) - (res (and (not (fuel-eval--retort-error ret)) - (fuel-eval--retort-output ret)))) - (if res - (fuel-markup--code (list '$code res)) - (fuel-markup--snippet (list '$snippet " " word))))) + (fuel-markup--word-info e 'synopsis)) (defun fuel-markup--null (e)) From c1347699c407ea0eb8310a414c5cd44694dddcc2 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 30 Jan 2009 14:56:44 -0600 Subject: [PATCH 08/14] Clean up CONSTRUCTOR: with Dan's idea: introduce set-slots and construct macros --- extra/constructors/constructors.factor | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor index 6968fd7eda..30d286eb96 100644 --- a/extra/constructors/constructors.factor +++ b/extra/constructors/constructors.factor @@ -1,17 +1,19 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: slots kernel sequences fry accessors parser lexer words -effects.parser ; +effects.parser macros ; IN: constructors ! An experiment -: constructor-quot ( class slot-names body -- quot ) - [ [ setter-word '[ swap _ execute ] ] map [ ] join ] dip - '[ _ new @ @ ] ; +MACRO: set-slots ( slots -- quot ) + [ setter-word '[ swap _ execute ] ] map [ ] join ; + +: construct ( ... class slots -- instance ) + [ new ] dip set-slots ; inline : define-constructor ( name class effect body -- ) - [ [ in>> ] dip constructor-quot ] [ drop ] 2bi + [ [ in>> ] dip '[ _ _ construct @ ] ] [ drop ] 2bi define-declared ; : CONSTRUCTOR: From 43672d90cb29f289b8db658160edf203e580f5bf Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 30 Jan 2009 15:16:05 -0600 Subject: [PATCH 09/14] Minor tweak --- extra/constructors/constructors.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/constructors/constructors.factor b/extra/constructors/constructors.factor index 30d286eb96..2eab91310f 100644 --- a/extra/constructors/constructors.factor +++ b/extra/constructors/constructors.factor @@ -13,7 +13,7 @@ MACRO: set-slots ( slots -- quot ) [ new ] dip set-slots ; inline : define-constructor ( name class effect body -- ) - [ [ in>> ] dip '[ _ _ construct @ ] ] [ drop ] 2bi + [ [ in>> '[ _ _ construct ] ] dip compose ] [ drop ] 2bi define-declared ; : CONSTRUCTOR: From f31cf8e9a93ba065db0ee4a7725d9375c451f1dd Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 30 Jan 2009 15:21:46 -0600 Subject: [PATCH 10/14] fix empty description --- basis/math/bitwise/bitwise-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/math/bitwise/bitwise-docs.factor b/basis/math/bitwise/bitwise-docs.factor index 18ae8e1497..358c984276 100644 --- a/basis/math/bitwise/bitwise-docs.factor +++ b/basis/math/bitwise/bitwise-docs.factor @@ -242,7 +242,7 @@ HELP: shift-mod { "n" integer } { "s" integer } { "w" integer } { "n" integer } } -{ $description "" } ; +{ $description "Calls " { $link shift } " on " { $snippet "n" } " and " { $snippet "s" } ", wrapping the result to " { $snippet "w" } " bits." } ; HELP: unmask { $values From 16c1f210a66d88a5e07ddc1d00a8f53b788b03b7 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 22:24:53 +0100 Subject: [PATCH 11/14] FUEL: Fix for $vocab-link markup. --- misc/fuel/fuel-markup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 0c2fe91551..3aee2dc912 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -323,7 +323,7 @@ (sort-lines nil start (point)))))) (defun fuel-markup--vocab-link (e) - (fuel-markup--insert-button (cadr e) (cadr e) 'vocab)) + (fuel-markup--insert-button (cadr e) (car (cddr e)) 'vocab)) (defun fuel-markup--vocab-links (e) (dolist (link (cdr e)) From e5897b5ef740c9559fd7b48055201d279fec9aa5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 30 Jan 2009 15:28:53 -0600 Subject: [PATCH 12/14] Remove bogus dependencies --- basis/html/streams/streams.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor index 24d9dceb80..43fa8bda85 100644 --- a/basis/html/streams/streams.factor +++ b/basis/html/streams/streams.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2004, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators generic assocs help http io io.styles +USING: combinators generic assocs io io.styles io.files continuations io.streams.string kernel math math.order math.parser namespaces make quotations assocs sequences strings words html.elements xml.entities sbufs continuations destructors From e872eb1e8e1b5f5e2fe81b53d6088048d0eba81d Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 30 Jan 2009 15:29:28 -0600 Subject: [PATCH 13/14] fix docs for environment --- basis/environment/environment-docs.factor | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/basis/environment/environment-docs.factor b/basis/environment/environment-docs.factor index e539b446f3..b48a7a01ad 100644 --- a/basis/environment/environment-docs.factor +++ b/basis/environment/environment-docs.factor @@ -7,12 +7,14 @@ HELP: (os-envs) { $values { "seq" sequence } } -{ $description "" } ; +{ $description "Returns a sequence of key/value pairs from the operating system." } +{ $notes "In most cases, use " { $link os-envs } " instead." } ; HELP: (set-os-envs) { $values { "seq" sequence } } -{ $description "" } ; +{ $description "Low-level word for replacing the current set of environment variables." } +{ $notes "In most cases, use " { $link set-os-envs } " instead." } ; HELP: os-env ( key -- value ) From 23d4699d5c59cefffe26b61c1720df927f98a9b3 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Fri, 30 Jan 2009 22:32:20 +0100 Subject: [PATCH 14/14] FUEL: Fix the previous fix. --- misc/fuel/fuel-markup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/fuel/fuel-markup.el b/misc/fuel/fuel-markup.el index 3aee2dc912..4844233ae7 100644 --- a/misc/fuel/fuel-markup.el +++ b/misc/fuel/fuel-markup.el @@ -323,7 +323,7 @@ (sort-lines nil start (point)))))) (defun fuel-markup--vocab-link (e) - (fuel-markup--insert-button (cadr e) (car (cddr e)) 'vocab)) + (fuel-markup--insert-button (cadr e) (or (car (cddr e)) (cadr e)) 'vocab)) (defun fuel-markup--vocab-links (e) (dolist (link (cdr e))