Merge branch 'master' of git://factorcode.org/git/factor into mongo-factor-driver

2009-05-11 10:08:53 +02:00 · 2009-05-11 10:08:53 +02:00 · 808ff2295b
parent 90378f7429 3fe5bb872b
commit 808ff2295b
43 changed files with 37 additions and 105 deletions
--- a/basis/none/deploy.factor
+++ b/basis/none/deploy.factor
@ -6,7 +6,6 @@ H{
    { deploy-name "none" }
    { "stop-after-last-window?" t }
    { deploy-c-types? f }
-    { deploy-compiler? f }
    { deploy-io 1 }
    { deploy-ui? f }
    { deploy-reflection 1 }
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@ -43,14 +43,14 @@ CONSTANT: theme-path "basis/ui/gadgets/theme/"
    [ my-arch make-image ] unless ;

 : bootstrap-profile ( -- profile )
-    {
-        { "math"     deploy-math?     }
-        { "compiler" deploy-compiler? }
-        { "threads"  deploy-threads?  }
-        { "ui"       deploy-ui?       }
-        { "unicode"  deploy-unicode?  }
-    } [ nip get ] assoc-filter keys
-    native-io? [ "io" suffix ] when ;
+    [
+        deploy-math? get [ "math" , ] when
+        deploy-threads? get [ "threads" , ] when
+        "compiler" ,
+        deploy-ui? get [ "ui" , ] when
+        deploy-unicode? get [ "unicode" , ] when
+        native-io? [ "io" , ] when
+    ] { } make ;

 : staging-image-name ( profile -- name )
    "staging."
--- a/basis/tools/deploy/config/config-docs.factor
+++ b/basis/tools/deploy/config/config-docs.factor
@ -5,7 +5,6 @@ IN: tools.deploy.config
 ARTICLE: "deploy-flags" "Deployment flags"
 "There are two sets of deployment flags. The first set controls the major subsystems which are to be included in the deployment image:"
 { $subsection deploy-math?     }
-{ $subsection deploy-compiler? }
 { $subsection deploy-unicode?   }
 { $subsection deploy-threads?  }
 { $subsection deploy-ui?       }
@ -53,11 +52,6 @@ HELP: deploy-math?
 $nl
 "On by default. Often the programmer will use rationals without realizing it. A small amount of space can be saved by stripping these features out, but some code may require changes to work properly." } ;

-HELP: deploy-compiler?
-{ $description "Deploy flag. If set, words in the deployed image will be compiled with the optimizing compiler when possible."
-$nl
-"On by default. Most programs should be compiled, not only for performance but because features which depend on the C library interface only function after compilation." } ;
-
 HELP: deploy-unicode?
 { $description "Deploy flag. If set, full Unicode " { $link POSTPONE: CHAR: } " syntax is included."
 $nl
--- a/basis/tools/deploy/config/config.factor
+++ b/basis/tools/deploy/config/config.factor
@ -7,7 +7,6 @@ IN: tools.deploy.config
 SYMBOL: deploy-name

 SYMBOL: deploy-ui?
-SYMBOL: deploy-compiler?
 SYMBOL: deploy-math?
 SYMBOL: deploy-unicode?
 SYMBOL: deploy-threads?
@ -55,7 +54,6 @@ SYMBOL: deploy-image
        { deploy-ui?                f }
        { deploy-io                 2 }
        { deploy-reflection         1 }
-        { deploy-compiler?          t }
        { deploy-threads?           t }
        { deploy-unicode?           f }
        { deploy-math?              t }
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@ -11,7 +11,7 @@ io.directories tools.deploy.test ;

 [ t ] [ "hello-ui" shake-and-bake 1300000 small-enough? ] unit-test

-[ "staging.math-compiler-threads-ui-strip.image" ] [
+[ "staging.math-threads-compiler-ui-strip.image" ] [
    "hello-ui" deploy-config
    [ bootstrap-profile staging-image-name file-name ] bind
 ] unit-test
@ -88,7 +88,6 @@ M: quit-responder call-responder*
 {
    "tools.deploy.test.6"
    "tools.deploy.test.7"
-    "tools.deploy.test.8"
    "tools.deploy.test.9"
    "tools.deploy.test.10"
    "tools.deploy.test.11"
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@ -337,16 +337,17 @@ IN: tools.deploy.shaker
    [ instances dup H{ } clone [ [ ] cache ] curry map ] dip call
    become ; inline

+: compress-object? ( obj -- ? )
+    {
+        { [ dup array? ] [ empty? ] }
+        { [ dup byte-array? ] [ drop t ] }
+        { [ dup string? ] [ drop t ] }
+        { [ dup wrapper? ] [ drop t ] }
+        [ drop f ]
+    } cond ;
+
 : compress-objects ( -- )
-    [
-        {
-            [ dup array? [ empty? ] [ drop f ] if ]
-            [ byte-array? ]
-            [ string? ]
-            [ wrapper? ]
-        } cleave
-        or or or
-    ] [ ] "objects" compress ;
+    [ compress-object? ] [ ] "objects" compress ;

 : remain-compiled ( old new -- old new )
    #! Quotations which were formerly compiled must remain
--- a/basis/tools/deploy/test/1/deploy.factor
+++ b/basis/tools/deploy/test/1/deploy.factor
@ -8,7 +8,6 @@ H{
    { deploy-math? t }
    { deploy-io 2 }
    { deploy-name "tools.deploy.test.1" }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
 }
--- a/basis/tools/deploy/test/10/deploy.factor
+++ b/basis/tools/deploy/test/10/deploy.factor
@ -4,7 +4,6 @@ H{
    { deploy-unicode? f }
    { deploy-io 2 }
    { deploy-word-props? f }
-    { deploy-compiler? f }
    { deploy-threads? f }
    { deploy-word-defs? f }
    { "stop-after-last-window?" t }
--- a/basis/tools/deploy/test/11/deploy.factor
+++ b/basis/tools/deploy/test/11/deploy.factor
@ -9,7 +9,6 @@ H{
    { deploy-math? f }
    { deploy-unicode? f }
    { deploy-threads? f }
-    { deploy-compiler? f }
    { deploy-io 2 }
    { deploy-ui? f }
 }
--- a/basis/tools/deploy/test/12/deploy.factor
+++ b/basis/tools/deploy/test/12/deploy.factor
@ -9,7 +9,6 @@ H{
    { deploy-io 2 }
    { deploy-ui? f }
    { deploy-name "tools.deploy.test.12" }
-    { deploy-compiler? f }
    { deploy-word-defs? f }
    { deploy-threads? f }
 }
--- a/basis/tools/deploy/test/13/deploy.factor
+++ b/basis/tools/deploy/test/13/deploy.factor
@ -1,7 +1,6 @@
 USING: tools.deploy.config ;
 H{
    { deploy-threads? t }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-io 2 }
    { "stop-after-last-window?" t }
--- a/basis/tools/deploy/test/2/deploy.factor
+++ b/basis/tools/deploy/test/2/deploy.factor
@ -8,7 +8,6 @@ H{
    { deploy-math? t }
    { deploy-io 2 }
    { deploy-name "tools.deploy.test.2" }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
 }
--- a/basis/tools/deploy/test/3/deploy.factor
+++ b/basis/tools/deploy/test/3/deploy.factor
@ -6,7 +6,6 @@ H{
    { "stop-after-last-window?" t }
    { deploy-word-defs? f }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-threads? t }
    { deploy-io 3 }
    { deploy-math? t }
--- a/basis/tools/deploy/test/4/deploy.factor
+++ b/basis/tools/deploy/test/4/deploy.factor
@ -8,7 +8,6 @@ H{
    { deploy-math? t }
    { deploy-io 2 }
    { deploy-name "tools.deploy.test.4" }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
 }
--- a/basis/tools/deploy/test/5/deploy.factor
+++ b/basis/tools/deploy/test/5/deploy.factor
@ -8,7 +8,6 @@ H{
    { deploy-math? t }
    { deploy-io 3 }
    { deploy-name "tools.deploy.test.5" }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
 }
--- a/basis/tools/deploy/test/6/deploy.factor
+++ b/basis/tools/deploy/test/6/deploy.factor
@ -5,7 +5,6 @@ H{
    { deploy-io 1 }
    { deploy-name "tools.deploy.test.6" }
    { deploy-math? t }
-    { deploy-compiler? t }
    { deploy-ui? f }
    { deploy-c-types? f }
    { deploy-word-defs? f }
--- a/basis/tools/deploy/test/7/deploy.factor
+++ b/basis/tools/deploy/test/7/deploy.factor
@ -6,7 +6,6 @@ H{
    { deploy-io 2 }
    { deploy-math? t }
    { "stop-after-last-window?" t }
-    { deploy-compiler? t }
    { deploy-unicode? f }
    { deploy-c-types? f }
    { deploy-reflection 1 }
--- a/basis/tools/deploy/test/8/8.factor
+++ b/basis/tools/deploy/test/8/8.factor
@ -1,11 +0,0 @@
-USING: kernel ;
-IN: tools.deploy.test.8
-
-: literal-merge-test-1 ( -- x ) H{ { "lil" "wayne" } } ;
-: literal-merge-test-2 ( -- x ) H{ { "lil" "wayne" } } ;
-
-: literal-merge-test ( -- )
-    literal-merge-test-1
-    literal-merge-test-2 eq? t assert= ;
-
-MAIN: literal-merge-test
--- a/basis/tools/deploy/test/8/deploy.factor
+++ b/basis/tools/deploy/test/8/deploy.factor
@ -1,15 +0,0 @@
-USING: tools.deploy.config ;
-H{
-    { deploy-name "tools.deploy.test.8" }
-    { deploy-c-types? f }
-    { deploy-word-props? f }
-    { deploy-ui? f }
-    { deploy-reflection 1 }
-    { deploy-compiler? f }
-    { deploy-unicode? f }
-    { deploy-io 1 }
-    { deploy-word-defs? f }
-    { deploy-threads? f }
-    { "stop-after-last-window?" t }
-    { deploy-math? f }
-}
--- a/basis/tools/deploy/test/9/deploy.factor
+++ b/basis/tools/deploy/test/9/deploy.factor
@ -6,7 +6,6 @@ H{
    { "stop-after-last-window?" t }
    { deploy-word-defs? f }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-threads? f }
    { deploy-io 1 }
    { deploy-math? t }
--- a/basis/ui/tools/deploy/deploy.factor
+++ b/basis/ui/tools/deploy/deploy.factor
@ -29,7 +29,6 @@ TUPLE: deploy-gadget < pack vocab settings ;

 : advanced-settings ( parent -- parent )
    "Advanced:" <label> add-gadget
-    deploy-compiler? get "Use optimizing compiler" <checkbox> add-gadget
    deploy-math? get "Rational and complex number support" <checkbox> add-gadget
    deploy-threads? get "Threading support" <checkbox> add-gadget
    deploy-unicode? get "Unicode character literal support" <checkbox> add-gadget
--- a/extra/4DNav/deploy.factor
+++ b/extra/4DNav/deploy.factor
@ -7,7 +7,6 @@ H{
    { deploy-math? t }
    { deploy-threads? t }
    { deploy-reflection 3 }
-    { deploy-compiler? t }
    { deploy-unicode? t }
    { deploy-io 3 }
    { "stop-after-last-window?" t }
--- a/extra/benchmark/fib6/deploy.factor
+++ b/extra/benchmark/fib6/deploy.factor
@ -6,7 +6,6 @@ H{
    { deploy-word-props? f }
    { deploy-ui? f }
    { deploy-io 1 }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
    { deploy-unicode? f }
--- a/extra/benchmark/regex-dna/deploy.factor
+++ b/extra/benchmark/regex-dna/deploy.factor
@ -3,7 +3,6 @@ H{
    { deploy-word-defs? f }
    { deploy-word-props? f }
    { deploy-math? f }
-    { deploy-compiler? t }
    { deploy-ui? f }
    { deploy-c-types? f }
    { "stop-after-last-window?" t }
--- a/extra/bunny/deploy.factor
+++ b/extra/bunny/deploy.factor
@ -3,7 +3,6 @@ H{
    { deploy-io 3 }
    { deploy-word-defs? f }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-c-types? f }
    { deploy-name "Bunny" }
    { deploy-word-props? f }
--- a/extra/chicago-talk/deploy.factor
+++ b/extra/chicago-talk/deploy.factor
@ -3,7 +3,6 @@ V{
    { deploy-ui? t }
    { deploy-io 1 }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/color-picker/deploy.factor
+++ b/extra/color-picker/deploy.factor
@ -7,7 +7,6 @@ H{
    { deploy-unicode? f }
    { deploy-c-types? f }
    { deploy-word-defs? f }
-    { deploy-compiler? t }
    { deploy-io 2 }
    { deploy-reflection 1 }
    { "stop-after-last-window?" t }
--- a/extra/drills/deployed/deploy.factor
+++ b/extra/drills/deployed/deploy.factor
@ -5,7 +5,6 @@ H{
    { deploy-math? t }
    { deploy-name "drills" }
    { deploy-ui? t }
-    { deploy-compiler? t }
    { "stop-after-last-window?" t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/gesture-logger/deploy.factor
+++ b/extra/gesture-logger/deploy.factor
@ -3,7 +3,6 @@ V{
    { deploy-ui? t }
    { deploy-io 1 }
    { deploy-reflection 3 }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/hello-ui/deploy.factor
+++ b/extra/hello-ui/deploy.factor
@ -1,14 +1,14 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-threads? t }
-    { deploy-math? t }
-    { deploy-name "Hello world" }
-    { deploy-c-types? f }
-    { deploy-word-props? f }
-    { deploy-io 2 }
    { deploy-ui? t }
-    { "stop-after-last-window?" t }
-    { deploy-word-defs? f }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
+    { deploy-unicode? f }
+    { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-c-types? f }
+    { deploy-name "Hello world" }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { "stop-after-last-window?" t }
+    { deploy-threads? t }
 }
--- a/extra/hello-unicode/deploy.factor
+++ b/extra/hello-unicode/deploy.factor
@ -3,7 +3,6 @@ H{
    { deploy-word-defs? f }
    { deploy-reflection 1 }
    { deploy-word-props? f }
-    { deploy-compiler? t }
    { deploy-threads? t }
    { deploy-unicode? f }
    { "stop-after-last-window?" t }
--- a/extra/hello-world/deploy.factor
+++ b/extra/hello-world/deploy.factor
@ -2,7 +2,6 @@ USING: tools.deploy.config ;
 H{
    { deploy-unicode? f }
    { deploy-ui? f }
-    { deploy-compiler? t }
    { deploy-name "Hello world (console)" }
    { deploy-io 2 }
    { deploy-threads? f }
--- a/extra/jamshred/deploy.factor
+++ b/extra/jamshred/deploy.factor
@ -3,7 +3,6 @@ V{
    { deploy-ui? t }
    { deploy-io 1 }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/joystick-demo/deploy.factor
+++ b/extra/joystick-demo/deploy.factor
@ -10,5 +10,4 @@ H{
    { deploy-math? t }
    { "stop-after-last-window?" t }
    { deploy-ui? t }
-    { deploy-compiler? t }
 }
--- a/extra/maze/deploy.factor
+++ b/extra/maze/deploy.factor
@ -1,14 +1,14 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-threads? t }
-    { deploy-math? t }
-    { deploy-name "Maze" }
-    { deploy-c-types? f }
-    { deploy-word-props? f }
-    { deploy-io 2 }
    { deploy-ui? t }
-    { "stop-after-last-window?" t }
-    { deploy-word-defs? f }
-    { deploy-compiler? t }
    { deploy-reflection 1 }
+    { deploy-unicode? f }
+    { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-c-types? f }
+    { deploy-name "Maze" }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { "stop-after-last-window?" t }
+    { deploy-threads? t }
 }
--- a/extra/merger/deploy.factor
+++ b/extra/merger/deploy.factor
@ -7,7 +7,6 @@ H{
    { "stop-after-last-window?" t }
    { deploy-ui? t }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-name "Merger" }
    { deploy-word-props? f }
    { deploy-threads? t }
--- a/extra/minneapolis-talk/deploy.factor
+++ b/extra/minneapolis-talk/deploy.factor
@ -3,7 +3,6 @@ V{
    { deploy-ui? t }
    { deploy-io 1 }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/nehe/deploy.factor
+++ b/extra/nehe/deploy.factor
@ -3,7 +3,6 @@ V{
    { deploy-ui? t }
    { deploy-io 1 }
    { deploy-reflection 1 }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-word-props? f }
    { deploy-c-types? f }
--- a/extra/spheres/deploy.factor
+++ b/extra/spheres/deploy.factor
@ -10,6 +10,5 @@ H{
    { deploy-word-props? f }
    { deploy-word-defs? f }
    { "stop-after-last-window?" t }
-    { deploy-compiler? t }
    { deploy-threads? t }
 }
--- a/extra/sudoku/deploy.factor
+++ b/extra/sudoku/deploy.factor
@ -3,7 +3,6 @@ H{
    { deploy-word-defs? f }
    { deploy-name "Sudoku" }
    { deploy-threads? f }
-    { deploy-compiler? t }
    { deploy-math? t }
    { deploy-c-types? f }
    { deploy-io 2 }
--- a/extra/terrain/deploy.factor
+++ b/extra/terrain/deploy.factor
@ -10,6 +10,5 @@ H{
    { deploy-word-props? f }
    { deploy-word-defs? f }
    { "stop-after-last-window?" t }
-    { deploy-compiler? t }
    { deploy-threads? t }
 }
--- a/extra/tetris/deploy.factor
+++ b/extra/tetris/deploy.factor
@ -1,7 +1,6 @@
 USING: tools.deploy.config ;
 H{
    { deploy-ui? t }
-    { deploy-compiler? t }
    { deploy-threads? t }
    { deploy-word-props? f }
    { deploy-reflection 1 }
--- a/extra/webkit-demo/deploy.factor
+++ b/extra/webkit-demo/deploy.factor
@ -4,7 +4,6 @@ H{
    { deploy-threads? f }
    { deploy-word-defs? f }
    { deploy-ui? f }
-    { deploy-compiler? t }
    { deploy-word-props? f }
    { "stop-after-last-window?" t }
    { deploy-unicode? f }