From e030d5bdfb5ba6c46899d8e9fbdfddca07588af3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 17:18:10 -0600
Subject: [PATCH 01/12] Move odbc to unmtainained: compile errors
---
{extra => unmaintained}/odbc/authors.txt | 0
{extra => unmaintained}/odbc/odbc-docs.factor | 0
{extra => unmaintained}/odbc/odbc.factor | 0
{extra => unmaintained}/odbc/summary.txt | 0
{extra => unmaintained}/odbc/tags.txt | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename {extra => unmaintained}/odbc/authors.txt (100%)
rename {extra => unmaintained}/odbc/odbc-docs.factor (100%)
rename {extra => unmaintained}/odbc/odbc.factor (100%)
rename {extra => unmaintained}/odbc/summary.txt (100%)
rename {extra => unmaintained}/odbc/tags.txt (100%)
diff --git a/extra/odbc/authors.txt b/unmaintained/odbc/authors.txt
similarity index 100%
rename from extra/odbc/authors.txt
rename to unmaintained/odbc/authors.txt
diff --git a/extra/odbc/odbc-docs.factor b/unmaintained/odbc/odbc-docs.factor
similarity index 100%
rename from extra/odbc/odbc-docs.factor
rename to unmaintained/odbc/odbc-docs.factor
diff --git a/extra/odbc/odbc.factor b/unmaintained/odbc/odbc.factor
similarity index 100%
rename from extra/odbc/odbc.factor
rename to unmaintained/odbc/odbc.factor
diff --git a/extra/odbc/summary.txt b/unmaintained/odbc/summary.txt
similarity index 100%
rename from extra/odbc/summary.txt
rename to unmaintained/odbc/summary.txt
diff --git a/extra/odbc/tags.txt b/unmaintained/odbc/tags.txt
similarity index 100%
rename from extra/odbc/tags.txt
rename to unmaintained/odbc/tags.txt
From 4feecbd23e880e0b92a405f20ee80e9cc568fdc3 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 17:20:02 -0600
Subject: [PATCH 02/12] More more stuff to unmaintained because of compile
errors
---
{extra => unmaintained}/factory/authors.txt | 0
{extra => unmaintained}/factory/commands/authors.txt | 0
{extra => unmaintained}/factory/commands/commands.factor | 0
{extra => unmaintained}/factory/factory-menus | 0
{extra => unmaintained}/factory/factory-rc | 0
{extra => unmaintained}/factory/factory.factor | 0
{extra => unmaintained}/factory/load/authors.txt | 0
{extra => unmaintained}/factory/load/load.factor | 0
{extra => unmaintained}/factory/summary.txt | 0
{extra => unmaintained}/factory/tags.txt | 0
{extra => unmaintained}/mortar/authors.txt | 0
{extra => unmaintained}/mortar/mortar.factor | 0
{extra => unmaintained}/mortar/sugar/sugar.factor | 0
{extra => unmaintained}/mortar/tags.txt | 0
{extra/ui/gadgets => unmaintained}/tiling/tiling.factor | 0
{extra => unmaintained}/x/authors.txt | 0
{extra => unmaintained}/x/font/authors.txt | 0
{extra => unmaintained}/x/font/font.factor | 0
{extra => unmaintained}/x/gc/authors.txt | 0
{extra => unmaintained}/x/gc/gc.factor | 0
{extra => unmaintained}/x/keysym-table/authors.txt | 0
{extra => unmaintained}/x/keysym-table/keysym-table.factor | 0
{extra => unmaintained}/x/pen/authors.txt | 0
{extra => unmaintained}/x/pen/pen.factor | 0
{extra => unmaintained}/x/widgets/authors.txt | 0
{extra => unmaintained}/x/widgets/button/authors.txt | 0
{extra => unmaintained}/x/widgets/button/button.factor | 0
{extra => unmaintained}/x/widgets/keymenu/authors.txt | 0
{extra => unmaintained}/x/widgets/keymenu/keymenu.factor | 0
{extra => unmaintained}/x/widgets/label/authors.txt | 0
{extra => unmaintained}/x/widgets/label/label.factor | 0
{extra => unmaintained}/x/widgets/widgets.factor | 0
{extra => unmaintained}/x/widgets/wm/child/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/child/child.factor | 0
{extra => unmaintained}/x/widgets/wm/frame/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/drag.factor | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/move/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/move/move.factor | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/size/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/frame/drag/size/size.factor | 0
{extra => unmaintained}/x/widgets/wm/frame/frame.factor | 0
{extra => unmaintained}/x/widgets/wm/menu/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/menu/menu.factor | 0
{extra => unmaintained}/x/widgets/wm/root/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/root/root.factor | 0
.../x/widgets/wm/unmapped-frames-menu/authors.txt | 0
.../x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor | 0
{extra => unmaintained}/x/widgets/wm/workspace/authors.txt | 0
{extra => unmaintained}/x/widgets/wm/workspace/workspace.factor | 0
{extra => unmaintained}/x/x.factor | 0
51 files changed, 0 insertions(+), 0 deletions(-)
rename {extra => unmaintained}/factory/authors.txt (100%)
rename {extra => unmaintained}/factory/commands/authors.txt (100%)
rename {extra => unmaintained}/factory/commands/commands.factor (100%)
rename {extra => unmaintained}/factory/factory-menus (100%)
rename {extra => unmaintained}/factory/factory-rc (100%)
rename {extra => unmaintained}/factory/factory.factor (100%)
rename {extra => unmaintained}/factory/load/authors.txt (100%)
rename {extra => unmaintained}/factory/load/load.factor (100%)
rename {extra => unmaintained}/factory/summary.txt (100%)
rename {extra => unmaintained}/factory/tags.txt (100%)
rename {extra => unmaintained}/mortar/authors.txt (100%)
rename {extra => unmaintained}/mortar/mortar.factor (100%)
rename {extra => unmaintained}/mortar/sugar/sugar.factor (100%)
rename {extra => unmaintained}/mortar/tags.txt (100%)
rename {extra/ui/gadgets => unmaintained}/tiling/tiling.factor (100%)
rename {extra => unmaintained}/x/authors.txt (100%)
rename {extra => unmaintained}/x/font/authors.txt (100%)
rename {extra => unmaintained}/x/font/font.factor (100%)
rename {extra => unmaintained}/x/gc/authors.txt (100%)
rename {extra => unmaintained}/x/gc/gc.factor (100%)
rename {extra => unmaintained}/x/keysym-table/authors.txt (100%)
rename {extra => unmaintained}/x/keysym-table/keysym-table.factor (100%)
rename {extra => unmaintained}/x/pen/authors.txt (100%)
rename {extra => unmaintained}/x/pen/pen.factor (100%)
rename {extra => unmaintained}/x/widgets/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/button/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/button/button.factor (100%)
rename {extra => unmaintained}/x/widgets/keymenu/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/keymenu/keymenu.factor (100%)
rename {extra => unmaintained}/x/widgets/label/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/label/label.factor (100%)
rename {extra => unmaintained}/x/widgets/widgets.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/child/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/child/child.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/drag.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/move/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/move/move.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/size/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/drag/size/size.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/frame/frame.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/menu/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/menu/menu.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/root/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/root/root.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/unmapped-frames-menu/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor (100%)
rename {extra => unmaintained}/x/widgets/wm/workspace/authors.txt (100%)
rename {extra => unmaintained}/x/widgets/wm/workspace/workspace.factor (100%)
rename {extra => unmaintained}/x/x.factor (100%)
diff --git a/extra/factory/authors.txt b/unmaintained/factory/authors.txt
similarity index 100%
rename from extra/factory/authors.txt
rename to unmaintained/factory/authors.txt
diff --git a/extra/factory/commands/authors.txt b/unmaintained/factory/commands/authors.txt
similarity index 100%
rename from extra/factory/commands/authors.txt
rename to unmaintained/factory/commands/authors.txt
diff --git a/extra/factory/commands/commands.factor b/unmaintained/factory/commands/commands.factor
similarity index 100%
rename from extra/factory/commands/commands.factor
rename to unmaintained/factory/commands/commands.factor
diff --git a/extra/factory/factory-menus b/unmaintained/factory/factory-menus
similarity index 100%
rename from extra/factory/factory-menus
rename to unmaintained/factory/factory-menus
diff --git a/extra/factory/factory-rc b/unmaintained/factory/factory-rc
similarity index 100%
rename from extra/factory/factory-rc
rename to unmaintained/factory/factory-rc
diff --git a/extra/factory/factory.factor b/unmaintained/factory/factory.factor
similarity index 100%
rename from extra/factory/factory.factor
rename to unmaintained/factory/factory.factor
diff --git a/extra/factory/load/authors.txt b/unmaintained/factory/load/authors.txt
similarity index 100%
rename from extra/factory/load/authors.txt
rename to unmaintained/factory/load/authors.txt
diff --git a/extra/factory/load/load.factor b/unmaintained/factory/load/load.factor
similarity index 100%
rename from extra/factory/load/load.factor
rename to unmaintained/factory/load/load.factor
diff --git a/extra/factory/summary.txt b/unmaintained/factory/summary.txt
similarity index 100%
rename from extra/factory/summary.txt
rename to unmaintained/factory/summary.txt
diff --git a/extra/factory/tags.txt b/unmaintained/factory/tags.txt
similarity index 100%
rename from extra/factory/tags.txt
rename to unmaintained/factory/tags.txt
diff --git a/extra/mortar/authors.txt b/unmaintained/mortar/authors.txt
similarity index 100%
rename from extra/mortar/authors.txt
rename to unmaintained/mortar/authors.txt
diff --git a/extra/mortar/mortar.factor b/unmaintained/mortar/mortar.factor
similarity index 100%
rename from extra/mortar/mortar.factor
rename to unmaintained/mortar/mortar.factor
diff --git a/extra/mortar/sugar/sugar.factor b/unmaintained/mortar/sugar/sugar.factor
similarity index 100%
rename from extra/mortar/sugar/sugar.factor
rename to unmaintained/mortar/sugar/sugar.factor
diff --git a/extra/mortar/tags.txt b/unmaintained/mortar/tags.txt
similarity index 100%
rename from extra/mortar/tags.txt
rename to unmaintained/mortar/tags.txt
diff --git a/extra/ui/gadgets/tiling/tiling.factor b/unmaintained/tiling/tiling.factor
similarity index 100%
rename from extra/ui/gadgets/tiling/tiling.factor
rename to unmaintained/tiling/tiling.factor
diff --git a/extra/x/authors.txt b/unmaintained/x/authors.txt
similarity index 100%
rename from extra/x/authors.txt
rename to unmaintained/x/authors.txt
diff --git a/extra/x/font/authors.txt b/unmaintained/x/font/authors.txt
similarity index 100%
rename from extra/x/font/authors.txt
rename to unmaintained/x/font/authors.txt
diff --git a/extra/x/font/font.factor b/unmaintained/x/font/font.factor
similarity index 100%
rename from extra/x/font/font.factor
rename to unmaintained/x/font/font.factor
diff --git a/extra/x/gc/authors.txt b/unmaintained/x/gc/authors.txt
similarity index 100%
rename from extra/x/gc/authors.txt
rename to unmaintained/x/gc/authors.txt
diff --git a/extra/x/gc/gc.factor b/unmaintained/x/gc/gc.factor
similarity index 100%
rename from extra/x/gc/gc.factor
rename to unmaintained/x/gc/gc.factor
diff --git a/extra/x/keysym-table/authors.txt b/unmaintained/x/keysym-table/authors.txt
similarity index 100%
rename from extra/x/keysym-table/authors.txt
rename to unmaintained/x/keysym-table/authors.txt
diff --git a/extra/x/keysym-table/keysym-table.factor b/unmaintained/x/keysym-table/keysym-table.factor
similarity index 100%
rename from extra/x/keysym-table/keysym-table.factor
rename to unmaintained/x/keysym-table/keysym-table.factor
diff --git a/extra/x/pen/authors.txt b/unmaintained/x/pen/authors.txt
similarity index 100%
rename from extra/x/pen/authors.txt
rename to unmaintained/x/pen/authors.txt
diff --git a/extra/x/pen/pen.factor b/unmaintained/x/pen/pen.factor
similarity index 100%
rename from extra/x/pen/pen.factor
rename to unmaintained/x/pen/pen.factor
diff --git a/extra/x/widgets/authors.txt b/unmaintained/x/widgets/authors.txt
similarity index 100%
rename from extra/x/widgets/authors.txt
rename to unmaintained/x/widgets/authors.txt
diff --git a/extra/x/widgets/button/authors.txt b/unmaintained/x/widgets/button/authors.txt
similarity index 100%
rename from extra/x/widgets/button/authors.txt
rename to unmaintained/x/widgets/button/authors.txt
diff --git a/extra/x/widgets/button/button.factor b/unmaintained/x/widgets/button/button.factor
similarity index 100%
rename from extra/x/widgets/button/button.factor
rename to unmaintained/x/widgets/button/button.factor
diff --git a/extra/x/widgets/keymenu/authors.txt b/unmaintained/x/widgets/keymenu/authors.txt
similarity index 100%
rename from extra/x/widgets/keymenu/authors.txt
rename to unmaintained/x/widgets/keymenu/authors.txt
diff --git a/extra/x/widgets/keymenu/keymenu.factor b/unmaintained/x/widgets/keymenu/keymenu.factor
similarity index 100%
rename from extra/x/widgets/keymenu/keymenu.factor
rename to unmaintained/x/widgets/keymenu/keymenu.factor
diff --git a/extra/x/widgets/label/authors.txt b/unmaintained/x/widgets/label/authors.txt
similarity index 100%
rename from extra/x/widgets/label/authors.txt
rename to unmaintained/x/widgets/label/authors.txt
diff --git a/extra/x/widgets/label/label.factor b/unmaintained/x/widgets/label/label.factor
similarity index 100%
rename from extra/x/widgets/label/label.factor
rename to unmaintained/x/widgets/label/label.factor
diff --git a/extra/x/widgets/widgets.factor b/unmaintained/x/widgets/widgets.factor
similarity index 100%
rename from extra/x/widgets/widgets.factor
rename to unmaintained/x/widgets/widgets.factor
diff --git a/extra/x/widgets/wm/child/authors.txt b/unmaintained/x/widgets/wm/child/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/child/authors.txt
rename to unmaintained/x/widgets/wm/child/authors.txt
diff --git a/extra/x/widgets/wm/child/child.factor b/unmaintained/x/widgets/wm/child/child.factor
similarity index 100%
rename from extra/x/widgets/wm/child/child.factor
rename to unmaintained/x/widgets/wm/child/child.factor
diff --git a/extra/x/widgets/wm/frame/authors.txt b/unmaintained/x/widgets/wm/frame/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/authors.txt
rename to unmaintained/x/widgets/wm/frame/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/authors.txt b/unmaintained/x/widgets/wm/frame/drag/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/drag.factor b/unmaintained/x/widgets/wm/frame/drag/drag.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/drag.factor
rename to unmaintained/x/widgets/wm/frame/drag/drag.factor
diff --git a/extra/x/widgets/wm/frame/drag/move/authors.txt b/unmaintained/x/widgets/wm/frame/drag/move/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/move/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/move/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/move/move.factor b/unmaintained/x/widgets/wm/frame/drag/move/move.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/move/move.factor
rename to unmaintained/x/widgets/wm/frame/drag/move/move.factor
diff --git a/extra/x/widgets/wm/frame/drag/size/authors.txt b/unmaintained/x/widgets/wm/frame/drag/size/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/size/authors.txt
rename to unmaintained/x/widgets/wm/frame/drag/size/authors.txt
diff --git a/extra/x/widgets/wm/frame/drag/size/size.factor b/unmaintained/x/widgets/wm/frame/drag/size/size.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/drag/size/size.factor
rename to unmaintained/x/widgets/wm/frame/drag/size/size.factor
diff --git a/extra/x/widgets/wm/frame/frame.factor b/unmaintained/x/widgets/wm/frame/frame.factor
similarity index 100%
rename from extra/x/widgets/wm/frame/frame.factor
rename to unmaintained/x/widgets/wm/frame/frame.factor
diff --git a/extra/x/widgets/wm/menu/authors.txt b/unmaintained/x/widgets/wm/menu/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/menu/authors.txt
rename to unmaintained/x/widgets/wm/menu/authors.txt
diff --git a/extra/x/widgets/wm/menu/menu.factor b/unmaintained/x/widgets/wm/menu/menu.factor
similarity index 100%
rename from extra/x/widgets/wm/menu/menu.factor
rename to unmaintained/x/widgets/wm/menu/menu.factor
diff --git a/extra/x/widgets/wm/root/authors.txt b/unmaintained/x/widgets/wm/root/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/root/authors.txt
rename to unmaintained/x/widgets/wm/root/authors.txt
diff --git a/extra/x/widgets/wm/root/root.factor b/unmaintained/x/widgets/wm/root/root.factor
similarity index 100%
rename from extra/x/widgets/wm/root/root.factor
rename to unmaintained/x/widgets/wm/root/root.factor
diff --git a/extra/x/widgets/wm/unmapped-frames-menu/authors.txt b/unmaintained/x/widgets/wm/unmapped-frames-menu/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/unmapped-frames-menu/authors.txt
rename to unmaintained/x/widgets/wm/unmapped-frames-menu/authors.txt
diff --git a/extra/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor b/unmaintained/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
similarity index 100%
rename from extra/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
rename to unmaintained/x/widgets/wm/unmapped-frames-menu/unmapped-frames-menu.factor
diff --git a/extra/x/widgets/wm/workspace/authors.txt b/unmaintained/x/widgets/wm/workspace/authors.txt
similarity index 100%
rename from extra/x/widgets/wm/workspace/authors.txt
rename to unmaintained/x/widgets/wm/workspace/authors.txt
diff --git a/extra/x/widgets/wm/workspace/workspace.factor b/unmaintained/x/widgets/wm/workspace/workspace.factor
similarity index 100%
rename from extra/x/widgets/wm/workspace/workspace.factor
rename to unmaintained/x/widgets/wm/workspace/workspace.factor
diff --git a/extra/x/x.factor b/unmaintained/x/x.factor
similarity index 100%
rename from extra/x/x.factor
rename to unmaintained/x/x.factor
From 84ce5c3b9114a87c08b57d2ad8785456446db1ba Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:15:09 -0600
Subject: [PATCH 03/12] Windows workaround
---
basis/editors/emacs/emacs.factor | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index 1550fccc0b..79387f9820 100644
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,11 +1,11 @@
USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors make ;
+math.parser namespaces editors make system ;
IN: editors.emacs
: emacsclient ( file line -- )
[
\ emacsclient get "emacsclient" or ,
- "--no-wait" ,
+ os windows? [ "--no-wait" , ] unless
"+" swap number>string append ,
,
] { } make try-process ;
From e4dde55d725ecfcffa6f18963625c7cb383b6a14 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:15:51 -0600
Subject: [PATCH 04/12] On Windows, we now look for factor-rc and
factor-boot-rc, instead of .factor-rc and .factor-boot-rc, since Explorer
doesn't like filenames with leading periods
---
basis/command-line/command-line-docs.factor | 48 ++++++++++++++++-----
basis/command-line/command-line.factor | 8 +++-
2 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor
index d1b18ab5da..65d290df3a 100644
--- a/basis/command-line/command-line-docs.factor
+++ b/basis/command-line/command-line-docs.factor
@@ -2,10 +2,10 @@ USING: help.markup help.syntax parser vocabs.loader strings ;
IN: command-line
HELP: run-bootstrap-init
-{ $description "Runs the " { $snippet ".factor-boot-rc" } " file in the user's home directory unless the " { $snippet "-no-user-init" } " command line switch was given." } ;
+{ $description "Runs the bootstrap initialization file in the user's home directory, unless the " { $snippet "-no-user-init" } " command line switch was given. This file is named " { $snippet ".factor-boot-rc" } " on Unix and " { $snippet "factor-boot-rc" } " on Windows." } ;
HELP: run-user-init
-{ $description "Runs the " { $snippet ".factor-rc" } " file in the user's home directory unless the " { $snippet "-no-user-init" } " command line switch was given." } ;
+{ $description "Runs the startup initialization file in the user's home directory, unless the " { $snippet "-no-user-init" } " command line switch was given. This file is named " { $snippet ".factor-rc" } " on Unix and " { $snippet "factor-rc" } " on Windows." } ;
HELP: cli-param
{ $values { "param" string } }
@@ -57,7 +57,7 @@ ARTICLE: "bootstrap-cli-args" "Command line switches for bootstrap"
"A number of command line switches can be passed to a bootstrap image to modify the behavior of the resulting image:"
{ $table
{ { $snippet "-output-image=" { $emphasis "image" } } { "Save the result to " { $snippet "image" } ". The default is " { $snippet "factor.image" } "." } }
- { { $snippet "-no-user-init" } { "Inhibits the running of the " { $snippet ".factor-boot-rc" } " file in the user's home directory." } }
+ { { $snippet "-no-user-init" } { "Inhibits the running of user initialization files on startup. See " { $link "rc-files" } "." } }
{ { $snippet "-include=" { $emphasis "components..." } } "A list of components to include (see below)." }
{ { $snippet "-exclude=" { $emphasis "components..." } } "A list of components to exclude." }
{ { $snippet "-ui-backend=" { $emphasis "backend" } } { "One of " { $snippet "x11" } ", " { $snippet "windows" } ", or " { $snippet "cocoa" } ". The default is platform-specific." } }
@@ -74,9 +74,9 @@ ARTICLE: "bootstrap-cli-args" "Command line switches for bootstrap"
"By default, all optional components are loaded. To load all optional components except for a given list, use the " { $snippet "-exclude=" } " switch; to only load specified optional components, use the " { $snippet "-include=" } "."
$nl
"For example, to build an image with the compiler but no other components, you could do:"
-{ $code "./factor -i=boot.ppc.image -include=compiler" }
+{ $code "./factor -i=boot.macosx-ppc.image -include=compiler" }
"To build an image with everything except for the user interface and graphical tools,"
-{ $code "./factor -i=boot.ppc.image -exclude=\"ui ui.tools\"" }
+{ $code "./factor -i=boot.macosx-ppc.image -exclude=\"ui ui.tools\"" }
"To generate a bootstrap image in the first place, see " { $link "bootstrap.image" } "." ;
ARTICLE: "standard-cli-args" "Command line switches for general usage"
@@ -84,17 +84,43 @@ ARTICLE: "standard-cli-args" "Command line switches for general usage"
{ $table
{ { $snippet "-e=" { $emphasis "code" } } { "This specifies a code snippet to evaluate. If you want Factor to exit immediately after, also specify " { $snippet "-run=none" } "." } }
{ { $snippet "-run=" { $emphasis "vocab" } } { { $snippet { $emphasis "vocab" } } " is the name of a vocabulary with a " { $link POSTPONE: MAIN: } " hook to run on startup, for example " { $vocab-link "listener" } ", " { $vocab-link "ui" } " or " { $vocab-link "none" } "." } }
- { { $snippet "-no-user-init" } { "Inhibits the running of the " { $snippet ".factor-rc" } " file in the user's home directory on startup." } }
+ { { $snippet "-no-user-init" } { "Inhibits the running of user initialization files on startup. See " { $link "rc-files" } "." } }
{ { $snippet "-quiet" } { "If set, " { $link run-file } " and " { $link require } " will not print load messages." } }
{ { $snippet "-script" } { "Equivalent to " { $snippet "-quiet -run=none" } "." $nl "On Unix systems, Factor can be used for scripting - just create an executable text file whose first line is:" { $code "#! /usr/local/bin/factor -script" } "The space after " { $snippet "#!" } " is necessary because of Factor syntax." } }
} ;
-ARTICLE: "rc-files" "Running code on startup"
-"Unless the " { $snippet "-no-user-init" } " command line switch is specified, The startup routine runs the " { $snippet ".factor-rc" } " file in the user's home directory, if it exists. This file can contain initialization and customization for your development environment."
+ARTICLE: "factor-boot-rc" "Bootstrap initialization file"
+"The botstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
$nl
-"The " { $snippet ".factor-rc" } " and " { $snippet ".factor-boot-rc" } " files can be run explicitly:"
-{ $subsection run-user-init }
-{ $subsection run-bootstrap-init } ;
+"A word to run this file from an existing Factor session:"
+{ $subsection run-bootstrap-init }
+"For example, if you changed " { $snippet ".factor-boot-rc" } " and do not want to bootstrap again, you can just invoke " { $link run-bootstrap-init } " in the listener." ;
+
+ARTICLE: "factor-rc" "Startup initialization file"
+"The startup initialization file is named " { $snippet "factor-rc" } " on Windows and " { $snippet ".factor-rc" } " on Unix. If it exists, it is run every time Factor starts."
+$nl
+"A word to run this file from an existing Factor session:"
+{ $subsection run-user-init } ;
+
+ARTICLE: "rc-files" "Running code on startup"
+"Factor looks for two files in your home directory."
+{ $subsection "factor-boot-rc" }
+{ $subsection "factor-rc" }
+"The " { $snippet "-no-user-init" } " command line switch will inhibit the running of these files."
+$nl
+"If you are unsure where the files should be located, evaluate the following code:"
+{ $code
+ "USE: command-line"
+ "\"factor-rc\" rc-path print"
+ "\"factor-boot-rc\" rc-path print"
+}
+"Here is an example " { $snippet ".factor-boot-rc" } " which sets up GVIM editor integration, adds an additional vocabulary root (see " { $link "vocabs.roots" } "), and increases the font size in the UI by setting the DPI (dots-per-inch) variable:"
+{ $code
+ "USING: editors.gvim vocabs.loader ui.freetype namespaces sequences ;"
+ "\"/opt/local/bin\" \\ gvim-path set-global"
+ "\"/home/jane/src/\" vocab-roots get push"
+ "100 dpi set-global"
+} ;
ARTICLE: "cli" "Command line usage"
"Zero or more command line arguments may be passed to the Factor runtime. Command line arguments starting with a dash (" { $snippet "-" } ") is interpreted as switches. All other arguments are taken to be file names to be run by " { $link run-file } "."
diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor
index 37dbf9b7a6..7691f6877b 100644
--- a/basis/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -5,14 +5,18 @@ kernel.private namespaces parser sequences strings system
splitting io.files eval ;
IN: command-line
+: rc-path ( name -- path )
+ os windows? [ "." prepend ] unless
+ home prepend-path ;
+
: run-bootstrap-init ( -- )
"user-init" get [
- home ".factor-boot-rc" append-path ?run-file
+ "factor-boot-rc" rc-path ?run-file
] when ;
: run-user-init ( -- )
"user-init" get [
- home ".factor-rc" append-path ?run-file
+ "factor-rc" rc-path ?run-file
] when ;
: cli-var-param ( name value -- ) swap set-global ;
From 251f9213c328d2a8fff678244ad9f49d21a700eb Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:19:53 -0600
Subject: [PATCH 05/12] Fix typo
---
core/vocabs/loader/loader-docs.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/vocabs/loader/loader-docs.factor b/core/vocabs/loader/loader-docs.factor
index ebaf8b3c8f..1325110122 100644
--- a/core/vocabs/loader/loader-docs.factor
+++ b/core/vocabs/loader/loader-docs.factor
@@ -11,7 +11,7 @@ ARTICLE: "vocabs.roots" "Vocabulary roots"
{ { $snippet "extra" } " - additional contributed libraries." }
{ { $snippet "work" } " - a root for vocabularies which are not intended to be contributed back to Factor." }
}
-"Your own vocabularies should go into " { $snippet "extra" } " or " { $snippet "work" } ", depending on whether or not you intend to contribute them back to the Factor project. If you wish to work on vocabularies outside of the Factor source directory, create a " { $snippet "~/.factor-rc" } " file like the following,"
+"Your own vocabularies should go into " { $snippet "extra" } " or " { $snippet "work" } ", depending on whether or not you intend to contribute them back to the Factor project. If you wish to work on vocabularies outside of the Factor source directory, create a " { $link "factor-boot-rc" } " file like the following:"
{ $code
"USING: namespaces sequences vocabs.loader ;"
"\"/home/jane/sources/\" vocab-roots get push"
From 8b5b887b7e19fab8df254484c6a46376da3bc9be Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:20:35 -0600
Subject: [PATCH 06/12] geom depends on mortar which has compiler errors.
moving to unmaintained
---
extra/cfdg/models/game1-turn6/game1-turn6.factor | 2 +-
extra/cfdg/models/sierpinski/sierpinski.factor | 2 +-
{extra => unmaintained}/geom/dim/authors.txt | 0
{extra => unmaintained}/geom/dim/dim.factor | 0
{extra => unmaintained}/geom/pos/authors.txt | 0
{extra => unmaintained}/geom/pos/pos.factor | 0
{extra => unmaintained}/geom/rect/authors.txt | 0
{extra => unmaintained}/geom/rect/rect.factor | 0
8 files changed, 2 insertions(+), 2 deletions(-)
rename {extra => unmaintained}/geom/dim/authors.txt (100%)
rename {extra => unmaintained}/geom/dim/dim.factor (100%)
rename {extra => unmaintained}/geom/pos/authors.txt (100%)
rename {extra => unmaintained}/geom/pos/pos.factor (100%)
rename {extra => unmaintained}/geom/rect/authors.txt (100%)
rename {extra => unmaintained}/geom/rect/rect.factor (100%)
diff --git a/extra/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor
index 5e512cd74a..66424acff7 100644
--- a/extra/cfdg/models/game1-turn6/game1-turn6.factor
+++ b/extra/cfdg/models/game1-turn6/game1-turn6.factor
@@ -1,6 +1,6 @@
USING: kernel namespaces math opengl.gl opengl.glu ui ui.gadgets.slate
- mortar random-weighted cfdg ;
+ random-weighted cfdg ;
IN: cfdg.models.game1-turn6
diff --git a/extra/cfdg/models/sierpinski/sierpinski.factor b/extra/cfdg/models/sierpinski/sierpinski.factor
index 2333506f29..8257302a3e 100644
--- a/extra/cfdg/models/sierpinski/sierpinski.factor
+++ b/extra/cfdg/models/sierpinski/sierpinski.factor
@@ -1,6 +1,6 @@
USING: kernel namespaces math opengl.gl opengl.glu ui ui.gadgets.slate
- mortar random-weighted cfdg ;
+ random-weighted cfdg ;
IN: cfdg.models.sierpinski
diff --git a/extra/geom/dim/authors.txt b/unmaintained/geom/dim/authors.txt
similarity index 100%
rename from extra/geom/dim/authors.txt
rename to unmaintained/geom/dim/authors.txt
diff --git a/extra/geom/dim/dim.factor b/unmaintained/geom/dim/dim.factor
similarity index 100%
rename from extra/geom/dim/dim.factor
rename to unmaintained/geom/dim/dim.factor
diff --git a/extra/geom/pos/authors.txt b/unmaintained/geom/pos/authors.txt
similarity index 100%
rename from extra/geom/pos/authors.txt
rename to unmaintained/geom/pos/authors.txt
diff --git a/extra/geom/pos/pos.factor b/unmaintained/geom/pos/pos.factor
similarity index 100%
rename from extra/geom/pos/pos.factor
rename to unmaintained/geom/pos/pos.factor
diff --git a/extra/geom/rect/authors.txt b/unmaintained/geom/rect/authors.txt
similarity index 100%
rename from extra/geom/rect/authors.txt
rename to unmaintained/geom/rect/authors.txt
diff --git a/extra/geom/rect/rect.factor b/unmaintained/geom/rect/rect.factor
similarity index 100%
rename from extra/geom/rect/rect.factor
rename to unmaintained/geom/rect/rect.factor
From 9e82f1f8dd96efccbd3834f01d34ebf93258cc19 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:42:53 -0600
Subject: [PATCH 07/12] Better inference error messages
---
basis/compiler/tree/builder/builder.factor | 12 ++++--------
basis/stack-checker/errors/errors.factor | 2 +-
.../recursive-state/recursive-state.factor | 4 +---
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/basis/compiler/tree/builder/builder.factor b/basis/compiler/tree/builder/builder.factor
index c2ec6552cd..4e79c4cd2d 100644
--- a/basis/compiler/tree/builder/builder.factor
+++ b/basis/compiler/tree/builder/builder.factor
@@ -34,14 +34,10 @@ IN: compiler.tree.builder
if ;
: (build-tree-from-word) ( word -- )
- dup
- [ "inline" word-prop ]
- [ "recursive" word-prop ] bi and [
- 1quotation f initial-recursive-state infer-quot
- ] [
- [ specialized-def ] [ initial-recursive-state ] bi
- infer-quot
- ] if ;
+ dup initial-recursive-state recursive-state set
+ dup [ "inline" word-prop ] [ "recursive" word-prop ] bi and
+ [ 1quotation ] [ specialized-def ] if
+ infer-quot-here ;
: check-cannot-infer ( word -- )
dup "cannot-infer" word-prop [ cannot-infer-effect ] [ drop ] if ;
diff --git a/basis/stack-checker/errors/errors.factor b/basis/stack-checker/errors/errors.factor
index efdc7e23b2..9fb2b59f6c 100644
--- a/basis/stack-checker/errors/errors.factor
+++ b/basis/stack-checker/errors/errors.factor
@@ -24,7 +24,7 @@ M: inference-error error-help error>> error-help ;
+warning+ (inference-error) ; inline
M: inference-error error.
- [ "In word: " write word>> . ] [ error>> error. ] bi ;
+ [ word>> [ "In word: " write . ] when* ] [ error>> error. ] bi ;
TUPLE: literal-expected ;
diff --git a/basis/stack-checker/recursive-state/recursive-state.factor b/basis/stack-checker/recursive-state/recursive-state.factor
index 41d7331230..9abfb1fcd5 100644
--- a/basis/stack-checker/recursive-state/recursive-state.factor
+++ b/basis/stack-checker/recursive-state/recursive-state.factor
@@ -4,9 +4,7 @@ USING: accessors arrays sequences kernel sequences assocs
namespaces stack-checker.recursive-state.tree ;
IN: stack-checker.recursive-state
-TUPLE: recursive-state words word quotations inline-words ;
-
-C: <recursive-state> recursive-state
+TUPLE: recursive-state word words quotations inline-words ;
: prepare-recursive-state ( word rstate -- rstate )
swap >>word
From f29300c6ba727579ce289766a25a240fc8288681 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 16 Nov 2008 19:47:52 -0600
Subject: [PATCH 08/12] Better error message when vocab top level forms leave
crap on the stack
---
core/vocabs/loader/loader-tests.factor | 9 +++++++--
core/vocabs/loader/loader.factor | 2 +-
core/vocabs/loader/test/e/e.factor | 1 +
core/vocabs/loader/test/e/tags.txt | 1 +
4 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 core/vocabs/loader/test/e/e.factor
create mode 100644 core/vocabs/loader/test/e/tags.txt
diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 5ba7f7ed88..3f06b9735c 100644
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -1,9 +1,9 @@
-! Unit tests for vocabs.loader vocabulary
IN: vocabs.loader.tests
USING: vocabs.loader tools.test continuations vocabs math
kernel arrays sequences namespaces io.streams.string
parser source-files words assocs classes.tuple definitions
-debugger compiler.units tools.vocabs accessors eval ;
+debugger compiler.units tools.vocabs accessors eval
+combinators ;
! This vocab should not exist, but just in case...
[ ] [
@@ -151,3 +151,8 @@ forget-junk
[ "xabbabbja" forget-vocab ] with-compilation-unit
forget-junk
+
+[ ] [ [ "vocabs.loader.test.e" forget-vocab ] with-compilation-unit ] unit-test
+
+[ "vocabs.loader.test.e" require ]
+[ relative-overflow? ] must-fail-with
diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index f48a3d1950..690b8b0d92 100644
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -55,7 +55,7 @@ SYMBOL: load-help?
f over set-vocab-source-loaded?
[ vocab-source-path [ parse-file ] [ [ ] ] if* ] keep
t swap set-vocab-source-loaded?
- [ % ] [ call ] if-bootstrapping ;
+ [ % ] [ assert-depth ] if-bootstrapping ;
: load-docs ( vocab -- vocab )
load-help? get [
diff --git a/core/vocabs/loader/test/e/e.factor b/core/vocabs/loader/test/e/e.factor
new file mode 100644
index 0000000000..b85905ec0b
--- /dev/null
+++ b/core/vocabs/loader/test/e/e.factor
@@ -0,0 +1 @@
+1 2 3
diff --git a/core/vocabs/loader/test/e/tags.txt b/core/vocabs/loader/test/e/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/core/vocabs/loader/test/e/tags.txt
@@ -0,0 +1 @@
+unportable
From 67878c389ba48283ec32341b1cad76056fbbc801 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 16 Nov 2008 20:55:25 -0600
Subject: [PATCH 09/12] automata: minor indentation fix
---
extra/automata/automata.factor | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extra/automata/automata.factor b/extra/automata/automata.factor
index 979a733692..0f3fdcd3f6 100644
--- a/extra/automata/automata.factor
+++ b/extra/automata/automata.factor
@@ -25,7 +25,7 @@ VAR: rule VAR: rule-number
: rule-values ( n -- seq ) >bin 8 CHAR: 0 pad-left string>digits ;
: set-rule ( n -- )
-dup >rule-number rule-values rule-keys [ rule> set-at ] 2each ;
+ dup >rule-number rule-values rule-keys [ rule> set-at ] 2each ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! step-capped-line
@@ -37,7 +37,7 @@ dup >rule-number rule-values rule-keys [ rule> set-at ] 2each ;
: cap-line ( line -- 0-line-0 ) { 0 } prepend { 0 } append ;
: wrap-line ( a-line-z -- za-line-za )
-dup peek 1array swap dup first 1array append append ;
+ dup peek 1array swap dup first 1array append append ;
: step-line ( line -- new-line ) 3 <clumps> [ pattern>state ] map ;
From 7688c8eb482f2ae80c66a0d677b29932bc83fd2a Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 16 Nov 2008 21:20:00 -0600
Subject: [PATCH 10/12] automata: more indentation fixes
---
extra/automata/automata.factor | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/extra/automata/automata.factor b/extra/automata/automata.factor
index 0f3fdcd3f6..9001521490 100644
--- a/extra/automata/automata.factor
+++ b/extra/automata/automata.factor
@@ -13,14 +13,14 @@ VAR: rule VAR: rule-number
: init-rule ( -- ) 8 <hashtable> >rule ;
: rule-keys ( -- array )
-{ { 1 1 1 }
- { 1 1 0 }
- { 1 0 1 }
- { 1 0 0 }
- { 0 1 1 }
- { 0 1 0 }
- { 0 0 1 }
- { 0 0 0 } } ;
+ { { 1 1 1 }
+ { 1 1 0 }
+ { 1 0 1 }
+ { 1 0 0 }
+ { 0 1 1 }
+ { 0 1 0 }
+ { 0 0 1 }
+ { 0 0 0 } } ;
: rule-values ( n -- seq ) >bin 8 CHAR: 0 pad-left string>digits ;
@@ -61,8 +61,8 @@ VARS: width height ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: interesting ( -- seq )
-{ 18 22 26 30 41 45 54 60 73 75 82 86 89 90 97 101 102 105 106 107 109
- 110 120 121 122 124 126 129 137 146 147 149 150 151 153 154 161 165 } ;
+ { 18 22 26 30 41 45 54 60 73 75 82 86 89 90 97 101 102 105 106 107 109
+ 110 120 121 122 124 126 129 137 146 147 149 150 151 153 154 161 165 } ;
: mild ( -- seq ) { 6 9 11 57 62 74 118 } ;
@@ -75,7 +75,7 @@ VAR: bitmap
VAR: last-line
: run-rule ( -- )
-last-line> height> [ drop step-capped-line dup ] map >bitmap >last-line ;
+ last-line> height> [ drop step-capped-line dup ] map >bitmap >last-line ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From fb45cd9e5549888702aa91f130439d67f12c7d43 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sun, 16 Nov 2008 23:31:36 -0600
Subject: [PATCH 11/12] automata.ui: minor indentation fix
---
extra/automata/ui/ui.factor | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extra/automata/ui/ui.factor b/extra/automata/ui/ui.factor
index cfb0462877..9210097cab 100644
--- a/extra/automata/ui/ui.factor
+++ b/extra/automata/ui/ui.factor
@@ -39,10 +39,10 @@ VAR: slate
! Call a 'model' quotation with the current 'view'.
: with-view ( quot -- )
-slate> rect-dim first >width
-slate> rect-dim second >height
-call
-slate> relayout-1 ;
+ slate> rect-dim first >width
+ slate> rect-dim second >height
+ call
+ slate> relayout-1 ;
! Create a quotation that is appropriate for buttons and gesture handler.
From 403381a6f3b48cd89274ef457df3f6773884025c Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 17 Nov 2008 00:49:42 -0600
Subject: [PATCH 12/12] boids: minor indentation fix
---
extra/boids/boids.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index 8c045ee270..c3cf1077e9 100644
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -76,7 +76,7 @@ VAR: separation-radius
: constrain ( n a b -- n ) rot min max ;
: angle-between ( vec vec -- angle )
-2dup v. -rot norm swap norm * / -1 1 constrain acos rad>deg ;
+ 2dup v. -rot norm swap norm * / -1 1 constrain acos rad>deg ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!