From acf0d8d9c81515cad041c5f7a9c12e6dd1fa76e2 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 17 Dec 2008 19:39:02 -0600 Subject: [PATCH] Get furnace and websites..concatenative to load --- basis/furnace/auth/auth-docs.factor | 2 +- .../conversations/conversations-docs.factor | 2 +- basis/furnace/sessions/sessions-docs.factor | 4 +++- basis/html/templates/fhtml/fhtml.factor | 2 +- basis/xmode/tokens/tokens.factor | 3 ++- .../parser-combinators/parser-combinators.factor | 16 ++++++++-------- extra/parser-combinators/regexp/regexp.factor | 6 +++--- extra/webapps/pastebin/pastebin.factor | 2 +- extra/webapps/planet/planet.factor | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/basis/furnace/auth/auth-docs.factor b/basis/furnace/auth/auth-docs.factor index e7e722344a..4a03d59581 100644 --- a/basis/furnace/auth/auth-docs.factor +++ b/basis/furnace/auth/auth-docs.factor @@ -1,5 +1,5 @@ USING: assocs classes help.markup help.syntax kernel -quotations strings words furnace.auth.providers.db +quotations strings words words.symbol furnace.auth.providers.db checksums.sha2 furnace.auth.providers math byte-arrays http multiline ; IN: furnace.auth diff --git a/basis/furnace/conversations/conversations-docs.factor b/basis/furnace/conversations/conversations-docs.factor index 4ad2c8a249..2b644ef422 100644 --- a/basis/furnace/conversations/conversations-docs.factor +++ b/basis/furnace/conversations/conversations-docs.factor @@ -1,5 +1,5 @@ USING: help.markup help.syntax urls http words kernel -furnace.sessions furnace.db ; +furnace.sessions furnace.db words.symbol ; IN: furnace.conversations HELP: diff --git a/basis/furnace/sessions/sessions-docs.factor b/basis/furnace/sessions/sessions-docs.factor index 959d6b69b8..7a4de18eaf 100644 --- a/basis/furnace/sessions/sessions-docs.factor +++ b/basis/furnace/sessions/sessions-docs.factor @@ -1,4 +1,6 @@ -USING: help.markup help.syntax io.streams.string quotations strings calendar serialize kernel furnace.db words kernel ; +USING: help.markup help.syntax io.streams.string quotations +strings calendar serialize kernel furnace.db words words.symbol +kernel ; IN: furnace.sessions HELP: diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor index 7742ff9bc6..992b660070 100644 --- a/basis/html/templates/fhtml/fhtml.factor +++ b/basis/html/templates/fhtml/fhtml.factor @@ -3,7 +3,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: continuations sequences kernel namespaces debugger combinators math quotations generic strings splitting -accessors assocs fry +accessors assocs fry vocabs.parser parser lexer io io.files io.streams.string io.encodings.utf8 html.elements html.templates ; diff --git a/basis/xmode/tokens/tokens.factor b/basis/xmode/tokens/tokens.factor index b8917529d6..945f4bb046 100644 --- a/basis/xmode/tokens/tokens.factor +++ b/basis/xmode/tokens/tokens.factor @@ -1,4 +1,5 @@ -USING: accessors parser words sequences namespaces kernel assocs +USING: accessors parser words words.symbol +sequences namespaces kernel assocs compiler.units ; IN: xmode.tokens diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor index 0ee91bc326..69f7a3bb92 100755 --- a/extra/parser-combinators/parser-combinators.factor +++ b/extra/parser-combinators/parser-combinators.factor @@ -43,11 +43,11 @@ C: parse-result 2over shorter? [ 3drop f ] [ - >r [ length head-slice ] keep r> string= + [ [ length head-slice ] keep ] dip string= ] if ; : ?string-head ( str head ignore-case -- newstr ? ) - >r 2dup r> string-head? + [ 2dup ] dip string-head? [ length tail-slice t ] [ drop f ] if ; TUPLE: token-parser string ignore-case? ; @@ -60,7 +60,7 @@ C: token-parser M: token-parser parse ( input parser -- list ) [ string>> ] [ ignore-case?>> ] bi - >r tuck r> ?string-head + [ tuck ] dip ?string-head [ ] [ 2drop nil ] if ; : 1token ( n -- parser ) 1string token ; @@ -76,7 +76,7 @@ M: satisfy-parser parse ( input parser -- list ) over empty? [ 2drop nil ] [ - quot>> >r unclip-slice dup r> call + quot>> [ unclip-slice dup ] dip call [ swap ] [ 2drop nil ] if ] if ; @@ -134,7 +134,7 @@ TUPLE: and-parser parsers ; : <&> ( parser1 parser2 -- parser ) over and-parser? [ - >r parsers>> r> suffix + [ parsers>> ] dip suffix ] [ 2array ] if and-parser boa ; @@ -146,7 +146,7 @@ TUPLE: and-parser parsers ; swap [ dup unparsed>> rot parse [ - >r parsed>> r> + [ parsed>> ] dip [ parsed>> 2array ] keep unparsed>> ] lazy-map-with @@ -191,7 +191,7 @@ C: sp sp-parser ( p1 -- parser ) M: sp-parser parse ( input parser -- list ) #! Skip all leading whitespace from the input then call #! the parser on the remaining input. - >r trim-left-slice r> p1>> parse ; + [ trim-left-slice ] dip p1>> parse ; TUPLE: just-parser p1 ; @@ -346,4 +346,4 @@ LAZY: surrounded-by ( parser start end -- parser' ) dupd exactly-n swap <*> <&> ; : from-m-to-n ( parser m n -- parser' ) - >r [ exactly-n ] 2keep r> swap - at-most-n <:&:> ; + [ [ exactly-n ] 2keep ] dip swap - at-most-n <:&:> ; diff --git a/extra/parser-combinators/regexp/regexp.factor b/extra/parser-combinators/regexp/regexp.factor index 7c23dcce0b..2becd937f2 100755 --- a/extra/parser-combinators/regexp/regexp.factor +++ b/extra/parser-combinators/regexp/regexp.factor @@ -17,7 +17,7 @@ SYMBOL: ignore-case? : char-between?-quot ( ch1 ch2 -- quot ) ignore-case? get - [ [ ch>upper ] bi@ [ >r >r ch>upper r> r> between? ] ] + [ [ ch>upper ] bi@ [ [ ch>upper ] 2dip between? ] ] [ [ between? ] ] if 2curry ; @@ -79,7 +79,7 @@ PRIVATE> [ hex> ] <@ ; : satisfy-tokens ( assoc -- parser ) - [ >r token r> <@literal ] { } assoc>map ; + [ [ token ] dip <@literal ] { } assoc>map ; : 'simple-escape-char' ( -- parser ) { @@ -270,7 +270,7 @@ TUPLE: regexp source parser ignore-case? ; ] keep regexp boa ; : do-ignore-case ( string regexp -- string regexp ) - dup ignore-case?>> [ >r >upper r> ] when ; + dup ignore-case?>> [ [ >upper ] dip ] when ; : matches? ( string regexp -- ? ) do-ignore-case parser>> just parse nil? not ; diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor index 01e068d351..38a3097999 100644 --- a/extra/webapps/pastebin/pastebin.factor +++ b/extra/webapps/pastebin/pastebin.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007, 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. USING: namespaces assocs sorting sequences kernel accessors -hashtables sequences.lib db.types db.tuples db combinators +hashtables db.types db.tuples db combinators calendar calendar.format math.parser math.order syndication urls xml.writer xmode.catalog validators html.forms diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor index 6c097d7faa..52d64f0f9e 100755 --- a/extra/webapps/planet/planet.factor +++ b/extra/webapps/planet/planet.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel accessors sequences sorting math math.order calendar alarms logging concurrency.combinators namespaces -sequences.lib db.types db.tuples db fry locals hashtables +db.types db.tuples db fry locals hashtables syndication urls xml.writer validators html.forms html.components