diff options
Diffstat (limited to 'src/Language/Fiddle/Compiler')
| -rw-r--r-- | src/Language/Fiddle/Compiler/ConsistencyCheck.hs | 4 | ||||
| -rw-r--r-- | src/Language/Fiddle/Compiler/Expansion.hs | 4 | ||||
| -rw-r--r-- | src/Language/Fiddle/Compiler/ImportResolution.hs | 4 | ||||
| -rw-r--r-- | src/Language/Fiddle/Compiler/Qualification.hs | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/Language/Fiddle/Compiler/ConsistencyCheck.hs b/src/Language/Fiddle/Compiler/ConsistencyCheck.hs index 903e6f4..a4f252e 100644 --- a/src/Language/Fiddle/Compiler/ConsistencyCheck.hs +++ b/src/Language/Fiddle/Compiler/ConsistencyCheck.hs @@ -77,7 +77,7 @@ deriving instance AdvanceStage S FiddleDecl instance AdvanceStage S FiddleUnit where advanceStage () fu@(FiddleUnit _ decls a) = - FiddleUnit (getUnitInterface fu) <$> mapM (advanceStage ()) decls <*> pure a + FiddleUnit (Present $ getUnitInterface fu) <$> mapM (advanceStage ()) decls <*> pure a where getUnitInterface = execWriter . walk_ doWalk @@ -102,7 +102,7 @@ instance AdvanceStage S FiddleUnit where tell (UnitInterface.singleton d) | (Just (ImportStatement {importInterface = ii})) <- castTS t -> - tell (UnitInterface mempty (dependencies ii)) + tell (UnitInterface mempty (dependencies (unwrap ii))) _ -> return () castTS :: diff --git a/src/Language/Fiddle/Compiler/Expansion.hs b/src/Language/Fiddle/Compiler/Expansion.hs index 19b7323..935d8ee 100644 --- a/src/Language/Fiddle/Compiler/Expansion.hs +++ b/src/Language/Fiddle/Compiler/Expansion.hs @@ -105,8 +105,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 v decls a) = + FiddleUnit v <$> reconfigureFiddleDecls path decls <*> pure a instance AdvanceStage CurrentStage Expression where advanceStage _ = \case diff --git a/src/Language/Fiddle/Compiler/ImportResolution.hs b/src/Language/Fiddle/Compiler/ImportResolution.hs index 6ecfc86..2249714 100644 --- a/src/Language/Fiddle/Compiler/ImportResolution.hs +++ b/src/Language/Fiddle/Compiler/ImportResolution.hs @@ -148,7 +148,7 @@ instance AdvanceStage CurrentStage ImportStatement where when (isNothing val) markFatal return $ fromMaybe empty val - return $ ImportStatement path list v a + return $ ImportStatement path list (Present v) a getImportResolutionState :: ( FilePath -> @@ -210,7 +210,7 @@ getImportResolutionState parseFile compileToChecked flags unit = do let doFullCompile = do parsed <- bump (parseFile path) - unitInterface <- addDependency path . fiddleUnitInterface <$> bump (compileToChecked parsed) + unitInterface <- addDependency path . unwrap . fiddleUnitInterface <$> bump (compileToChecked parsed) lift2 $ writeInterfaceFile intf unitInterface return unitInterface diff --git a/src/Language/Fiddle/Compiler/Qualification.hs b/src/Language/Fiddle/Compiler/Qualification.hs index 7eea141..a39e5dc 100644 --- a/src/Language/Fiddle/Compiler/Qualification.hs +++ b/src/Language/Fiddle/Compiler/Qualification.hs @@ -117,8 +117,8 @@ instance AdvanceStage S PackageBody where PackageBody <$> advanceFiddleDecls localState decls <*> pure a instance AdvanceStage S FiddleUnit where - advanceStage localState (FiddleUnit () decls a) = - FiddleUnit () <$> advanceFiddleDecls localState decls <*> pure a + advanceStage localState (FiddleUnit v decls a) = + FiddleUnit v <$> advanceFiddleDecls localState decls <*> pure a modifyEphemeralScope :: ( Scope String (Metadata, ExportedDecl) -> Scope String (Metadata, ExportedDecl) @@ -200,7 +200,7 @@ advanceFiddleDecls localState decls = fmap (reverse . fst) $ do return (declsRet, modifyCurrentScopePath (addUsingPath (nameToList name)) localState') OptionDecl key value ann -> doReturn $ OptionDecl key value ann ImportDecl st@(ImportStatement {importInterface = interface}) a -> - let localState'' = modifyEphemeralScope (<> rootScope interface) localState' + let localState'' = modifyEphemeralScope (<> rootScope (unwrap interface)) localState' in doReturnWith localState'' =<< ImportDecl <$> advanceStage localState'' st |