Changeset 8726

Timestamp:

01/17/06 14:08:41 (3 years ago)

Author:

audreyt

Message:

* Pugs.Run.Args: When the arg list parser encounters the script

file name, treat everything after it (even -options) as arguments.

So these two forms are now identical:

pugs foo.p6 --help
pugs foo.p6 -- --help

(t/pugsrun/12-script-args.t now passes because of this.)

Files:

• lib/pugs/run.pod (modified) (1 diff)
• src/Pugs/Run/Args.hs (modified) (2 diffs)

lib/pugs/run.pod

@@ -24 +24 @@
 WRITEME
 
-=head2 Flags separation
-
-Pugs uses C<--> to separate flags of Pugs itself and arguments to the program.
-For example, this will print C<--help>:
-
-    $ pugs -e 'say @ARGS' -- --help
-
-But this will show the help message of Pugs:
-
-    $ pugs -e 'say @ARGS' --help
-
-For the same reason, to use Pugs in the Unix C<#!> line, add an extra C<-->
-after it:
-
-    #!/usr/bin/pugs --
-    say 'Hello, ', @ARGS, '!';
-
 =head2 Command line options
 

src/Pugs/Run/Args.hs

@@ -19 +19 @@
 
 -- | Command line argument parser for pugs.
-module Pugs.Run.Args (canonicalArgs
-, gatherArgs
-, unpackOptions
-
-)
-where
+module Pugs.Run.Args (
+    canonicalArgs,
+    gatherArgs,
+    unpackOptions,
+) where
 import Pugs.Internals
 
@@ -53 +52 @@
 
 unpackOptions :: [String] -> [String]
-unpackOptions [] = []
-unpackOptions (('-':[]):rest)  = ["-"] ++ unpackOptions rest
-unpackOptions ("--":opts) = ["--"] ++ opts
-unpackOptions (('-':opt):rest) = unpackOption opt ++ unpackOptions rest
-unpackOptions (filename:rest) = filename : unpackOptions rest
+unpackOptions []                = []
+unpackOptions (("-"):rest)      = ("-":unpackOptions rest)
+unpackOptions opts@("--":_)     = opts
+unpackOptions (('-':opt):arg:rest)
+    | takesArg opt              = unpackOption opt ++ (arg:unpackOptions rest)
+unpackOptions (('-':opt):rest)  = unpackOption opt ++ unpackOptions rest
+unpackOptions opts@[filename]   = opts
+unpackOptions (filename:rest)   = filename : "--" : unpackOptions rest
+
+takesArg :: String -> Bool
+takesArg xs     | xs `elem` withParam   = True
+takesArg (x:xs) | x `elem` composable   = takesArg xs
+takesArg _                              = False
 
 unpackOption :: String -> [String]