Fixing the build

diff --git a/basis/compiler/tests/stack-trace.factor b/basis/compiler/tests/stack-trace.factor
index cfbea3bcb92c9e060e932876a86cdf1faa47f2cb..b317ed3eb5e5ef6a606625919540b1a9cecf020b 100755 (executable)
--- a/basis/compiler/tests/stack-trace.factor
+++ b/basis/compiler/tests/stack-trace.factor
@@ -14,7 +14,7 @@ words splitting grouping sorting accessors ;
 [ t ] [
     symbolic-stack-trace
     [ word? ] filter
-    { baz bar foo throw } tail?
+    { baz bar foo } tail?
 ] unit-test
 
 : bleh ( seq -- seq' ) [ 3 + ] map [ 0 > ] filter ;

diff --git a/basis/generalizations/generalizations-docs.factor b/basis/generalizations/generalizations-docs.factor
index 376ae5bed20aa0c212d8e825bd7270e19a03bd86..2088e468c64593800b8d869e335f6b618ceb6bfa 100644 (file)
--- a/basis/generalizations/generalizations-docs.factor
+++ b/basis/generalizations/generalizations-docs.factor
@@ -58,7 +58,7 @@ HELP: npick
 "placed on the top of the stack."\r
 }\r
 { $examples\r
-  { $example "USING: kernel prettyprint generalizations ;" "1 2 3 4 4 npick .s clear" "1\n2\n3\n4\n1" }\r
+  { $example "USING: kernel prettyprint generalizations ;" "1 2 3 4 4 npick 5 narray ." "{ 1 2 3 4 1 }" }\r
   "Some core words expressed in terms of " { $link npick } ":"\r
     { $table\r
         { { $link dup } { $snippet "1 npick" } }\r
@@ -75,7 +75,7 @@ HELP: ndup
 "placed on the top of the stack."\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 4 ndup .s clear" "1\n2\n3\n4\n1\n2\n3\n4" }\r
+  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 4 ndup 8 narray ." "{ 1 2 3 4 1 2 3 4 }" }\r
   "Some core words expressed in terms of " { $link ndup } ":"\r
     { $table\r
         { { $link dup } { $snippet "1 ndup" } }\r
@@ -91,7 +91,7 @@ HELP: nnip
 "for any number of items."\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 3 nnip .s clear" "4" }\r
+  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 3 nnip ." "4" }\r
   "Some core words expressed in terms of " { $link nnip } ":"\r
     { $table\r
         { { $link nip } { $snippet "1 nnip" } }\r
@@ -106,7 +106,7 @@ HELP: ndrop
 "for any number of items."\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 3 ndrop .s clear" "1" }\r
+  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 3 ndrop ." "1" }\r
   "Some core words expressed in terms of " { $link ndrop } ":"\r
     { $table\r
         { { $link drop } { $snippet "1 ndrop" } }\r
@@ -121,7 +121,7 @@ HELP: nrot
 "number of items on the stack. "\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 4 nrot .s clear" "2\n3\n4\n1" }\r
+  { $example "USING: arrays generalizations kernel prettyprint ;" "1 2 3 4 4 nrot 4array ." "{ 2 3 4 1 }" }\r
   "Some core words expressed in terms of " { $link nrot } ":"\r
     { $table\r
         { { $link swap } { $snippet "1 nrot" } }\r
@@ -135,7 +135,7 @@ HELP: -nrot
 "number of items on the stack. "\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 4 -nrot .s clear" "4\n1\n2\n3" }\r
+  { $example "USING: arrays generalizations kernel prettyprint ;" "1 2 3 4 4 -nrot 4array ." "{ 4 1 2 3 }" }\r
   "Some core words expressed in terms of " { $link -nrot } ":"\r
     { $table\r
         { { $link swap } { $snippet "1 -nrot" } }\r
@@ -151,8 +151,8 @@ HELP: ndip
 "stack. The quotation can consume and produce any number of items."\r
 } \r
 { $examples\r
-  { $example "USING: generalizations kernel prettyprint kernel ;" "1 2 [ dup ] 1 ndip .s clear" "1\n1\n2" }\r
-  { $example "USING: generalizations kernel prettyprint kernel ;" "1 2 3 [ drop ] 2 ndip .s clear" "2\n3" }\r
+  { $example "USING: arrays generalizations kernel prettyprint ;" "1 2 [ dup ] 1 ndip 3array ." "{ 1 1 2 }" }\r
+  { $example "USING: arrays generalizations kernel prettyprint ;" "1 2 3 [ drop ] 2 ndip 2array ." "{ 2 3 }" }\r
   "Some core words expressed in terms of " { $link ndip } ":"\r
     { $table\r
         { { $link dip } { $snippet "1 ndip" } }\r
@@ -168,7 +168,7 @@ HELP: nslip
 "removed from the stack, the quotation called, and the items restored."\r
 } \r
 { $examples\r
-  { $example "USING: generalizations kernel prettyprint ;" "[ 99 ] 1 2 3 4 5 5 nslip .s clear" "99\n1\n2\n3\n4\n5" }\r
+  { $example "USING: generalizations kernel prettyprint ;" "[ 99 ] 1 2 3 4 5 5 nslip 6 narray ." "{ 99 1 2 3 4 5 }" }\r
   "Some core words expressed in terms of " { $link nslip } ":"\r
     { $table\r
         { { $link slip } { $snippet "1 nslip" } }\r
@@ -184,7 +184,7 @@ HELP: nkeep
 "saved, the quotation called, and the items restored."\r
 } \r
 { $examples\r
-  { $example "USING: generalizations kernel prettyprint ;" "1 2 3 4 5 [ drop drop drop drop drop 99 ] 5 nkeep .s clear" "99\n1\n2\n3\n4\n5" }\r
+  { $example "USING: generalizations kernel prettyprint ;" "1 2 3 4 5 [ drop drop drop drop drop 99 ] 5 nkeep 6 narray ." "{ 99 1 2 3 4 5 }" }\r
   "Some core words expressed in terms of " { $link nkeep } ":"\r
     { $table\r
         { { $link keep } { $snippet "1 nkeep" } }\r

diff --git a/basis/html/streams/streams-tests.factor b/basis/html/streams/streams-tests.factor
index 249861b12a8b93e7c6125ec827705219b4a5eb81..835874cbb751030659993b8c186b8f4d4b64e36c 100644 (file)
--- a/basis/html/streams/streams-tests.factor
+++ b/basis/html/streams/streams-tests.factor
@@ -61,6 +61,4 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ;
     [ H{ } [ ] with-nesting nl ] make-html-string
 ] unit-test
 
-[ ] [ [ { 1 2 3 } describe ] with-html-writer drop ] unit-test
-
-[ ] [ [ \ predicate-instance? def>> . ] with-html-writer drop ] unit-test
+[ ] [ [ { 1 2 3 } describe ] with-html-writer drop ] unit-test
\ No newline at end of file

diff --git a/basis/tools/deploy/shaker/strip-call.factor b/basis/tools/deploy/shaker/strip-call.factor
index 860a0f38492fa2e80400f8a77fd7ea8bce0be905..d0593b6c150165c37208483cc5e81580249fe32f 100644 (file)
--- a/basis/tools/deploy/shaker/strip-call.factor
+++ b/basis/tools/deploy/shaker/strip-call.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: tools.deploy.shaker.call
 
-IN: call
-USE: call.private
+IN: combinators
+USE: combinators.private
 
 : call-effect ( word effect -- ) call-effect-unsafe ; inline
 

diff --git a/basis/urls/urls-docs.factor b/basis/urls/urls-docs.factor
index 437a9419e39131a2b67d6c33974b97b243cc0312..707caf31880bb6275ea71c3d8f6c7a783ef0b690 100644 (file)
--- a/basis/urls/urls-docs.factor
+++ b/basis/urls/urls-docs.factor
@@ -82,9 +82,9 @@ HELP: parse-host
 { $notes "This word is used by " { $link >url } ". It can also be used directly to parse " { $snippet "host:port" } " strings which are not full URLs." }
 { $examples
     { $example
-        "USING: prettyprint urls kernel ;"
-        "\"sbcl.org:80\" parse-host .s 2drop"
-        "\"sbcl.org\"\n80"
+        "USING: arrays kernel prettyprint urls ;"
+        "\"sbcl.org:80\" parse-host 2array ."
+        "{ \"sbcl.org\" 80 }"
     }
 } ;
 

diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index cb4a0b50aa9c78f176f162ce25705ced54d78911..4241999bcd221c89f1faf620823575d85d187aa9 100644 (file)
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -27,20 +27,18 @@ combinators vocabs.parser grouping ;
 
 IN: vocabs.loader.test.2
 
-: hello 3 ;
+: hello ( -- ) ;
 
 MAIN: hello
 
 IN: vocabs.loader.tests
 
-[ { 3 3 3 } ] [
+[ ] [
     "vocabs.loader.test.2" run
     "vocabs.loader.test.2" vocab run
     "vocabs.loader.test.2" <vocab-link> run
-    3array
 ] unit-test
 
-
 [
     "resource:core/vocabs/loader/test/a/a.factor" forget-source
     "vocabs.loader.test.a" forget-vocab

diff --git a/extra/advice/advice.factor b/extra/advice/advice.factor
index fbdfa9c66bb41397f312da904873c51c41efbf1b..be9835c5b9bec8d819800750356089defc51dcae 100644 (file)
--- a/extra/advice/advice.factor
+++ b/extra/advice/advice.factor
@@ -49,7 +49,7 @@ PRIVATE>
     in-advice? get [ "ad-do-it should only be called inside 'around' advice" throw ] unless coyield ;
     
 : make-advised ( word -- )
-    [ dup [ over dup '[ _ call-before _ _ call-around _ call-after ] ] annotate ]
+    [ dup '[ [ _ ] dip over dup '[ _ call-before _ _ call-around _ call-after ] ] annotate ]
     [ { before after around } [ <linked-hash> swap set-word-prop ] with each ] 
     [ t advised set-word-prop ] tri ;
 

diff --git a/extra/wordtimer/wordtimer.factor b/extra/wordtimer/wordtimer.factor
index 7abdc149dd8ed71bf5077c4927739e7f457cb830..34cd19c34fc99344f8b86536dfd7a51f4cf2d703 100644 (file)
--- a/extra/wordtimer/wordtimer.factor
+++ b/extra/wordtimer/wordtimer.factor
@@ -1,6 +1,6 @@
 USING: kernel sequences namespaces make math assocs words arrays
 tools.annotations vocabs sorting prettyprint io system
-math.statistics accessors tools.time ;
+math.statistics accessors tools.time fry ;
 IN: wordtimer
 
 SYMBOL: *wordtimes*
@@ -40,7 +40,7 @@ SYMBOL: *calling*
   [ swap time-unless-recursing ] 2curry ; 
 
 : add-timer ( word -- )
-  dup [ (add-timer) ] annotate ;
+  dup '[ [ _ ] dip (add-timer) ] annotate ;
 
 : add-timers ( vocab -- )
   words [ add-timer ] each ;