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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-02-05 17:31:38 -06:00
parent 898770f774 ede3254f0a
commit e1097b27f5
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/bootstrap/stage2.factor
View File

@ -88,5 +88,7 @@ IN: bootstrap.stage2
"output-image" get resource-path save-image-and-exit "output-image" get resource-path save-image-and-exit
] if ] if
] [ ] [
print-error :c "listener" vocab-main execute 1 exit print-error :c restarts.
"listener" vocab-main execute
1 exit
] recover ] recover

2
extra/state-parser/state-parser.factor
View File

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

2
extra/trees/splay/splay.factor
View File

@ -7,7 +7,7 @@ IN: trees.splay
TUPLE: splay ; TUPLE: splay ;
: <splay> ( -- splay-tree ) : <splay> ( -- splay-tree )
splay construct-tree ; \ splay construct-tree ;
INSTANCE: splay tree-mixin INSTANCE: splay tree-mixin

2
extra/xml/xml.factor
View File

@ -3,7 +3,7 @@
USING: io io.streams.string io.files kernel math namespaces USING: io io.streams.string io.files kernel math namespaces
prettyprint sequences arrays generic strings vectors prettyprint sequences arrays generic strings vectors
xml.char-classes xml.data xml.errors xml.tokenize xml.writer xml.char-classes xml.data xml.errors xml.tokenize xml.writer
xml.utilities state-parser assocs unicode.categories ; xml.utilities state-parser assocs ascii ;
IN: xml IN: xml
! -- Overall parser with data tree ! -- Overall parser with data tree