A few more fixes for string parsing.

diff --git a/basis/db/sqlite/sqlite-tests.factor b/basis/db/sqlite/sqlite-tests.factor
index ed515efff47d86c9e9da8d7557fa59ebb43a6708..7419ee518dc13687eae290bb0ed01e438a51af07 100644 (file)
--- a/basis/db/sqlite/sqlite-tests.factor
+++ b/basis/db/sqlite/sqlite-tests.factor
@@ -22,7 +22,7 @@ ${
     {
         { "table-name" "TREE" }
         { "table-id" "NODE" }
-        { "foreign-table-name" "NODE"}
+        { "foreign-table-name" "NODE" }
         { "foreign-table-id" "ID" }
     } [ delete-trigger-restrict ] with-variables
     normalize

diff --git a/core/macros/macros-tests.factor b/core/macros/macros-tests.factor
index f02ea299f7aca2192985c59cfea7117e69ad9a6c..b4c4817c080adb058effa3783baf4dc909822f69 100644 (file)
--- a/core/macros/macros-tests.factor
+++ b/core/macros/macros-tests.factor
@@ -7,7 +7,7 @@ MACRO: see-test ( a b -- quot ) + ;
 
 { t } [ \ see-test macro? ] unit-test
 
-{ "USING: macros math ;\nIN: macros.tests\nMACRO: see-test ( a b -- quot ) + ;\n" }
+{ "USING: math ;\nIN: macros.tests\nMACRO: see-test ( a b -- quot ) + ;\n" }
 [ [ \ see-test see ] with-string-writer ]
 unit-test
 
@@ -20,13 +20,13 @@ unit-test
 
 { f } [ \ see-test macro? ] unit-test
 
-{ } [ "USING: macros stack-checker kernel ; IN: hanging-macro MACRO: c ( quot -- quot ) infer drop [ ] ;" eval( -- ) ] unit-test
-{ } [ "USING: macros kernel ; IN: hanging-macro : a ( -- ) [ a ] c ;" eval( -- ) ] unit-test
+{ } [ "USING: stack-checker kernel ; IN: hanging-macro MACRO: c ( quot -- quot ) infer drop [ ] ;" eval( -- ) ] unit-test
+{ } [ "USING: kernel ; IN: hanging-macro : a ( -- ) [ a ] c ;" eval( -- ) ] unit-test
 
 { } [ [ "hanging-macro" forget-vocab ] with-compilation-unit ] unit-test
 
-{ } [ "IN: macros.tests USE: macros MACRO: foo ( -- x ) [ ] ;" eval( -- ) ] unit-test
-    [ "IN: macros.tests USE: macros MACRO: foo ( -- x ) [ ] ; inline" eval( -- ) ] must-fail
+{ } [ "IN: macros.tests MACRO: foo ( -- x ) [ ] ;" eval( -- ) ] unit-test
+    [ "IN: macros.tests MACRO: foo ( -- x ) [ ] ; inline" eval( -- ) ] must-fail
 
 ! The macro expander code should infer
 MACRO: bad-macro ( a -- b ) 1 2 3 [ ] ;

diff --git a/core/memoize/memoize-tests.factor b/core/memoize/memoize-tests.factor
index f67a1fefda89b879e4cc83ea5e91bf5bf42cb6e0..123dbf59d0fd0c8ead694afce3032e281f6ce9c9 100644 (file)
--- a/core/memoize/memoize-tests.factor
+++ b/core/memoize/memoize-tests.factor
@@ -22,7 +22,7 @@ MEMO: x ( a b c d e -- f g h i j )
 
 MEMO: see-test ( a -- b ) reverse ;
 
-{ "USING: memoize sequences ;\nIN: memoize.tests\nMEMO: see-test ( a -- b ) reverse ;\n" }
+{ "USING: sequences ;\nIN: memoize.tests\nMEMO: see-test ( a -- b ) reverse ;\n" }
 [ [ \ see-test see ] with-string-writer ]
 unit-test
 

diff --git a/extra/logic/logic-docs.factor b/extra/logic/logic-docs.factor
index e0f3e8f0e0140ff97d2e155658c99cc1bda05b7d..3dfb0d82768085b1219b0ab8c5925e5e0418be89 100644 (file)
--- a/extra/logic/logic-docs.factor
+++ b/extra/logic/logic-docs.factor
@@ -689,7 +689,7 @@ HELP: writeo
 
 ARTICLE: "logic" "Logic"
 { $vocab-link "logic" }
-" is a vocab for an embedded language that runs on "{ $url "https://github.com/factor/factor" "Factor" } " with the capabilities of a subset of Prolog." $nl
+" is a vocab for an embedded language that runs on " { $url "https://github.com/factor/factor" "Factor" } " with the capabilities of a subset of Prolog." $nl
 "It is an extended port from tiny_prolog and its descendants, " { $url "https://github.com/preston/ruby-prolog" "ruby-prolog" } "." $nl
 { $code
 "USE: logic

diff --git a/extra/math/matrices/extras/extras-docs.factor b/extra/math/matrices/extras/extras-docs.factor
index 2a14d895f18d59854ee96d93603037706922ec77..c9b3a6ff750f1ae07520e00b33e67495eb9312ef 100644 (file)
--- a/extra/math/matrices/extras/extras-docs.factor
+++ b/extra/math/matrices/extras/extras-docs.factor
@@ -117,7 +117,7 @@ HELP: <random-integer-matrix>
     { "The signedness of the numbers in the resulting matrix will be randomized. Use " { $link mabs } " with this word to generate a matrix of random positive integers." }
     { $equiv-word-note "integral" <random-unit-matrix> }
 }
-{ $errors { $link no-method } " if " { $snippet "max"} " is not an " { $link integer } "." }
+{ $errors { $link no-method } " if " { $snippet "max" } " is not an " { $link integer } "." }
 { $examples
     { $unchecked-example
         "USING: math.matrices.extras prettyprint ;"

diff --git a/extra/tensors/tensors-docs.factor b/extra/tensors/tensors-docs.factor
index 239b3df6538ff2a4f5307650003a177395f25c3c..c2619848ead8a9c9ed7533e598f9d4be0728fe8c 100644 (file)
--- a/extra/tensors/tensors-docs.factor
+++ b/extra/tensors/tensors-docs.factor
@@ -193,26 +193,26 @@ HELP: stack
 { $description "Joins the sequences in " { $snippet "seq" } " along a new axis. "
 { $snippet "tensor" } " will have one more dimension than the arrays in " { $snippet "seq" } "." } 
 { $errors "Throws a " { $link shape-mismatch-error } " if the sequences in "
-{ $snippet "seq" } " do not have the same shape."} ;
+{ $snippet "seq" } " do not have the same shape." } ;
 
 
 HELP: hstack 
 { $values { "seq" sequence } { "tensor" tensor } } 
 { $description "Joins the sequences in " { $snippet "seq" } " column-wise." }
 { $errors "Throws a " { $link shape-mismatch-error } " if the sequences in "
-{ $snippet "seq" } " do not have the same shape along all but the second axis."} ;
+{ $snippet "seq" } " do not have the same shape along all but the second axis." } ;
 
 HELP: vstack 
 { $values { "seq" sequence } { "tensor" tensor } } 
 { $description "Joins the sequences in " { $snippet "seq" } " row-wise." }
 { $errors "Throws a " { $link shape-mismatch-error } " if the sequences in "
-{ $snippet "seq" } " do not have the same shape along all but the first axis."} ;
+{ $snippet "seq" } " do not have the same shape along all but the first axis." } ;
 
 HELP: t-concat
 { $values { "seq" sequence } { "tensor" tensor } } 
 { $description "Joins the sequences in " { $snippet "seq" } " along the first axis." }
 { $errors "Throws a " { $link shape-mismatch-error } " if the sequences in "
-{ $snippet "seq" } " do not have the same shape along all but the first axis."} ;
+{ $snippet "seq" } " do not have the same shape along all but the first axis." } ;
 
 
 ABOUT: "tensors"