Skip to content

S
sv2v
Commit b1481179 by Zachary Snow
Options

fix conversion ordering

parent 7883e263
Showing with 4 additions and 6 deletions
src/Convert.hs
...@@ -29,6 +29,7 @@ type Phase = AST -> AST ...@@ -29,6 +29,7 @@ type Phase = AST -> AST
phases :: [Job.Exclude] -> [Phase] phases :: [Job.Exclude] -> [Phase]
phases excludes = phases excludes =
[ Convert.AsgnOp.convert [ Convert.AsgnOp.convert
, selectExclude (Job.Logic , Convert.Logic.convert)
, Convert.FuncRet.convert , Convert.FuncRet.convert
, Convert.Enum.convert , Convert.Enum.convert
, Convert.PackedArray.convert , Convert.PackedArray.convert
...@@ -39,13 +40,10 @@ phases excludes = ...@@ -39,13 +40,10 @@ phases excludes =
, Convert.Typedef.convert , Convert.Typedef.convert
, Convert.UnbasedUnsized.convert , Convert.UnbasedUnsized.convert
, Convert.Unique.convert , Convert.Unique.convert
] ++ extras , selectExclude (Job.Interface, Convert.Interface.convert)
, selectExclude (Job.Always , Convert.AlwaysKW.convert)
]
where 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 :: (Job.Exclude, Phase) -> Phase
selectExclude (exclude, phase) = selectExclude (exclude, phase) =
if elem exclude excludes if elem exclude excludes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment