X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcTransform.hs;h=c30bc1f8efe525ffb3f2c8950b14476153449756;hp=7138bf91bd954a29cfd271bc6ee1c022b02a6536;hb=38ae85a344eb50f748eb2a2f1df305e82d41b212;hpb=419d06258d71978c934398633a644c5842e83b92 diff --git a/NmcTransform.hs b/NmcTransform.hs index 7138bf9..c30bc1f 100644 --- a/NmcTransform.hs +++ b/NmcTransform.hs @@ -42,10 +42,10 @@ mergeIncl queryOp depth base = do base' = mbase {domDelegate = Nothing, domImport = Nothing} -- print base if depth <= 0 then return $ Left "Nesting of imports is too deep" - else case ((domDelegate mbase), (domImport mbase)) of - (Nothing, Nothing ) -> return $ Right base' - (Nothing, Just keys) -> foldM mergeIncl1 (Right base') keys - (Just key, _ ) -> mergeIncl1 (Right emptyNmcDom) key + else case ((domDelegate mbase), (domImport mbase)) of + (Nothing, Nothing ) -> return $ Right base' + (Nothing, Just keys) -> foldM mergeIncl1 (Right base') keys + (Just key, _ ) -> mergeIncl1 (Right emptyNmcDom) key where mergeIncl1 (Left err) _ = return $ Left err -- can never happen mergeIncl1 (Right acc) key = do