Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/lcs/lcs.factor b/basis/lcs/lcs.factor
index 8c67590697a603698d9a9ac48736efce9204ca57..d32b1998738bf76e7dc17bf03ee59c5d96d1238a 100644 (file)
--- a/basis/lcs/lcs.factor
+++ b/basis/lcs/lcs.factor
@@ -8,7 +8,7 @@ IN: lcs
     0 1 ? + [ [ 1+ ] bi@ ] dip min min ;\r
 \r
 : lcs-step ( insert delete change same? -- next )\r
-    1 -1./0. ? + max max ; ! -1./0. is -inf (float)\r
+    1 -1/0. ? + max max ; ! -1/0. is -inf (float)\r
 \r
 :: loop-step ( i j matrix old new step -- )\r
     i j 1+ matrix nth nth ! insertion\r

diff --git a/core/math/parser/parser-docs.factor b/core/math/parser/parser-docs.factor
index bcc75a842aa9b9abd34b3217384e1bde9ab1c45d..ba0df3e35748df8c7a9f677c7204a25a790be40b 100644 (file)
--- a/core/math/parser/parser-docs.factor
+++ b/core/math/parser/parser-docs.factor
@@ -25,7 +25,7 @@ $nl
 ABOUT: "number-strings"
 
 HELP: digits>integer
-{ $values { "seq" "a sequence of integers" } { "radix" "an integer between 2 and 36" } { "n" integer } }
+{ $values { "seq" "a sequence of integers" } { "radix" "an integer between 2 and 36" } { "n/f" { $maybe integer } } }
 { $description "Converts a sequence of digits (with most significant digit first) into an integer." }
 { $notes "This is one of the factors of " { $link string>number } "." } ;
 

diff --git a/core/sequences/sequences-tests.factor b/core/sequences/sequences-tests.factor
index da495f410fb62ae0a23adf304553a330b1e472dc..85f9d5659652eeacff10cc958d67f868b33b1d1a 100644 (file)
--- a/core/sequences/sequences-tests.factor
+++ b/core/sequences/sequences-tests.factor
@@ -227,7 +227,7 @@ unit-test
 [ -3 10 nth ] must-fail
 [ 11 10 nth ] must-fail
 
-[ -1./0. 0 delete-nth ] must-fail
+[ -1/0. 0 delete-nth ] must-fail
 [ "" ] [ "" [ CHAR: \s = ] trim ] unit-test
 [ "" ] [ "" [ CHAR: \s = ] trim-head ] unit-test
 [ "" ] [ "" [ CHAR: \s = ] trim-tail ] unit-test

diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index bb8791df97ef4ed319834be8823bf092097764f6..33a0096ff9324a8f7564562d00b397bb5986ce68 100644 (file)
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -66,6 +66,12 @@ ARTICLE: "syntax-floats" "Float syntax"
     "7.e13"
     "1.0e-5"
 }
+"There are three special float values:"
+{ $table
+{ "Positive infinity" { $snippet "1/0." } }
+{ "Negative infinity" { $snippet "-1/0." } }
+{ "Not-a-number" { $snippet "0/0." } }
+}
 "More information on floats can be found in " { $link "floats" } "." ;
 
 ARTICLE: "syntax-complex-numbers" "Complex number syntax"