From 02ecc45165b7cebcdbacf5f21f4a5aeddda662a8 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 10 Feb 2011 21:09:20 -0600 Subject: [PATCH 01/21] Don't normalize cookie names to lower-case. --- basis/http/http.factor | 4 ++-- basis/http/parsers/parsers-tests.factor | 4 ++++ basis/http/parsers/parsers.factor | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/basis/http/http.factor b/basis/http/http.factor index 46b67b5321..2030b0d825 100644 --- a/basis/http/http.factor +++ b/basis/http/http.factor @@ -108,7 +108,7 @@ TUPLE: cookie name value version comment path domain expires max-age http-only s : (unparse-cookie) ( cookie -- strings ) [ - dup name>> check-cookie-string >lower + dup name>> check-cookie-string over value>> check-cookie-value unparse-cookie-value "$path" over path>> unparse-cookie-value "$domain" over domain>> unparse-cookie-value @@ -120,7 +120,7 @@ TUPLE: cookie name value version comment path domain expires max-age http-only s : unparse-set-cookie ( cookie -- string ) [ - dup name>> check-cookie-string >lower + dup name>> check-cookie-string over value>> check-cookie-value unparse-cookie-value "path" over path>> unparse-cookie-value "domain" over domain>> unparse-cookie-value diff --git a/basis/http/parsers/parsers-tests.factor b/basis/http/parsers/parsers-tests.factor index f8c3b836a6..438f15a7a3 100644 --- a/basis/http/parsers/parsers-tests.factor +++ b/basis/http/parsers/parsers-tests.factor @@ -11,6 +11,10 @@ IN: http.parsers.tests [ "__s=12345567" parse-cookie ] unit-test +[ { T{ cookie { name "CaseSensitive" } { value "aBc" } } } ] +[ "CaseSensitive=aBc" parse-cookie ] +unit-test + [ { T{ cookie { name "__s" } { value "12345567" } } } ] [ "__s=12345567;" parse-cookie ] unit-test diff --git a/basis/http/parsers/parsers.factor b/basis/http/parsers/parsers.factor index 1a80236817..9c81510925 100644 --- a/basis/http/parsers/parsers.factor +++ b/basis/http/parsers/parsers.factor @@ -135,7 +135,7 @@ PEG: parse-header-line ( string -- pair ) 2choice case-sensitive ; : 'attr' ( -- parser ) - 'token' case-insensitive ; + 'token' case-sensitive ; : 'av-pair' ( -- parser ) [ From fd7e5ffee8073e1ee9c355687fd89df5dda16b21 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 12 Feb 2011 22:41:13 -0600 Subject: [PATCH 02/21] More efficient polyval algorithm in math.polynomials --- basis/math/polynomials/polynomials-tests.factor | 6 ++++++ basis/math/polynomials/polynomials.factor | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/basis/math/polynomials/polynomials-tests.factor b/basis/math/polynomials/polynomials-tests.factor index 22ac89bc7d..43217b452c 100644 --- a/basis/math/polynomials/polynomials-tests.factor +++ b/basis/math/polynomials/polynomials-tests.factor @@ -33,3 +33,9 @@ IN: math.polynomials.tests [ { 10 200 3000 } ] [ { 1 10 100 1000 } pdiff ] unit-test + +[ { -512 2304 -4608 5376 -4032 2016 -672 144 -18 1 } ] +[ { -2 1 } 9 p^ ] unit-test + +[ 0 ] +[ 2 { -2 1 } 9 p^ polyval ] unit-test diff --git a/basis/math/polynomials/polynomials.factor b/basis/math/polynomials/polynomials.factor index 241fd34be9..7e43ec94ba 100644 --- a/basis/math/polynomials/polynomials.factor +++ b/basis/math/polynomials/polynomials.factor @@ -91,7 +91,10 @@ PRIVATE> dup length iota v* rest ; : polyval ( x p -- p[x] ) - [ length swap powers ] [ nip ] 2bi v. ; + ! Horner scheme + [ nip unclip-slice swap ] + [ drop ] 2bi + '[ [ _ * ] dip + ] each ; MACRO: polyval* ( p -- ) reverse From 5a71a0d67167523071c4a66d711496b0557329a4 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 03:08:01 +0900 Subject: [PATCH 03/21] math.combinatorics: fix typo in docs --- basis/math/combinatorics/combinatorics-docs.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/math/combinatorics/combinatorics-docs.factor b/basis/math/combinatorics/combinatorics-docs.factor index 75a54c2300..9b2a29bd73 100644 --- a/basis/math/combinatorics/combinatorics-docs.factor +++ b/basis/math/combinatorics/combinatorics-docs.factor @@ -4,7 +4,7 @@ IN: math.combinatorics HELP: factorial { $values { "n" "a non-negative integer" } { "n!" integer } } { $description "Outputs the product of all positive integers less than or equal to " { $snippet "n" } "." } -{ $examples +{ $examples { $example "USING: math.combinatorics prettyprint ;" "4 factorial ." "24" } } ; @@ -46,7 +46,7 @@ HELP: all-permutations HELP: each-permutation { $values { "seq" sequence } { "quot" { $quotation "( seq -- )" } } } -{ $description "Applies the quotation to each permuation of " { $snippet "seq" } " in order." } ; +{ $description "Applies the quotation to each permutation of " { $snippet "seq" } " in order." } ; HELP: inverse-permutation { $values { "seq" sequence } { "permutation" sequence } } @@ -121,7 +121,7 @@ HELP: selections { $description "Returns all the ways to take n (possibly the same) items from the " "sequence of items." -} +} { $examples { $example "USING: math.combinatorics prettyprint ;" From 70d06dc4c77c4b551b2eeadb0a5771c3d9c8f969 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 03:38:54 +0900 Subject: [PATCH 04/21] combinators.random: fix a couple of usage examples in casep and casep* --- basis/combinators/random/random-docs.factor | 40 ++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/basis/combinators/random/random-docs.factor b/basis/combinators/random/random-docs.factor index 2fc0b8c00e..826474420c 100644 --- a/basis/combinators/random/random-docs.factor +++ b/basis/combinators/random/random-docs.factor @@ -32,17 +32,21 @@ HELP: casep { $examples "The following two forms will output 1 with 0.2 probability, 2 with 0.3 probability and 3 with 0.5 probability" { $code - "USING: combinators.random ;" - "{ { 0.2 [ 1 ] }" - " { 0.3 [ 2 ] }" - " { 0.5 [ 3 ] } } casep ." + "USING: combinators.random prettyprint ;" + "{" + " { 0.2 [ 1 ] }" + " { 0.3 [ 2 ] }" + " { 0.5 [ 3 ] }" + "} casep ." } $nl { $code - "USING: combinators.random ;" - "{ { 0.2 [ 1 ] }" - " { 0.3 [ 2 ] }" - " { [ 3 ] } } casep ." + "USING: combinators.random prettyprint ;" + "{" + " { 0.2 [ 1 ] }" + " { 0.3 [ 2 ] }" + " [ 3 ]" + "} casep ." } } @@ -62,17 +66,21 @@ HELP: casep* { $examples "The following two forms will output 1 with 0.5 probability, 2 with 0.25 probability and 3 with 0.25 probability" { $code - "USING: combinators.random ;" - "{ { 0.5 [ 1 ] }" - " { 0.5 [ 2 ] }" - " { 1 [ 3 ] } } casep* ." + "USING: combinators.random prettyprint ;" + "{" + " { 0.5 [ 1 ] }" + " { 0.5 [ 2 ] }" + " { 1 [ 3 ] }" + "} casep* ." } $nl { $code - "USING: combinators.random ;" - "{ { 0.5 [ 1 ] }" - " { 0.5 [ 2 ] }" - " { [ 3 ] } } casep* ." + "USING: combinators.random prettyprint ;" + "{" + " { 0.5 [ 1 ] }" + " { 0.5 [ 2 ] }" + " [ 3 ]" + "} casep* ." } } From 77922f61f7d8e8a7355a1af336b9a8a86995652b Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 04:08:45 +0900 Subject: [PATCH 05/21] environment: add using list to usage example of os-env word --- basis/environment/environment-docs.factor | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/basis/environment/environment-docs.factor b/basis/environment/environment-docs.factor index 3df3a8da8f..7e08a78920 100644 --- a/basis/environment/environment-docs.factor +++ b/basis/environment/environment-docs.factor @@ -5,7 +5,7 @@ IN: environment HELP: (os-envs) { $values - + { "seq" sequence } } { $description "Returns a sequence of key/value pairs from the operating system." } { $notes "In most cases, use " { $link os-envs } " instead." } ; @@ -22,7 +22,11 @@ HELP: os-env { $description "Looks up the value of a shell environment variable." } { $examples "This is an operating system-specific feature. On Unix, you can do:" - { $unchecked-example "\"USER\" os-env print" "jane" } + { $unchecked-example + "USING: environment io ;" + "\"USER\" os-env print" + "jane" + } } ; HELP: os-envs From 42ef23feed041ef5e7d5d1cf9edeb5388b7fad45 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 04:53:35 +0900 Subject: [PATCH 06/21] definitions: import of make vocab in refactored a.factor --- core/definitions/definitions-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions/definitions-docs.factor b/core/definitions/definitions-docs.factor index 049104e61c..390ecd1b73 100644 --- a/core/definitions/definitions-docs.factor +++ b/core/definitions/definitions-docs.factor @@ -34,7 +34,7 @@ $nl $nl "Now, after some heavily editing and refactoring, the file looks like this:" { $code - "USING: namespaces ;" + "USING: make namespaces ;" "IN: a" ": hello ( -- ) \"Hello\" % ;" ": hello-world ( -- str ) [ hello \" \" % world ] \"\" make ;" From 93b3cc0a930011f6058bb4a9529d4cbc7389b1bc Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 06:11:31 +0900 Subject: [PATCH 07/21] io.styles: remove a nl in usage example of background --- basis/io/styles/styles-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/io/styles/styles-docs.factor b/basis/io/styles/styles-docs.factor index 98338639bb..437bcfe9bb 100644 --- a/basis/io/styles/styles-docs.factor +++ b/basis/io/styles/styles-docs.factor @@ -221,7 +221,7 @@ HELP: background "10 iota [" " \"Hello world\\n\"" " swap 10 / 1 over - over 1 " - " background associate format nl" + " background associate format" "] each" } } ; From 7703d7323094ee01a9d370e2808d48d7fc3584fe Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 09:16:41 +0900 Subject: [PATCH 08/21] locals: remove trailing whitespace in docs --- basis/locals/locals-docs.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/locals/locals-docs.factor b/basis/locals/locals-docs.factor index 69a7ef25f6..b2275360c7 100644 --- a/basis/locals/locals-docs.factor +++ b/basis/locals/locals-docs.factor @@ -55,7 +55,7 @@ $nl { $examples "See " { $link "locals-examples" } "." } ; { POSTPONE: MEMO: POSTPONE: MEMO:: } related-words - + HELP: M:: { $syntax "M:: class generic ( vars... -- outputs... ) body... ;" } { $description "Defines a new method on " { $snippet "generic" } " for " { $snippet "class" } " with named inputs. The method binds its input values to lexical variables from left to right, then executes the body with those bindings in scope." @@ -127,7 +127,7 @@ TUPLE: counter adder subtractor ; [ adder>> call . ] [ adder>> call . ] -[ subtractor>> call . ] tri """ +[ subtractor>> call . ] tri""" """1 2 1""" @@ -149,7 +149,7 @@ mutable-example [ call . ] bi@""" 6 6 6""" -} +} "In " { $snippet "rebinding-example" } ", the binding of " { $snippet "a" } " to " { $snippet "5" } " is closed over in the first quotation, and the binding of " { $snippet "a" } " to " { $snippet "6" } " is closed over in the second, so calling both quotations results in " { $snippet "5" } " and " { $snippet "6" } " respectively. By contrast, in " { $snippet "mutable-example" } ", both quotations close over a single binding of " { $snippet "a" } ". Even though " { $snippet "a" } " is assigned to " { $snippet "6" } " after the first quotation is made, calling either quotation will output the new value of " { $snippet "a" } "." { $heading "Lexical variables in literals" } "Some kinds of literals can include references to lexical variables as described in " { $link "locals-literals" } ". For example, the " { $link 3array } " word could be implemented as follows:" @@ -161,7 +161,7 @@ IN: scratchpad 1 "two" 3.0 my-3array .""" """{ 1 "two" 3.0 }""" } ; - + ARTICLE: "locals-literals" "Lexical variables in literals" "Certain data type literals are permitted to contain lexical variables. Any such literals are rewritten into code which constructs an instance of the type with the values of the variables spliced in. Conceptually, this is similar to the transformation applied to quotations containing free variables." $nl From 32e3e1cfefd43db7cbd4f2064c693f3500d1eee2 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 20 Feb 2011 15:58:57 +0900 Subject: [PATCH 09/21] ui.tools.listener: highlighting F1 key in tips --- basis/ui/tools/listener/listener-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/ui/tools/listener/listener-docs.factor b/basis/ui/tools/listener/listener-docs.factor index 966ac37d30..fd09e60266 100644 --- a/basis/ui/tools/listener/listener-docs.factor +++ b/basis/ui/tools/listener/listener-docs.factor @@ -32,7 +32,7 @@ $nl { $heading "Implementation" } "Listeners are instances of " { $link listener-gadget } ". The listener consists of an output area (instance of " { $link pane } ") and an input area (instance of " { $link interactor } "). Clickable presentations can also be printed to the listener; see " { $link "ui-presentations" } "." ; -TIP: "You can read documentation by pressing F1." ; +TIP: "You can read documentation by pressing " { $snippet "F1" } "." ; TIP: "The listener tool remembers previous lines of input. Press " { $command interactor "completion" recall-previous } " and " { $command interactor "completion" recall-next } " to cycle through them." ; From e374d55d0993fbbbbe2247e31b9b5f981005433f Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Mon, 21 Feb 2011 02:46:06 +0900 Subject: [PATCH 10/21] io.encodings.8-bit.latin9, io.encodings.shift-jis: fix typo in docs. offical => official --- basis/io/encodings/8-bit/latin9/latin9-docs.factor | 4 ++-- basis/io/encodings/shift-jis/shift-jis-docs.factor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/io/encodings/8-bit/latin9/latin9-docs.factor b/basis/io/encodings/8-bit/latin9/latin9-docs.factor index 2416db382f..ffb19280c5 100644 --- a/basis/io/encodings/8-bit/latin9/latin9-docs.factor +++ b/basis/io/encodings/8-bit/latin9/latin9-docs.factor @@ -4,10 +4,10 @@ USING: help.markup help.syntax ; IN: io.encodings.8-bit.latin9 HELP: latin9 -{ $var-description "This is the ISO-8859-15 encoding, also called Latin-9 and unoffically as Latin-0. It is an 8-bit superset of ASCII designed as a modification of Latin-1, removing little-used characters in favor of the Euro symbol and other characters." } +{ $var-description "This is the ISO-8859-15 encoding, also called Latin-9 and unofficially as Latin-0. It is an 8-bit superset of ASCII designed as a modification of Latin-1, removing little-used characters in favor of the Euro symbol and other characters." } { $see-also "encodings-introduction" } ; ARTICLE: "io.encodings.8-bit.latin9" "Latin9 encoding" -"The " { $vocab-link "io.encodings.8-bit.latin9" } " vocabulary provides the " { $link latin9 } " encoding." ; +"The " { $vocab-link "io.encodings.8-bit.latin9" } " vocabulary provides the " { $link latin9 } " encoding." ; ABOUT: "io.encodings.8-bit.latin9" diff --git a/basis/io/encodings/shift-jis/shift-jis-docs.factor b/basis/io/encodings/shift-jis/shift-jis-docs.factor index b8f5603200..50a553c948 100644 --- a/basis/io/encodings/shift-jis/shift-jis-docs.factor +++ b/basis/io/encodings/shift-jis/shift-jis-docs.factor @@ -4,7 +4,7 @@ USING: help.markup help.syntax ; IN: io.encodings.shift-jis ARTICLE: "io.encodings.shift-jis" "Shift JIS" -"Shift JIS is a text encoding for Japanese. There are multiple versions, depending on whether the offical standard or the modified Microsoft version is required." +"Shift JIS is a text encoding for Japanese. There are multiple versions, depending on whether the official standard or the modified Microsoft version is required." { $subsections shift-jis windows-31j From f515dd2cfcc8644b3a02bdc3f05f1a22916b0e8c Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 24 Feb 2011 15:37:41 +0900 Subject: [PATCH 11/21] definitions: remove unused vocabulary in refactored a.factor --- core/definitions/definitions-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions/definitions-docs.factor b/core/definitions/definitions-docs.factor index 390ecd1b73..d92c250faf 100644 --- a/core/definitions/definitions-docs.factor +++ b/core/definitions/definitions-docs.factor @@ -34,7 +34,7 @@ $nl $nl "Now, after some heavily editing and refactoring, the file looks like this:" { $code - "USING: make namespaces ;" + "USING: make ;" "IN: a" ": hello ( -- ) \"Hello\" % ;" ": hello-world ( -- str ) [ hello \" \" % world ] \"\" make ;" From 4c864999e4a2afb36db4d193849a554c1bb1f155 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Fri, 25 Feb 2011 19:59:44 +0900 Subject: [PATCH 12/21] lists: fix a few typos in docs --- basis/lists/lists-docs.factor | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/basis/lists/lists-docs.factor b/basis/lists/lists-docs.factor index a3056b0332..bb47d31fcf 100644 --- a/basis/lists/lists-docs.factor +++ b/basis/lists/lists-docs.factor @@ -62,11 +62,11 @@ ARTICLE: { "lists" "manipulation" } "Manipulating lists" lcut } ; -HELP: cons +HELP: cons { $values { "car" "the head of the list cell" } { "cdr" "the tail of the list cell" } { "cons" list } } { $description "Constructs a cons cell." } ; -HELP: swons +HELP: swons { $values { "cdr" "the tail of the list cell" } { "car" "the head of the list cell" } { "cons" list } } { $description "Constructs a cons cell." } ; @@ -82,11 +82,11 @@ HELP: cdr { car cdr } related-words -HELP: nil +HELP: nil { $values { "symbol" "The empty cons (+nil+)" } } { $description "Returns a symbol representing the empty list" } ; -HELP: nil? +HELP: nil? { $values { "object" object } { "?" "a boolean" } } { $description "Return true if the cons object is the nil cons." } ; @@ -108,12 +108,12 @@ HELP: 3list HELP: lnth { $values { "n" "an integer index" } { "list" list } { "elt" "the element at the nth index" } } -{ $description "Outputs the nth element of the list." } +{ $description "Outputs the nth element of the list." } { $see-also llength cons car cdr } ; HELP: llength { $values { "list" list } { "n" "a non-negative integer" } } -{ $description "Outputs the length of the list. This should not be called on an infinite list." } +{ $description "Outputs the length of the list. This should not be called on an infinite list." } { $see-also lnth cons car cdr } ; HELP: uncons @@ -132,11 +132,11 @@ HELP: leach HELP: foldl { $values { "list" list } { "identity" "an object" } { "quot" { $quotation "( ... prev elt -- ... next )" } } { "result" "the final result" } } -{ $description "Combines successive elements of the list (in a left-assocative order) using a binary operation and outputs the final result." } ; +{ $description "Combines successive elements of the list (in a left-associative order) using a binary operation and outputs the final result." } ; HELP: foldr { $values { "list" list } { "identity" "an object" } { "quot" { $quotation "( ... prev elt -- ... next )" } } { "result" "the final result" } } -{ $description "Combines successive elements of the list (in a right-assocative order) using a binary operation, and outputs the final result." } ; +{ $description "Combines successive elements of the list (in a right-associative order) using a binary operation, and outputs the final result." } ; HELP: lmap { $values { "list" list } { "quot" { $quotation "( ... elt -- ... newelt )" } } { "result" "the final result" } } @@ -144,9 +144,9 @@ HELP: lmap HELP: lreverse { $values { "list" list } { "newlist" list } } -{ $description "Reverses the input list, outputing a new, reversed list. The output is a strict cons list." } ; +{ $description "Reverses the input list, outputting a new, reversed list. The output is a strict cons list." } ; -HELP: list>array +HELP: list>array { $values { "list" list } { "array" array } } { $description "Convert a list into an array." } ; From c10d0377631396fa9949ee3d412d48a23972fc03 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 25 Feb 2011 10:22:14 -0800 Subject: [PATCH 13/21] bunny.model, gpu.demos.bunny: update url for bunny model download --- extra/bunny/model/model.factor | 2 +- extra/gpu/demos/bunny/bunny.factor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor index 0f22b531c6..4d3c80cbaa 100644 --- a/extra/bunny/model/model.factor +++ b/extra/bunny/model/model.factor @@ -42,7 +42,7 @@ IN: bunny.model : model-path ( -- path ) "bun_zipper.ply" temp-file ; -: model-url ( -- url ) "http://factorcode.org/slava/bun_zipper.ply" ; +: model-url ( -- url ) "http://duriansoftware.com/joe/media/bun_zipper.ply" ; : maybe-download ( -- path ) model-path dup exists? [ diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor index 0491191c63..cb769add14 100644 --- a/extra/gpu/demos/bunny/bunny.factor +++ b/extra/gpu/demos/bunny/bunny.factor @@ -145,7 +145,7 @@ UNIFORM-TUPLE: loading-uniforms : bunny-model-path ( -- path ) "bun_zipper.ply" temp-file ; -CONSTANT: bunny-model-url "http://factorcode.org/slava/bun_zipper.ply" +CONSTANT: bunny-model-url "http://duriansoftware.com/joe/media/bun_zipper.ply" : download-bunny ( -- path ) bunny-model-path dup exists? [ From 6f7e4e32d023b40475d920aea59204755ba61f6a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:05:38 -0800 Subject: [PATCH 14/21] compiler.cfg.ssa.construction: update unit tests for nths change --- .../cfg/ssa/construction/tdmsc/tdmsc-tests.factor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor index 9b24c55078..2b80ce9d59 100644 --- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor +++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc-tests.factor @@ -24,10 +24,10 @@ V{ } 5 test-bb [ ] [ test-tdmsc ] unit-test -[ V{ 4 } ] [ 1 get 1array merge-set [ number>> ] map ] unit-test -[ V{ 4 } ] [ 2 get 1array merge-set [ number>> ] map ] unit-test -[ V{ } ] [ 0 get 1array merge-set ] unit-test -[ V{ } ] [ 4 get 1array merge-set ] unit-test +[ { 4 } ] [ 1 get 1array merge-set [ number>> ] map ] unit-test +[ { 4 } ] [ 2 get 1array merge-set [ number>> ] map ] unit-test +[ { } ] [ 0 get 1array merge-set ] unit-test +[ { } ] [ 4 get 1array merge-set ] unit-test V{ } 0 test-bb V{ } 1 test-bb @@ -70,5 +70,5 @@ V{ } 7 test-bb [ ] [ test-tdmsc ] unit-test -[ V{ 2 } ] [ { 2 3 4 5 } [ get ] map merge-set [ number>> ] map ] unit-test -[ V{ } ] [ { 0 1 6 7 } [ get ] map merge-set ] unit-test +[ { 2 } ] [ { 2 3 4 5 } [ get ] map merge-set [ number>> ] map ] unit-test +[ { } ] [ { 0 1 6 7 } [ get ] map merge-set ] unit-test From 78a85d0b059a00d2261d7c250f8defe9f5c07888 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:05:56 -0800 Subject: [PATCH 15/21] io.sockets.secure.unix: update unit test for close-notify change --- basis/io/sockets/secure/unix/unix-tests.factor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/basis/io/sockets/secure/unix/unix-tests.factor b/basis/io/sockets/secure/unix/unix-tests.factor index f87ad93fbd..3572a9a845 100644 --- a/basis/io/sockets/secure/unix/unix-tests.factor +++ b/basis/io/sockets/secure/unix/unix-tests.factor @@ -41,7 +41,11 @@ io.sockets.secure.unix.debug ; ] server-test ] unit-test -[ client-test ] [ premature-close? ] must-fail-with +! Actually, this should not be an error since many HTTPS servers +! (eg, google.com) do this. + +! [ client-test ] [ premature-close? ] must-fail-with +[ "hello" ] [ client-test ] unit-test ! Now, try validating the certificate. This should fail because its ! actually an invalid certificate From 836743b25b3fa5da1522a62a05ce26738ec1fdd4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:06:10 -0800 Subject: [PATCH 16/21] combinators: fix help lint --- core/combinators/combinators-docs.factor | 1 + 1 file changed, 1 insertion(+) diff --git a/core/combinators/combinators-docs.factor b/core/combinators/combinators-docs.factor index 28ef4a764f..a1488ca5c6 100644 --- a/core/combinators/combinators-docs.factor +++ b/core/combinators/combinators-docs.factor @@ -355,6 +355,7 @@ HELP: case { $examples { $example "USING: combinators io kernel ;" + "IN: scratchpad" "SYMBOLS: yes no maybe ;" "maybe {" " { yes [ ] } ! Do nothing" From e5dba6b64ccf0de89e3659277604cd6c3f3b3168 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:06:22 -0800 Subject: [PATCH 17/21] tools.deploy: fix a test on Windows --- basis/tools/deploy/deploy-tests.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor index 0d0dba325f..b738a7852c 100644 --- a/basis/tools/deploy/deploy-tests.factor +++ b/basis/tools/deploy/deploy-tests.factor @@ -137,8 +137,8 @@ os macosx? [ [ ] [ "tools.deploy.test.20" shake-and-bake ] unit-test -[ "Factor\n" ] -[ deploy-test-command ascii [ contents ] with-process-reader ] unit-test +[ "Factor" ] +[ deploy-test-command ascii [ readln ] with-process-reader ] unit-test [ ] [ 800000 small-enough? ] unit-test From e90fd3b942e0113e627d9cc76636f86d8228a33b Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:08:00 -0800 Subject: [PATCH 18/21] Fix usage note in dns vocab, move tools.dns from basis to extra since dns vocab is in extra --- extra/dns/dns.factor | 1 - {basis => extra}/tools/dns/authors.txt | 0 {basis => extra}/tools/dns/dns.factor | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) rename {basis => extra}/tools/dns/authors.txt (100%) rename {basis => extra}/tools/dns/dns.factor (92%) diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor index a0e6ba5f6e..802d4d7277 100644 --- a/extra/dns/dns.factor +++ b/extra/dns/dns.factor @@ -368,7 +368,6 @@ M: SOA rdata>byte-array : message>query-name ( message -- string ) query>> first name>> dotted> ; -USE: nested-comments (* M: string resolve-host dup >lower "localhost" = [ diff --git a/basis/tools/dns/authors.txt b/extra/tools/dns/authors.txt similarity index 100% rename from basis/tools/dns/authors.txt rename to extra/tools/dns/authors.txt diff --git a/basis/tools/dns/dns.factor b/extra/tools/dns/dns.factor similarity index 92% rename from basis/tools/dns/dns.factor rename to extra/tools/dns/dns.factor index f59a9da217..c3b6ad87e1 100644 --- a/basis/tools/dns/dns.factor +++ b/extra/tools/dns/dns.factor @@ -7,7 +7,7 @@ IN: tools.dns [ write " has address " write ] [ print ] bi* ; : a-message. ( message -- ) - [ message>query-name ] [ message>names ] bi + [ message>query-name ] [ message>a-names ] bi [ a-line. ] with each ; : mx-line. ( host pair -- ) From cd39ab0d10be192f4d6899846d114be363961540 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 21:26:11 -0800 Subject: [PATCH 19/21] tools.deploy: add test for formatting vocab --- basis/tools/deploy/test/21/21.factor | 7 +++++++ basis/tools/deploy/test/21/deploy.factor | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 basis/tools/deploy/test/21/21.factor create mode 100644 basis/tools/deploy/test/21/deploy.factor diff --git a/basis/tools/deploy/test/21/21.factor b/basis/tools/deploy/test/21/21.factor new file mode 100644 index 0000000000..1f5cbc9a31 --- /dev/null +++ b/basis/tools/deploy/test/21/21.factor @@ -0,0 +1,7 @@ +USING: formatting ; +IN: tools.deploy.test.21 + +: formatting-test ( -- ) + 1 2 3 "%d %d %d" printf ; + +MAIN: formatting-test diff --git a/basis/tools/deploy/test/21/deploy.factor b/basis/tools/deploy/test/21/deploy.factor new file mode 100644 index 0000000000..7c155dee3e --- /dev/null +++ b/basis/tools/deploy/test/21/deploy.factor @@ -0,0 +1,15 @@ +USING: tools.deploy.config ; +H{ + { deploy-name "tools.deploy.test.21" } + { deploy-ui? f } + { deploy-c-types? f } + { deploy-console? t } + { deploy-unicode? f } + { "stop-after-last-window?" t } + { deploy-io 2 } + { deploy-reflection 1 } + { deploy-word-props? f } + { deploy-math? t } + { deploy-threads? t } + { deploy-word-defs? f } +} From e9bccc0d59237ff80228e2954f451c7de4e434aa Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 22:13:54 -0800 Subject: [PATCH 20/21] tools.deploy: actually add the new test --- basis/tools/deploy/deploy-tests.factor | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor index b738a7852c..aa2bca26f1 100644 --- a/basis/tools/deploy/deploy-tests.factor +++ b/basis/tools/deploy/deploy-tests.factor @@ -142,4 +142,11 @@ os macosx? [ [ ] [ 800000 small-enough? ] unit-test +[ ] [ "tools.deploy.test.21" shake-and-bake ] unit-test + +[ "1 2 3" ] +[ deploy-test-command ascii [ readln ] with-process-reader ] unit-test + +[ ] [ 600000 small-enough? ] unit-test + [ ] [ "benchmark.ui-panes" shake-and-bake run-temp-image ] unit-test From 266c6d32e719cbaf29a0621393a9aad8c540e34c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 25 Feb 2011 22:33:28 -0800 Subject: [PATCH 21/21] io.sockets: add scope-id to ipv6 addrspecs, fixing a problem with connecting to localhost on Mac OS X (and other systems) where localhost is associated with a link-local address such as fe80::1 --- basis/io/sockets/icmp/icmp.factor | 2 +- basis/io/sockets/sockets-tests.factor | 20 +++++++++++++++++--- basis/io/sockets/sockets.factor | 26 ++++++++++++++++++-------- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/basis/io/sockets/icmp/icmp.factor b/basis/io/sockets/icmp/icmp.factor index 80693c0963..095a03ab7b 100644 --- a/basis/io/sockets/icmp/icmp.factor +++ b/basis/io/sockets/icmp/icmp.factor @@ -41,7 +41,7 @@ M: icmp4 resolve-host 1array ; TUPLE: icmp6 < ipv6 ; -C: icmp6 +: ( host -- icmp6 ) 0 icmp6 boa ; M: ipv6 with-icmp host>> ; diff --git a/basis/io/sockets/sockets-tests.factor b/basis/io/sockets/sockets-tests.factor index d601512753..0c79323a24 100644 --- a/basis/io/sockets/sockets-tests.factor +++ b/basis/io/sockets/sockets-tests.factor @@ -1,11 +1,12 @@ USING: io.sockets io.sockets.private sequences math tools.test namespaces accessors kernel destructors calendar io.timeouts io.encodings.utf8 io concurrency.promises threads -io.streams.string ; +io.streams.string present ; IN: io.sockets.tests +[ T{ local f "/tmp/foo" } ] [ "/tmp/foo" ] unit-test [ T{ inet4 f f 0 } ] [ f 0 ] unit-test -[ T{ inet6 f f 0 } ] [ f 0 ] unit-test +[ T{ inet6 f f 0 1 } ] [ f 1 ] unit-test [ T{ inet f "google.com" f } ] [ "google.com" f ] unit-test @@ -13,10 +14,23 @@ IN: io.sockets.tests [ T{ inet f "google.com" 80 } ] [ "google.com" 0 80 with-port ] unit-test [ T{ inet4 f "8.8.8.8" 0 } ] [ "8.8.8.8" 0 ] unit-test [ T{ inet4 f "8.8.8.8" 53 } ] [ "8.8.8.8" 0 53 with-port ] unit-test -[ T{ inet6 f "5:5:5:5:6:6:6:6" 12 } ] [ "5:5:5:5:6:6:6:6" 0 12 with-port ] unit-test +[ T{ inet6 f "5:5:5:5:6:6:6:6" 0 12 } ] [ "5:5:5:5:6:6:6:6" 0 12 with-port ] unit-test +[ T{ inet6 f "fe80::1" 1 80 } ] [ T{ ipv6 f "fe80::1" 1 } 80 with-port ] unit-test + +: test-sockaddr ( addrspec -- ) + [ dup make-sockaddr ] keep parse-sockaddr assert= ; + +[ ] [ T{ inet4 f "8.8.8.8" 53 } test-sockaddr ] unit-test +[ ] [ T{ inet6 f "5:5:5:5:6:6:6:6" 0 12 } test-sockaddr ] unit-test +[ ] [ T{ inet6 f "fe80:0:0:0:0:0:0:1" 1 80 } test-sockaddr ] unit-test [ T{ inet f "google.com" 80 } ] [ "google.com" 80 with-port ] unit-test +! Test present on addrspecs +[ "4.4.4.4:12" ] [ "4.4.4.4" 12 present ] unit-test +[ "::1:12" ] [ "::1" 12 present ] unit-test +[ "fe80::1%1:12" ] [ "fe80::1" 1 12 inet6 boa present ] unit-test + [ B{ 1 2 3 4 } ] [ "1.2.3.4" T{ inet4 } inet-pton ] unit-test diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor index fcdc00d127..b567721e3f 100644 --- a/basis/io/sockets/sockets.factor +++ b/basis/io/sockets/sockets.factor @@ -125,9 +125,11 @@ M: inet4 present M: inet4 protocol drop 0 ; -TUPLE: ipv6 { host ?string read-only } ; +TUPLE: ipv6 +{ host ?string read-only } +{ scope-id integer read-only } ; -C: ipv6 +: ( host -- ipv6 ) 0 ipv6 boa ; M: ipv6 inet-ntop ( data addrspec -- str ) drop 16 memory>byte-array 2 [ be> >hex ] map ":" join ; @@ -184,23 +186,31 @@ M: ipv6 make-sockaddr ( inet -- sockaddr ) AF_INET6 >>family swap [ port>> htons >>port ] - [ host>> "::" or ] - [ inet-pton >>addr ] tri ; + [ [ host>> "::" or ] keep inet-pton >>addr ] + [ scope-id>> >>scopeid ] + tri ; M: ipv6 parse-sockaddr - [ addr>> ] dip inet-ntop ; + [ [ addr>> ] dip inet-ntop ] [ drop scopeid>> ] 2bi + ipv6 boa ; + +M: ipv6 present + [ host>> ] [ scope-id>> ] bi + [ number>string "%" glue ] unless-zero ; TUPLE: inet6 < ipv6 { port integer read-only } ; -C: inet6 +: ( host port -- inet6 ) [ 0 ] dip inet6 boa ; -M: ipv6 with-port [ host>> ] dip ; +M: ipv6 with-port + [ [ host>> ] [ scope-id>> ] bi ] dip + inet6 boa ; M: inet6 parse-sockaddr [ call-next-method ] [ drop port>> ntohs ] 2bi with-port ; M: inet6 present - [ host>> ] [ port>> number>string ] bi ":" glue ; + [ call-next-method ] [ port>> number>string ] bi ":" glue ; M: inet6 protocol drop 0 ;