fix conversion ordering

This commit is contained in:
Zachary Snow 2019-03-31 15:57:28 -04:00
parent 7883e263f9
commit b148117935
1 changed files with 4 additions and 6 deletions

View File

@ -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