Changeset 6004 for src/Pugs/Run

Timestamp:

08/02/05 18:14:11 (3 years ago)

Author:

vkon

svk:copy_cache_prev:

8154

Message:

do not parse arguments after '--'; do not treat '-foo' as '-f'

Files:

• src/Pugs/Run/Args.hs (modified) (2 diffs)

src/Pugs/Run/Args.hs

@@ -55 +55 @@
 unpackOptions [] = []
 unpackOptions (('-':[]):rest)  = ["-"] ++ unpackOptions rest
-unpackOptions ("--":opts) = opts
+unpackOptions ("--":opts) = ["--"] ++ opts
 unpackOptions (('-':opt):rest) = unpackOption opt ++ unpackOptions rest
 unpackOptions (filename:rest) = filename : unpackOptions rest
@@ -136 +136 @@
 gatherArgs("-V:":item:rest)       = [Opt "-V:" item] ++ gatherArgs(rest)
 gatherArgs(('-':[]):xs)           = [File "-"] ++ gatherArgs(xs)
-gatherArgs(('-':x):xs)            = [Switch (head x)] ++ gatherArgs(xs)
+gatherArgs(("--"):rest)           = [File x | x <- rest]
+gatherArgs(('-':x:[]):xs)         = [Switch x] ++ gatherArgs(xs)
 gatherArgs(x:xs)                  = [File x] ++ gatherArgs(xs)