diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor index 49c4dab0db..60a9f785e6 100644 --- a/basis/farkup/farkup-tests.factor +++ b/basis/farkup/farkup-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: farkup kernel peg peg.ebnf tools.test namespaces xml -urls.encoding assocs xml.utilities xml.data ; +urls.encoding assocs xml.traversal xml.data ; IN: farkup.tests relative-link-prefix off diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index bad41296ee..a5951a5080 100755 --- a/basis/farkup/farkup.factor +++ b/basis/farkup/farkup.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays combinators io io.streams.string kernel math namespaces peg peg.ebnf -sequences sequences.deep strings xml.entities xml.literals +sequences sequences.deep strings xml.entities xml.syntax vectors splitting xmode.code2html urls.encoding xml.data xml.writer ; IN: farkup diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor index dd24d8dcde..6024607d37 100644 --- a/basis/furnace/chloe-tags/chloe-tags.factor +++ b/basis/furnace/chloe-tags/chloe-tags.factor @@ -7,8 +7,8 @@ xml xml.data xml.entities xml.writer -xml.utilities -xml.literals +xml.traversal +xml.syntax html.components html.elements html.forms diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor index 26fc4e2637..cccf320e44 100644 --- a/basis/help/html/html.factor +++ b/basis/help/html/html.factor @@ -5,7 +5,7 @@ io.files io.files.temp io.directories html.streams help kernel assocs sequences make words accessors arrays help.topics vocabs tools.vocabs tools.vocabs.browser namespaces prettyprint io vocabs.loader serialize fry memoize unicode.case math.order -sorting debugger html xml.literals xml.writer ; +sorting debugger html xml.syntax xml.writer ; IN: help.html : escape-char ( ch -- ) diff --git a/basis/html/components/components-docs.factor b/basis/html/components/components-docs.factor index ce4bddde6a..b432cc0cc6 100644 --- a/basis/html/components/components-docs.factor +++ b/basis/html/components/components-docs.factor @@ -100,6 +100,6 @@ $nl { $subsection farkup } "Creating custom components:" { $subsection render* } -"Custom components can emit HTML using the " { $vocab-link "xml.literals" } " vocabulary." ; +"Custom components can emit HTML using the " { $vocab-link "xml.syntax" } " vocabulary." ; ABOUT: "html.components" diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor index f811343df2..82bb75015e 100644 --- a/basis/html/components/components.factor +++ b/basis/html/components/components.factor @@ -4,7 +4,7 @@ USING: accessors kernel namespaces io math.parser assocs classes classes.tuple words arrays sequences splitting mirrors hashtables combinators continuations math strings inspector fry locals calendar calendar.format xml.entities xml.data -validators urls present xml.writer xml.literals xml +validators urls present xml.writer xml.syntax xml xmode.code2html lcs.diff2html farkup io.streams.string html html.streams html.forms ; IN: html.components diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor index e23d929d6d..85df4f7b27 100644 --- a/basis/html/elements/elements.factor +++ b/basis/html/elements/elements.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: io io.styles kernel namespaces prettyprint quotations sequences strings words xml.entities compiler.units effects -xml.data xml.literals urls math math.parser combinators +xml.data urls math math.parser combinators present fry io.streams.string xml.writer html ; IN: html.elements diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor index 0a69e2ed70..d5c744beab 100644 --- a/basis/html/forms/forms.factor +++ b/basis/html/forms/forms.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel accessors strings namespaces assocs hashtables io mirrors math fry sequences words continuations -xml.entities xml.writer xml.literals ; +xml.entities xml.writer xml.syntax ; IN: html.forms TUPLE: form errors values validation-failed ; diff --git a/basis/html/html.factor b/basis/html/html.factor index 5e86add10e..e86b4917d7 100644 --- a/basis/html/html.factor +++ b/basis/html/html.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2004, 2009 Chris Double, Daniel Ehrenberg, ! Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel xml.data xml.writer xml.literals urls.encoding ; +USING: kernel xml.data xml.writer xml.syntax urls.encoding ; IN: html : simple-page ( title head body -- xml ) @@ -21,4 +21,4 @@ IN: html [XML <-> XML] ; : simple-link ( xml url -- xml' ) - url-encode swap [XML ><-> XML] ; \ No newline at end of file + url-encode swap [XML ><-> XML] ; diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor index 0a4b8eddd4..28d6e6d5de 100644 --- a/basis/html/streams/streams.factor +++ b/basis/html/streams/streams.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2004, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel assocs io io.styles math math.order math.parser -sequences strings make words combinators macros xml.literals html fry +sequences strings make words combinators macros xml.syntax html fry destructors ; IN: html.streams diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor index e5b40fcfaa..6ab6722afe 100644 --- a/basis/html/templates/chloe/chloe.factor +++ b/basis/html/templates/chloe/chloe.factor @@ -5,7 +5,7 @@ namespaces make classes.tuple assocs splitting words arrays io io.files io.files.info io.encodings.utf8 io.streams.string unicode.case mirrors math urls present multiline quotations xml logging continuations -xml.data xml.writer xml.literals strings +xml.data xml.writer xml.syntax strings html.forms html html.elements diff --git a/basis/html/templates/chloe/syntax/syntax.factor b/basis/html/templates/chloe/syntax/syntax.factor index c2ecd4506b..f149c3fe47 100644 --- a/basis/html/templates/chloe/syntax/syntax.factor +++ b/basis/html/templates/chloe/syntax/syntax.factor @@ -5,7 +5,7 @@ USING: accessors kernel sequences combinators kernel namespaces classes.tuple assocs splitting words arrays memoize parser lexer io io.files io.encodings.utf8 io.streams.string unicode.case mirrors fry math urls -multiline xml xml.data xml.writer xml.utilities +multiline xml xml.data xml.writer xml.syntax html.components html.templates ; diff --git a/basis/html/templates/templates.factor b/basis/html/templates/templates.factor index efaf8d6a62..4aca73cc57 100644 --- a/basis/html/templates/templates.factor +++ b/basis/html/templates/templates.factor @@ -3,7 +3,7 @@ USING: accessors kernel fry io io.encodings.utf8 io.files debugger prettyprint continuations namespaces boxes sequences arrays strings html io.streams.string -quotations xml.data xml.writer xml.literals ; +quotations xml.data xml.writer xml.syntax ; IN: html.templates MIXIN: template diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor index f593980467..49acdb639c 100644 --- a/basis/http/http-tests.factor +++ b/basis/http/http-tests.factor @@ -299,7 +299,7 @@ test-db [ [ "Goodbye" ] [ "http://localhost/quit" add-port http-get nip ] unit-test USING: html.components html.forms -xml xml.utilities validators +xml xml.traversal validators furnace furnace.conversations ; SYMBOL: a diff --git a/basis/http/server/responses/responses.factor b/basis/http/server/responses/responses.factor index c9b4600ac8..3902b7f5e2 100644 --- a/basis/http/server/responses/responses.factor +++ b/basis/http/server/responses/responses.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: math.parser http accessors kernel xml.literals xml.writer +USING: math.parser http accessors kernel xml.syntax xml.writer io io.streams.string io.encodings.utf8 ; IN: http.server.responses diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor index 2df8838061..53d3d4f917 100644 --- a/basis/http/server/static/static.factor +++ b/basis/http/server/static/static.factor @@ -4,7 +4,7 @@ USING: calendar kernel math math.order math.parser namespaces parser sequences strings assocs hashtables debugger mime.types sorting logging calendar.format accessors splitting io io.files io.files.info io.directories io.pathnames io.encodings.binary -fry xml.entities destructors urls html xml.literals +fry xml.entities destructors urls html xml.syntax html.templates.fhtml http http.server http.server.responses http.server.redirection xml.writer ; IN: http.server.static diff --git a/basis/lcs/diff2html/diff2html.factor b/basis/lcs/diff2html/diff2html.factor index 16e6cc8d97..ca9e48eb05 100644 --- a/basis/lcs/diff2html/diff2html.factor +++ b/basis/lcs/diff2html/diff2html.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: lcs xml.literals xml.writer kernel strings ; +USING: lcs xml.syntax xml.writer kernel strings ; FROM: accessors => item>> ; FROM: io => write ; FROM: sequences => each if-empty when-empty map ; diff --git a/basis/mime/multipart/multipart.factor b/basis/mime/multipart/multipart.factor index fc3024bd01..eda7849a73 100755 --- a/basis/mime/multipart/multipart.factor +++ b/basis/mime/multipart/multipart.factor @@ -99,7 +99,7 @@ ERROR: end-of-stream multipart ; dup name>> empty-name? [ drop ] [ - [ [ header>> ] [ name>> unquote ] [ name-content>> ] tri mime-variable boa ] + [ name-content>> ] [ name>> unquote ] [ mime-parts>> set-at ] tri ] if ; diff --git a/basis/sequences/next/next-tests.factor b/basis/sequences/next/next-tests.factor deleted file mode 100644 index be728b2d8e..0000000000 --- a/basis/sequences/next/next-tests.factor +++ /dev/null @@ -1,5 +0,0 @@ -USING: sequences.next tools.test arrays kernel math sequences ; - -[ { { 1 0 } { 2 1 } { f 2 } } ] [ 3 [ 2array ] map-next ] unit-test - -[ 8 ] [ 3 [ 1+ ] map 0 swap [ swap [ + + ] [ drop ] if* ] each-next ] unit-test diff --git a/basis/sequences/next/next.factor b/basis/sequences/next/next.factor deleted file mode 100644 index 19b406cc58..0000000000 --- a/basis/sequences/next/next.factor +++ /dev/null @@ -1,21 +0,0 @@ -USING: kernel sequences sequences.private math ; -IN: sequences.next - - - -: each-next ( seq quot: ( next-elt elt -- ) -- ) - iterate-seq [ (map-next) ] 2curry each-integer ; inline - -: map-next ( seq quot: ( next-elt elt -- newelt ) -- newseq ) - over dup length swap new-sequence [ - iterate-seq [ (map-next) ] 2curry - ] dip [ collect ] keep ; inline diff --git a/basis/sequences/next/summary.txt b/basis/sequences/next/summary.txt deleted file mode 100644 index fe5bd315de..0000000000 --- a/basis/sequences/next/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Iteration with access to next element diff --git a/basis/sequences/next/tags.txt b/basis/sequences/next/tags.txt deleted file mode 100644 index 42d711b32b..0000000000 --- a/basis/sequences/next/tags.txt +++ /dev/null @@ -1 +0,0 @@ -collections diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor index 4cd5ef17b3..9901fd4ce4 100755 --- a/basis/syndication/syndication.factor +++ b/basis/syndication/syndication.factor @@ -1,10 +1,10 @@ ! Copyright (C) 2006 Chris Double, Daniel Ehrenberg. ! Portions copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: xml.utilities kernel assocs math.order +USING: xml.traversal kernel assocs math.order strings sequences xml.data xml.writer io.streams.string combinators xml xml.entities.html io.files io - http.client namespaces make xml.literals hashtables + http.client namespaces make xml.syntax hashtables calendar.format accessors continuations urls present ; IN: syndication diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor index 7566138e11..65fab0ac38 100644 --- a/basis/unicode/case/case.factor +++ b/basis/unicode/case/case.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: unicode.data sequences sequences.next namespaces +USING: unicode.data sequences namespaces sbufs make unicode.syntax unicode.normalize math hints unicode.categories combinators unicode.syntax assocs strings splitting kernel accessors unicode.breaks fry locals ; diff --git a/basis/xml-rpc/xml-rpc.factor b/basis/xml-rpc/xml-rpc.factor index 24dfabc8ff..9632cbb1ac 100644 --- a/basis/xml-rpc/xml-rpc.factor +++ b/basis/xml-rpc/xml-rpc.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel xml arrays math generic http.client combinators hashtables namespaces io base64 sequences strings -calendar xml.data xml.writer xml.utilities assocs math.parser -debugger calendar.format math.order xml.literals xml.dispatch ; +calendar xml.data xml.writer xml.traversal assocs math.parser +debugger calendar.format math.order xml.syntax ; IN: xml-rpc ! * Sending RPC requests diff --git a/basis/xml/data/data-docs.factor b/basis/xml/data/data-docs.factor index 639ef5591c..8c837fdf19 100644 --- a/basis/xml/data/data-docs.factor +++ b/basis/xml/data/data-docs.factor @@ -10,7 +10,7 @@ ARTICLE: "xml.data" "XML data types" "Simple words for manipulating names:" { $subsection names-match? } { $subsection assure-name } -"For high-level tools for manipulating XML, see " { $vocab-link "xml.utilities" } ; +"For high-level tools for manipulating XML, see " { $vocab-link "xml.traversal" } ; ARTICLE: { "xml.data" "classes" } "XML data classes" "XML documents and chunks are made of the following classes:" diff --git a/basis/xml/dispatch/dispatch-docs.factor b/basis/xml/dispatch/dispatch-docs.factor deleted file mode 100644 index d3d24d736c..0000000000 --- a/basis/xml/dispatch/dispatch-docs.factor +++ /dev/null @@ -1,25 +0,0 @@ -! Copyright (C) 2005, 2009 Daniel Ehrenberg -! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax ; -IN: xml.dispatch - -ABOUT: "xml.dispatch" - -ARTICLE: "xml.dispatch" "Dispatch on XML tag names" -"The " { $link "xml.dispatch" } " vocabulary defines a system, analogous to generic words, for processing XML. A word can dispatch off the name of the tag that is passed to it. To define such a word, use" -{ $subsection POSTPONE: TAGS: } -"and to define a new 'method' for this word, use" -{ $subsection POSTPONE: TAG: } ; - -HELP: TAGS: -{ $syntax "TAGS: word" } -{ $values { "word" "a new word to define" } } -{ $description "Creates a new word to which dispatches on XML tag names." } -{ $see-also POSTPONE: TAG: } ; - -HELP: TAG: -{ $syntax "TAG: tag word definition... ;" } -{ $values { "tag" "an XML tag name" } { "word" "an XML process" } } -{ $description "Defines a 'method' on a word created with " { $link POSTPONE: TAGS: } ". It determines what such a word should do for an argument that is has the given name." } -{ $examples { $code "TAGS: x ( tag -- )\nTAG: a x drop \"hi\" write ;" } } -{ $see-also POSTPONE: TAGS: } ; diff --git a/basis/xml/dispatch/dispatch-tests.factor b/basis/xml/dispatch/dispatch-tests.factor deleted file mode 100644 index e76a759291..0000000000 --- a/basis/xml/dispatch/dispatch-tests.factor +++ /dev/null @@ -1,33 +0,0 @@ -! Copyright (C) 2005, 2009 Daniel Ehrenberg -! See http://factorcode.org/license.txt for BSD license. -USING: xml io kernel math sequences strings xml.utilities -tools.test math.parser xml.dispatch ; -IN: xml.dispatch.tests - -TAGS: calculate ( tag -- n ) - -: calc-2children ( tag -- n n ) - children-tags first2 [ calculate ] dip calculate ; - -TAG: number calculate - children>string string>number ; -TAG: add calculate - calc-2children + ; -TAG: minus calculate - calc-2children - ; -TAG: times calculate - calc-2children * ; -TAG: divide calculate - calc-2children / ; -TAG: neg calculate - children-tags first calculate neg ; - -: calc-arith ( string -- n ) - string>xml first-child-tag calculate ; - -[ 32 ] [ - "13-8" - calc-arith -] unit-test - -\ calc-arith must-infer diff --git a/basis/xml/dispatch/dispatch.factor b/basis/xml/dispatch/dispatch.factor deleted file mode 100644 index af47f7c14c..0000000000 --- a/basis/xml/dispatch/dispatch.factor +++ /dev/null @@ -1,32 +0,0 @@ -! Copyright (C) 2005, 2009 Daniel Ehrenberg -! See http://factorcode.org/license.txt for BSD license. -USING: words assocs kernel accessors parser sequences summary -lexer splitting fry combinators locals ; -IN: xml.dispatch - -TUPLE: no-tag name word ; -M: no-tag summary - drop "The tag-dispatching word has no method for the given tag name" ; - -alist swap '[ _ no-tag boa throw ] suffix - '[ dup main>> _ case ] ; - -PRIVATE> - -: define-tags ( word -- ) - dup dup "xtable" word-prop compile-tags define ; - -:: define-tag ( string word quot -- ) - quot string word "xtable" word-prop set-at - word define-tags ; - -: TAGS: - CREATE - [ H{ } clone "xtable" set-word-prop ] - [ define-tags ] bi ; parsing - -: TAG: - scan scan-word parse-definition define-tag ; parsing diff --git a/basis/xml/literals/authors.txt b/basis/xml/literals/authors.txt deleted file mode 100644 index 29e79639ae..0000000000 --- a/basis/xml/literals/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Daniel Ehrenberg \ No newline at end of file diff --git a/basis/xml/literals/literals-docs.factor b/basis/xml/literals/literals-docs.factor deleted file mode 100644 index a37fcbd711..0000000000 --- a/basis/xml/literals/literals-docs.factor +++ /dev/null @@ -1,60 +0,0 @@ -USING: help.markup help.syntax present multiline xml.data ; -IN: xml.literals - -ABOUT: "xml.literals" - -ARTICLE: "xml.literals" "XML literals" -"The " { $vocab-link "xml.literals" } " vocabulary provides a convenient syntax for generating XML documents and chunks. It defines the following parsing words:" -{ $subsection POSTPONE: ... XML>" } -{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML document (" { $link xml } ") on the stack. It can be used for interpolation as well, if interpolation slots are used. For more information about XML interpolation, see " { $link { "xml.literals" "interpolation" } } "." } ; - -HELP: [XML -{ $syntax "[XML foo ... bar ... baz XML]" } -{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML chunk (" { $link xml-chunk } ") on the stack. For more information about XML interpolation, see " { $link { "xml.literals" "interpolation" } } "." } ; - -ARTICLE: { "xml.literals" "interpolation" } "XML interpolation syntax" -"XML interpolation has two forms for each of the words " { $link POSTPONE: " } ". To splice something in from the stack, in the style of " { $vocab-link "fry" } ", use the syntax " { $snippet "<->" } ". An XML interpolation form may only use one of these styles." -$nl -"These forms can be used where a tag might go, as in " { $snippet "[XML <-> XML]" } " or where an attribute might go, as in " { $snippet "[XML /> XML]" } ". When an attribute is spliced in, it is not included if the value is " { $snippet "f" } " and if the value is not a string, the value is put through " { $link present } ". Here is an example of the fry style of XML interpolation:" -{ $example -{" USING: splitting sequences xml.writer xml.literals ; -"one two three" " " split -[ [XML <-> XML] ] map -<-> XML> pprint-xml"} -{" - - - one - - - two - - - three - -"} } -"Here is an example of the locals version:" -{ $example -{" USING: locals urls xml.literals xml.writer ; -[let | - number [ 3 ] - false [ f ] - url [ URL" http://factorcode.org/" ] - string [ "hello" ] - word [ \ drop ] | - - false=<-false-> - url=<-url-> - string=<-string-> - word=<-word-> /> - XML> pprint-xml ] "} -{" -"} } ; diff --git a/basis/xml/literals/summary.txt b/basis/xml/literals/summary.txt deleted file mode 100644 index 7c18fc8c76..0000000000 --- a/basis/xml/literals/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Syntax for XML interpolation diff --git a/basis/xml/literals/tags.txt b/basis/xml/literals/tags.txt deleted file mode 100644 index d236e9679f..0000000000 --- a/basis/xml/literals/tags.txt +++ /dev/null @@ -1,2 +0,0 @@ -syntax -enterprise diff --git a/basis/sequences/next/authors.txt b/basis/xml/syntax/authors.txt similarity index 100% rename from basis/sequences/next/authors.txt rename to basis/xml/syntax/authors.txt diff --git a/basis/xml/dispatch/summary.txt b/basis/xml/syntax/summary.txt similarity index 100% rename from basis/xml/dispatch/summary.txt rename to basis/xml/syntax/summary.txt diff --git a/basis/xml/syntax/syntax-docs.factor b/basis/xml/syntax/syntax-docs.factor new file mode 100644 index 0000000000..34473fecfc --- /dev/null +++ b/basis/xml/syntax/syntax-docs.factor @@ -0,0 +1,101 @@ +! Copyright (C) 2005, 2009 Daniel Ehrenberg +! See http://factorcode.org/license.txt for BSD license. +USING: help.markup help.syntax xml.data present multiline ; +IN: xml.syntax + +ABOUT: "xml.syntax" + +ARTICLE: "xml.syntax" "Syntax extensions for XML" +"The " { $link "xml.syntax" } " vocabulary defines a number of new parsing words forXML processing." +{ $subsection { "xml.syntax" "tags" } } +{ $subsection { "xml.syntax" "literals" } } +{ $subsection POSTPONE: XML-NS: } ; + +ARTICLE: { "xml.syntax" "tags" } "Dispatch on XML tag names" +"There is a system, analogous to generic words, for processing XML. A word can dispatch off the name of the tag that is passed to it. To define such a word, use" +{ $subsection POSTPONE: TAGS: } +"and to define a new 'method' for this word, use" +{ $subsection POSTPONE: TAG: } ; + +HELP: TAGS: +{ $syntax "TAGS: word" } +{ $values { "word" "a new word to define" } } +{ $description "Creates a new word to which dispatches on XML tag names." } +{ $see-also POSTPONE: TAG: } ; + +HELP: TAG: +{ $syntax "TAG: tag word definition... ;" } +{ $values { "tag" "an XML tag name" } { "word" "an XML process" } } +{ $description "Defines a 'method' on a word created with " { $link POSTPONE: TAGS: } ". It determines what such a word should do for an argument that is has the given name." } +{ $examples { $code "TAGS: x ( tag -- )\nTAG: a x drop \"hi\" write ;" } } +{ $see-also POSTPONE: TAGS: } ; + +ARTICLE: { "xml.syntax" "literals" } "XML literals" +"The following words provide syntax for XML literals:" +{ $subsection POSTPONE: ... XML>" } +{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML document (" { $link xml } ") on the stack. It can be used for interpolation as well, if interpolation slots are used. For more information about XML interpolation, see " { $link { "xml.syntax" "interpolation" } } "." } ; + +HELP: [XML +{ $syntax "[XML foo ... bar ... baz XML]" } +{ $description "This gives syntax for literal XML documents. When evaluated, there is an XML chunk (" { $link xml-chunk } ") on the stack. For more information about XML interpolation, see " { $link { "xml.syntax" "interpolation" } } "." } ; + +ARTICLE: { "xml.syntax" "interpolation" } "XML interpolation syntax" +"XML interpolation has two forms for each of the words " { $link POSTPONE: " } ". To splice something in from the stack, in the style of " { $vocab-link "fry" } ", use the syntax " { $snippet "<->" } ". An XML interpolation form may only use one of these styles." +$nl +"These forms can be used where a tag might go, as in " { $snippet "[XML <-> XML]" } " or where an attribute might go, as in " { $snippet "[XML /> XML]" } ". When an attribute is spliced in, it is not included if the value is " { $snippet "f" } " and if the value is not a string, the value is put through " { $link present } ". Here is an example of the fry style of XML interpolation:" +{ $example +{" USING: splitting sequences xml.writer xml.syntax ; +"one two three" " " split +[ [XML <-> XML] ] map +<-> XML> pprint-xml"} +{" + + + one + + + two + + + three + +"} } +"Here is an example of the locals version:" +{ $example +{" USING: locals urls xml.syntax xml.writer ; +[let | + number [ 3 ] + false [ f ] + url [ URL" http://factorcode.org/" ] + string [ "hello" ] + word [ \ drop ] | + + false=<-false-> + url=<-url-> + string=<-string-> + word=<-word-> /> + XML> pprint-xml ] "} +{" +"} } +"XML interpolation can also be used, in conjunction with " { $vocab-link "inverse" } " in pattern matching. For example:" +{ $example {" USING: sequences xml.syntax inverse ; +: dispatch ( xml -- string ) + { + { [ [XML <-> XML] ] [ "a" prepend ] } + { [ [XML <-> XML] ] [ "b" prepend ] } + { [ [XML XML] ] [ "yes" ] } + { [ [XML /> XML] ] [ "no" prepend ] } + } switch ; +[XML pple XML] dispatch write "} "apple" } ; + +HELP: XML-NS: +{ $syntax "XML-NS: name http://url" } +{ $description "Defines a new word of the given name which constructs XML names in the namespace of the given URL. The names constructed are memoized." } ; diff --git a/basis/xml/literals/literals-tests.factor b/basis/xml/syntax/syntax-tests.factor similarity index 73% rename from basis/xml/literals/literals-tests.factor rename to basis/xml/syntax/syntax-tests.factor index 0d8367c144..10ab961ec0 100644 --- a/basis/xml/literals/literals-tests.factor +++ b/basis/xml/syntax/syntax-tests.factor @@ -1,9 +1,45 @@ -! Copyright (C) 2009 Daniel Ehrenberg. +! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test xml.literals multiline kernel assocs -sequences accessors xml.writer xml.literals.private -locals splitting urls xml.data classes ; -IN: xml.literals.tests +USING: xml io kernel math sequences strings xml.traversal +tools.test math.parser xml.syntax xml.data xml.syntax.private +accessors multiline locals inverse xml.writer splitting classes ; +IN: xml.syntax.tests + +! TAGS test + +TAGS: calculate ( tag -- n ) + +: calc-2children ( tag -- n n ) + children-tags first2 [ calculate ] dip calculate ; + +TAG: number calculate + children>string string>number ; +TAG: add calculate + calc-2children + ; +TAG: minus calculate + calc-2children - ; +TAG: times calculate + calc-2children * ; +TAG: divide calculate + calc-2children / ; +TAG: neg calculate + children-tags first calculate neg ; + +: calc-arith ( string -- n ) + string>xml first-child-tag calculate ; + +[ 32 ] [ + "13-8" + calc-arith +] unit-test + +\ calc-arith must-infer + +XML-NS: foo http://blah.com + +[ T{ name { main "bling" } { url "http://blah.com" } } ] [ "bling" foo ] unit-test + +! XML literals [ "a" "c" { "a" "c" f } ] [ "<-a->/><->" @@ -47,7 +83,7 @@ IN: xml.literals.tests [ {" "} ] -[ 3 f URL" http://factorcode.org/" "hello" \ drop +[ 3 f "http://factorcode.org/" "hello" \ drop false=<-> url=<-> string=<-> word=<->/> XML> pprint-xml>string ] unit-test diff --git a/basis/xml/literals/literals.factor b/basis/xml/syntax/syntax.factor similarity index 83% rename from basis/xml/literals/literals.factor rename to basis/xml/syntax/syntax.factor index 4648f7b0e7..8e6bebfe6b 100644 --- a/basis/xml/literals/literals.factor +++ b/basis/xml/syntax/syntax.factor @@ -1,11 +1,42 @@ -! Copyright (C) 2009 Daniel Ehrenberg. +! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: xml xml.state kernel sequences fry assocs xml.data -accessors strings make multiline parser namespaces macros -sequences.deep generalizations words combinators -math present arrays unicode.categories locals.backend -quotations ; -IN: xml.literals +USING: words assocs kernel accessors parser sequences summary +lexer splitting combinators locals xml.data memoize sequences.deep +xml.data xml.state xml namespaces present arrays generalizations strings +make math macros multiline inverse combinators.short-circuit +sorting fry unicode.categories ; +IN: xml.syntax + +alist swap '[ _ no-tag boa throw ] suffix + '[ dup main>> _ case ] ; + +: define-tags ( word -- ) + dup dup "xtable" word-prop compile-tags define ; + +:: define-tag ( string word quot -- ) + quot string word "xtable" word-prop set-at + word define-tags ; + +PRIVATE> + +: TAGS: + CREATE + [ H{ } clone "xtable" set-word-prop ] + [ define-tags ] bi ; parsing + +: TAG: + scan scan-word parse-definition define-tag ; parsing + +: XML-NS: + CREATE-WORD (( string -- name )) over set-stack-effect + scan '[ f swap _ ] define-memoized ; parsing : [XML "XML]" [ string>chunk ] parse-def ; parsing -USING: inverse sorting fry combinators.short-circuit ; - : remove-blanks ( seq -- newseq ) [ { [ string? not ] [ [ blank? ] all? not ] } 1|| ] filter ; diff --git a/basis/xml/dispatch/tags.txt b/basis/xml/syntax/tags.txt similarity index 100% rename from basis/xml/dispatch/tags.txt rename to basis/xml/syntax/tags.txt diff --git a/basis/xml/tests/encodings.factor b/basis/xml/tests/encodings.factor index 35076d2930..aec3e40a52 100644 --- a/basis/xml/tests/encodings.factor +++ b/basis/xml/tests/encodings.factor @@ -1,4 +1,4 @@ -USING: xml xml.data xml.utilities tools.test accessors kernel +USING: xml xml.data xml.traversal tools.test accessors kernel io.encodings.8-bit ; [ "\u000131" ] [ "resource:basis/xml/tests/latin5.xml" file>xml children>string ] unit-test diff --git a/basis/xml/tests/soap.factor b/basis/xml/tests/soap.factor index d2568a24e1..3d1ac2379e 100644 --- a/basis/xml/tests/soap.factor +++ b/basis/xml/tests/soap.factor @@ -1,4 +1,4 @@ -USING: sequences xml kernel arrays xml.utilities io.files tools.test ; +USING: sequences xml kernel arrays xml.traversal io.files tools.test ; IN: xml.tests : assemble-data ( tag -- 3array ) diff --git a/basis/xml/tests/templating.factor b/basis/xml/tests/templating.factor index 618e785d05..4861f86d7b 100644 --- a/basis/xml/tests/templating.factor +++ b/basis/xml/tests/templating.factor @@ -1,5 +1,5 @@ USING: kernel xml sequences assocs tools.test io arrays namespaces fry -accessors xml.data xml.utilities xml.writer generic sequences.deep multiline ; +accessors xml.data xml.traversal xml.writer generic sequences.deep multiline ; IN: xml.tests : sub-tag diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor index dcd428d9e6..b1f6cf002f 100644 --- a/basis/xml/tests/test.factor +++ b/basis/xml/tests/test.factor @@ -3,7 +3,7 @@ IN: xml.tests USING: kernel xml tools.test io namespaces make sequences xml.errors xml.entities.html parser strings xml.data io.files -xml.utilities continuations assocs +xml.traversal continuations assocs sequences.deep accessors io.streams.string ; ! This is insufficient diff --git a/basis/xml/tests/xmltest.factor b/basis/xml/tests/xmltest.factor index a8024ce151..80472fc788 100644 --- a/basis/xml/tests/xmltest.factor +++ b/basis/xml/tests/xmltest.factor @@ -1,6 +1,6 @@ USING: accessors assocs combinators continuations fry generalizations io.pathnames kernel macros sequences stack-checker tools.test xml -xml.utilities xml.writer arrays xml.data ; +xml.traversal xml.writer arrays xml.data ; IN: xml.tests.suite TUPLE: xml-test id uri sections description type ; diff --git a/basis/xml/dispatch/authors.txt b/basis/xml/traversal/authors.txt old mode 100644 new mode 100755 similarity index 100% rename from basis/xml/dispatch/authors.txt rename to basis/xml/traversal/authors.txt diff --git a/basis/xml/traversal/summary.txt b/basis/xml/traversal/summary.txt new file mode 100644 index 0000000000..365ec87864 --- /dev/null +++ b/basis/xml/traversal/summary.txt @@ -0,0 +1 @@ +Utilities for traversing an XML DOM tree diff --git a/basis/xml/utilities/tags.txt b/basis/xml/traversal/tags.txt similarity index 100% rename from basis/xml/utilities/tags.txt rename to basis/xml/traversal/tags.txt diff --git a/basis/xml/utilities/utilities-docs.factor b/basis/xml/traversal/traversal-docs.factor similarity index 91% rename from basis/xml/utilities/utilities-docs.factor rename to basis/xml/traversal/traversal-docs.factor index 161ca824c3..1329c4975e 100644 --- a/basis/xml/utilities/utilities-docs.factor +++ b/basis/xml/traversal/traversal-docs.factor @@ -1,12 +1,12 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. USING: help.markup help.syntax xml.data sequences strings ; -IN: xml.utilities +IN: xml.traversal -ABOUT: "xml.utilities" +ABOUT: "xml.traversal" -ARTICLE: "xml.utilities" "Utilities for processing XML" - "Getting parts of an XML document or tag:" +ARTICLE: "xml.traversal" "Utilities for traversing XML" + "The " { $vocab-link "xml.traversal" } " vocabulary provides utilities for traversing an XML DOM tree and viewing the contents of a single tag. The following words are defined:" $nl "Note: the difference between deep-tag-named and tag-named is that the former searches recursively among all children and children of children of the tag, while the latter only looks at the direct children, and is therefore more efficient." { $subsection tag-named } diff --git a/basis/xml/utilities/utilities-tests.factor b/basis/xml/traversal/traversal-tests.factor similarity index 73% rename from basis/xml/utilities/utilities-tests.factor rename to basis/xml/traversal/traversal-tests.factor index 673bf47f6e..165ca34adf 100644 --- a/basis/xml/utilities/utilities-tests.factor +++ b/basis/xml/traversal/traversal-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: xml xml.utilities tools.test xml.data sequences ; -IN: xml.utilities.tests +USING: xml xml.traversal tools.test xml.data sequences ; +IN: xml.traversal.tests [ "bar" ] [ "bar" string>xml children>string ] unit-test @@ -9,14 +9,10 @@ IN: xml.utilities.tests [ "" ] [ "" string>xml children>string ] unit-test -XML-NS: foo http://blah.com - -[ T{ name { main "bling" } { url "http://blah.com" } } ] [ "bling" foo ] unit-test - [ "blah" ] [ "" string>xml-chunk "foo" deep-tag-named "attr" attr ] unit-test [ { "blah" } ] [ "" string>xml-chunk "foo" deep-tags-named [ "attr" attr ] map ] unit-test [ "blah" ] [ "" string>xml "foo" deep-tag-named "attr" attr ] unit-test -[ { "blah" } ] [ "" string>xml "foo" deep-tags-named [ "attr" attr ] map ] unit-test \ No newline at end of file +[ { "blah" } ] [ "" string>xml "foo" deep-tags-named [ "attr" attr ] map ] unit-test diff --git a/basis/xml/utilities/utilities.factor b/basis/xml/traversal/traversal.factor similarity index 86% rename from basis/xml/utilities/utilities.factor rename to basis/xml/traversal/traversal.factor index 1249da8c36..b337ea1472 100755 --- a/basis/xml/utilities/utilities.factor +++ b/basis/xml/traversal/traversal.factor @@ -3,7 +3,7 @@ USING: accessors kernel namespaces sequences words io assocs quotations strings parser lexer arrays xml.data xml.writer debugger splitting vectors sequences.deep combinators fry memoize ; -IN: xml.utilities +IN: xml.traversal : children>string ( tag -- string ) children>> { @@ -66,14 +66,3 @@ PRIVATE> : assert-tag ( name name -- ) names-match? [ "Unexpected XML tag found" throw ] unless ; - -: insert-children ( children tag -- ) - dup children>> [ push-all ] - [ swap V{ } like >>children drop ] if ; - -: insert-child ( child tag -- ) - [ 1vector ] dip insert-children ; - -: XML-NS: - CREATE-WORD (( string -- name )) over set-stack-effect - scan '[ f swap _ ] define-memoized ; parsing diff --git a/basis/xml/utilities/authors.txt b/basis/xml/utilities/authors.txt deleted file mode 100755 index f990dd0ed2..0000000000 --- a/basis/xml/utilities/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Daniel Ehrenberg diff --git a/basis/xml/utilities/summary.txt b/basis/xml/utilities/summary.txt deleted file mode 100644 index a671132945..0000000000 --- a/basis/xml/utilities/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Utilities for manipulating an XML DOM tree diff --git a/basis/xml/writer/writer-docs.factor b/basis/xml/writer/writer-docs.factor index cc45528cec..9971abcdf1 100644 --- a/basis/xml/writer/writer-docs.factor +++ b/basis/xml/writer/writer-docs.factor @@ -41,7 +41,7 @@ HELP: pprint-xml HELP: indenter { $var-description "Contains the string which is used for indenting in the XML prettyprinter. For example, to print an XML document using " { $snippet "%%%%" } " for indentation, you can use the following:" } -{ $example {" USING: xml.literals xml.writer namespaces ; +{ $example {" USING: xml.syntax xml.writer namespaces ; [XML bar XML] "%%%%" indenter [ pprint-xml ] with-variable "} {" %%%%bar @@ -49,7 +49,7 @@ HELP: indenter HELP: sensitive-tags { $var-description "Contains a sequence of " { $link name } "s where whitespace should be considered significant for prettyprinting purposes. The sequence can contain " { $link string } "s in place of names. For example, to preserve whitespace inside a " { $snippet "pre" } " tag:" } -{ $example {" USING: xml.literals xml.writer namespaces ; +{ $example {" USING: xml.syntax xml.writer namespaces ; [XML something
bing
 bang
    bong
XML] { "pre" } sensitive-tags [ pprint-xml ] with-variable "} {" diff --git a/basis/xml/writer/writer-tests.factor b/basis/xml/writer/writer-tests.factor index f414264e11..23fb7a5074 100644 --- a/basis/xml/writer/writer-tests.factor +++ b/basis/xml/writer/writer-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. USING: xml.data xml.writer tools.test fry xml kernel multiline -xml.writer.private io.streams.string xml.utilities sequences +xml.writer.private io.streams.string xml.traversal sequences io.encodings.utf8 io.files accessors io.directories ; IN: xml.writer.tests diff --git a/basis/xml/xml-docs.factor b/basis/xml/xml-docs.factor index 901fce2dd4..024b086ef9 100644 --- a/basis/xml/xml-docs.factor +++ b/basis/xml/xml-docs.factor @@ -93,7 +93,7 @@ ARTICLE: "xml" "XML parser" { $vocab-subsection "XML parsing errors" "xml.errors" } { $vocab-subsection "XML entities" "xml.entities" } { $vocab-subsection "XML data types" "xml.data" } - { $vocab-subsection "Utilities for processing XML" "xml.utilities" } - { $vocab-subsection "Dispatch on XML tag names" "xml.dispatch" } ; + { $vocab-subsection "Utilities for traversing XML" "xml.traversal" } + { $vocab-subsection "Syntax extensions for XML" "xml.syntax" } ; ABOUT: "xml" diff --git a/basis/xmode/code2html/code2html.factor b/basis/xmode/code2html/code2html.factor index 2f35cd6d76..3fb5a532c9 100644 --- a/basis/xmode/code2html/code2html.factor +++ b/basis/xmode/code2html/code2html.factor @@ -1,6 +1,6 @@ USING: xmode.tokens xmode.marker xmode.catalog kernel locals io io.files sequences words io.encodings.utf8 -namespaces xml.entities accessors xml.literals locals xml.writer ; +namespaces xml.entities accessors xml.syntax locals xml.writer ; IN: xmode.code2html : htmlize-tokens ( tokens -- xml ) diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor index b661f4eb3f..70466913a0 100644 --- a/basis/xmode/loader/loader.factor +++ b/basis/xmode/loader/loader.factor @@ -1,5 +1,5 @@ USING: xmode.loader.syntax xmode.tokens xmode.rules -xmode.keyword-map xml.data xml.utilities xml assocs kernel +xmode.keyword-map xml.data xml.traversal xml assocs kernel combinators sequences math.parser namespaces parser xmode.utilities parser-combinators.regexp io.files accessors ; IN: xmode.loader diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor index b546969a37..0e7293da97 100644 --- a/basis/xmode/loader/syntax/syntax.factor +++ b/basis/xmode/loader/syntax/syntax.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors xmode.tokens xmode.rules xmode.keyword-map -xml.data xml.utilities xml assocs kernel combinators sequences +xml.data xml.traversal xml assocs kernel combinators sequences math.parser namespaces make parser lexer xmode.utilities parser-combinators.regexp io.files splitting arrays ; IN: xmode.loader.syntax diff --git a/basis/xmode/utilities/utilities.factor b/basis/xmode/utilities/utilities.factor index d6407d8180..2423fb0d86 100644 --- a/basis/xmode/utilities/utilities.factor +++ b/basis/xmode/utilities/utilities.factor @@ -1,5 +1,5 @@ USING: accessors sequences assocs kernel quotations namespaces -xml.data xml.utilities combinators macros parser lexer words fry ; +xml.data xml.traversal combinators macros parser lexer words fry ; IN: xmode.utilities : implies ( x y -- z ) [ not ] dip or ; inline diff --git a/extra/4DNav/space-file-decoder/space-file-decoder.factor b/extra/4DNav/space-file-decoder/space-file-decoder.factor index ecc8f778fa..e85830de52 100755 --- a/extra/4DNav/space-file-decoder/space-file-decoder.factor +++ b/extra/4DNav/space-file-decoder/space-file-decoder.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Jeff Bigot ! See http://factorcode.org/license.txt for BSD license. -USING: adsoda xml xml.utilities xml.dispatch accessors +USING: adsoda xml xml.traversal xml.syntax accessors combinators sequences math.parser kernel splitting values continuations ; IN: 4DNav.space-file-decoder diff --git a/extra/graphics/bitmap/bitmap-tests.factor b/extra/graphics/bitmap/bitmap-tests.factor new file mode 100644 index 0000000000..4998427b22 --- /dev/null +++ b/extra/graphics/bitmap/bitmap-tests.factor @@ -0,0 +1,15 @@ +USING: graphics.bitmap ; +IN: graphics.bitmap.tests + +: test-bitmap24 ( -- ) + "resource:extra/graphics/bitmap/test-images/thiswayup24.bmp" bitmap. ; + +: test-bitmap8 ( -- ) + "resource:extra/graphics/bitmap/test-images/rgb8bit.bmp" bitmap. ; + +: test-bitmap4 ( -- ) + "resource:extra/graphics/bitmap/test-images/rgb4bit.bmp" bitmap. ; + +: test-bitmap1 ( -- ) + "resource:extra/graphics/bitmap/test-images/1bit.bmp" bitmap. ; + diff --git a/extra/graphics/bitmap/bitmap.factor b/extra/graphics/bitmap/bitmap.factor index a0212e47de..bd34a9ee41 100755 --- a/extra/graphics/bitmap/bitmap.factor +++ b/extra/graphics/bitmap/bitmap.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien arrays byte-arrays combinators summary -graphics.viewer io io.binary io.files kernel libc math +io io.binary io.files kernel libc math math.functions math.bitwise namespaces opengl opengl.gl prettyprint sequences strings ui ui.gadgets.panes fry io.encodings.binary accessors grouping macros alien.c-types ; @@ -12,10 +12,11 @@ IN: graphics.bitmap ! Handles row-reversed bitmaps (their height is negative) TUPLE: bitmap magic size reserved offset header-length width - height planes bit-count compression size-image - x-pels y-pels color-used color-important rgb-quads color-index array ; +height planes bit-count compression size-image +x-pels y-pels color-used color-important rgb-quads color-index +array ; -: (array-copy) ( bitmap array -- bitmap array' ) +: array-copy ( bitmap array -- bitmap array' ) over size-image>> abs memory>byte-array ; MACRO: (nbits>bitmap) ( bits -- ) @@ -24,7 +25,7 @@ MACRO: (nbits>bitmap) ( bits -- ) 2over * _ * >>size-image swap >>height swap >>width - swap (array-copy) [ >>array ] [ >>color-index ] bi + swap array-copy [ >>array ] [ >>color-index ] bi _ >>bit-count ] ; @@ -45,7 +46,7 @@ MACRO: (nbits>bitmap) ( bits -- ) : raw-bitmap>array ( bitmap -- array ) dup bit-count>> { - { 32 [ "32bit" throw ] } + { 32 [ color-index>> ] } { 24 [ color-index>> ] } { 16 [ "16bit" throw ] } { 8 [ 8bit>array ] } @@ -59,107 +60,75 @@ ERROR: bitmap-magic ; M: bitmap-magic summary drop "First two bytes of bitmap stream must be 'BM'" ; -: parse-file-header ( bitmap -- ) - 2 read >string dup "BM" = [ bitmap-magic ] unless >>magic - 4 read le> >>size - 4 read le> >>reserved - 4 read le> >>offset drop ; +: read2 ( -- n ) 2 read le> ; +: read4 ( -- n ) 4 read le> ; -: parse-bitmap-header ( bitmap -- ) - 4 read le> >>header-length - 4 read signed-le> >>width - 4 read signed-le> >>height - 2 read le> >>planes - 2 read le> >>bit-count - 4 read le> >>compression - 4 read le> >>size-image - 4 read le> >>x-pels - 4 read le> >>y-pels - 4 read le> >>color-used - 4 read le> >>color-important drop ; +: parse-file-header ( bitmap -- bitmap ) + 2 read >string dup "BM" = [ bitmap-magic ] unless >>magic + read4 >>size + read4 >>reserved + read4 >>offset ; + +: parse-bitmap-header ( bitmap -- bitmap ) + read4 >>header-length + read4 >>width + read4 >>height + read2 >>planes + read2 >>bit-count + read4 >>compression + read4 >>size-image + read4 >>x-pels + read4 >>y-pels + read4 >>color-used + read4 >>color-important ; : rgb-quads-length ( bitmap -- n ) - [ offset>> 14 - ] keep header-length>> - ; + [ offset>> 14 - ] [ header-length>> ] bi - ; : color-index-length ( bitmap -- n ) - [ width>> ] keep [ planes>> * ] keep - [ bit-count>> * 31 + 32 /i 4 * ] keep - height>> abs * ; + { + [ width>> ] + [ planes>> * ] + [ bit-count>> * 31 + 32 /i 4 * ] + [ height>> abs * ] + } cleave ; -: parse-bitmap ( bitmap -- ) +: parse-bitmap ( bitmap -- bitmap ) dup rgb-quads-length read >>rgb-quads - dup color-index-length read >>color-index drop ; + dup color-index-length read >>color-index ; : load-bitmap ( path -- bitmap ) binary [ bitmap new - dup parse-file-header - dup parse-bitmap-header - dup parse-bitmap + parse-file-header parse-bitmap-header parse-bitmap ] with-file-reader dup raw-bitmap>array >>array ; +: write2 ( n -- ) 2 >le write ; +: write4 ( n -- ) 4 >le write ; + : save-bitmap ( bitmap path -- ) binary [ - "BM" >byte-array write - dup array>> length 14 + 40 + 4 >le write - 0 4 >le write - 54 4 >le write - - 40 4 >le write - { - [ width>> 4 >le write ] - [ height>> 4 >le write ] - [ planes>> 1 or 2 >le write ] - [ bit-count>> 24 or 2 >le write ] - [ compression>> 0 or 4 >le write ] - [ size-image>> 4 >le write ] - [ x-pels>> 0 or 4 >le write ] - [ y-pels>> 0 or 4 >le write ] - [ color-used>> 0 or 4 >le write ] - [ color-important>> 0 or 4 >le write ] - [ rgb-quads>> write ] - [ color-index>> write ] - } cleave + B{ CHAR: B CHAR: M } write + [ + array>> length 14 + 40 + write4 + 0 write4 + 54 write4 + 40 write4 + ] [ + { + [ width>> write4 ] + [ height>> write4 ] + [ planes>> 1 or write2 ] + [ bit-count>> 24 or write2 ] + [ compression>> 0 or write4 ] + [ size-image>> write4 ] + [ x-pels>> 0 or write4 ] + [ y-pels>> 0 or write4 ] + [ color-used>> 0 or write4 ] + [ color-important>> 0 or write4 ] + [ rgb-quads>> write ] + [ color-index>> write ] + } cleave + ] bi ] with-file-writer ; - -M: bitmap draw-image ( bitmap -- ) - dup height>> 0 < [ - 0 0 glRasterPos2i - 1.0 -1.0 glPixelZoom - ] [ - 0 over height>> abs glRasterPos2i - 1.0 1.0 glPixelZoom - ] if - [ width>> ] keep - [ - [ height>> abs ] keep - bit-count>> { - { 32 [ GL_BGRA GL_UNSIGNED_BYTE ] } - { 24 [ GL_BGR GL_UNSIGNED_BYTE ] } - { 8 [ GL_BGR GL_UNSIGNED_BYTE ] } - { 4 [ GL_BGR GL_UNSIGNED_BYTE ] } - } case - ] keep array>> glDrawPixels ; - -M: bitmap width ( bitmap -- ) width>> ; -M: bitmap height ( bitmap -- ) height>> ; - -: bitmap. ( path -- ) - load-bitmap gadget. ; - -: bitmap-window ( path -- gadget ) - load-bitmap [ "bitmap" open-window ] keep ; - -: test-bitmap24 ( -- ) - "resource:extra/graphics/bitmap/test-images/thiswayup24.bmp" bitmap. ; - -: test-bitmap8 ( -- ) - "resource:extra/graphics/bitmap/test-images/rgb8bit.bmp" bitmap. ; - -: test-bitmap4 ( -- ) - "resource:extra/graphics/bitmap/test-images/rgb4bit.bmp" bitmap. ; - -: test-bitmap1 ( -- ) - "resource:extra/graphics/bitmap/test-images/1bit.bmp" bitmap. ; - diff --git a/extra/graphics/viewer/viewer.factor b/extra/graphics/viewer/viewer.factor index 0533ffaf5d..8e0b1ec43c 100644 --- a/extra/graphics/viewer/viewer.factor +++ b/extra/graphics/viewer/viewer.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2007 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel math math.functions namespaces opengl -ui.gadgets ui.render accessors ; +USING: accessors arrays combinators graphics.bitmap kernel math +math.functions namespaces opengl opengl.gl ui ui.gadgets +ui.gadgets.panes ui.render ; IN: graphics.viewer TUPLE: graphics-gadget < gadget image ; @@ -19,3 +20,31 @@ M: graphics-gadget draw-gadget* ( gadget -- ) : ( bitmap -- gadget ) \ graphics-gadget new-gadget swap >>image ; + +M: bitmap draw-image ( bitmap -- ) + dup height>> 0 < [ + 0 0 glRasterPos2i + 1.0 -1.0 glPixelZoom + ] [ + 0 over height>> abs glRasterPos2i + 1.0 1.0 glPixelZoom + ] if + [ width>> ] keep + [ + [ height>> abs ] keep + bit-count>> { + { 32 [ GL_BGRA GL_UNSIGNED_BYTE ] } + { 24 [ GL_BGR GL_UNSIGNED_BYTE ] } + { 8 [ GL_BGR GL_UNSIGNED_BYTE ] } + { 4 [ GL_BGR GL_UNSIGNED_BYTE ] } + } case + ] keep array>> glDrawPixels ; + +M: bitmap width ( bitmap -- ) width>> ; +M: bitmap height ( bitmap -- ) height>> ; + +: bitmap. ( path -- ) + load-bitmap gadget. ; + +: bitmap-window ( path -- gadget ) + load-bitmap [ "bitmap" open-window ] keep ; diff --git a/extra/msxml-to-csv/msxml-to-csv.factor b/extra/msxml-to-csv/msxml-to-csv.factor index 855275efcc..cab28c14ca 100644 --- a/extra/msxml-to-csv/msxml-to-csv.factor +++ b/extra/msxml-to-csv/msxml-to-csv.factor @@ -1,4 +1,4 @@ -USING: io io.files sequences xml xml.utilities +USING: io io.files sequences xml xml.traversal io.encodings.ascii kernel ; IN: msxml-to-csv diff --git a/extra/svg/svg-tests.factor b/extra/svg/svg-tests.factor index 3a28310d71..0f0c349b8e 100644 --- a/extra/svg/svg-tests.factor +++ b/extra/svg/svg-tests.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff, see BSD license USING: accessors arrays literals math math.affine-transforms -math.functions multiline sequences svg tools.test xml xml.utilities ; +math.functions multiline sequences svg tools.test xml xml.traversal ; IN: svg.tests { 1.0 2.25 } { -3.0 4.0 } { 5.5 0.000001 } 1array [ diff --git a/extra/svg/svg.factor b/extra/svg/svg.factor index 4d8a6e6a17..2ed5d21707 100644 --- a/extra/svg/svg.factor +++ b/extra/svg/svg.factor @@ -1,7 +1,7 @@ ! (c)2009 Joe Groff, see BSD license USING: accessors arrays assocs fry kernel math math.affine-transforms math.constants math.functions math.parser math.vectors memoize peg.ebnf sequences sequences.squish -splitting strings xml.data xml.utilities ; +splitting strings xml.data xml.syntax ; IN: svg XML-NS: svg-name http://www.w3.org/2000/svg diff --git a/extra/yahoo/yahoo.factor b/extra/yahoo/yahoo.factor index d163c8f1ac..b58a11747f 100755 --- a/extra/yahoo/yahoo.factor +++ b/extra/yahoo/yahoo.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2006 Daniel Ehrenberg, Walton Chan ! See http://factorcode.org/license.txt for BSD license. -USING: http.client xml xml.utilities kernel sequences +USING: http.client xml xml.traversal kernel sequences math.parser urls accessors locals ; IN: yahoo