Expand macros more aggressively

Author: anka-213

UDAnnotations.hs

@@ -288,6 +288,7 @@ catsForPOS env = M.fromListWith (++) $
 expandMacro :: UDEnv -> AbsTree -> AbsTree
 expandMacro env tr@(RTree f ts) = case M.lookup f (macroFunctions (cncLabels env)) of
   Just (MacroFunction _ xx df _) | length ts' == length xx -> 
+    expandMacro env $
     subst (zip xx ts') df
   _ -> RTree f ts'
  where
@@ -296,7 +297,7 @@ expandMacro env tr@(RTree f ts) = case M.lookup f (macroFunctions (cncLabels env
     case us of
      [] -> maybe t id (lookup h xts)
      -- Expand head: #auxfun Ex a b : A -> B -> C = a b ; cn head
-     _ | Just (RTree h' hus) <- lookup h xts -> expandMacro env $ RTree h' (hus ++ map (subst xts) us)
+     _ | Just (RTree h' hus) <- lookup h xts -> RTree h' (hus ++ map (subst xts) us)
      _  -> RTree h (map (subst xts) us)
 
 ----------------------------------------------------------------------------