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

Clean up io.unix.launcher command parser

release
Slava Pestov 2007-11-24 19:37:21 -05:00
parent 82e98dac8b
commit 026c4186f1
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extra/io/unix/launcher/launcher-tests.factor
View File

@ -16,4 +16,18 @@ USING: io.unix.launcher tools.test ;
[ { "abc def" "hey" } ] [ "'abc def' \"hey\"" tokenize-command ] unit-test [ { "abc def" "hey" } ] [ "'abc def' \"hey\"" tokenize-command ] unit-test
[ "'abc def' \"hey" tokenize-command ] unit-test-fails [ "'abc def' \"hey" tokenize-command ] unit-test-fails
[ "'abc def" tokenize-command ] unit-test-fails [ "'abc def" tokenize-command ] unit-test-fails
[ { "abc def" "h\"ey" } ] [ "'abc def' \"h\"ey\" " tokenize-command ] unit-test [ { "abc def" "h\"ey" } ] [ "'abc def' \"h\\\"ey\" " tokenize-command ] unit-test
[
{
"Hello world.app/Contents/MacOS/hello-ui"
"-i=boot.macosx-ppc.image"
"-include= math compiler ui"
"-deploy-vocab=hello-ui"
"-output-image=Hello world.app/Contents/Resources/hello-ui.image"
"-no-stack-traces"
"-no-user-init"
}
] [
"\"Hello world.app/Contents/MacOS/hello-ui\" -i=boot.macosx-ppc.image \"-include= math compiler ui\" -deploy-vocab=hello-ui \"-output-image=Hello world.app/Contents/Resources/hello-ui.image\" -no-stack-traces -no-user-init" tokenize-command
] unit-test

19
extra/io/unix/launcher/launcher.factor
View File

@ -16,19 +16,18 @@ USE: unix
! "foo bar" -- quotation ! "foo bar" -- quotation
LAZY: 'escaped-char' "\\" token any-char-parser &> ; LAZY: 'escaped-char' "\\" token any-char-parser &> ;
LAZY: 'chars' 'escaped-char' any-char-parser <|> <*> ; LAZY: 'quoted-char' ( delimiter -- parser' )
'escaped-char'
swap [ member? not ] curry satisfy
<|> ; inline
LAZY: 'quoted-1' 'chars' "\"" "\"" surrounded-by ; LAZY: 'quoted' ( delimiter -- parser )
dup 'quoted-char' <*> swap dup surrounded-by ;
LAZY: 'quoted-2' 'chars' "'" "'" surrounded-by ; LAZY: 'unquoted' ( -- parser ) " " 'quoted-char' <+> ;
LAZY: 'non-space-char' LAZY: 'argument' ( -- parser )
'escaped-char' [ CHAR: \s = not ] satisfy <|> ; "\"" 'quoted' "'" 'quoted' 'unquoted' <|> <|>
LAZY: 'unquoted' 'non-space-char' <+> ;
LAZY: 'argument'
'quoted-1' 'quoted-2' 'unquoted' <|> <|>
[ >string ] <@ ; [ >string ] <@ ;
MEMO: 'arguments' ( -- parser ) MEMO: 'arguments' ( -- parser )