From 026c4186f1beaa82ded1eaf16d91786c29adf6a0 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sat, 24 Nov 2007 19:37:21 -0500
Subject: [PATCH] Clean up io.unix.launcher command parser
---
extra/io/unix/launcher/launcher-tests.factor | 16 +++++++++++++++-
extra/io/unix/launcher/launcher.factor | 19 +++++++++----------
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/extra/io/unix/launcher/launcher-tests.factor b/extra/io/unix/launcher/launcher-tests.factor
index d07ab24da5..88f467385a 100755
--- a/extra/io/unix/launcher/launcher-tests.factor
+++ b/extra/io/unix/launcher/launcher-tests.factor
@@ -16,4 +16,18 @@ USING: io.unix.launcher tools.test ;
[ { "abc def" "hey" } ] [ "'abc def' \"hey\"" tokenize-command ] unit-test
[ "'abc def' \"hey" 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
diff --git a/extra/io/unix/launcher/launcher.factor b/extra/io/unix/launcher/launcher.factor
index ef45a0705e..322bef7e7f 100755
--- a/extra/io/unix/launcher/launcher.factor
+++ b/extra/io/unix/launcher/launcher.factor
@@ -16,19 +16,18 @@ USE: unix
! "foo bar" -- quotation
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'
- 'escaped-char' [ CHAR: \s = not ] satisfy <|> ;
-
-LAZY: 'unquoted' 'non-space-char' <+> ;
-
-LAZY: 'argument'
- 'quoted-1' 'quoted-2' 'unquoted' <|> <|>
+LAZY: 'argument' ( -- parser )
+ "\"" 'quoted' "'" 'quoted' 'unquoted' <|> <|>
[ >string ] <@ ;
MEMO: 'arguments' ( -- parser )