summaryrefslogtreecommitdiff
path: root/src/Language/Fiddle/Compiler/Expansion.hs
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2024-10-03 01:58:23 -0600
committerJosh Rahm <joshuarahm@gmail.com>2024-10-03 01:58:23 -0600
commitfa32199f5ffc6405bd405e055051e11e85c80668 (patch)
tree87effa6909f7cc6f05782f818c01d0a983a620fb /src/Language/Fiddle/Compiler/Expansion.hs
parent719c8f8ed3d1e6337f27d3b9d5a033a4b63726b8 (diff)
downloadfiddle-fa32199f5ffc6405bd405e055051e11e85c80668.tar.gz
fiddle-fa32199f5ffc6405bd405e055051e11e85c80668.tar.bz2
fiddle-fa32199f5ffc6405bd405e055051e11e85c80668.zip
Another monolithic change. Not good git ettiquite.
Import statements are fully implemented including compiling to an interface file for faster compilations.
Diffstat (limited to 'src/Language/Fiddle/Compiler/Expansion.hs')
-rw-r--r--src/Language/Fiddle/Compiler/Expansion.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Language/Fiddle/Compiler/Expansion.hs b/src/Language/Fiddle/Compiler/Expansion.hs
index 7201686..1e8fbae 100644
--- a/src/Language/Fiddle/Compiler/Expansion.hs
+++ b/src/Language/Fiddle/Compiler/Expansion.hs
@@ -39,7 +39,7 @@ expandAst :: FiddleUnit CurrentStage I Annot -> Compile () (FiddleUnit Expanded
expandAst = fmap snd . subCompile (State [] []) . advanceStage (Path mempty)
expansionPhase :: CompilationPhase CurrentStage Expanded
-expansionPhase = CompilationPhase (pure ()) (\_ _ -> return ()) (\_ _ -> expandAst)
+expansionPhase = CompilationPhase (pure ()) (\_ _ -> return ([], Just ())) (\_ _ -> expandAst)
-- Shorthand for Identity
type I = Identity
@@ -108,8 +108,8 @@ instance AdvanceStage CurrentStage FiddleDecl where
_ -> id
instance AdvanceStage CurrentStage FiddleUnit where
- advanceStage path (FiddleUnit decls a) =
- FiddleUnit <$> reconfigureFiddleDecls path decls <*> pure a
+ advanceStage path (FiddleUnit _ decls a) =
+ FiddleUnit () <$> reconfigureFiddleDecls path decls <*> pure a
instance AdvanceStage CurrentStage Expression where
advanceStage _ = \case