From 7c6b3e6278fe4a94a9ae4b408b2d5c7a6eff9c44 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 6 Jan 2009 16:31:11 -0600 Subject: [PATCH 01/22] L-system: Handle case of 'f' string (use axiom) --- extra/L-system/L-system.factor | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor index 97a971de47..a38581b0f9 100644 --- a/extra/L-system/L-system.factor +++ b/extra/L-system/L-system.factor @@ -254,9 +254,7 @@ DEFER: default-L-parser-values ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: < gadget - camera display-list - commands axiom rules string ; +TUPLE: < gadget camera display-list commands axiom rules string ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -332,7 +330,7 @@ TUPLE: < gadget ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! :: iterate-L-system-string ( L-SYSTEM -- ) - L-SYSTEM string>> + L-SYSTEM string>> L-SYSTEM axiom>> or L-SYSTEM rules>> iterate-string L-SYSTEM (>>string) ; @@ -357,7 +355,7 @@ TUPLE: < gadget L-SYSTEM display-list>> GL_COMPILE glNewList turtle - L-SYSTEM string>> + L-SYSTEM string>> L-SYSTEM axiom>> or L-SYSTEM commands>> interpret-string drop @@ -403,16 +401,12 @@ M:: pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -:: camera-left ( L-SYSTEM -- ) - L-SYSTEM camera>> 5 turn-left drop - L-SYSTEM relayout-1 ; - -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - :: with-camera ( L-SYSTEM QUOT -- ) L-SYSTEM camera>> QUOT call drop L-SYSTEM relayout-1 ; +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + H{ { T{ key-down f f "LEFT" } [ [ 5 turn-left ] with-camera ] } From 39391fe852f155be054baceffcaa1341184919b3 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 7 Jan 2009 13:46:52 -0600 Subject: [PATCH 02/22] CGI responder would fail if the CGI script would emit non-ASCII characters; set encoding to binary --- basis/http/server/cgi/cgi.factor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/basis/http/server/cgi/cgi.factor b/basis/http/server/cgi/cgi.factor index 59cd62f338..0c2f639cba 100644 --- a/basis/http/server/cgi/cgi.factor +++ b/basis/http/server/cgi/cgi.factor @@ -1,7 +1,7 @@ -! Copyright (C) 2007, 2008 Slava Pestov. +! Copyright (C) 2007, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: namespaces kernel assocs io.files io.streams.duplex -combinators arrays io.launcher io.encodings.binary io +combinators arrays io.launcher io.encodings io.encodings.binary io http.server.static http.server http accessors sequences strings math.parser fry urls urls.encoding calendar ; IN: http.server.cgi @@ -52,6 +52,7 @@ IN: http.server.cgi 200 >>code "CGI output follows" >>message swap '[ + binary encode-output _ output-stream get swap binary [ post-request? [ request get post-data>> raw>> write flush ] when input-stream get swap (stream-copy) From ca7ffd6ea223271951204ac53d858bb518a8984a Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 7 Jan 2009 20:57:49 +0100 Subject: [PATCH 03/22] Separate lazy lists from core primes number generation --- extra/math/primes/factors/factors.factor | 2 +- extra/math/primes/lists/authors.txt | 1 + extra/math/primes/lists/lists-docs.factor | 10 ++++++++++ extra/math/primes/lists/lists-tests.factor | 6 ++++++ extra/math/primes/lists/lists.factor | 9 +++++++++ extra/math/primes/lists/summary.txt | 1 + extra/math/primes/primes-docs.factor | 10 +--------- extra/math/primes/primes-tests.factor | 9 ++------- extra/math/primes/primes.factor | 11 +++-------- extra/project-euler/007/007.factor | 2 +- extra/project-euler/134/134.factor | 2 +- 11 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 extra/math/primes/lists/authors.txt create mode 100644 extra/math/primes/lists/lists-docs.factor create mode 100644 extra/math/primes/lists/lists-tests.factor create mode 100644 extra/math/primes/lists/lists.factor create mode 100644 extra/math/primes/lists/summary.txt diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor index 282c46c82e..8e22757249 100644 --- a/extra/math/primes/factors/factors.factor +++ b/extra/math/primes/factors/factors.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007-2009 Samuel Tardieu. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel lists make math math.primes sequences ; +USING: arrays kernel lists make math math.primes.lists sequences ; IN: math.primes.factors array ] unit-test +{ { 101 103 107 109 113 } } [ 5 100 lprimes-from ltake list>array ] unit-test +{ { 1000117 1000121 } } [ 2 1000100 lprimes-from ltake list>array ] unit-test +{ { 999983 1000003 } } [ 2 999982 lprimes-from ltake list>array ] unit-test diff --git a/extra/math/primes/lists/lists.factor b/extra/math/primes/lists/lists.factor new file mode 100644 index 0000000000..13f314f6ba --- /dev/null +++ b/extra/math/primes/lists/lists.factor @@ -0,0 +1,9 @@ +! Copyright (C) 2007-2009 Samuel Tardieu. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel lists.lazy math math.primes ; +IN: math.primes.lists + +: lprimes ( -- list ) 2 [ next-prime ] lfrom-by ; + +: lprimes-from ( n -- list ) + dup 3 < [ drop lprimes ] [ 1- next-prime [ next-prime ] lfrom-by ] if ; diff --git a/extra/math/primes/lists/summary.txt b/extra/math/primes/lists/summary.txt new file mode 100644 index 0000000000..39a780a26b --- /dev/null +++ b/extra/math/primes/lists/summary.txt @@ -0,0 +1 @@ +Infinite stream of prime numbers through lazy lists diff --git a/extra/math/primes/primes-docs.factor b/extra/math/primes/primes-docs.factor index 516b081624..c7dbc950e8 100644 --- a/extra/math/primes/primes-docs.factor +++ b/extra/math/primes/primes-docs.factor @@ -11,15 +11,7 @@ HELP: prime? { $values { "n" "an integer" } { "?" "a boolean" } } { $description "Test if an integer is a prime number." } ; -{ lprimes lprimes-from primes-upto primes-between } related-words - -HELP: lprimes -{ $values { "list" "a lazy list" } } -{ $description "Return a sorted list containing all the prime numbers." } ; - -HELP: lprimes-from -{ $values { "n" "an integer" } { "list" "a lazy list" } } -{ $description "Return a sorted list containing all the prime numbers greater or equal to " { $snippet "n" } "." } ; +{ primes-upto primes-between } related-words HELP: primes-upto { $values { "n" "an integer" } { "seq" "a sequence" } } diff --git a/extra/math/primes/primes-tests.factor b/extra/math/primes/primes-tests.factor index b0b25285c0..db738399ef 100644 --- a/extra/math/primes/primes-tests.factor +++ b/extra/math/primes/primes-tests.factor @@ -1,14 +1,9 @@ -USING: arrays math.primes tools.test lists.lazy ; +USING: arrays math.primes tools.test ; { 1237 } [ 1234 next-prime ] unit-test { f t } [ 1234 prime? 1237 prime? ] unit-test -{ { 2 3 5 7 11 13 17 19 23 29 } } [ 10 lprimes ltake list>array ] unit-test -{ { 101 103 107 109 113 } } [ 5 100 lprimes-from ltake list>array ] unit-test -{ { 1000117 1000121 } } [ 2 1000100 lprimes-from ltake list>array ] unit-test -{ { 999983 1000003 } } [ 2 999982 lprimes-from ltake list>array ] unit-test { { 2 3 5 7 } } [ 10 primes-upto >array ] unit-test { { 999983 1000003 } } [ 999982 1000010 primes-between >array ] unit-test { { 4999963 4999999 5000011 5000077 5000081 } } -[ 4999962 5000082 primes-between >array ] -unit-test +[ 4999962 5000082 primes-between >array ] unit-test diff --git a/extra/math/primes/primes.factor b/extra/math/primes/primes.factor index fa42d7385a..807ebf097b 100644 --- a/extra/math/primes/primes.factor +++ b/extra/math/primes/primes.factor @@ -1,7 +1,7 @@ -! Copyright (C) 2007 Samuel Tardieu. +! Copyright (C) 2007-2009 Samuel Tardieu. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators kernel lists.lazy math math.functions -math.miller-rabin math.order math.primes.erato math.ranges sequences ; +USING: combinators kernel math math.functions math.miller-rabin +math.order math.primes.erato math.ranges sequences ; IN: math.primes : next-prime ( n -- p ) next-odd [ dup really-prime? ] [ 2 + ] [ ] until ; foldable -: lprimes ( -- list ) 2 [ next-prime ] lfrom-by ; - -: lprimes-from ( n -- list ) - dup 3 < [ drop lprimes ] [ 1- next-prime [ next-prime ] lfrom-by ] if ; - : primes-between ( low high -- seq ) [ dup 3 max dup even? [ 1 + ] when ] dip 2 [ prime? ] filter diff --git a/extra/project-euler/007/007.factor b/extra/project-euler/007/007.factor index f2b659fe94..f40108e4d7 100644 --- a/extra/project-euler/007/007.factor +++ b/extra/project-euler/007/007.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2007 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: lists math math.primes ; +USING: lists math math.primes.lists ; IN: project-euler.007 ! http://projecteuler.net/index.php?section=problems&id=7 diff --git a/extra/project-euler/134/134.factor b/extra/project-euler/134/134.factor index 7bdf17ef68..e00e86865d 100644 --- a/extra/project-euler/134/134.factor +++ b/extra/project-euler/134/134.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2007 Samuel Tardieu. ! See http://factorcode.org/license.txt for BSD license. USING: arrays kernel lists lists.lazy math.algebra math math.functions - math.order math.primes math.ranges project-euler.common sequences ; + math.order math.primes.lists math.ranges project-euler.common sequences ; IN: project-euler.134 ! http://projecteuler.net/index.php?section=problems&id=134 From 594bd3aee87eeeecaa1d93e26aa03feeacf52454 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 7 Jan 2009 21:12:48 +0100 Subject: [PATCH 04/22] Move math.primes from extra to basis --- {extra => basis}/math/primes/authors.txt | 0 {extra => basis}/math/primes/erato/authors.txt | 0 {extra => basis}/math/primes/erato/erato-docs.factor | 0 {extra => basis}/math/primes/erato/erato-tests.factor | 0 {extra => basis}/math/primes/erato/erato.factor | 0 {extra => basis}/math/primes/erato/summary.txt | 0 {extra => basis}/math/primes/primes-docs.factor | 0 {extra => basis}/math/primes/primes-tests.factor | 0 {extra => basis}/math/primes/primes.factor | 0 {extra => basis}/math/primes/summary.txt | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {extra => basis}/math/primes/authors.txt (100%) rename {extra => basis}/math/primes/erato/authors.txt (100%) rename {extra => basis}/math/primes/erato/erato-docs.factor (100%) rename {extra => basis}/math/primes/erato/erato-tests.factor (100%) rename {extra => basis}/math/primes/erato/erato.factor (100%) rename {extra => basis}/math/primes/erato/summary.txt (100%) rename {extra => basis}/math/primes/primes-docs.factor (100%) rename {extra => basis}/math/primes/primes-tests.factor (100%) rename {extra => basis}/math/primes/primes.factor (100%) rename {extra => basis}/math/primes/summary.txt (100%) diff --git a/extra/math/primes/authors.txt b/basis/math/primes/authors.txt similarity index 100% rename from extra/math/primes/authors.txt rename to basis/math/primes/authors.txt diff --git a/extra/math/primes/erato/authors.txt b/basis/math/primes/erato/authors.txt similarity index 100% rename from extra/math/primes/erato/authors.txt rename to basis/math/primes/erato/authors.txt diff --git a/extra/math/primes/erato/erato-docs.factor b/basis/math/primes/erato/erato-docs.factor similarity index 100% rename from extra/math/primes/erato/erato-docs.factor rename to basis/math/primes/erato/erato-docs.factor diff --git a/extra/math/primes/erato/erato-tests.factor b/basis/math/primes/erato/erato-tests.factor similarity index 100% rename from extra/math/primes/erato/erato-tests.factor rename to basis/math/primes/erato/erato-tests.factor diff --git a/extra/math/primes/erato/erato.factor b/basis/math/primes/erato/erato.factor similarity index 100% rename from extra/math/primes/erato/erato.factor rename to basis/math/primes/erato/erato.factor diff --git a/extra/math/primes/erato/summary.txt b/basis/math/primes/erato/summary.txt similarity index 100% rename from extra/math/primes/erato/summary.txt rename to basis/math/primes/erato/summary.txt diff --git a/extra/math/primes/primes-docs.factor b/basis/math/primes/primes-docs.factor similarity index 100% rename from extra/math/primes/primes-docs.factor rename to basis/math/primes/primes-docs.factor diff --git a/extra/math/primes/primes-tests.factor b/basis/math/primes/primes-tests.factor similarity index 100% rename from extra/math/primes/primes-tests.factor rename to basis/math/primes/primes-tests.factor diff --git a/extra/math/primes/primes.factor b/basis/math/primes/primes.factor similarity index 100% rename from extra/math/primes/primes.factor rename to basis/math/primes/primes.factor diff --git a/extra/math/primes/summary.txt b/basis/math/primes/summary.txt similarity index 100% rename from extra/math/primes/summary.txt rename to basis/math/primes/summary.txt From b3d175821a0a9d94680e2fbf8be31275a798902c Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Wed, 7 Jan 2009 15:08:08 -0600 Subject: [PATCH 05/22] Unicode word breaks --- basis/unicode/breaks/breaks-tests.factor | 2 +- basis/unicode/breaks/breaks.factor | 69 ++++++++++++++++-------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/basis/unicode/breaks/breaks-tests.factor b/basis/unicode/breaks/breaks-tests.factor index 39baa8f808..b91cb2b26c 100644 --- a/basis/unicode/breaks/breaks-tests.factor +++ b/basis/unicode/breaks/breaks-tests.factor @@ -36,4 +36,4 @@ IN: unicode.breaks.tests ] each ; grapheme-break-test parse-test-file [ >graphemes ] test -! word-break-test parse-test-file [ >words ] test +word-break-test parse-test-file [ >words ] test diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index 9d2bad4724..5652cc2906 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -110,10 +110,10 @@ VALUE: grapheme-table str [ dup quot call cut-slice swap , quot (>pieces) - ] unless-empty ; + ] unless-empty ; inline recursive : >pieces ( str quot -- graphemes ) - [ (>pieces) ] { } make ; + [ (>pieces) ] { } make ; inline : >graphemes ( str -- graphemes ) [ first-grapheme ] >pieces ; @@ -139,14 +139,14 @@ to: word-break-table C-ENUM: wOther wCR wLF wNewline wExtend wFormat wKatakana wALetter wMidLetter wMidNum wMidNumLet wNumeric wExtendNumLet words ; -MEMO: word-break-classes ( -- table ) +: word-break-classes ( -- table ) ! Is there a way to avoid this? H{ - { "Other" wOther } { "CR" wCR } { "LF" wLF } { "Newline" wNewline } - { "Extend" wExtend } { "Format" wFormat } { "Katakana" wKatakana } - { "ALetter" wALetter } { "MidLetter" wMidLetter } - { "MidNum" wMidNum } { "MidNumLet" wMidNumLet } { "Numeric" wNumeric } - { "ExtendNumLet" wExtendNumLet } - } [ execute ] assoc-map ; + { "Other" 0 } { "CR" 1 } { "LF" 2 } { "Newline" 3 } + { "Extend" 4 } { "Format" 5 } { "Katakana" 6 } + { "ALetter" 7 } { "MidLetter" 8 } + { "MidNum" 9 } { "MidNumLet" 10 } { "Numeric" 11 } + { "ExtendNumLet" 12 } + } ; : word-break-prop ( char -- word-break-prop ) word-break-table interval-at @@ -185,22 +185,49 @@ words init-table table [ make-word-table finish-word-table ] with-variable to: word-table -: word-break? ( class1 class2 -- ? ) - word-table nth nth not ; +: word-table-nth ( class1 class2 -- ? ) + word-table nth nth ; -: skip? ( char -- ? ) - word-break-prop { 4 5 } member? ; ! wExtend or wFormat +: property-not= ( i str property -- ? ) + pick [ + [ ?nth ] dip swap + [ word-break-prop = not ] [ drop f ] if* + ] [ 3drop t ] if ; -: word-break-next ( old-class new-char -- next-class ? ) - word-break-prop dup { 4 5 } member? - [ drop f ] [ tuck word-break? ] if ; +: format/extended? ( ch -- ? ) + word-break-prop { 4 5 } member? ; -: first-word ( str -- i ) - unclip-slice word-break-prop over - [ word-break-next ] find-index +:: walk-up ( str i -- j ) + i 1 + str [ format/extended? not ] find-from drop + 1+ str [ format/extended? not ] find-from drop ; ! possible bounds error? + +:: walk-down ( str i -- j ) + i str [ format/extended? not ] find-last-from drop + 1- str [ format/extended? not ] find-last-from drop ; ! possible bounds error? + +:: word-break? ( table-entry i str -- ? ) + table-entry { + { t [ f ] } + { f [ t ] } + { check-letter-after + [ str i walk-up str wALetter property-not= ] } + { check-letter-before + [ str i walk-down str wALetter property-not= ] } + { check-number-after + [ str i walk-up str wNumeric property-not= ] } + { check-number-before + [ str i walk-down str wNumeric property-not= ] } + } case ; + +:: word-break-next ( old-class new-char i str -- next-class ? ) + new-char word-break-prop dup { 4 5 } member? + [ drop old-class dup { 1 2 3 } member? ] + [ old-class over word-table-nth i str word-break? ] if ; + +:: first-word ( str -- i ) + str unclip-slice word-break-prop over + [ swap str word-break-next ] assoc-find 2drop nip swap length or 1+ ; -! This must be changed to ignore format/extended chars and -! handle symbols in the table specially : >words ( str -- words ) [ first-word ] >pieces ; From 397790241f2aa13b67b9b3dc58c1110640b2beee Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 7 Jan 2009 22:16:39 +0100 Subject: [PATCH 06/22] math.primes.factors rewrite --- extra/math/primes/factors/factors.factor | 39 +++++++++--------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor index 8e22757249..05d6b26010 100644 --- a/extra/math/primes/factors/factors.factor +++ b/extra/math/primes/factors/factors.factor @@ -1,40 +1,29 @@ ! Copyright (C) 2007-2009 Samuel Tardieu. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel lists make math math.primes.lists sequences ; +USING: arrays combinators kernel make math math.primes sequences ; IN: math.primes.factors [ - swap uncons swap [ pick call ] dip swap (factors) - ] [ 3drop ] if ; inline recursive - -: decompose ( n quot -- seq ) [ lprimes rot (factors) ] { } make ; inline +: write-factor ( n d -- n' d ) + 2dup mod zero? [ [ [ count-factor ] keep swap 2array , ] keep ] when ; PRIVATE> -: factors ( n -- seq ) [ (factor) ] decompose ; flushable +: group-factors ( n -- seq ) + [ 2 [ over 1 > ] [ write-factor next-prime ] [ ] while 2drop ] { } make ; -: group-factors ( n -- seq ) [ (count) ] decompose ; flushable +: unique-factors ( n -- seq ) group-factors [ first ] map ; -: unique-factors ( n -- seq ) [ (unique) ] decompose ; flushable +: factors ( n -- seq ) group-factors [ first2 swap ] map concat ; : totient ( n -- t ) - dup 2 < [ - drop 0 - ] [ - dup unique-factors [ 1 [ 1- * ] reduce ] [ product ] bi / * - ] if ; foldable + { + { [ dup 2 < ] [ drop 0 ] } + [ dup unique-factors [ 1 [ 1- * ] reduce ] [ product ] bi / * ] + } cond ; foldable From 6a2f46ed7f5a472806830282eb2579a36861a5ba Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 7 Jan 2009 23:01:27 +0100 Subject: [PATCH 07/22] Move math.primes.factors from extra to basis --- {extra => basis}/math/primes/factors/authors.txt | 0 {extra => basis}/math/primes/factors/factors-docs.factor | 0 {extra => basis}/math/primes/factors/factors-tests.factor | 0 {extra => basis}/math/primes/factors/factors.factor | 0 {extra => basis}/math/primes/factors/summary.txt | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {extra => basis}/math/primes/factors/authors.txt (100%) rename {extra => basis}/math/primes/factors/factors-docs.factor (100%) rename {extra => basis}/math/primes/factors/factors-tests.factor (100%) rename {extra => basis}/math/primes/factors/factors.factor (100%) rename {extra => basis}/math/primes/factors/summary.txt (100%) diff --git a/extra/math/primes/factors/authors.txt b/basis/math/primes/factors/authors.txt similarity index 100% rename from extra/math/primes/factors/authors.txt rename to basis/math/primes/factors/authors.txt diff --git a/extra/math/primes/factors/factors-docs.factor b/basis/math/primes/factors/factors-docs.factor similarity index 100% rename from extra/math/primes/factors/factors-docs.factor rename to basis/math/primes/factors/factors-docs.factor diff --git a/extra/math/primes/factors/factors-tests.factor b/basis/math/primes/factors/factors-tests.factor similarity index 100% rename from extra/math/primes/factors/factors-tests.factor rename to basis/math/primes/factors/factors-tests.factor diff --git a/extra/math/primes/factors/factors.factor b/basis/math/primes/factors/factors.factor similarity index 100% rename from extra/math/primes/factors/factors.factor rename to basis/math/primes/factors/factors.factor diff --git a/extra/math/primes/factors/summary.txt b/basis/math/primes/factors/summary.txt similarity index 100% rename from extra/math/primes/factors/summary.txt rename to basis/math/primes/factors/summary.txt From e4b3f01e9e0b275275716b1bca8c8957ad31a3a1 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 7 Jan 2009 23:16:27 +0100 Subject: [PATCH 08/22] Fix bit-array>integer byte ordering --- basis/bit-arrays/bit-arrays-tests.factor | 2 ++ basis/bit-arrays/bit-arrays.factor | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/basis/bit-arrays/bit-arrays-tests.factor b/basis/bit-arrays/bit-arrays-tests.factor index 24c27fa15b..1de49d353d 100644 --- a/basis/bit-arrays/bit-arrays-tests.factor +++ b/basis/bit-arrays/bit-arrays-tests.factor @@ -78,3 +78,5 @@ IN: bit-arrays.tests } bit-array>integer ] unit-test [ 49 ] [ 49 dup set-bits [ ] count ] unit-test + +[ HEX: 100 ] [ ?{ f f f f f f f f t } bit-array>integer ] unit-test diff --git a/basis/bit-arrays/bit-arrays.factor b/basis/bit-arrays/bit-arrays.factor index 18796fbfed..f1ba71ce1e 100644 --- a/basis/bit-arrays/bit-arrays.factor +++ b/basis/bit-arrays/bit-arrays.factor @@ -83,7 +83,7 @@ M: bit-array byte-length length 7 + -3 shift ; ] if ; : bit-array>integer ( bit-array -- n ) - 0 swap underlying>> dup length [ + 0 swap underlying>> dup length [ alien-unsigned-1 swap 8 shift bitor ] with each ; From 589e509469072e6a05068022ebf81bd0bb450b99 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 16:24:56 -0600 Subject: [PATCH 09/22] L-system: Add rotating pedestal --- extra/L-system/L-system.factor | 51 +++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor index a38581b0f9..43e6cbbfa6 100644 --- a/extra/L-system/L-system.factor +++ b/extra/L-system/L-system.factor @@ -1,9 +1,9 @@ -USING: accessors arrays assocs colors combinators.short-circuit -kernel locals math math.functions math.matrices math.order -math.parser math.trig math.vectors opengl opengl.demo-support -opengl.gl sbufs sequences strings ui.gadgets ui.gadgets.worlds -ui.gestures ui.render ; +USING: accessors arrays assocs calendar colors +combinators.short-circuit kernel locals math math.functions +math.matrices math.order math.parser math.trig math.vectors +opengl opengl.demo-support opengl.gl sbufs sequences strings +threads ui.gadgets ui.gadgets.worlds ui.gestures ui.render ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -254,7 +254,27 @@ DEFER: default-L-parser-values ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: < gadget camera display-list commands axiom rules string ; +TUPLE: < gadget + camera display-list pedestal paused commands axiom rules string ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +:: iterate-system ( GADGET -- ) GADGET pedestal>> 0.5 + GADGET (>>pedestal) ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +:: start-rotation-thread ( GADGET -- ) + GADGET f >>paused drop + [ + [ + GADGET paused>> + [ f ] + [ GADGET iterate-system GADGET relayout-1 25 milliseconds sleep t ] + if + ] + loop + ] + in-thread ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -385,6 +405,10 @@ M:: draw-gadget* ( L-SYSTEM -- ) ! draw axis white gl-color GL_LINES glBegin { 0 0 0 } gl-vertex { 0 0 1 } gl-vertex glEnd + ! rotate pedestal + + L-SYSTEM pedestal>> 0 0 1 glRotated + L-SYSTEM display-list>> glCallList ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -417,6 +441,11 @@ H{ { T{ key-down f f "a" } [ [ 1 step-turtle ] with-camera ] } { T{ key-down f f "z" } [ [ -1 step-turtle ] with-camera ] } + { T{ key-down f f "q" } [ [ 5 roll-left ] with-camera ] } + { T{ key-down f f "w" } [ [ 5 roll-right ] with-camera ] } + + { T{ key-down f f "r" } [ start-rotation-thread ] } + { T{ key-down f f "x" } [ @@ -435,8 +464,16 @@ set-gestures : L-system ( -- L-system ) new-gadget + + 0 >>pedestal - turtle 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ; + ! turtle 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ; + + turtle 90 pitch-down -5 step-turtle 2 strafe-up >>camera + + dup start-rotation-thread + + ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! From 13cf6ec4be623f4fece0b972579adaa4ca2c4780 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 16:25:32 -0600 Subject: [PATCH 10/22] L-system.models.abop-1: Minor tweaks --- extra/L-system/models/abop-1/abop-1.factor | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/extra/L-system/models/abop-1/abop-1.factor b/extra/L-system/models/abop-1/abop-1.factor index 45cc522470..34f1d4777a 100644 --- a/extra/L-system/models/abop-1/abop-1.factor +++ b/extra/L-system/models/abop-1/abop-1.factor @@ -1,5 +1,5 @@ -USING: accessors kernel ui L-system ; +USING: accessors ui L-system ; IN: L-system.models.abop-1 @@ -12,15 +12,13 @@ IN: L-system.models.abop-1 "c(12)FFAL" >>axiom { - { "A" "F[&'(.8)!BL]>(137)'!(.9)A" } - { "B" "F[-'(.8)!(.9)$CL]'!(.9)C" } - { "C" "F[+'(.8)!(.9)$BL]'!(.9)B" } + { "A" "F [ & '(.8) ! B L ] >(137) ' !(.9) A" } + { "B" "F [ - '(.8) !(.9) $ C L ] ' !(.9) C" } + { "C" "F [ + '(.8) !(.9) $ B L ] ' !(.9) B" } - { "L" "~c(8){+(30)f-(120)f-(120)f}" } + { "L" " ~ c(8) { +(30) f -(120) f -(120) f }" } } - >>rules - - dup axiom>> >>string ; + >>rules ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! From 80ada88038a71dc8e0325bf1a8eeaaf47fe049bc Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 16:26:19 -0600 Subject: [PATCH 11/22] Add L-system.models.abop-2 --- extra/L-system/models/abop-2/abop-2.factor | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 extra/L-system/models/abop-2/abop-2.factor diff --git a/extra/L-system/models/abop-2/abop-2.factor b/extra/L-system/models/abop-2/abop-2.factor new file mode 100644 index 0000000000..2ed8f64abe --- /dev/null +++ b/extra/L-system/models/abop-2/abop-2.factor @@ -0,0 +1,28 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-2 + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-2 ( -- ) + + L-parser-dialect >>commands + + "c(12)FAL" >>axiom + + { + { "A" "F[&'(.7)!BL]>(137)[&'(.6)!BL]>(137)'(.9)!(.9)A" } + { "B" "F[-'(.7)!(.9)$CL]'(.9)!(.9)C" } + { "C" "F[+'(.7)!(.9)$BL]'(.9)!(.9)B" } + + { "L" "~c(8){+f(.1)-f(.1)-f(.1)+|+f(.1)-f(.1)-f(.1)}" } + + } >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-2 "L-system" open-window ] with-ui ; + +MAIN: main + \ No newline at end of file From d75f686a686b712e321c6e41fea0384cf6b61b13 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 16:47:25 -0600 Subject: [PATCH 12/22] L-system: offer help via F1 --- extra/L-system/L-system.factor | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor index 43e6cbbfa6..9b8bdc1914 100644 --- a/extra/L-system/L-system.factor +++ b/extra/L-system/L-system.factor @@ -1,9 +1,10 @@ USING: accessors arrays assocs calendar colors -combinators.short-circuit kernel locals math math.functions -math.matrices math.order math.parser math.trig math.vectors -opengl opengl.demo-support opengl.gl sbufs sequences strings -threads ui.gadgets ui.gadgets.worlds ui.gestures ui.render ; +combinators.short-circuit help.markup help.syntax kernel locals +math math.functions math.matrices math.order math.parser +math.trig math.vectors opengl opengl.demo-support opengl.gl +sbufs sequences strings threads ui.gadgets ui.gadgets.worlds +ui.gestures ui.render ui.tools.workspace ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -455,6 +456,8 @@ H{ drop ] } + + { T{ key-down f f "F1" } [ drop "L-system" help-window ] } } set-gestures @@ -477,3 +480,23 @@ set-gestures ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +ARTICLE: "L-system" "L-system" + +"Press 'x' to iterate the L-system." $nl + +"Camera control:" + +{ $table + + { "a" "Forward" } + { "z" "Backward" } + + { "LEFT" "Turn left" } + { "RIGHT" "Turn right" } + { "UP" "Pitch down" } + { "DOWN" "Pitch up" } + + { "q" "Roll left" } + { "w" "Roll right" } } ; + +ABOUT: "L-system" \ No newline at end of file From 501fb3ccf1d70482bda85c67085b0492220789f3 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Wed, 7 Jan 2009 17:59:01 -0600 Subject: [PATCH 13/22] Unicode docs --- basis/bootstrap/unicode/unicode.factor | 2 +- basis/unicode/breaks/breaks-docs.factor | 39 ++++++++++++ basis/unicode/breaks/breaks.factor | 13 +++- basis/unicode/case/case-docs.factor | 19 ++++++ basis/unicode/case/case.factor | 7 ++- .../unicode/categories/categories-docs.factor | 59 +++++++++++++++++++ basis/unicode/collation/collation-docs.factor | 8 +-- basis/unicode/normalize/normalize-docs.factor | 33 +++++++++++ basis/unicode/normalize/normalize.factor | 11 +++- basis/unicode/unicode-docs.factor | 16 +++++ basis/unicode/unicode.factor | 1 + 11 files changed, 197 insertions(+), 11 deletions(-) create mode 100644 basis/unicode/breaks/breaks-docs.factor create mode 100644 basis/unicode/case/case-docs.factor create mode 100644 basis/unicode/categories/categories-docs.factor create mode 100644 basis/unicode/normalize/normalize-docs.factor create mode 100644 basis/unicode/unicode-docs.factor create mode 100644 basis/unicode/unicode.factor diff --git a/basis/bootstrap/unicode/unicode.factor b/basis/bootstrap/unicode/unicode.factor index 1046d41bdc..1e9f8b8642 100644 --- a/basis/bootstrap/unicode/unicode.factor +++ b/basis/bootstrap/unicode/unicode.factor @@ -1,4 +1,4 @@ -USING: strings.parser kernel namespaces unicode.data ; +USING: strings.parser kernel namespaces unicode unicode.data ; IN: bootstrap.unicode [ name>char [ "Invalid character" throw ] unless* ] diff --git a/basis/unicode/breaks/breaks-docs.factor b/basis/unicode/breaks/breaks-docs.factor new file mode 100644 index 0000000000..552883a299 --- /dev/null +++ b/basis/unicode/breaks/breaks-docs.factor @@ -0,0 +1,39 @@ +USING: help.syntax help.markup strings ; +IN: unicode.breaks + +ABOUT: "unicode.breaks" + +ARTICLE: "unicode.breaks" "Word and grapheme breaks" +"The " { $vocab-link "unicode.breaks" "unicode.breaks" } " vocabulary partially implements Unicode Standard Annex #29. This provides for segmentation of a string along grapheme and word boundaries. In Unicode, a grapheme, or a basic unit of display in text, may be more than one code point. For example, in the string \"e\\u000301\" (where U+0301 is a combining acute accent), there is only one grapheme, as the acute accent goes above the e, forming a single grapheme. Word breaks, in general, are more complicated than simply splitting by whitespace, and the Unicode algorithm provides for that." +$nl "Operations for graphemes:" +{ $subsection first-grapheme } +{ $subsection last-grapheme } +{ $subsection >graphemes } +{ $subsection string-reverse } +"Operations on words:" +{ $subsection first-word } +{ $subsection >words } ; + +HELP: first-grapheme +{ $values { "str" string } { "i" "an index" } } +{ $description "Finds the length of the first grapheme of the string. This can be used repeatedly to efficiently traverse the graphemes of the string, using slices." } ; + +HELP: last-grapheme +{ $values { "str" string } { "i" "an index" } } +{ $description "Finds the index of the start of the last grapheme of the string. This can be used to traverse the graphemes of a string backwards." } ; + +HELP: >graphemes +{ $values { "str" string } { "graphemes" "an array of strings" } } +{ $description "Divides a string into a sequence of individual graphemes." } ; + +HELP: string-reverse +{ $values { "str" string } { "rts" string } } +{ $description "Reverses a string, leaving graphemes in-tact." } ; + +HELP: first-word +{ $values { "str" string } { "i" "index" } } +{ $description "Finds the length of the first word in the string." } ; + +HELP: >words +{ $values { "str" string } { "words" "an array of strings" } } +{ $description "Divides the string up into words." } ; diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index 5652cc2906..b85e8879e1 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -2,11 +2,12 @@ ! See http://factorcode.org/license.txt for BSD license. USING: combinators.short-circuit unicode.categories kernel math combinators splitting sequences math.parser io.files io assocs -arrays namespaces make math.ranges unicode.normalize values +arrays namespaces make math.ranges unicode.normalize.private values io.encodings.ascii unicode.syntax unicode.data compiler.units alien.syntax sets accessors interval-maps memoize locals words ; IN: unicode.breaks + + : first-grapheme ( str -- i ) unclip-slice grapheme-class over [ grapheme-class tuck grapheme-break? ] find-index nip swap length or 1+ ; +pieces) ( str quot -- ) str [ dup quot call cut-slice @@ -115,6 +120,8 @@ VALUE: grapheme-table : >pieces ( str quot -- graphemes ) [ (>pieces) ] { } make ; inline +PRIVATE> + : >graphemes ( str -- graphemes ) [ first-grapheme ] >pieces ; @@ -125,6 +132,8 @@ VALUE: grapheme-table unclip-last-slice grapheme-class swap [ grapheme-class dup rot grapheme-break? ] find-last-index ?1+ nip ; + + :: first-word ( str -- i ) str unclip-slice word-break-prop over [ swap str word-break-next ] assoc-find 2drop diff --git a/basis/unicode/case/case-docs.factor b/basis/unicode/case/case-docs.factor new file mode 100644 index 0000000000..a5790f9a54 --- /dev/null +++ b/basis/unicode/case/case-docs.factor @@ -0,0 +1,19 @@ +USING: help.syntax help.markup ; +IN: unicode.case + +ABOUT: "unicode.case" + +ARTICLE: "unicode.case" "Case mapping" +"When considering Unicode in general and not just ASCII or a smaller character set, putting a string in upper case, title case or lower case is slightly more complicated. In most contexts it's best to use the general Unicode routines for case conversion. There is an additional type of casing, case-fold, which is defined as bringing a string into upper case and then lower. This exists because in some cases it is different from simple lower case." +{ $subsection >upper } +{ $subsection >lower } +{ $subsection >title } +{ $subsection >case-fold } +"To test if a string is in a given case:" +{ $subsection upper? } +{ $subsection lower? } +{ $subsection title? } +{ $subsection case-fold? } +"For certain languages (Turkish, Azeri, Lithuanian), case mapping is dependent on locale; To change this, set the following variable to the ISO-639-1 code for your language:" +{ $subsection locale } +"This is unnecessary for most languages." ; diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor index ea1baa6e9c..42fd13fc97 100644 --- a/basis/unicode/case/case.factor +++ b/basis/unicode/case/case.factor @@ -5,14 +5,15 @@ unicode.normalize math unicode.categories combinators assocs strings splitting kernel accessors ; IN: unicode.case +lower ( ch -- lower ) simple-lower at-default ; : ch>upper ( ch -- upper ) simple-upper at-default ; : ch>title ( ch -- title ) simple-title at-default ; - +PRIVATE> SYMBOL: locale ! Just casing locale, or overall? - + : >lower ( string -- lower ) i-dot? [ turk>lower ] when final-sigma [ lower>> ] [ ch>lower ] map-case ; diff --git a/basis/unicode/categories/categories-docs.factor b/basis/unicode/categories/categories-docs.factor new file mode 100644 index 0000000000..421fa90dd2 --- /dev/null +++ b/basis/unicode/categories/categories-docs.factor @@ -0,0 +1,59 @@ +! Copyright (C) 2009 Your name. +! See http://factorcode.org/license.txt for BSD license. +USING: help.markup help.syntax kernel ; +IN: unicode.categories + +HELP: LETTER? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether the code point is an upper-cased letter" } ; + +HELP: Letter? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether the code point is a letter of any case" } ; + +HELP: alpha? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether the code point is alphanumeric" } ; + +HELP: blank? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether the code point is whitespace" } ; + +HELP: character? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a number is a code point which has been assigned" } ; + +HELP: control? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a code point is a control character" } ; + +HELP: digit? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a code point is a digit" } ; + +HELP: letter? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a code point is a lower-cased letter" } ; + +HELP: printable? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a code point is printable, as opposed to being a control character or formatting character" } ; + +HELP: uncased? +{ $values { "ch" "a character" } { "?" "a boolean" } } +{ $description "Determines whether a character has a case" } ; + +ARTICLE: "unicode.categories" "Character classes" +{ $vocab-link "unicode.categories" } " is a vocabulary which provides predicates for determining if a code point has a particular property, for example being a lower cased letter. These should be used in preference to the " { $vocab-link "ASCII" "ascii" } " equivalents in most cases. Below are links to the useful predicates, but note that each of these is defined to be a predicate class." +{ $subsection blank? } +{ $subsection letter? } +{ $subsection LETTER? } +{ $subsection Letter? } +{ $subsection digit? } +{ $subsection printable? } +{ $subsection alpha? } +{ $subsection control? } +{ $subsection uncased? } +{ $subsection character? } ; + +ABOUT: "unicode.categories" diff --git a/basis/unicode/collation/collation-docs.factor b/basis/unicode/collation/collation-docs.factor index 3847ca2237..183ca85b69 100644 --- a/basis/unicode/collation/collation-docs.factor +++ b/basis/unicode/collation/collation-docs.factor @@ -1,10 +1,8 @@ USING: help.syntax help.markup strings byte-arrays ; IN: unicode.collation -ABOUT: "unicode.collation" - -ARTICLE: "unicode.collation" "Unicode collation algorithm (UCA)" -"The Unicode Collation Algorithm (UTS #10) forms a reasonable way to sort strings when accouting for all of the characters in Unicode. At the moment, only the default Unicode collation element table (DUCET) is used, but a more accurate collation would take locale into account. The following words are defined:" +ARTICLE: "unicode.collation" "Collation and weak comparison" +"The " { $vocab-link "unicode.collation" "unicode.collation" } " vocabulary implements the Unicode Collation Algorithm. The Unicode Collation Algorithm (UTS #10) forms a reasonable way to sort strings when accouting for all of the characters in Unicode. It is far preferred over code point order when sorting for human consumption, in user interfaces. At the moment, only the default Unicode collation element table (DUCET) is used, but a more accurate collation would take locale into account. The following words are defined:" { $subsection sort-strings } { $subsection collation-key } { $subsection string<=> } @@ -13,6 +11,8 @@ ARTICLE: "unicode.collation" "Unicode collation algorithm (UCA)" { $subsection tertiary= } { $subsection quaternary= } ; +ABOUT: "unicode.collation" + HELP: sort-strings { $values { "strings" "a sequence of strings" } { "sorted" "the strings in DUCET order" } } { $description "This word takes a sequence of strings and sorts them according to the UCA, using code point order as a tie-breaker." } ; diff --git a/basis/unicode/normalize/normalize-docs.factor b/basis/unicode/normalize/normalize-docs.factor new file mode 100644 index 0000000000..423332fb6e --- /dev/null +++ b/basis/unicode/normalize/normalize-docs.factor @@ -0,0 +1,33 @@ +USING: help.syntax help.markup strings ; +IN: unicode.normalize + +ABOUT: "unicode.normalize" + +ARTICLE: "unicode.normalize" "Unicode normalization" +"The " { $vocab-link "unicode.normalize" "unicode.normalize" } " vocabulary defines words for normalizing Unicode strings. In Unicode, it is often possible to have multiple sequences of characters which really represent exactly the same thing. For example, to represent e with an acute accent above, there are two possible strings: \"e\\u000301\" (the e character, followed by the combining acute accent character) and \"\\u0000e9\" (a single character, e with an acute accent). There are four normalization forms: NFD, NFC, NFKD, and NFKC. Basically, in NFD and NFKD, everything is expanded, whereas in NFC and NFKC, everything is contracted. In NFKD and NFKC, more things are expanded and contracted. This is a process which loses some information, so it should be done only with care. Most of the world uses NFC to communicate, but for many purposes, NFD/NFKD is easier to process. For more information, see Unicode Standard Annex #15 and section 3 of the Unicode standard." +{ $subsection nfc } +{ $subsection nfd } +{ $subsection nfkc } +{ $subsection nfkd } +"If two strings in a normalization form are appended, the result may not be in that normalization form still. To append two strings in NFD and make sure the result is in NFD, the following procedure is supplied:" +{ $subsection string-append } ; + +HELP: nfc +{ $values { "string" string } { "nfc" "a string in NFC" } } +{ $description "Converts a string to Normalization Form C" } ; + +HELP: nfd +{ $values { "string" string } { "nfd" "a string in NFD" } } +{ $description "Converts a string to Normalization Form D" } ; + +HELP: nfkc +{ $values { "string" string } { "nfkc" "a string in NFKC" } } +{ $description "Converts a string to Normalization Form KC" } ; + +HELP: nfkd +{ $values { "string" string } { "nfc" "a string in NFKD" } } +{ $description "Converts a string to Normalization Form KD" } ; + +HELP: string-append +{ $values { "s1" "a string in NFD" } { "s2" "a string in NFD" } { "string" "a string in NFD" } } +{ $description "Appends two strings, putting the result in NFD." } ; diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor index 7a411a0141..eacdb2724a 100644 --- a/basis/unicode/normalize/normalize.factor +++ b/basis/unicode/normalize/normalize.factor @@ -4,6 +4,7 @@ USING: sequences namespaces make unicode.data kernel math arrays locals sorting.insertion accessors assocs ; IN: unicode.normalize + + +: nfd ( string -- nfd ) [ canonical-entry ] decompose ; -: nfkd ( string -- string ) +: nfkd ( string -- nfkd ) [ compatibility-entry ] decompose ; : string-append ( s1 s2 -- string ) @@ -87,6 +90,8 @@ IN: unicode.normalize 0 over ?nth non-starter? [ length dupd reorder-back ] [ drop ] if ; + + : nfc ( string -- nfc ) nfd compose ; diff --git a/basis/unicode/unicode-docs.factor b/basis/unicode/unicode-docs.factor new file mode 100644 index 0000000000..5b7b7e9ab3 --- /dev/null +++ b/basis/unicode/unicode-docs.factor @@ -0,0 +1,16 @@ +USING: help.markup help.syntax ; +IN: unicode + +ARTICLE: "unicode" "Unicode" +"Unicode is a set of characters, or " { $emphasis "code points" } " covering what's used in most world writing systems. Any Factor string can hold any of these code points transparently; a factor string is a sequence of Unicode code points. Unicode is accompanied by several standard algorithms for common operations like encoding in files, capitalizing a string, finding the boundaries between words, etc. When a programmer is faced with a string manipulation problem, where the string represents human language, a Unicode algorithm is often much better than the naive one. This is not in terms of efficiency, but rather internationalization. Even English text that remains in ASCII is better served by the Unicode collation algorithm than a naive algorithm. The Unicode algorithms implemented here are:" +{ $vocab-subsection "Case mapping" "unicode.case" } +{ $vocab-subsection "Collation and weak comparison" "unicode.collation" } +{ $vocab-subsection "Character classes" "unicode.categories" } +{ $vocab-subsection "Word and grapheme breaks" "unicode.breaks" } +{ $vocab-subsection "Unicode normalization" "unicode.normalize" } +"The following are mostly for internal use:" +{ $vocab-subsection "Unicode syntax" "unicode.syntax" } +{ $vocab-subsection "Unicode data tables" "unicode.data" } +{ $see-also "io.encodings" } ; + +ABOUT: "unicode" diff --git a/basis/unicode/unicode.factor b/basis/unicode/unicode.factor new file mode 100644 index 0000000000..32adb961d4 --- /dev/null +++ b/basis/unicode/unicode.factor @@ -0,0 +1 @@ +IN: unicode From 676ead93a515f35954f52ecbf714875bae23aa98 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Thu, 8 Jan 2009 01:30:12 +0100 Subject: [PATCH 14/22] FUEL: Extract word refactoring. --- extra/fuel/fuel.factor | 2 +- misc/fuel/README | 2 ++ misc/fuel/fuel-mode.el | 2 ++ misc/fuel/fuel-refactor.el | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 misc/fuel/fuel-refactor.el diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index 60420b3c39..becbf2161a 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -269,7 +269,7 @@ MEMO: fuel-article-title ( name -- title/f ) help-path [ dup article-title swap 2array ] map ; inline : (fuel-word-help) ( word -- element ) - dup \ article swap article-title rot + \ article swap dup article-title swap [ { [ fuel-parent-topics [ \ $doc-path prefix , ] unless-empty ] diff --git a/misc/fuel/README b/misc/fuel/README index 14a9ca8b5d..f5d366a22e 100644 --- a/misc/fuel/README +++ b/misc/fuel/README @@ -74,6 +74,8 @@ beast. - C-cM-<, C-cC-d< : show callers of word at point - C-cM->, C-cC-d> : show callees of word at point + - C-cC-xw : extract region as a separate word + *** In the listener: - TAB : complete word at point diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el index 651cc323d0..c0728dbbc5 100644 --- a/misc/fuel/fuel-mode.el +++ b/misc/fuel/fuel-mode.el @@ -224,6 +224,8 @@ interacting with a factor listener is at your disposal. (fuel-mode--key ?e ?w 'fuel-edit-word) (fuel-mode--key ?e ?x 'fuel-eval-definition) +(fuel-mode--key ?x ?w 'fuel-refactor-extract-word) + (fuel-mode--key ?d ?> 'fuel-show-callees) (fuel-mode--key ?d ?< 'fuel-show-callers) (fuel-mode--key ?d ?a 'fuel-autodoc-mode) diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el new file mode 100644 index 0000000000..4bf84ad8ec --- /dev/null +++ b/misc/fuel/fuel-refactor.el @@ -0,0 +1,45 @@ +;;; fuel-refactor.el -- code refactoring support + +;; Copyright (C) 2009 Jose Antonio Ortega Ruiz +;; See http://factorcode.org/license.txt for BSD license. + +;; Author: Jose Antonio Ortega Ruiz +;; Keywords: languages, fuel, factor +;; Start date: Thu Jan 08, 2009 00:57 + +;;; Comentary: + +;; Utilities performing refactoring on factor code. + +;;; Code: + +(require 'fuel-stack) +(require 'fuel-syntax) +(require 'fuel-base) + + +;;; Extract word: + +(defun fuel-refactor-extract-word (begin end) + "Extracts current region as a separate word." + (interactive "r") + (let* ((word (read-string "New word name: ")) + (code (buffer-substring begin end)) + (code-str (fuel--region-to-string begin end)) + (stack-effect (or (fuel-stack--infer-effect code-str) + (read-string "Stack effect: ")))) + (goto-char begin) + (delete-region begin end) + (insert word) + (indent-region begin (point)) + (set-mark (point)) + (fuel-syntax--beginning-of-defun) + (open-line 1) + (let ((start (point))) + (insert ": " word " " stack-effect "\n" code " ;\n") + (indent-region start (point))) + (goto-char (mark)))) + + +(provide 'fuel-refactor) +;;; fuel-refactor.el ends here From 73dc586be1cc3fae122ac129a3bf20a9b71871cc Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Thu, 8 Jan 2009 01:50:35 +0100 Subject: [PATCH 15/22] FUEL: Highlight new word during fuel-refactor-extract-word. --- misc/fuel/fuel-refactor.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index 4bf84ad8ec..04313e4fdc 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -37,8 +37,11 @@ (open-line 1) (let ((start (point))) (insert ": " word " " stack-effect "\n" code " ;\n") - (indent-region start (point))) - (goto-char (mark)))) + (indent-region start (point)) + (move-overlay fuel-stack--overlay start (point)) + (goto-char (mark)) + (sit-for fuel-stack-highlight-period) + (delete-overlay fuel-stack--overlay)))) (provide 'fuel-refactor) From c30c9f0c03a6de699791d5e310e3d469a1bc247d Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Thu, 8 Jan 2009 01:54:22 +0100 Subject: [PATCH 16/22] FUEL: Ooops, missing require. --- misc/fuel/fuel-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/fuel/fuel-mode.el b/misc/fuel/fuel-mode.el index c0728dbbc5..c1abcf414b 100644 --- a/misc/fuel/fuel-mode.el +++ b/misc/fuel/fuel-mode.el @@ -21,6 +21,7 @@ (require 'fuel-eval) (require 'fuel-help) (require 'fuel-xref) +(require 'fuel-refactor) (require 'fuel-stack) (require 'fuel-autodoc) (require 'fuel-font-lock) From 75b0f1e058bb0d6d8064cf7df837151fc4a3f0af Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Thu, 8 Jan 2009 02:00:04 +0100 Subject: [PATCH 17/22] FUEL: Adjust region to word boundaries if needed in fuel-refactor-extract-word. --- misc/fuel/fuel-refactor.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index 04313e4fdc..68713e1e4e 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -24,6 +24,10 @@ "Extracts current region as a separate word." (interactive "r") (let* ((word (read-string "New word name: ")) + (begin (save-excursion + (goto-char begin) (fuel-syntax--beginning-of-symbol-pos))) + (end (save-excursion + (goto-char end) (fuel-syntax--end-of-symbol-pos))) (code (buffer-substring begin end)) (code-str (fuel--region-to-string begin end)) (stack-effect (or (fuel-stack--infer-effect code-str) From 6a7de816fc783768b7f87e31408178c0317f06fa Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Thu, 8 Jan 2009 02:08:57 +0100 Subject: [PATCH 18/22] FUEL: Better region boundary adjustment in extract-word. --- misc/fuel/fuel-refactor.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index 68713e1e4e..547da19552 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -25,9 +25,14 @@ (interactive "r") (let* ((word (read-string "New word name: ")) (begin (save-excursion - (goto-char begin) (fuel-syntax--beginning-of-symbol-pos))) + (goto-char begin) + (when (zerop (skip-syntax-backward "w")) + (skip-syntax-forward "-")) + (point))) (end (save-excursion - (goto-char end) (fuel-syntax--end-of-symbol-pos))) + (goto-char end) + (skip-syntax-forward "w") + (point))) (code (buffer-substring begin end)) (code-str (fuel--region-to-string begin end)) (stack-effect (or (fuel-stack--infer-effect code-str) From c47f14afcd232d1bbfc778d371a9f2efe86417c4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 7 Jan 2009 21:20:05 -0600 Subject: [PATCH 19/22] Add link --- core/kernel/kernel-docs.factor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor index bac4048706..7a53ff5172 100644 --- a/core/kernel/kernel-docs.factor +++ b/core/kernel/kernel-docs.factor @@ -691,11 +691,10 @@ HELP: assert= { $values { "a" object } { "b" object } } { $description "Throws an " { $link assert } " error if " { $snippet "a" } " does not equal " { $snippet "b" } "." } ; - ARTICLE: "shuffle-words" "Shuffle words" "Shuffle words rearrange items at the top of the data stack. They control the flow of data between words that perform actions." $nl -"The " { $link "cleave-combinators" } " and " { $link "spread-combinators" } " are closely related to shuffle words and should be used instead where possible because they can result in clearer code; also, see the advice in " { $link "cookbook-philosophy" } "." +"The " { $link "cleave-combinators" } ", " { $link "spread-combinators" } " and " { $link "apply-combinators" } " are closely related to shuffle words and should be used instead where possible because they can result in clearer code; also, see the advice in " { $link "cookbook-philosophy" } "." $nl "Removing stack elements:" { $subsection drop } From eef0db3a3685c12d116a4fdc72b7bce682971212 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 21:23:57 -0600 Subject: [PATCH 20/22] Add L-system.models.abop-3 --- extra/L-system/models/abop-3/abop-3.factor | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 extra/L-system/models/abop-3/abop-3.factor diff --git a/extra/L-system/models/abop-3/abop-3.factor b/extra/L-system/models/abop-3/abop-3.factor new file mode 100644 index 0000000000..49a63eb074 --- /dev/null +++ b/extra/L-system/models/abop-3/abop-3.factor @@ -0,0 +1,25 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-3 + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-3 ( -- ) + + L-parser-dialect >>commands + + "c(12)FA" >>axiom + + { + { "A" "!(.9)t(.4)FB>(94)B>(132)B" } + { "B" "[&t(.4)F$A]" } + { "F" "'(1.25)F'(.8)" } + } + >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-3 "L-system" open-window ] with-ui ; + +MAIN: main From 19e177f19b8c549290ae98df18cb0909722b50bd Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 21:24:30 -0600 Subject: [PATCH 21/22] Add L-system.models.abop-4 --- extra/L-system/models/abop-4/abop-4.factor | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 extra/L-system/models/abop-4/abop-4.factor diff --git a/extra/L-system/models/abop-4/abop-4.factor b/extra/L-system/models/abop-4/abop-4.factor new file mode 100644 index 0000000000..6b2688a478 --- /dev/null +++ b/extra/L-system/models/abop-4/abop-4.factor @@ -0,0 +1,54 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-4 + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-4 ( -- ) + + L-parser-dialect >>commands + + "c(12)&(20)N" >>axiom + + { + { + "N" + "FII[&(60)rY]>(90)[&(45)'(0.8)rA]>(90)[&(60)rY]>(90)[&(45)'(0.8)rD]!FIK" + } + { "Y" "[c(4){++l.--l.--l.++|++l.--l.--l.}]" } + { "l" "g(.2)l" } + { "K" "[!c(2)FF>w>(72)w>(72)w>(72)w>(72)w]" } + { "w" "[c(2)^!F][c(5)&(72){-(54)f(3)+(54)f(3)|-(54)f(3)+(54)f(3)}]" } + { "f" "_" } + + { "A" "B" } + { "B" "C" } + { "C" "D" } + { "D" "E" } + { "E" "G" } + { "G" "H" } + { "H" "N" } + + { "I" "FoO" } + { "O" "FoP" } + { "P" "FoQ" } + { "Q" "FoR" } + { "R" "FoS" } + { "S" "FoT" } + { "T" "FoU" } + { "U" "FoV" } + { "V" "FoW" } + { "W" "FoX" } + { "X" "_" } + + { "o" "$t(-0.03)" } + { "r" "~(30)" } + } + >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-4 "L-system" open-window ] with-ui ; + +MAIN: main From fe2c0b19297967a5e0c1acd52cb62cf9a3b384de Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 21:24:44 -0600 Subject: [PATCH 22/22] Add L-system.models.abop-5 --- extra/L-system/models/abop-5/abop-5.factor | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 extra/L-system/models/abop-5/abop-5.factor diff --git a/extra/L-system/models/abop-5/abop-5.factor b/extra/L-system/models/abop-5/abop-5.factor new file mode 100644 index 0000000000..abc346946a --- /dev/null +++ b/extra/L-system/models/abop-5/abop-5.factor @@ -0,0 +1,33 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-5 + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-5 ( -- ) + + L-parser-dialect >>commands + + "&(90)+(90)a" >>axiom + + { + { "a" "F[+(45)l][-(45)l]^;ca" } + + { "l" "j" } + { "j" "h" } + { "h" "s" } + { "s" "d" } + { "d" "x" } + { "x" "a" } + + { "F" "'(1.17)F'(.855)" } + } + >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-5 "L-system" open-window ] with-ui ; + +MAIN: main + \ No newline at end of file