Enhace constants pool handling.

[hs-java.git] / Java / ClassPath / Common.hs

diff --git a/Java/ClassPath/Common.hs b/Java/ClassPath/Common.hs
index 3c61a3552aa224bc887d959ad37356d5f1d30bcc..e20286fc0897e8d3eeaf320640d6bcbe535ed492 100644 (file)
--- a/Java/ClassPath/Common.hs
+++ b/Java/ClassPath/Common.hs
@@ -57,6 +57,7 @@ merge1 [] x = [x]
 merge1 (x@(File e): es) y@(File e') | e == e'   = x: es
                                     | otherwise = x: merge1 es y
 merge1 (d@(Directory _ _):es) f@(File _) = d: merge1 es f
+merge1 (f@(File _):es) d@(Directory _ _) = f: merge1 es d
 merge1 (x@(Directory dir f):es) y@(Directory dir' f')
   | dir == dir' = Directory dir (merge $ f ++ f'): es 
   | otherwise   = x: merge1 es y