From: Sven Panne Date: Sat, 6 May 2006 11:05:19 +0000 (+0000) Subject: Merge "unrecognized long opt" fix from 6.4.2 X-Git-Tag: directory_2007-05-24~289 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=087ce7b7b3576e2fb3a8bf5b447c1ad6f7889a65;p=haskell-directory.git Merge "unrecognized long opt" fix from 6.4.2 --- diff --git a/System/Console/GetOpt.hs b/System/Console/GetOpt.hs index c1463c0..fa9f9b2 100644 --- a/System/Console/GetOpt.hs +++ b/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,[],[]) + procNextOpt (NonOpt x) RequireOrder = ([],x:rest,us,[]) procNextOpt (NonOpt x) Permute = (os,x:xs,us,es) procNextOpt (NonOpt x) (ReturnInOrder f) = (f x :os, xs,us,es) procNextOpt EndOfOpts RequireOrder = ([],rest,[],[])