diff options
author | Simon Marlow <simonmar@microsoft.com> | 2006-07-05 14:25:37 +0000 |
---|---|---|
committer | Simon Marlow <simonmar@microsoft.com> | 2006-07-05 14:25:37 +0000 |
commit | 2d747fd90c5bab08d4f03d55373c804fddfa3b32 (patch) | |
tree | 9db3d2ef5857943713b8243e824bedc250e14800 /libraries/base/System/Console | |
parent | a2880cfea2a04e1380494de5f34131d017b9e6ae (diff) | |
download | haskell-2d747fd90c5bab08d4f03d55373c804fddfa3b32.tar.gz |
UNDO: Merge "unrecognized long opt" fix from 6.4.2
This patch undid the previous patch, "RequireOrder: do not collect
unrecognised options after a non-opt". I asked Sven to revert it, but
didn't get an answer.
See bug #473.
Diffstat (limited to 'libraries/base/System/Console')
-rw-r--r-- | libraries/base/System/Console/GetOpt.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/base/System/Console/GetOpt.hs b/libraries/base/System/Console/GetOpt.hs index fa9f9b20c5..c1463c0f1e 100644 --- a/libraries/base/System/Console/GetOpt.hs +++ b/libraries/base/System/Console/GetOpt.hs @@ -161,7 +161,7 @@ getOpt' _ _ [] = ([],[],[],[]) getOpt' ordering optDescr (arg:args) = procNextOpt opt ordering where procNextOpt (Opt o) _ = (o:os,xs,us,es) procNextOpt (UnreqOpt u) _ = (os,xs,u:us,es) - procNextOpt (NonOpt x) RequireOrder = ([],x:rest,us,[]) + procNextOpt (NonOpt x) RequireOrder = ([],x:rest,[],[]) procNextOpt (NonOpt x) Permute = (os,x:xs,us,es) procNextOpt (NonOpt x) (ReturnInOrder f) = (f x :os, xs,us,es) procNextOpt EndOfOpts RequireOrder = ([],rest,[],[]) |