steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor: remove multiline almost everywhere. more

locals-and-roots
Doug Coleman 2016-06-22 14:27:36 -07:00
parent 4a273ba95e
commit c519a52b57
76 changed files with 133 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/classes/classes-tests.factor
View File

@ -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

2
core/cpu/architecture/architecture-docs.factor
View File

@ -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<

4
core/delegate/delegate-tests.factor
View File

@ -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 ;

6
core/locals/locals-tests.factor
View File

@ -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 ) ;

38
core/modern/compiler/compiler.factor
View File

@ -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 <effect>
! '[ _ ?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 <effect>
'[ _ ?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
*/
]]

2
core/modern/modern.factor
View File

@ -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

6
core/modern/out/out-tests.factor
View File

@ -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

64
core/multiline/multiline.factor
View File

@ -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! ;

24
core/parser/parser-tests.factor
View File

@ -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 ( -- ) ;"
<string-reader> "was-once-a-word-test" parse-stream
] unit-test
![[
{ [ ] } [
"IN: parser.tests : was-once-a-word-bug ( -- ) ;"
<string-reader> "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>"
<string-reader> "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>"
<string-reader> "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:
{ [ ] } [

2
demos/bunny/cel-shaded/cel-shaded.factor
View File

@ -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

2
demos/bunny/outlined/outlined.factor
View File

@ -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 ;

2
demos/spheres/spheres.factor
View File

@ -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 ;

2
demos/talks/otug-talk/otug-talk.factor
View File

@ -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 -- )

2
ffi/cocoa/apple-script/apple-script-docs.factor
View File

@ -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." } ;

2
ffi/cocoa/apple-script/apple-script.factor
View File

@ -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 ;

10
ffi/forestdb/lib/lib-tests.factor
View File

@ -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

2
ffi/macho/macho-tests.factor
View File

@ -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 [[

7
ffi/mongodb/msg/msg.factor
View File

@ -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 }

2
ffi/opencl/ffi/ffi-tests.factor
View File

@ -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 ;

2
ffi/opencl/opencl-tests.factor
View File

@ -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 ;

2
ffi/opengl/shaders/shaders-docs.factor
View File

@ -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

2
ffi/windows/com/com-docs.factor
View File

@ -1,5 +1,5 @@
USING: help.markup help.syntax io kernel math quotations
multiline destructors ;
destructors ;
IN: windows.com
HELP: com-query-interface

2
frameworks/furnace/actions/actions-tests.factor
View File

@ -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

2
frameworks/furnace/chloe-tags/chloe-tags.factor
View File

@ -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

2
frameworks/furnace/recaptcha/recaptcha-docs.factor
View File

@ -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: <recaptcha>

2
frameworks/furnace/utilities/utilities-tests.factor
View File

@ -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<

2
frameworks/gpu/shaders/shaders-docs.factor
View File

@ -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: <program-instance>

2
frameworks/gpu/shaders/shaders-tests.factor
View File

@ -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

2
frameworks/gpu/shaders/shaders.factor
View File

@ -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

2
games/terrain/shaders/shaders.factor
View File

@ -1,4 +1,4 @@
USING: multiline ;
USING: ;
IN: terrain.shaders
CONSTANT: sky-vertex-shader [[

2
language/compiler/cfg/builder/alien/alien-docs.factor
View File

@ -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<

2
language/compiler/cfg/builder/blocks/blocks-docs.factor
View File

@ -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<

2
language/compiler/cfg/builder/builder-docs.factor
View File

@ -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

2
language/compiler/cfg/instructions/syntax/syntax-docs.factor
View File

@ -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<

2
language/compiler/codegen/codegen-docs.factor
View File

@ -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<

2
language/compiler/tree/propagation/propagation-docs.factor
View File

@ -1,4 +1,4 @@
USING: help.markup help.syntax literals multiline ;
USING: help.markup help.syntax literals ;
IN: compiler.tree.propagation
COMPILE<

2
language/functors/functors-tests.factor
View File

@ -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

2
language/funktors/funktors.factor
View File

@ -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

2
language/io/encodings/euc/euc-tests.factor
View File

@ -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 )

2
language/io/encodings/johab/johab-tests.factor
View File

@ -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 )

2
language/io/encodings/shift-jis/shift-jis.factor
View File

@ -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

2
language/literals/literals-docs.factor
View File

@ -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: $

5
language/literate/literate.factor
View File

@ -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 ;

2
language/pair-rocket/pair-rocket-docs.factor
View File

@ -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: =>

2
language/peg/ebnf/ebnf-tests.factor
View File

@ -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" } } [

10
language/tuple-arrays/tuple-arrays-tests.factor
View File

@ -5,7 +5,7 @@ IN: tuple-arrays.tests
SYMBOL: mat
TUPLE: foo bar ; final
C: <foo> foo ;
tuple-array: foo
TUPLE-ARRAY: foo
{ 2 } [ 2 <foo-array> 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 <baz-array> first bing>> ] unit-test
{ f } [ 1 <baz-array> first bong>> ] unit-test
@ -27,7 +27,7 @@ tuple-array: baz
TUPLE: broken x ; final
: broken ( -- ) ;
tuple-array: broken
TUPLE-ARRAY: broken
{ 100 } [ 100 <broken-array> 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 <empty-tuple-array> length ] unit-test
{ T{ empty-tuple } } [ 100 <empty-tuple-array> 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

2
language/tuple-arrays/tuple-arrays.factor
View File

@ -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 ;

2
language/variants/variants-docs.factor
View File

@ -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:

6
libs/c/preprocessor/preprocessor-tests.factor
View File

@ -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

2
libs/compression/huffman/huffman.factor
View File

@ -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 ;

2
libs/compression/run-length/run-length.factor
View File

@ -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

2
libs/elf/nm/nm-tests.factor
View File

@ -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

2
libs/fullscreen/fullscreen.factor
View File

@ -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 ;

2
libs/html/templates/chloe/syntax/syntax.factor
View File

@ -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

2
libs/http/http-tests.factor
View File

@ -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

2
libs/http/server/requests/requests-tests.factor
View File

@ -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

2
libs/managed-server/managed-server.factor
View File

@ -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

2
libs/mime/multipart/multipart-tests.factor
View File

@ -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

2
libs/peg/expr/expr-tests.factor
View File

@ -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 } [

2
libs/qw/qw-docs.factor
View File

@ -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{

2
libs/regexp/regexp-tests.factor
View File

@ -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*" <regexp> matches? ] unit-test

11
libs/regexp/regexp.factor
View File

@ -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 <optioned-regexp> compile-next-match suffix! ;
SYNTAX: \ R[=[ "]=]" parse-multiline-string lexer get parse-noblank-token <optioned-regexp> compile-next-match suffix! ;
SYNTAX: \ R(( "))" parse-multiline-string lexer get parse-noblank-token <optioned-regexp> compile-next-match suffix! ;
SYNTAX: \ R{{ "}}" parse-multiline-string lexer get parse-noblank-token <optioned-regexp> compile-next-match suffix! ;
USE: vocabs.loader
{ "prettyprint" "regexp" } "regexp.prettyprint" require-when

2
libs/robots/robots.factor
View File

@ -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

2
libs/roles/roles-docs.factor
View File

@ -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:

2
libs/sorting/slots/slots-tests.factor
View File

@ -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 ;

2
libs/svg/svg-tests.factor
View File

@ -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

2
libs/text-analysis/text-analysis.factor
View File

@ -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

2
libs/xml/data/data.factor
View File

@ -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

2
libs/xml/syntax/syntax-tests.factor
View File

@ -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

2
libs/xml/tests/templating.factor
View File

@ -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

2
libs/xml/writer/writer-docs.factor
View File

@ -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"

2
libs/xml/writer/writer-tests.factor
View File

@ -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 ;

5
libs/xmode/code2html/code2html-tests.factor
View File

@ -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

2
tools/spider/spider-docs.factor
View File

@ -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: <spider>

2
tools/spider/spider.factor
View File

@ -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

3
webapps/webapps/imagebin/imagebin.factor
View File

@ -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 ;