From b148117935f49b356efe41bffb521e9516210b7d Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Sun, 31 Mar 2019 15:57:28 -0400 Subject: [PATCH] fix conversion ordering --- src/Convert.hs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Convert.hs b/src/Convert.hs index 9dbc35a..a46cf65 100644 --- a/src/Convert.hs +++ b/src/Convert.hs @@ -29,6 +29,7 @@ type Phase = AST -> AST phases :: [Job.Exclude] -> [Phase] phases excludes = [ Convert.AsgnOp.convert + , selectExclude (Job.Logic , Convert.Logic.convert) , Convert.FuncRet.convert , Convert.Enum.convert , Convert.PackedArray.convert @@ -39,13 +40,10 @@ phases excludes = , Convert.Typedef.convert , Convert.UnbasedUnsized.convert , Convert.Unique.convert - ] ++ extras + , selectExclude (Job.Interface, Convert.Interface.convert) + , selectExclude (Job.Always , Convert.AlwaysKW.convert) + ] where - availableExcludes = - [ (Job.Interface, Convert.Interface.convert) - , (Job.Logic , Convert.Logic.convert) - , (Job.Always , Convert.AlwaysKW.convert) ] - extras = map selectExclude availableExcludes selectExclude :: (Job.Exclude, Phase) -> Phase selectExclude (exclude, phase) = if elem exclude excludes