Fixing fallout from sequences.generalizations change

diff --git a/basis/generalizations/generalizations-docs.factor b/basis/generalizations/generalizations-docs.factor
index 168f2dfcd2e8762ab7874eaff358051958de4b5d..dee69e3cbd0a076ad5a6146b7054d98173634210 100644 (file)
--- a/basis/generalizations/generalizations-docs.factor
+++ b/basis/generalizations/generalizations-docs.factor
@@ -14,7 +14,13 @@ HELP: npick
 "placed on the top of the stack."\r
 }\r
 { $examples\r
-  { $example "USING: kernel prettyprint generalizations ;" "1 2 3 4 4 npick 5 narray ." "{ 1 2 3 4 1 }" }\r
+  { $example\r
+      "USING: kernel generalizations prettyprint"\r
+      "sequences.generalizations ;"\r
+      ""\r
+      "1 2 3 4 4 npick 5 narray ."\r
+      "{ 1 2 3 4 1 }"\r
+  }\r
   "Some core words expressed in terms of " { $link npick } ":"\r
     { $table\r
         { { $link dup } { $snippet "1 npick" } }\r
@@ -31,7 +37,13 @@ HELP: ndup
 "placed on the top of the stack."\r
 }\r
 { $examples\r
-  { $example "USING: prettyprint generalizations kernel ;" "1 2 3 4 4 ndup 8 narray ." "{ 1 2 3 4 1 2 3 4 }" }\r
+  { $example\r
+      "USING: prettyprint generalizations kernel"\r
+      "sequences.generalizations ;"\r
+      ""\r
+      "1 2 3 4 4 ndup 8 narray ."\r
+      "{ 1 2 3 4 1 2 3 4 }"\r
+  }\r
   "Some core words expressed in terms of " { $link ndup } ":"\r
     { $table\r
         { { $link dup } { $snippet "1 ndup" } }\r
@@ -129,7 +141,13 @@ 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 6 narray ." "{ 99 1 2 3 4 5 }" }\r
+  { $example\r
+      "USING: generalizations kernel prettyprint"\r
+      "sequences.generalizations ;"\r
+      ""\r
+      "1 2 3 4 5 [ drop drop drop drop drop 99 ] 5 nkeep 6 narray ."\r
+      "{ 99 1 2 3 4 5 }"\r
+  }\r
   "Some core words expressed in terms of " { $link nkeep } ":"\r
     { $table\r
         { { $link keep } { $snippet "1 nkeep" } }\r

diff --git a/basis/math/vectors/conversion/conversion-tests.factor b/basis/math/vectors/conversion/conversion-tests.factor
index d46f062d9cdce38a9a55bfd5c52098776d8f84a1..c9ff2cb10257d502c44cd10f34890dce7cc30e5a 100644 (file)
--- a/basis/math/vectors/conversion/conversion-tests.factor
+++ b/basis/math/vectors/conversion/conversion-tests.factor
@@ -1,7 +1,7 @@
 ! (c)Joe Groff bsd license
 USING: accessors arrays compiler.test continuations generalizations
 kernel kernel.private locals math.vectors.conversion math.vectors.simd
-sequences stack-checker tools.test ;
+sequences stack-checker tools.test sequences.generalizations ;
 FROM: alien.c-types => char uchar short ushort int uint longlong ulonglong float double ;
 IN: math.vectors.conversion.tests
 

diff --git a/basis/sequences/generalizations/generalizations-docs.factor b/basis/sequences/generalizations/generalizations-docs.factor
index af1f67317044878a61d71543348337a41d9fa412..acc9705f10f7fe2720b7b2c25ffd9531ac95afda 100644 (file)
--- a/basis/sequences/generalizations/generalizations-docs.factor
+++ b/basis/sequences/generalizations/generalizations-docs.factor
@@ -10,7 +10,7 @@ HELP: nsequence
 "that constructs a sequence from the top " { $snippet "n" } " elements of the stack."
 }
 { $examples
-    { $example "USING: generalizations prettyprint ;" "CHAR: f CHAR: i CHAR: s CHAR: h 4 \"\" nsequence ." "\"fish\"" }
+    { $example "USING: prettyprint sequences.generalizations ;" "CHAR: f CHAR: i CHAR: s CHAR: h 4 \"\" nsequence ." "\"fish\"" }
 } ;
 
 HELP: narray
@@ -60,7 +60,7 @@ HELP: nappend
 { $description "Outputs a new sequence consisting of the elements of the top " { $snippet "n" } " sequences from the datastack in turn." }
 { $errors "Throws an error if any of the sequences contain elements that are not permitted in the sequence type of the first sequence." }
 { $examples
-    { $example "USING: generalizations prettyprint math ;"
+    { $example "USING: math prettyprint sequences.generalizations ;"
                "{ 1 2 } { 3 4 } { 5 6 } { 7 8 } 4 nappend ."
                "{ 1 2 3 4 5 6 7 8 }"
     }
@@ -74,7 +74,7 @@ HELP: nappend-as
 { $description "Outputs a new sequence of type " { $snippet "exemplar" } " consisting of the elements of the top " { $snippet "n" } " sequences from the datastack in turn." }
 { $errors "Throws an error if any of the sequences contain elements that are not permitted in the sequence type of the first sequence." }
 { $examples
-    { $example "USING: generalizations prettyprint math ;"
+    { $example "USING: math prettyprint sequences.generalizations ;"
                "{ 1 2 } { 3 4 } { 5 6 } { 7 8 } 4 V{ } nappend-as ."
                "V{ 1 2 3 4 5 6 7 8 }"
     }