From c519a52b57ab1ae49360e833aea7d5af0d9fef2b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 22 Jun 2016 14:27:36 -0700 Subject: [PATCH] factor: remove multiline almost everywhere. more --- core/classes/classes-tests.factor | 2 +- .../cpu/architecture/architecture-docs.factor | 2 +- core/delegate/delegate-tests.factor | 4 +- core/locals/locals-tests.factor | 6 +- core/modern/compiler/compiler.factor | 38 +++++------ core/modern/modern.factor | 2 +- core/modern/out/out-tests.factor | 6 +- core/multiline/multiline.factor | 64 ++----------------- core/parser/parser-tests.factor | 24 +++---- demos/bunny/cel-shaded/cel-shaded.factor | 2 +- demos/bunny/outlined/outlined.factor | 2 +- demos/spheres/spheres.factor | 2 +- demos/talks/otug-talk/otug-talk.factor | 2 +- .../apple-script/apple-script-docs.factor | 2 +- ffi/cocoa/apple-script/apple-script.factor | 2 +- ffi/forestdb/lib/lib-tests.factor | 10 +-- ffi/macho/macho-tests.factor | 2 +- ffi/mongodb/msg/msg.factor | 7 +- ffi/opencl/ffi/ffi-tests.factor | 2 +- ffi/opencl/opencl-tests.factor | 2 +- ffi/opengl/shaders/shaders-docs.factor | 2 +- ffi/windows/com/com-docs.factor | 2 +- .../furnace/actions/actions-tests.factor | 2 +- .../furnace/chloe-tags/chloe-tags.factor | 2 +- .../furnace/recaptcha/recaptcha-docs.factor | 2 +- .../furnace/utilities/utilities-tests.factor | 2 +- frameworks/gpu/shaders/shaders-docs.factor | 2 +- frameworks/gpu/shaders/shaders-tests.factor | 2 +- frameworks/gpu/shaders/shaders.factor | 2 +- games/terrain/shaders/shaders.factor | 2 +- .../cfg/builder/alien/alien-docs.factor | 2 +- .../cfg/builder/blocks/blocks-docs.factor | 2 +- .../compiler/cfg/builder/builder-docs.factor | 2 +- .../instructions/syntax/syntax-docs.factor | 2 +- language/compiler/codegen/codegen-docs.factor | 2 +- .../tree/propagation/propagation-docs.factor | 2 +- language/functors/functors-tests.factor | 2 +- language/funktors/funktors.factor | 2 +- language/io/encodings/euc/euc-tests.factor | 2 +- .../io/encodings/johab/johab-tests.factor | 2 +- .../io/encodings/shift-jis/shift-jis.factor | 2 +- language/literals/literals-docs.factor | 2 +- language/literate/literate.factor | 5 +- language/pair-rocket/pair-rocket-docs.factor | 2 +- language/peg/ebnf/ebnf-tests.factor | 2 +- .../tuple-arrays/tuple-arrays-tests.factor | 10 +-- language/tuple-arrays/tuple-arrays.factor | 2 +- language/variants/variants-docs.factor | 2 +- libs/c/preprocessor/preprocessor-tests.factor | 6 +- libs/compression/huffman/huffman.factor | 2 +- libs/compression/run-length/run-length.factor | 2 +- libs/elf/nm/nm-tests.factor | 2 +- libs/fullscreen/fullscreen.factor | 2 +- .../html/templates/chloe/syntax/syntax.factor | 2 +- libs/http/http-tests.factor | 2 +- .../server/requests/requests-tests.factor | 2 +- libs/managed-server/managed-server.factor | 2 +- libs/mime/multipart/multipart-tests.factor | 2 +- libs/peg/expr/expr-tests.factor | 2 +- libs/qw/qw-docs.factor | 2 +- libs/regexp/regexp-tests.factor | 2 +- libs/regexp/regexp.factor | 11 ++-- libs/robots/robots.factor | 2 +- libs/roles/roles-docs.factor | 2 +- libs/sorting/slots/slots-tests.factor | 2 +- libs/svg/svg-tests.factor | 4 +- libs/text-analysis/text-analysis.factor | 2 +- libs/xml/data/data.factor | 2 +- libs/xml/syntax/syntax-tests.factor | 2 +- libs/xml/tests/templating.factor | 2 +- libs/xml/writer/writer-docs.factor | 2 +- libs/xml/writer/writer-tests.factor | 2 +- libs/xmode/code2html/code2html-tests.factor | 5 +- tools/spider/spider-docs.factor | 2 +- tools/spider/spider.factor | 2 +- webapps/webapps/imagebin/imagebin.factor | 3 +- 76 files changed, 133 insertions(+), 192 deletions(-) diff --git a/core/classes/classes-tests.factor b/core/classes/classes-tests.factor index 96cfe4b445..54a2291efe 100644 --- a/core/classes/classes-tests.factor +++ b/core/classes/classes-tests.factor @@ -1,5 +1,5 @@ USING: assocs classes classes.private compiler.units definitions -eval generic io.streams.string kernel math multiline namespaces +eval generic io.streams.string kernel math namespaces parser sequences sets sorting tools.test vocabs words ; IN: classes.tests diff --git a/core/cpu/architecture/architecture-docs.factor b/core/cpu/architecture/architecture-docs.factor index 60a66f0043..af76c4d679 100644 --- a/core/cpu/architecture/architecture-docs.factor +++ b/core/cpu/architecture/architecture-docs.factor @@ -1,7 +1,7 @@ USING: alien assocs classes compiler.cfg.instructions compiler.cfg.registers compiler.cfg.stack-frame cpu.x86.assembler cpu.x86.assembler.operands help.markup help.syntax kernel layouts -literals math multiline sequences strings system vm words ; +literals math sequences strings system vm words ; IN: cpu.architecture COMPILE< diff --git a/core/delegate/delegate-tests.factor b/core/delegate/delegate-tests.factor index f1a13ea44a..3161ce3abd 100644 --- a/core/delegate/delegate-tests.factor +++ b/core/delegate/delegate-tests.factor @@ -1,6 +1,6 @@ USING: delegate kernel arrays tools.test words math definitions compiler.units parser generic prettyprint io.streams.string -accessors eval multiline generic.single delegate.protocols +accessors eval generic.single delegate.protocols delegate.private assocs see make ; IN: delegate.tests @@ -39,7 +39,7 @@ M: hello bing hello-test ; { H{ { goodbye T{ consultation f baz goodbye [ these>> ] } } } } [ baz protocol-consult ] unit-test { H{ } } [ bee protocol-consult ] unit-test -{ "USING: delegate ;\nIN: delegate.tests\nPROTOCOL: baz foo bar { whoa 1 } ; inline\n" } [ [ baz see ] with-string-writer ] unit-test +{ "IN: delegate.tests\nPROTOCOL: baz foo bar { whoa 1 } ; inline\n" } [ [ baz see ] with-string-writer ] unit-test GENERIC: one ( a -- b ) ; M: integer one ; diff --git a/core/locals/locals-tests.factor b/core/locals/locals-tests.factor index 440c2ac92c..bf56dc9b1b 100644 --- a/core/locals/locals-tests.factor +++ b/core/locals/locals-tests.factor @@ -2,7 +2,7 @@ USING: locals math sequences tools.test hashtables words kernel namespaces arrays strings prettyprint io.streams.string parser accessors generic eval combinators combinators.short-circuit combinators.short-circuit.smart math.order math.functions -definitions compiler.units fry lexer words.symbol see multiline +definitions compiler.units fry lexer words.symbol see combinators.smart ; IN: locals.tests @@ -361,7 +361,7 @@ ERROR: punned-class x ; { 4 } [ 12 littledan-cond-problem-1 ] unit-test { "howdy" } [ 0 littledan-cond-problem-1 ] unit-test -/* +![[ :: littledan-case-problem-3 ( a quot -- b ) a { { t [ a not ] } @@ -377,7 +377,7 @@ ERROR: punned-class x ; [ 1 + ] littledan-case-problem-3 ; \ littledan-case-problem-4 def>> must-infer -*/ +]] GENERIC: lambda-method-forget-test ( a -- b ) ; diff --git a/core/modern/compiler/compiler.factor b/core/modern/compiler/compiler.factor index b6678f55e6..7743a25c11 100644 --- a/core/modern/compiler/compiler.factor +++ b/core/modern/compiler/compiler.factor @@ -3,7 +3,7 @@ USING: accessors arrays assocs classes.mixin combinators combinators.short-circuit definitions effects effects.parser fry graphs io.pathnames kernel lexer locals math math.statistics -memoize modern multiline parser quotations sequences +memoize modern parser quotations sequences sequences.extras sets splitting strings unicode words ; IN: modern.compiler @@ -16,22 +16,24 @@ IN: modern.compiler : filter-using ( using -- using' ) { "accessors" "threads.private" "threads" } diff ; -! << -! SYNTAX: STRING-DISPATCH: - ! [ - ! scan-new-word scan-effect - ! H{ } clone over [ in>> but-last ] [ out>> ] bi - ! '[ _ ?at [ throw ] unless _ call-effect ] - ! swap - ! ] with-definition define-declared ; +![[ +COMPILE< +SYNTAX: STRING-DISPATCH: + [ + scan-new-word scan-effect + H{ } clone over [ in>> but-last ] [ out>> ] bi + '[ _ ?at [ throw ] unless _ call-effect ] + swap + ] with-definition define-declared ; -! SYNTAX: STRING-M: - ! [ - ! scan-token scan-word parse-definition - ! over changed-definition - ! swap def>> first swapd set-at - ! ] with-definition ; -! COMPILE> +SYNTAX: STRING-M: + [ + scan-token scan-word parse-definition + over changed-definition + swap def>> first swapd set-at + ] with-definition ; +COMPILE> +]] TUPLE: holder literal ; @@ -356,7 +358,7 @@ MEMO: load-modern ( name -- literals ) load-modern [ holders>using [ load-modern ] map ] closure ; -/* +![[ "sequences" load-modern [ holder>definitions ] map sift [ dup array? [ [ name>> ] map ] [ name>> ] if ] map flatten @@ -368,4 +370,4 @@ clear definitions>> [ define'? ] filter [ holder>> word'? ] filter first -*/ +]] diff --git a/core/modern/modern.factor b/core/modern/modern.factor index 7eca27c0c1..f6aee23c18 100644 --- a/core/modern/modern.factor +++ b/core/modern/modern.factor @@ -4,7 +4,7 @@ USING: accessors arrays assocs assocs.extras combinators combinators.short-circuit constructors continuations fry generalizations io.encodings.utf8 io.files kernel locals macros make math math.order modern.lexer modern.paths modern.slices -multiline namespaces quotations sequences sequences.extras +namespaces quotations sequences sequences.extras shuffle splitting splitting.extras splitting.monotonic strings unicode vocabs.loader ; IN: modern diff --git a/core/modern/out/out-tests.factor b/core/modern/out/out-tests.factor index 049998addc..209469ad84 100644 --- a/core/modern/out/out-tests.factor +++ b/core/modern/out/out-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2016 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors combinators.short-circuit kernel modern -modern.out sequences tools.test multiline ; +modern.out sequences tools.test ; IN: modern.out.tests : rewrite-same-string ( string -- ? ) @@ -44,14 +44,14 @@ IN: modern.out.tests { "^ foo ^ bar" } [ "\\ foo \\ bar" rename-backslash-delimiter ] unit-test -/* +![[ { ": asdf < '< > > ;" } [ ": asdf [ '[ ] ] ;" [ dup { [ single-matched-literal? ] [ delimiter>> "[" = ] } 1&& [ [ drop "<" ] change-delimiter ] when ] rewrite-string ] unit-test -*/ +]] ! lexable-paths [ transform-single-line-comment>hash-comment ] rewrite-paths diff --git a/core/multiline/multiline.factor b/core/multiline/multiline.factor index 9f8141cbbb..77c0b200fb 100644 --- a/core/multiline/multiline.factor +++ b/core/multiline/multiline.factor @@ -1,40 +1,11 @@ ! Copyright (C) 2007 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: accessors combinators kernel lexer locals make math -namespaces parser quotations sequences words ; +USING: accessors kernel lexer make math namespaces sequences ; IN: multiline -ERROR: bad-heredoc identifier ; - PRIVATE< -: rest-of-line ( lexer -- seq ) - [ line-text>> ] [ column>> ] bi tail ; - -: next-line-text ( lexer -- str ? ) - [ next-line ] [ line-text>> ] [ still-parsing? ] tri ; - -: (parse-here) ( lexer -- ) - dup next-line-text [ - dup ";" = - [ drop next-line ] - [ % char: \n , (parse-here) ] if - ] [ ";" throw-unexpected-eof ] if ; - -PRIVATE> - -ERROR: text-found-before-eol string ; - -: parse-here ( -- str ) - [ - lexer get - dup rest-of-line [ text-found-before-eol ] unless-empty - (parse-here) - ] "" make but-last ; - -PRIVATE< - -:: (scan-multiline-string) ( i end lexer -- j ) +:: scan-multiline-string ( i end lexer -- j ) lexer line-text>> :> text lexer still-parsing? [ end text i start* |[ j | @@ -42,47 +13,20 @@ PRIVATE< ] [ text i short tail % char: \n , lexer next-line - 0 end lexer (scan-multiline-string) + 0 end lexer scan-multiline-string ] if* ] [ end throw-unexpected-eof ] if ; :: (parse-multiline-string) ( end-text lexer skip-n-chars -- str ) [ lexer - [ skip-n-chars + end-text lexer (scan-multiline-string) ] + [ skip-n-chars + end-text lexer scan-multiline-string ] change-column drop ] "" make ; -: advance-same-line ( lexer text -- ) - length [ + ] curry change-column drop ; - -:: (parse-til-line-begins) ( begin-text lexer -- ) - lexer still-parsing? [ - lexer line-text>> begin-text sequence= [ - lexer begin-text advance-same-line - ] [ - lexer line-text>> % char: \n , - lexer next-line - begin-text lexer (parse-til-line-begins) - ] if - ] [ - begin-text bad-heredoc - ] if ; - -: parse-til-line-begins ( begin-text lexer -- seq ) - [ (parse-til-line-begins) ] "" make ; - PRIVATE> : parse-multiline-string ( end-text -- str ) lexer get 1 (parse-multiline-string) ; SYNTAX: /* "*/" parse-multiline-string drop ; - -SYNTAX: \ HEREDOC: - lexer get { - [ skip-blank ] - [ rest-of-line ] - [ next-line ] - [ parse-til-line-begins ] - } cleave suffix! ; diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor index 902b49551d..fb21131236 100644 --- a/core/parser/parser-tests.factor +++ b/core/parser/parser-tests.factor @@ -1,6 +1,6 @@ USING: accessors arrays assocs classes compiler.units effects eval generic grouping io.pathnames io.streams.string kernel -lexer math multiline namespaces parser sequences sets +lexer math namespaces parser sequences sets source-files source-files.errors strings tools.crossref tools.test vocabs vocabs.parser words words.symbol ; IN: parser.tests @@ -540,19 +540,21 @@ EXCLUDE: qualified.tests.bar => x ; ! Two similar bugs ! Replace : def with something in COMPILE< COMPILE> -/* { [ ] } [ - "IN: parser.tests : was-once-a-word-bug ( -- ) ;" - "was-once-a-word-test" parse-stream -] unit-test +![[ + { [ ] } [ + "IN: parser.tests : was-once-a-word-bug ( -- ) ;" + "was-once-a-word-test" parse-stream + ] unit-test -{ t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test + { t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test -{ [ ] } [ - "IN: parser.tests USE: words COMPILE< \"was-once-a-word-bug\" \"parser.tests\" create-word [ ] ( -- ) define-declared COMPILE>" - "was-once-a-word-test" parse-stream -] unit-test + { [ ] } [ + "IN: parser.tests USE: words COMPILE< \"was-once-a-word-bug\" \"parser.tests\" create-word [ ] ( -- ) define-declared COMPILE>" + "was-once-a-word-test" parse-stream + ] unit-test -{ t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test */ + { t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test +]] ! Replace : def with DEFER: { [ ] } [ diff --git a/demos/bunny/cel-shaded/cel-shaded.factor b/demos/bunny/cel-shaded/cel-shaded.factor index 19ac4ad305..4566cfec0a 100644 --- a/demos/bunny/cel-shaded/cel-shaded.factor +++ b/demos/bunny/cel-shaded/cel-shaded.factor @@ -1,5 +1,5 @@ USING: arrays bunny.model continuations destructors kernel -multiline opengl opengl.shaders opengl.capabilities opengl.gl +opengl opengl.shaders opengl.capabilities opengl.gl sequences accessors combinators ; IN: bunny.cel-shaded diff --git a/demos/bunny/outlined/outlined.factor b/demos/bunny/outlined/outlined.factor index 622b77d5da..d38bf8eca9 100644 --- a/demos/bunny/outlined/outlined.factor +++ b/demos/bunny/outlined/outlined.factor @@ -1,5 +1,5 @@ USING: arrays bunny.model bunny.cel-shaded continuations -destructors kernel math multiline opengl opengl.shaders +destructors kernel math opengl opengl.shaders opengl.framebuffers opengl.gl opengl.textures opengl.demo-support fry opengl.capabilities sequences ui.gadgets combinators accessors macros locals ; diff --git a/demos/spheres/spheres.factor b/demos/spheres/spheres.factor index 404b18c543..7729cd4e30 100644 --- a/demos/spheres/spheres.factor +++ b/demos/spheres/spheres.factor @@ -1,5 +1,5 @@ USING: kernel opengl opengl.demo-support opengl.gl opengl.textures -opengl.shaders opengl.framebuffers opengl.capabilities multiline +opengl.shaders opengl.framebuffers opengl.capabilities ui.gadgets accessors sequences ui.render ui math locals arrays generalizations combinators ui.gadgets.worlds literals ui.pixel-formats ; diff --git a/demos/talks/otug-talk/otug-talk.factor b/demos/talks/otug-talk/otug-talk.factor index 9f320aff4f..fbee02b7a9 100644 --- a/demos/talks/otug-talk/otug-talk.factor +++ b/demos/talks/otug-talk/otug-talk.factor @@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations tools.annotations tools.crossref help.topics math.functions compiler.tree.optimizer compiler.cfg.optimizer fry ui.gadgets.panes tetris tetris.game combinators generalizations -multiline sequences.private ; +sequences.private ; IN: talks.otug-talk : $tetris ( element -- ) diff --git a/ffi/cocoa/apple-script/apple-script-docs.factor b/ffi/cocoa/apple-script/apple-script-docs.factor index 73ea013a91..efc790f7ff 100644 --- a/ffi/cocoa/apple-script/apple-script-docs.factor +++ b/ffi/cocoa/apple-script/apple-script-docs.factor @@ -8,6 +8,6 @@ HELP: run-apple-script { $notes "Currently, return values are unsupported." } ; HELP: \ APPLESCRIPT: -{ $syntax "APPLESCRIPT: word ...applescript... APPLESCRIPT;" } +{ $syntax "APPLESCRIPT: word [[ ...applescript ... ]]" } { $values { "word" "a new word to define" } { "...applescript..." "AppleScript source text" } } { $description "Defines a word that when called will run the provided uncompiled AppleScript. The word has stack effect " { $snippet "( -- )" } " due to return values being currently unsupported." } ; diff --git a/ffi/cocoa/apple-script/apple-script.factor b/ffi/cocoa/apple-script/apple-script.factor index 08dbbef2a2..503a102fba 100644 --- a/ffi/cocoa/apple-script/apple-script.factor +++ b/ffi/cocoa/apple-script/apple-script.factor @@ -12,5 +12,5 @@ IN: cocoa.apple-script f send\ executeAndReturnError: drop ; SYNTAX: \ APPLESCRIPT: - scan-new-word "APPLESCRIPT;" parse-multiline-string + scan-new-word scan-object [ run-apple-script ] curry ( -- ) define-declared ; diff --git a/ffi/forestdb/lib/lib-tests.factor b/ffi/forestdb/lib/lib-tests.factor index 46d13c96c0..1b903fb6e5 100644 --- a/ffi/forestdb/lib/lib-tests.factor +++ b/ffi/forestdb/lib/lib-tests.factor @@ -5,7 +5,7 @@ alien.syntax arrays assocs classes.struct combinators combinators.short-circuit constructors continuations destructors forestdb.ffi forestdb.utils fry generalizations io.directories io.encodings.string io.encodings.utf8 io.files.temp io.pathnames -kernel layouts libc make math math.parser math.ranges multiline +kernel layouts libc make math math.parser math.ranges namespaces sequences system tools.test ; IN: forestdb.lib @@ -135,7 +135,7 @@ IN: forestdb.lib ! Snapshots -/* +![[ { 5 5 } [ [ 5 set-kv-n @@ -145,10 +145,10 @@ IN: forestdb.lib ] with-forestdb-snapshot ] with-forestdb-test-manual ] unit-test -*/ +]] -/* +![[ ! Snapshots can only occur on commits. If you commit five keys at once, ! and then try to open a snapshot on the second key, it should fail. @@ -243,7 +243,7 @@ IN: forestdb.lib ] with-forestdb-tester ] unit-test -*/ +]] ! Iterators test diff --git a/ffi/macho/macho-tests.factor b/ffi/macho/macho-tests.factor index 209d23a5b6..4eab0a6834 100644 --- a/ffi/macho/macho-tests.factor +++ b/ffi/macho/macho-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien io io.streams.string kernel literals macho -multiline sequences strings system tools.test ; +sequences strings system tools.test ; IN: macho.tests CONSTANT: validation-output [[ diff --git a/ffi/mongodb/msg/msg.factor b/ffi/mongodb/msg/msg.factor index 4fa85ac27c..2e77c86b76 100644 --- a/ffi/mongodb/msg/msg.factor +++ b/ffi/mongodb/msg/msg.factor @@ -1,6 +1,5 @@ USING: accessors assocs hashtables constructors kernel linked-assocs math sequences strings ; - IN: mongodb.msg CONSTANT: OP_Reply 1 ; @@ -12,9 +11,9 @@ CONSTANT: OP_GetMore 2005 ; CONSTANT: OP_Delete 2006 ; CONSTANT: OP_KillCursors 2007 ; -CONSTANT: ResultFlag_CursorNotFound 1 ; ! /* returned, with zero results, when getMore is called but the cursor id is not valid at the server. */ -CONSTANT: ResultFlag_ErrSet 2 ; ! /* { $err : ... } is being returned */ -CONSTANT: ResultFlag_ShardConfigStale 4 ; ! /* have to update config from the server, usually $err is also set */ +CONSTANT: ResultFlag_CursorNotFound 1 ; ! returned, with zero results, when getMore is called but the cursor id is not valid at the server. +CONSTANT: ResultFlag_ErrSet 2 ; ! { $err : ... } is being returned +CONSTANT: ResultFlag_ShardConfigStale 4 ; ! have to update config from the server, usually $err is also set TUPLE: mdb-msg { opcode integer } diff --git a/ffi/opencl/ffi/ffi-tests.factor b/ffi/opencl/ffi/ffi-tests.factor index b3660b3d04..86ee961b10 100644 --- a/ffi/opencl/ffi/ffi-tests.factor +++ b/ffi/opencl/ffi/ffi-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test opencl.ffi multiline locals kernel io.encodings.ascii +USING: tools.test opencl.ffi locals kernel io.encodings.ascii io.encodings.string sequences libc alien.c-types destructors math specialized-arrays alien.data math.order alien ; FROM: alien.c-types => float ; diff --git a/ffi/opencl/opencl-tests.factor b/ffi/opencl/opencl-tests.factor index 7086be0947..1d2b612c65 100644 --- a/ffi/opencl/opencl-tests.factor +++ b/ffi/opencl/opencl-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. -USING: multiline locals io.encodings.ascii io.encodings.string sequences +USING: locals io.encodings.ascii io.encodings.string sequences math specialized-arrays alien.c-types math.order alien opencl tools.test accessors arrays destructors kernel namespaces alien.data ; FROM: alien.c-types => float ; diff --git a/ffi/opengl/shaders/shaders-docs.factor b/ffi/opengl/shaders/shaders-docs.factor index 87185a43b1..10a4fbc62c 100644 --- a/ffi/opengl/shaders/shaders-docs.factor +++ b/ffi/opengl/shaders/shaders-docs.factor @@ -1,5 +1,5 @@ USING: help.markup help.syntax io kernel math quotations -opengl.gl multiline assocs strings ; +opengl.gl assocs strings ; IN: opengl.shaders HELP: gl-shader diff --git a/ffi/windows/com/com-docs.factor b/ffi/windows/com/com-docs.factor index c1cba6f943..d0da4d82d1 100644 --- a/ffi/windows/com/com-docs.factor +++ b/ffi/windows/com/com-docs.factor @@ -1,5 +1,5 @@ USING: help.markup help.syntax io kernel math quotations -multiline destructors ; +destructors ; IN: windows.com HELP: com-query-interface diff --git a/frameworks/furnace/actions/actions-tests.factor b/frameworks/furnace/actions/actions-tests.factor index 7a16f8ad42..28f5ddfd0f 100644 --- a/frameworks/furnace/actions/actions-tests.factor +++ b/frameworks/furnace/actions/actions-tests.factor @@ -1,5 +1,5 @@ USING: kernel furnace.actions io.crlf validators tools.test math math.parser -multiline namespaces http io.streams.string http.server http.server.requests +namespaces http io.streams.string http.server http.server.requests sequences splitting accessors ; IN: furnace.actions.tests diff --git a/frameworks/furnace/chloe-tags/chloe-tags.factor b/frameworks/furnace/chloe-tags/chloe-tags.factor index 09dedd0edb..a95c177d2d 100644 --- a/frameworks/furnace/chloe-tags/chloe-tags.factor +++ b/frameworks/furnace/chloe-tags/chloe-tags.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays kernel combinators assocs namespaces sequences splitting words -fry urls multiline present +fry urls present xml xml.data xml.entities diff --git a/frameworks/furnace/recaptcha/recaptcha-docs.factor b/frameworks/furnace/recaptcha/recaptcha-docs.factor index 3d23979962..2a219717ad 100644 --- a/frameworks/furnace/recaptcha/recaptcha-docs.factor +++ b/frameworks/furnace/recaptcha/recaptcha-docs.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: help.markup help.syntax http.server.filters kernel -multiline furnace.actions furnace.alloy furnace.conversations ; +furnace.actions furnace.alloy furnace.conversations ; IN: furnace.recaptcha HELP: diff --git a/frameworks/furnace/utilities/utilities-tests.factor b/frameworks/furnace/utilities/utilities-tests.factor index d716def336..ec979560f8 100644 --- a/frameworks/furnace/utilities/utilities-tests.factor +++ b/frameworks/furnace/utilities/utilities-tests.factor @@ -1,5 +1,5 @@ USING: furnace.utilities io.encodings.utf8 io.files io.files.temp kernel -multiline parser tools.test webapps.counter ; +parser tools.test webapps.counter ; IN: furnace.utilities.tests COMPILE< diff --git a/frameworks/gpu/shaders/shaders-docs.factor b/frameworks/gpu/shaders/shaders-docs.factor index 2f1c603d74..aa0b87c01a 100644 --- a/frameworks/gpu/shaders/shaders-docs.factor +++ b/frameworks/gpu/shaders/shaders-docs.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff bsd license USING: classes classes.struct gpu.buffers help.markup help.syntax -images kernel math multiline quotations sequences strings words ; +images kernel math quotations sequences strings words ; IN: gpu.shaders HELP: diff --git a/frameworks/gpu/shaders/shaders-tests.factor b/frameworks/gpu/shaders/shaders-tests.factor index b62e9e6113..bb5ebdf109 100644 --- a/frameworks/gpu/shaders/shaders-tests.factor +++ b/frameworks/gpu/shaders/shaders-tests.factor @@ -1,5 +1,5 @@ ! (c)2009 Joe Groff bsd license -USING: multiline gpu.shaders gpu.shaders.private tools.test ; +USING: gpu.shaders gpu.shaders.private tools.test ; IN: gpu.shaders.tests { "ERROR: foo.factor:20: Bad command or filename diff --git a/frameworks/gpu/shaders/shaders.factor b/frameworks/gpu/shaders/shaders.factor index c076cb5f3d..d8c911945c 100755 --- a/frameworks/gpu/shaders/shaders.factor +++ b/frameworks/gpu/shaders/shaders.factor @@ -4,7 +4,7 @@ arrays assocs byte-arrays classes.mixin classes.parser classes.singleton classes.struct combinators combinators.short-circuit definitions destructors fry generic.parser gpu gpu.buffers gpu.private gpu.state hashtables images io.encodings.ascii io.files io.pathnames -kernel lexer literals locals math math.parser memoize multiline namespaces +kernel lexer literals locals math math.parser memoize namespaces opengl opengl.gl opengl.shaders parser quotations sequences specialized-arrays splitting strings tr ui.gadgets.worlds variants vectors vocabs vocabs.loader vocabs.parser words diff --git a/games/terrain/shaders/shaders.factor b/games/terrain/shaders/shaders.factor index 0e37f68f97..c96f47c3c8 100644 --- a/games/terrain/shaders/shaders.factor +++ b/games/terrain/shaders/shaders.factor @@ -1,4 +1,4 @@ -USING: multiline ; +USING: ; IN: terrain.shaders CONSTANT: sky-vertex-shader [[ diff --git a/language/compiler/cfg/builder/alien/alien-docs.factor b/language/compiler/cfg/builder/alien/alien-docs.factor index 3f1ab4d48d..6d02483003 100644 --- a/language/compiler/cfg/builder/alien/alien-docs.factor +++ b/language/compiler/cfg/builder/alien/alien-docs.factor @@ -1,6 +1,6 @@ USING: alien alien.libraries compiler.cfg compiler.cfg.builder compiler.cfg.instructions compiler.tree help.markup help.syntax -literals make multiline sequences stack-checker.alien strings ; +literals make sequences stack-checker.alien strings ; IN: compiler.cfg.builder.alien COMPILE< diff --git a/language/compiler/cfg/builder/blocks/blocks-docs.factor b/language/compiler/cfg/builder/blocks/blocks-docs.factor index 012d5891e9..9e85adce1f 100644 --- a/language/compiler/cfg/builder/blocks/blocks-docs.factor +++ b/language/compiler/cfg/builder/blocks/blocks-docs.factor @@ -1,5 +1,5 @@ USING: compiler.cfg compiler.cfg.stacks.local compiler.tree help.markup -help.syntax literals make math multiline quotations sequences ; +help.syntax literals make math quotations sequences ; IN: compiler.cfg.builder.blocks COMPILE< diff --git a/language/compiler/cfg/builder/builder-docs.factor b/language/compiler/cfg/builder/builder-docs.factor index 11f28af99d..13131d10c7 100644 --- a/language/compiler/cfg/builder/builder-docs.factor +++ b/language/compiler/cfg/builder/builder-docs.factor @@ -1,6 +1,6 @@ USING: assocs compiler.cfg compiler.cfg.builder.blocks compiler.cfg.instructions compiler.cfg.stacks.local compiler.tree -help.markup help.syntax kernel literals math multiline quotations +help.markup help.syntax kernel literals math quotations sequences vectors words ; IN: compiler.cfg.builder diff --git a/language/compiler/cfg/instructions/syntax/syntax-docs.factor b/language/compiler/cfg/instructions/syntax/syntax-docs.factor index 32625eb549..6f831ee6dc 100644 --- a/language/compiler/cfg/instructions/syntax/syntax-docs.factor +++ b/language/compiler/cfg/instructions/syntax/syntax-docs.factor @@ -1,4 +1,4 @@ -USING: help.markup help.syntax literals multiline sequences splitting ; +USING: help.markup help.syntax literals sequences splitting ; IN: compiler.cfg.instructions.syntax COMPILE< diff --git a/language/compiler/codegen/codegen-docs.factor b/language/compiler/codegen/codegen-docs.factor index 736273b0d4..f916ce422f 100644 --- a/language/compiler/codegen/codegen-docs.factor +++ b/language/compiler/codegen/codegen-docs.factor @@ -1,6 +1,6 @@ USING: alien byte-arrays compiler.cfg compiler.cfg.instructions compiler.codegen.labels compiler.codegen.relocation cpu.architecture hashtables -help.markup help.syntax literals make multiline sequences ; +help.markup help.syntax literals make sequences ; IN: compiler.codegen COMPILE< diff --git a/language/compiler/tree/propagation/propagation-docs.factor b/language/compiler/tree/propagation/propagation-docs.factor index 51efbd36db..3a643b2fb2 100644 --- a/language/compiler/tree/propagation/propagation-docs.factor +++ b/language/compiler/tree/propagation/propagation-docs.factor @@ -1,4 +1,4 @@ -USING: help.markup help.syntax literals multiline ; +USING: help.markup help.syntax literals ; IN: compiler.tree.propagation COMPILE< diff --git a/language/functors/functors-tests.factor b/language/functors/functors-tests.factor index 19a7f9fae4..ef515d0988 100644 --- a/language/functors/functors-tests.factor +++ b/language/functors/functors-tests.factor @@ -1,5 +1,5 @@ USING: classes.struct classes.tuple functors tools.test math -words kernel multiline parser io.streams.string generic ; +words kernel parser io.streams.string generic ; QUALIFIED-WITH: alien.c-types c ; IN: functors.tests diff --git a/language/funktors/funktors.factor b/language/funktors/funktors.factor index 9354bb7550..77187636be 100644 --- a/language/funktors/funktors.factor +++ b/language/funktors/funktors.factor @@ -3,7 +3,7 @@ multiline namespaces parser sequences sets splitting vocabs.parser words ; IN: funktors -SYNTAX: \ factor[[ "]]" parse-multiline-string +SYNTAX: \ funktor[[ "]]" parse-multiline-string manifest get search-vocab-names>> { "syntax" } diff members current-vocab name>> ".private" ?tail drop ".private" append suffix diff --git a/language/io/encodings/euc/euc-tests.factor b/language/io/encodings/euc/euc-tests.factor index 808f85a017..9ee04f1936 100644 --- a/language/io/encodings/euc/euc-tests.factor +++ b/language/io/encodings/euc/euc-tests.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: arrays byte-arrays io io.encodings io.encodings.euc-kr assocs io.encodings.string io.streams.string io.encodings.euc.private words -kernel locals multiline namespaces sequences strings tools.test ; +kernel locals namespaces sequences strings tools.test ; IN: io.encodings.euc.tests : euc-kr>unicode ( ch -- ch/f ) diff --git a/language/io/encodings/johab/johab-tests.factor b/language/io/encodings/johab/johab-tests.factor index 99f12baf9f..ef1b400ec7 100644 --- a/language/io/encodings/johab/johab-tests.factor +++ b/language/io/encodings/johab/johab-tests.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: arrays byte-arrays io io.encodings io.encodings.johab assocs io.encodings.string io.streams.string io.encodings.euc.private words -kernel locals multiline namespaces sequences strings tools.test ; +kernel locals namespaces sequences strings tools.test ; IN: io.encodings.johab.tests : johab>unicode ( ch -- ch/f ) diff --git a/language/io/encodings/shift-jis/shift-jis.factor b/language/io/encodings/shift-jis/shift-jis.factor index cb2cae549f..f6fd3a6743 100644 --- a/language/io/encodings/shift-jis/shift-jis.factor +++ b/language/io/encodings/shift-jis/shift-jis.factor @@ -4,7 +4,7 @@ USING: sequences kernel io io.files combinators.short-circuit math.order assocs io.encodings io.binary fry strings math io.encodings.ascii arrays byte-arrays accessors splitting math.parser biassocs io.encodings.iana namespaces -locals multiline combinators simple-flat-file ; +locals combinators simple-flat-file ; IN: io.encodings.shift-jis SINGLETON: shift-jis diff --git a/language/literals/literals-docs.factor b/language/literals/literals-docs.factor index 6b0823cdfa..d1dde0b47e 100644 --- a/language/literals/literals-docs.factor +++ b/language/literals/literals-docs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax kernel multiline sequences ; +USING: help.markup help.syntax kernel sequences ; IN: literals HELP: $ diff --git a/language/literate/literate.factor b/language/literate/literate.factor index 7d746721fe..d52d431978 100644 --- a/language/literate/literate.factor +++ b/language/literate/literate.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2012 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors combinators.short-circuit compiler.units kernel -lexer math multiline parser sequences splitting ; - +USING: accessors compiler.units kernel lexer math multiline +parser sequences splitting ; IN: literate TUPLE: literate-lexer < lexer ; diff --git a/language/pair-rocket/pair-rocket-docs.factor b/language/pair-rocket/pair-rocket-docs.factor index 96ab14f4df..a8437e11e1 100644 --- a/language/pair-rocket/pair-rocket-docs.factor +++ b/language/pair-rocket/pair-rocket-docs.factor @@ -1,5 +1,5 @@ ! (c)2009 Joe Groff bsd license -USING: help.markup help.syntax multiline ; +USING: help.markup help.syntax ; IN: pair-rocket HELP: => diff --git a/language/peg/ebnf/ebnf-tests.factor b/language/peg/ebnf/ebnf-tests.factor index 60132ed644..c5946c791d 100644 --- a/language/peg/ebnf/ebnf-tests.factor +++ b/language/peg/ebnf/ebnf-tests.factor @@ -3,7 +3,7 @@ ! USING: kernel tools.test peg peg.ebnf peg.ebnf.private words math math.parser sequences accessors peg.parsers parser -namespaces arrays strings eval unicode multiline ; +namespaces arrays strings eval unicode ; IN: peg.ebnf.tests { T{ ebnf-non-terminal f "abc" } } [ diff --git a/language/tuple-arrays/tuple-arrays-tests.factor b/language/tuple-arrays/tuple-arrays-tests.factor index cfb74b43cc..8c212c6f0a 100644 --- a/language/tuple-arrays/tuple-arrays-tests.factor +++ b/language/tuple-arrays/tuple-arrays-tests.factor @@ -5,7 +5,7 @@ IN: tuple-arrays.tests SYMBOL: mat TUPLE: foo bar ; final C: foo ; -tuple-array: foo +TUPLE-ARRAY: foo { 2 } [ 2 dup mat set length ] unit-test { T{ foo } } [ mat get first ] unit-test @@ -19,7 +19,7 @@ tuple-array: foo { T{ foo f 1 } } [ T{ foo f 1 } 0 mat get [ set-nth ] keep first ] unit-test TUPLE: baz { bing integer } bong ; final -tuple-array: baz +TUPLE-ARRAY: baz { 0 } [ 1 first bing>> ] unit-test { f } [ 1 first bong>> ] unit-test @@ -27,7 +27,7 @@ tuple-array: baz TUPLE: broken x ; final : broken ( -- ) ; -tuple-array: broken +TUPLE-ARRAY: broken { 100 } [ 100 length ] unit-test @@ -46,7 +46,7 @@ must-fail-with ! Empty tuple TUPLE: empty-tuple ; final -tuple-array: empty-tuple +TUPLE-ARRAY: empty-tuple { 100 } [ 100 length ] unit-test { T{ empty-tuple } } [ 100 first ] unit-test @@ -56,7 +56,7 @@ tuple-array: empty-tuple ! of crashing Factor TUPLE: tuple-to-struct x ; final -tuple-array: tuple-to-struct +TUPLE-ARRAY: tuple-to-struct { f } [ tuple-to-struct struct-class? ] unit-test diff --git a/language/tuple-arrays/tuple-arrays.factor b/language/tuple-arrays/tuple-arrays.factor index fa15b37b9b..53289ed88e 100644 --- a/language/tuple-arrays/tuple-arrays.factor +++ b/language/tuple-arrays/tuple-arrays.factor @@ -73,4 +73,4 @@ INSTANCE: CLASS-array sequence ; FUNCTOR> -SYNTAX: \ tuple-array: scan-word define-tuple-array ; +SYNTAX: \ TUPLE-ARRAY: scan-word define-tuple-array ; diff --git a/language/variants/variants-docs.factor b/language/variants/variants-docs.factor index 5d63a6379d..8d334a10ac 100644 --- a/language/variants/variants-docs.factor +++ b/language/variants/variants-docs.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff bsd license USING: arrays classes classes.singleton classes.tuple help.markup -help.syntax kernel multiline slots quotations ; +help.syntax kernel slots quotations ; IN: variants HELP: \ VARIANT: diff --git a/libs/c/preprocessor/preprocessor-tests.factor b/libs/c/preprocessor/preprocessor-tests.factor index f0ac37258a..94b923f2a1 100644 --- a/libs/c/preprocessor/preprocessor-tests.factor +++ b/libs/c/preprocessor/preprocessor-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: tools.test c.preprocessor kernel accessors multiline ; +USING: tools.test c.preprocessor kernel accessors ; IN: c.preprocessor.tests [ "vocab:c/tests/test1/test1.c" start-preprocess-file ] @@ -9,10 +9,10 @@ IN: c.preprocessor.tests { "yo\n\n\n\nyo4\n" } [ "vocab:c/tests/test2/test2.c" start-preprocess-file nip ] unit-test -/* +![[ [ "vocab:c/tests/test3/test3.c" start-preprocess-file ] [ "\"BOO\"" = ] must-fail-with -*/ +]] { V{ "\"omg\"" "\"lol\"" } } [ "vocab:c/tests/test4/test4.c" start-preprocess-file drop warnings>> ] unit-test diff --git a/libs/compression/huffman/huffman.factor b/libs/compression/huffman/huffman.factor index 4077589c3f..613e8964f2 100644 --- a/libs/compression/huffman/huffman.factor +++ b/libs/compression/huffman/huffman.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs fry hashtables io kernel locals math math.order math.parser -math.ranges multiline sequences bitstreams bit-arrays ; +math.ranges sequences bitstreams bit-arrays ; IN: compression.huffman QUALIFIED-WITH: bitstreams bs ; diff --git a/libs/compression/run-length/run-length.factor b/libs/compression/run-length/run-length.factor index 8faaaffc1e..7b041d99d3 100644 --- a/libs/compression/run-length/run-length.factor +++ b/libs/compression/run-length/run-length.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays combinators grouping kernel locals math -math.matrices math.order multiline sequences.parser sequences +math.matrices math.order sequences.parser sequences tools.continuations ; IN: compression.run-length diff --git a/libs/elf/nm/nm-tests.factor b/libs/elf/nm/nm-tests.factor index a20e2f339f..0ee233c9b9 100644 --- a/libs/elf/nm/nm-tests.factor +++ b/libs/elf/nm/nm-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. -USING: elf.nm io io.streams.string kernel literals multiline strings +USING: elf.nm io io.streams.string kernel literals strings system tools.test ; IN: elf.nm.tests diff --git a/libs/fullscreen/fullscreen.factor b/libs/fullscreen/fullscreen.factor index 7b30d25f0e..b1339fbdad 100755 --- a/libs/fullscreen/fullscreen.factor +++ b/libs/fullscreen/fullscreen.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2010 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.c-types arrays classes.struct fry kernel -literals locals make math math.bitwise multiline sequences +literals locals make math math.bitwise sequences slots.syntax ui.backend.windows vocabs.loader windows.errors windows.gdi32 windows.kernel32 windows.types windows.user32 ui.gadgets.worlds ; diff --git a/libs/html/templates/chloe/syntax/syntax.factor b/libs/html/templates/chloe/syntax/syntax.factor index a9367a7b83..847849f855 100644 --- a/libs/html/templates/chloe/syntax/syntax.factor +++ b/libs/html/templates/chloe/syntax/syntax.factor @@ -3,7 +3,7 @@ USING: accessors sequences combinators kernel namespaces classes.tuple assocs splitting words arrays memoize parser lexer io io.files io.encodings.utf8 io.streams.string unicode mirrors fry math urls -multiline xml xml.data xml.writer xml.syntax html.components +xml xml.data xml.writer xml.syntax html.components html.templates ; IN: html.templates.chloe.syntax diff --git a/libs/http/http-tests.factor b/libs/http/http-tests.factor index 953e93da7d..95ea3bf889 100644 --- a/libs/http/http-tests.factor +++ b/libs/http/http-tests.factor @@ -1,5 +1,5 @@ USING: destructors http http.server http.server.requests http.client -http.client.private tools.test multiline fry io.streams.string io.crlf +http.client.private tools.test fry io.streams.string io.crlf io.encodings.utf8 io.encodings.8-bit io.encodings.binary io.encodings.string io.encodings.ascii kernel arrays splitting sequences assocs io.sockets db db.sqlite make continuations urls hashtables accessors namespaces xml.data diff --git a/libs/http/server/requests/requests-tests.factor b/libs/http/server/requests/requests-tests.factor index e07f9987ca..56baa42e3f 100644 --- a/libs/http/server/requests/requests-tests.factor +++ b/libs/http/server/requests/requests-tests.factor @@ -1,7 +1,7 @@ USING: accessors assocs continuations http http.client http.client.private http.server http.server.requests io.crlf io.streams.limited io.streams.string linked-assocs kernel math -math.parser multiline namespaces peg sequences splitting +math.parser namespaces peg sequences splitting tools.test urls ; IN: http.server.requests.tests diff --git a/libs/managed-server/managed-server.factor b/libs/managed-server/managed-server.factor index a84a0dce6c..0d57e2f97f 100644 --- a/libs/managed-server/managed-server.factor +++ b/libs/managed-server/managed-server.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs calendar continuations destructors io io.encodings.binary io.servers io.sockets -io.streams.duplex fry kernel locals math math.ranges multiline +io.streams.duplex fry kernel locals math math.ranges namespaces prettyprint random sequences sets splitting threads tools.continuations ; IN: managed-server diff --git a/libs/mime/multipart/multipart-tests.factor b/libs/mime/multipart/multipart-tests.factor index e53c0717f1..c9f93bfe6f 100644 --- a/libs/mime/multipart/multipart-tests.factor +++ b/libs/mime/multipart/multipart-tests.factor @@ -3,7 +3,7 @@ USING: accessors assocs continuations fry http.server io io.encodings.ascii io.files io.files.temp io.files.unique io.servers io.streams.duplex io.streams.string -kernel math.ranges mime.multipart multiline namespaces random +kernel math.ranges mime.multipart namespaces random sequences sorting strings threads tools.test ; IN: mime.multipart.tests diff --git a/libs/peg/expr/expr-tests.factor b/libs/peg/expr/expr-tests.factor index 446e5ef9ce..7979830506 100644 --- a/libs/peg/expr/expr-tests.factor +++ b/libs/peg/expr/expr-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. ! -USING: kernel tools.test peg peg.expr multiline sequences ; +USING: kernel tools.test peg peg.expr sequences ; IN: peg.expr.tests { 5 } [ diff --git a/libs/qw/qw-docs.factor b/libs/qw/qw-docs.factor index 0931fa5af2..64b3df2128 100644 --- a/libs/qw/qw-docs.factor +++ b/libs/qw/qw-docs.factor @@ -1,5 +1,5 @@ ! (c)2009 Joe Groff bsd license -USING: help.markup help.syntax multiline ; +USING: help.markup help.syntax ; IN: qw HELP: \ qw{ diff --git a/libs/regexp/regexp-tests.factor b/libs/regexp/regexp-tests.factor index 818e690b36..7d8b170855 100644 --- a/libs/regexp/regexp-tests.factor +++ b/libs/regexp/regexp-tests.factor @@ -1,5 +1,5 @@ USING: arrays regexp tools.test kernel sequences regexp.parser -regexp.private eval strings multiline accessors ; +regexp.private eval strings accessors ; IN: regexp-tests { f } [ "b" "a*" matches? ] unit-test diff --git a/libs/regexp/regexp.factor b/libs/regexp/regexp.factor index 81526b1797..af8b6f1d70 100644 --- a/libs/regexp/regexp.factor +++ b/libs/regexp/regexp.factor @@ -1,10 +1,9 @@ ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors combinators kernel kernel.private math sequences -sequences.private strings sets assocs make lexer namespaces parser -arrays fry locals regexp.parser splitting sorting regexp.ast -regexp.negation regexp.compiler compiler.units words math.ranges -multiline ; +USING: accessors arrays compiler.units kernel kernel.private +lexer make math math.ranges multiline namespaces regexp.ast +regexp.compiler regexp.negation regexp.parser sequences +sequences.private splitting strings words ; IN: regexp TUPLE: regexp @@ -217,12 +216,10 @@ PRIVATE< PRIVATE> -SYNTAX: \ R/ parse-regexp ; SYNTAX: \ R[[ "]]" parse-multiline-string lexer get parse-noblank-token compile-next-match suffix! ; SYNTAX: \ R[=[ "]=]" parse-multiline-string lexer get parse-noblank-token compile-next-match suffix! ; SYNTAX: \ R(( "))" parse-multiline-string lexer get parse-noblank-token compile-next-match suffix! ; SYNTAX: \ R{{ "}}" parse-multiline-string lexer get parse-noblank-token compile-next-match suffix! ; USE: vocabs.loader - { "prettyprint" "regexp" } "regexp.prettyprint" require-when diff --git a/libs/robots/robots.factor b/libs/robots/robots.factor index cf18465071..30d6c4392a 100644 --- a/libs/robots/robots.factor +++ b/libs/robots/robots.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs calendar.format combinators combinators.short-circuit fry globs http.client kernel make -math.parser multiline namespaces present regexp +math.parser namespaces present regexp regexp.combinators sequences sets splitting splitting.monotonic unicode urls ; IN: robots diff --git a/libs/roles/roles-docs.factor b/libs/roles/roles-docs.factor index 0dd9f115b9..d40117d7eb 100644 --- a/libs/roles/roles-docs.factor +++ b/libs/roles/roles-docs.factor @@ -1,5 +1,5 @@ ! (c)2009 Joe Groff bsd license -USING: classes.mixin help.markup help.syntax kernel multiline roles ; +USING: classes.mixin help.markup help.syntax kernel roles ; IN: roles HELP: \ ROLE: diff --git a/libs/sorting/slots/slots-tests.factor b/libs/sorting/slots/slots-tests.factor index 23857bb9b1..2544ad444e 100644 --- a/libs/sorting/slots/slots-tests.factor +++ b/libs/sorting/slots/slots-tests.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors math.order sorting.slots tools.test -arrays sequences kernel assocs multiline sorting.functor ; +arrays sequences kernel assocs sorting.functor ; IN: sorting.literals.tests TUPLE: sort-test a b c tuple2 ; diff --git a/libs/svg/svg-tests.factor b/libs/svg/svg-tests.factor index c087a5fb33..60e741590d 100644 --- a/libs/svg/svg-tests.factor +++ b/libs/svg/svg-tests.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff, see BSD license USING: accessors literals math math.affine-transforms -math.functions multiline sequences svg tools.test xml +math.functions sequences svg tools.test xml xml.traversal ; IN: svg.tests @@ -94,7 +94,7 @@ ${ T{ elliptical-arc f { 5.0 6.0 } 7.0 t f { 8.0 9.0 } f } } } [ " - M 1.0,+1 3,-10e-1 l 2 2, 2 -2, 2 2 v -9 1 H 9 8 z + M 1.0,+1 3,-10e-1 l 2 2, 2 -2, 2 2 v -9 1 H 9 8 z M 0 0 C -4.0 0.0 -8.0 4.0 -8.0 8.0 -8.0 4.0 -12.0 8.0 -16.0 8.0 s 0.0,2.0 2.0,0.0 Q -2 0 0 -2 -3. 0 0 3 diff --git a/libs/text-analysis/text-analysis.factor b/libs/text-analysis/text-analysis.factor index 087921db5d..7e1a659750 100644 --- a/libs/text-analysis/text-analysis.factor +++ b/libs/text-analysis/text-analysis.factor @@ -3,7 +3,7 @@ USING: accessors combinators formatting fry io.encodings.ascii io.files kernel literals math math.functions math.order -multiline regexp sequences sequences.extras sets splitting +regexp sequences sequences.extras sets splitting unicode ; IN: text-analysis diff --git a/libs/xml/data/data.factor b/libs/xml/data/data.factor index 50ac159271..1528f57a66 100644 --- a/libs/xml/data/data.factor +++ b/libs/xml/data/data.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. USING: kernel sequences sequences.private assocs arrays -delegate.protocols delegate vectors accessors multiline +delegate.protocols delegate vectors accessors macros words quotations combinators slots fry strings combinators.short-circuit ; IN: xml.data diff --git a/libs/xml/syntax/syntax-tests.factor b/libs/xml/syntax/syntax-tests.factor index 384a9d624d..99576de7ac 100644 --- a/libs/xml/syntax/syntax-tests.factor +++ b/libs/xml/syntax/syntax-tests.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. 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 +accessors locals inverse xml.writer splitting classes xml.private ; IN: xml.syntax.tests diff --git a/libs/xml/tests/templating.factor b/libs/xml/tests/templating.factor index fedc59c205..0496ca2c9f 100644 --- a/libs/xml/tests/templating.factor +++ b/libs/xml/tests/templating.factor @@ -1,5 +1,5 @@ USING: kernel xml sequences assocs tools.test io arrays namespaces fry -accessors xml.data xml.traversal xml.writer generic sequences.deep multiline ; +accessors xml.data xml.traversal xml.writer generic sequences.deep ; IN: xml.tests CONSTANT: sub-tag diff --git a/libs/xml/writer/writer-docs.factor b/libs/xml/writer/writer-docs.factor index b673b97625..8eb37d23dc 100644 --- a/libs/xml/writer/writer-docs.factor +++ b/libs/xml/writer/writer-docs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: help.syntax help.markup io strings xml.data multiline ; +USING: help.syntax help.markup io strings xml.data ; IN: xml.writer ABOUT: "xml.writer" diff --git a/libs/xml/writer/writer-tests.factor b/libs/xml/writer/writer-tests.factor index 9f9e2a3157..c9c824e4fe 100644 --- a/libs/xml/writer/writer-tests.factor +++ b/libs/xml/writer/writer-tests.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2005, 2009 Daniel Ehrenberg ! See http://factorcode.org/license.txt for BSD license. -USING: xml.data xml.writer tools.test fry xml xml.syntax kernel multiline +USING: xml.data xml.writer tools.test fry xml xml.syntax kernel xml.writer.private io.streams.string xml.traversal sequences io.encodings.utf8 io.files io.files.temp accessors io.directories math math.parser ; diff --git a/libs/xmode/code2html/code2html-tests.factor b/libs/xmode/code2html/code2html-tests.factor index a7aaa04530..1da63b9136 100644 --- a/libs/xmode/code2html/code2html-tests.factor +++ b/libs/xmode/code2html/code2html-tests.factor @@ -1,7 +1,6 @@ -IN: xmode.code2html.tests -USING: xmode.code2html xmode.catalog -tools.test multiline splitting memoize +USING: xmode.code2html xmode.catalog tools.test splitting memoize kernel io.streams.string xml.writer ; +IN: xmode.code2html.tests { } [ \ (load-mode) reset-memoized ] unit-test diff --git a/tools/spider/spider-docs.factor b/tools/spider/spider-docs.factor index b85d31e27f..cd7be7f75d 100644 --- a/tools/spider/spider-docs.factor +++ b/tools/spider/spider-docs.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: help.markup help.syntax io.streams.string urls -multiline spider.private quotations ; +spider.private quotations ; IN: spider HELP: diff --git a/tools/spider/spider.factor b/tools/spider/spider.factor index 5bb6fe0a34..2f9e4d1e0e 100644 --- a/tools/spider/spider.factor +++ b/tools/spider/spider.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors fry html.parser html.parser.analyzer http.client kernel tools.time sets assocs sequences -concurrency.combinators io threads namespaces math multiline +concurrency.combinators io threads namespaces math math.parser inspector urls logging combinators.short-circuit continuations calendar prettyprint dlists deques locals spider.unique-deque combinators concurrency.semaphores diff --git a/webapps/webapps/imagebin/imagebin.factor b/webapps/webapps/imagebin/imagebin.factor index 38ef0f9459..50d58d91c5 100644 --- a/webapps/webapps/imagebin/imagebin.factor +++ b/webapps/webapps/imagebin/imagebin.factor @@ -3,8 +3,7 @@ USING: accessors furnace.actions furnace.redirection html.forms http http.server http.server.dispatchers io.directories io.encodings.utf8 io.files io.pathnames -kernel math.parser multiline namespaces sequences urls -math ; +kernel math.parser namespaces sequences urls math ; IN: webapps.imagebin TUPLE: imagebin < dispatcher path n ;