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

db4
Slava Pestov 2008-04-20 22:30:18 -05:00
commit e4d50833a7
2 changed files with 17 additions and 3 deletions

View File

@ -1,7 +1,7 @@
USING: kernel parser words continuations namespaces debugger USING: kernel parser words continuations namespaces debugger
sequences combinators prettyprint sequences combinators splitting prettyprint
system io io.files io.launcher sequences.deep system io io.files io.launcher io.encodings.utf8 sequences.deep
accessors multi-methods newfx shell.parser ; accessors multi-methods newfx shell.parser ;
IN: shell IN: shell
@ -44,6 +44,19 @@ METHOD: expand { glob-expr }
METHOD: expand { factor-expr } expr>> eval unparse ; METHOD: expand { factor-expr } expr>> eval unparse ;
DEFER: expansion
METHOD: expand { back-quoted-expr }
expr>>
expr
ast>>
command>>
expansion
utf8 <process-stream>
contents
" \n" split
"" remove ;
METHOD: expand { object } ; METHOD: expand { object } ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

View File

@ -1,5 +1,6 @@
USING: kernel system sequences io.files io.launcher bootstrap.image USING: kernel system sequences io.files io.launcher bootstrap.image
http.client
builder.util builder.release.branch ; builder.util builder.release.branch ;
IN: update IN: update
@ -23,7 +24,7 @@ IN: update
: remote-clean-image ( -- url ) : remote-clean-image ( -- url )
"http://factorcode.org/images/clean/" my-boot-image-name append ; "http://factorcode.org/images/clean/" my-boot-image-name append ;
: download-clean-image ( -- ) { "wget" remote-clean-image } run-command ; : download-clean-image ( -- ) remote-clean-image download ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!