Merge branch 'master' of http://dharmatech.onigirihouse.com/factor

2008-02-01 18:30:38 -06:00 · 2008-02-01 18:30:38 -06:00 · ca6e873b08
parent 6c3d2775a9 bff385269c
commit ca6e873b08
29 changed files with 89 additions and 80 deletions
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@ -348,45 +348,49 @@ SYMBOL: bootstrap-syntax
        call
    ] with-scope ; inline

+SYMBOL: interactive-vocabs
+
+{
+    "arrays"
+    "assocs"
+    "combinators"
+    "compiler.errors"
+    "continuations"
+    "debugger"
+    "definitions"
+    "editors"
+    "generic"
+    "help"
+    "inspector"
+    "io"
+    "io.files"
+    "kernel"
+    "listener"
+    "math"
+    "memory"
+    "namespaces"
+    "prettyprint"
+    "sequences"
+    "slicing"
+    "sorting"
+    "strings"
+    "syntax"
+    "tools.annotations"
+    "tools.crossref"
+    "tools.memory"
+    "tools.profiler"
+    "tools.test"
+    "tools.time"
+    "vocabs"
+    "vocabs.loader"
+    "words"
+    "scratchpad"
+} interactive-vocabs set-global
+
 : with-interactive-vocabs ( quot -- )
    [
        "scratchpad" in set
-        {
-            "arrays"
-            "assocs"
-            "combinators"
-            "compiler.errors"
-            "continuations"
-            "debugger"
-            "definitions"
-            "editors"
-            "generic"
-            "help"
-            "inspector"
-            "io"
-            "io.files"
-            "kernel"
-            "listener"
-            "math"
-            "memory"
-            "namespaces"
-            "prettyprint"
-            "sequences"
-            "slicing"
-            "sorting"
-            "strings"
-            "syntax"
-            "tools.annotations"
-            "tools.crossref"
-            "tools.memory"
-            "tools.profiler"
-            "tools.test"
-            "tools.time"
-            "vocabs"
-            "vocabs.loader"
-            "words"
-            "scratchpad"
-        } set-use
+	interactive-vocabs get set-use
        call
    ] with-scope ; inline

--- a/extra/benchmark/knucleotide/knucleotide.factor
+++ b/extra/benchmark/knucleotide/knucleotide.factor
@ -1,6 +1,6 @@
 USING: kernel io io.files splitting strings
       hashtables sequences assocs math namespaces prettyprint
-       math.parser combinators arrays sorting ;
+       math.parser combinators arrays sorting unicode.case ;

 IN: benchmark.knucleotide

--- a/extra/benchmark/reverse-complement/reverse-complement.factor
+++ b/extra/benchmark/reverse-complement/reverse-complement.factor
@ -1,6 +1,6 @@
 USING: io io.files io.streams.duplex kernel sequences
 sequences.private strings vectors words memoize splitting
-hints ;
+hints unicode.case ;
 IN: benchmark.reverse-complement

 MEMO: trans-map ( -- str )
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@ -1,5 +1,5 @@

-USING: kernel io io.files io.launcher
+USING: kernel io io.files io.launcher tools.deploy.backend
       system namespaces sequences splitting math.parser
       unix prettyprint tools.time calendar bake vars ;

@ -31,8 +31,6 @@ SYMBOL: builder-recipients
  
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

-: boot-image ( -- filename ) `{ "boot" ,[ cpu ] "image" } "." join ;
-
 : target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;

 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -61,7 +59,7 @@ if

 "factor" cd

-{ "/usr/bin/git" "show" } <process-stream>
+{ "git" "show" } <process-stream>
 [ readln ] with-stream
 " " split second
 "../git-id" <file-writer> [ print ] with-stream
@ -76,7 +74,7 @@ if
  "builder: vm compile" throw
 ] if

-"wget http://factorcode.org/images/latest/" boot-image append system
+"wget http://factorcode.org/images/latest/" boot-image-name append system
 0 =
 [ ]
 [
@ -84,7 +82,11 @@ if
  "builder: image download" throw
 ] if

-[ "./factor -i=" boot-image " -no-user-init > ../boot-log" 3append system ]
+[
+  "./factor -i=" boot-image-name " -no-user-init > ../boot-log"
+  3append
+  system
+]
 benchmark nip
 "../boot-time" <file-writer> [ . ] with-stream
 0 =
--- a/extra/cryptlib/cryptlib.factor
+++ b/extra/cryptlib/cryptlib.factor
@ -6,7 +6,7 @@
 ! Adapted from cryptlib.h
 ! Tested with cryptlib 3.3.1.0
 USING: cryptlib.libcl kernel hashtables alien math 
-namespaces sequences assocs libc alien.c-types continuations ;
+namespaces sequences assocs libc alien.c-types alien.accessors continuations ;

 IN: cryptlib

--- a/extra/fjsc/fjsc.factor
+++ b/extra/fjsc/fjsc.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel peg strings promises sequences math math.parser
       namespaces words quotations arrays hashtables io
-       io.streams.string assocs memoize ;
+       io.streams.string assocs memoize ascii ;
 IN: fjsc

 TUPLE: ast-number value ;
--- a/extra/globs/globs.factor
+++ b/extra/globs/globs.factor
@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: parser-combinators regexp lazy-lists sequences kernel
-promises strings ;
+promises strings unicode.case ;
 IN: globs

 <PRIVATE
--- a/extra/hexdump/hexdump.factor
+++ b/extra/hexdump/hexdump.factor
@ -1,6 +1,6 @@
 USING: arrays combinators.lib io io.streams.string
-kernel math math.parser namespaces prettyprint
-sequences splitting strings ;
+       kernel math math.parser namespaces prettyprint
+       sequences splitting strings ascii ;
 IN: hexdump

 <PRIVATE
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@ -4,7 +4,7 @@

 USING: arrays combinators io io.binary io.files io.paths
 io.utf16 kernel math math.parser namespaces sequences
-splitting strings assocs ;
+splitting strings assocs unicode.categories ;

 IN: id3

--- a/extra/irc/irc.factor
+++ b/extra/irc/irc.factor
@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays calendar io io.sockets kernel match namespaces
-sequences splitting strings continuations threads ;
+sequences splitting strings continuations threads ascii ;
 IN: irc

 ! "setup" objects
--- a/extra/json/reader/reader.factor
+++ b/extra/json/reader/reader.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser-combinators namespaces sequences promises strings 
       assocs math math.parser math.vectors math.functions
-       lazy-lists hashtables ;
+       lazy-lists hashtables ascii ;
 IN: json.reader

 ! Grammar for JSON from RFC 4627
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@ -1,9 +1,8 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien arrays assocs combinators.lib io kernel
+USING: alien alien.accessors arrays assocs combinators.lib io kernel
 macros math namespaces prettyprint quotations sequences
-vectors vocabs words ;
-USING: html.elements slots.private tar ;
+vectors vocabs words html.elements slots.private tar ;
 IN: lint

 SYMBOL: def-hash
--- a/extra/parser-combinators/simple/simple.factor
+++ b/extra/parser-combinators/simple/simple.factor
@ -1,7 +1,7 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel strings math sequences lazy-lists words
-math.parser promises parser-combinators ;
+math.parser promises parser-combinators unicode.categories ;
 IN: parser-combinators.simple

 : 'digit' ( -- parser )
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser words arrays strings math.parser sequences 
-       quotations vectors namespaces math assocs continuations peg ;
+       quotations vectors namespaces math assocs continuations peg
+       unicode.categories ;
 IN: peg.ebnf

 TUPLE: ebnf-non-terminal symbol ;
--- a/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel sequences strings namespaces math assocs shuffle 
-       vectors arrays combinators.lib memoize math.parser match ;
+       vectors arrays combinators.lib memoize math.parser match
+       unicode.categories ;
 IN: peg

 TUPLE: parse-result remaining ast ;
--- a/extra/project-euler/017/017.factor
+++ b/extra/project-euler/017/017.factor
@ -1,6 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.lib kernel math.ranges math.text.english sequences strings ;
+USING: combinators.lib kernel math.ranges math.text.english sequences strings
+       ascii ;
 IN: project-euler.017

 ! http://projecteuler.net/index.php?section=problems&id=17
--- a/extra/project-euler/022/022.factor
+++ b/extra/project-euler/022/022.factor
@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files kernel math math.parser namespaces sequences sorting splitting
-    strings system vocabs ;
+    strings system vocabs ascii ;
 IN: project-euler.022

 ! http://projecteuler.net/index.php?section=problems&id=22
--- a/extra/prolog/prolog.factor
+++ b/extra/prolog/prolog.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.

 USING: kernel sequences arrays vectors namespaces math strings
-    combinators continuations quotations io assocs ;
+    combinators continuations quotations io assocs ascii ;

 IN: prolog

--- a/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@ -1,7 +1,7 @@
 USING: arrays combinators kernel lazy-lists math math.parser
 namespaces parser parser-combinators parser-combinators.simple
 promises quotations sequences combinators.lib strings
-assocs prettyprint.backend memoize ;
+assocs prettyprint.backend memoize unicode.case unicode.categories ;
 USE: io
 IN: regexp

--- a/extra/roman/roman.factor
+++ b/extra/roman/roman.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.

 USING: arrays assocs kernel math math.vectors namespaces
-quotations sequences sequences.lib sequences.private strings ;
+quotations sequences sequences.lib sequences.private strings unicode.case ;
 IN: roman

 <PRIVATE
--- a/extra/rot13/rot13.factor
+++ b/extra/rot13/rot13.factor
@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math sequences strings io combinators ;
+USING: kernel math sequences strings io combinators ascii ;
 IN: rot13

 : rotate ( ch base -- ch ) tuck - 13 + 26 mod + ;
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@ -1,6 +1,6 @@
 USING: combinators.lib kernel sequences math namespaces assocs 
-random sequences.private shuffle math.functions mirrors ;
-USING: arrays math.parser sorting strings ;
+random sequences.private shuffle math.functions mirrors
+arrays math.parser sorting strings ascii ;
 IN: sequences.lib

 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- a/extra/state-parser/state-parser.factor
+++ b/extra/state-parser/state-parser.factor
@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.streams.string kernel math namespaces sequences
-strings circular prettyprint debugger ;
+strings circular prettyprint debugger unicode.categories ;
 IN: state-parser

 ! * Basic underlying words
--- a/extra/strings/lib/lib.factor
+++ b/extra/strings/lib/lib.factor
@ -1,14 +1,14 @@
 USING: math arrays sequences kernel splitting strings ;
 IN: strings.lib

-: char>digit ( c -- i ) 48 - ;
+! : char>digit ( c -- i ) 48 - ;

-: string>digits ( s -- seq ) [ char>digit ] { } map-as ;
+! : string>digits ( s -- seq ) [ char>digit ] { } map-as ;

-: >Upper ( str -- str )
-    dup empty? [
-        unclip ch>upper 1string swap append
-    ] unless ;
+! : >Upper ( str -- str )
+!     dup empty? [
+!         unclip ch>upper 1string swap append
+!     ] unless ;

-: >Upper-dashes ( str -- str )
-    "-" split [ >Upper ] map "-" join ;
+! : >Upper-dashes ( str -- str )
+!     "-" split [ >Upper ] map "-" join ;
--- a/extra/xml/tokenize/tokenize.factor
+++ b/extra/xml/tokenize/tokenize.factor
@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml.errors xml.data xml.utilities xml.char-classes
 xml.entities kernel state-parser kernel namespaces strings math
-math.parser sequences assocs arrays splitting combinators ;
+math.parser sequences assocs arrays splitting combinators unicode.case ;
 IN: xml.tokenize

 ! XML namespace processing: ns = namespace
--- a/extra/xml/xml.factor
+++ b/extra/xml/xml.factor
@ -3,7 +3,7 @@
 USING: io io.streams.string io.files kernel math namespaces
 prettyprint sequences arrays generic strings vectors
 xml.char-classes xml.data xml.errors xml.tokenize xml.writer
-xml.utilities state-parser assocs ;
+xml.utilities state-parser assocs unicode.categories ;
 IN: xml

 !   -- Overall parser with data tree
--- a/extra/xmode/keyword-map/keyword-map.factor
+++ b/extra/xmode/keyword-map/keyword-map.factor
@ -1,4 +1,5 @@
-USING: kernel strings assocs sequences hashtables sorting ;
+USING: kernel strings assocs sequences hashtables sorting
+       unicode.case unicode.categories ;
 IN: xmode.keyword-map

 ! Based on org.gjt.sp.jedit.syntax.KeywordMap
--- a/extra/xmode/marker/marker.factor
+++ b/extra/xmode/marker/marker.factor
@ -2,7 +2,7 @@ IN: xmode.marker
 USING: kernel namespaces xmode.rules xmode.tokens
 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators combinators.lib
-strings regexp splitting parser-combinators ;
+strings regexp splitting parser-combinators ascii unicode.case ;

 ! Based on org.gjt.sp.jedit.syntax.TokenMarker

--- a/extra/xmode/rules/rules.factor
+++ b/extra/xmode/rules/rules.factor
@ -1,5 +1,5 @@
 USING: xmode.tokens xmode.keyword-map kernel
-sequences vectors assocs strings memoize regexp ;
+sequences vectors assocs strings memoize regexp unicode.case ;
 IN: xmode.rules

 TUPLE: string-matcher string ignore-case? ;