From a3217608be008e56d0ed3d130f9dc71f6e6289e9 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Jul 2006 14:25:37 +0000 Subject: [PATCH 1/1] 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. --- System/Console/GetOpt.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/System/Console/GetOpt.hs b/System/Console/GetOpt.hs index fa9f9b2..c1463c0 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,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,[],[]) -- 1.7.10.4