anoma/juvix
1
1
Fork 0
mirror of https://github.com/anoma/juvix.git synced 2024-09-11 08:15:41 +03:00
Code Issues Projects Releases Wiki Activity

remove redundant GitClone constraint (#2738)

Browse Source 
Removes redundant `GitClone` constraint in the pipeline
This commit is contained in:
Jan Mas Rovira 2024-04-18 20:00:18 +02:00 committed by GitHub
parent 52a3eed162
commit d200b34991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Juvix/Compiler/Pipeline.hs
View File

@ -89,71 +89,71 @@ upToInternalTyped ::
upToInternalTyped = Internal.typeCheckingNew upToInternal
upToCore ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Core.CoreResult
upToCore = upToInternalTyped >>= Core.fromInternal
upToStoredCore ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Core.CoreResult
upToStoredCore =
upToCore >>= \r -> Core.toStored (r ^. Core.coreResultModule) >>= \md -> return r {Core._coreResultModule = md}
upToReg ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Reg.InfoTable
upToReg =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToReg _coreResultModule
upToTree ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Tree.InfoTable
upToTree =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToTree Core.Identity _coreResultModule
upToAsm ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Asm.InfoTable
upToAsm =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToAsm _coreResultModule
upToCasm ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Casm.Result
upToCasm =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToCasm _coreResultModule
upToCairo ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Cairo.Result
upToCairo =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToCairo _coreResultModule
upToMiniC ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r C.MiniCResult
upToMiniC = upToAsm >>= asmToMiniC
upToVampIR ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r VampIR.Result
upToVampIR =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToVampIR _coreResultModule
upToGeb ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Geb.ResultSpec ->
Sem r Geb.Result
upToGeb spec =
upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToGeb spec _coreResultModule
upToAnoma ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r NockmaTree.AnomaResult
upToAnoma = upToStoredCore >>= \Core.CoreResult {..} -> storedCoreToAnoma _coreResultModule
upToCoreTypecheck ::
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, GitClone, PathResolver] r) =>
(Members '[HighlightBuilder, Reader Parser.ParserResult, Reader EntryPoint, Reader Store.ModuleTable, Files, NameIdGen, Error JuvixError, PathResolver] r) =>
Sem r Core.CoreResult
upToCoreTypecheck =
upToCore >>= \r -> Core.toTypechecked (r ^. Core.coreResultModule) >>= \md -> return r {Core._coreResultModule = md}

27
src/Juvix/Compiler/Pipeline/Driver.hs
View File

@ -30,7 +30,6 @@ import Juvix.Compiler.Store.Language qualified as Store
import Juvix.Compiler.Store.Options qualified as StoredModule
import Juvix.Compiler.Store.Options qualified as StoredOptions
import Juvix.Data.CodeAnn
import Juvix.Data.Effect.Git
import Juvix.Data.Effect.TaggedLock
import Juvix.Data.SHA256 qualified as SHA256
import Juvix.Extra.Serialize
@ -62,7 +61,7 @@ type MCache = MCache' (PipelineResult Store.ModuleInfo)
processFile ::
forall r.
(Members '[TaggedLock, HighlightBuilder, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[TaggedLock, HighlightBuilder, Error JuvixError, Files, PathResolver] r) =>
EntryPoint ->
Sem r (PipelineResult Parser.ParserResult)
processFile entry =
@ -72,7 +71,7 @@ processFile entry =
processImport ::
forall r.
(Members '[TaggedLock, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[TaggedLock, Error JuvixError, Files, PathResolver] r) =>
EntryPoint ->
Import 'Parsed ->
Sem r (PipelineResult Store.ModuleInfo)
@ -83,7 +82,7 @@ processImport entry i =
processModule ::
forall r.
(Members '[TaggedLock, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[TaggedLock, Error JuvixError, Files, PathResolver] r) =>
EntryPoint ->
Sem r (PipelineResult Store.ModuleInfo)
processModule entry =
@ -93,7 +92,7 @@ processModule entry =
processFileToStoredCore ::
forall r.
(Members '[TaggedLock, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[TaggedLock, Error JuvixError, Files, PathResolver] r) =>
EntryPoint ->
Sem r (PipelineResult Core.CoreResult)
processFileToStoredCore entry =
@ -103,7 +102,7 @@ processFileToStoredCore entry =
processFileUpTo ::
forall r a.
(Members '[TaggedLock, HighlightBuilder, Reader EntryPoint, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[TaggedLock, HighlightBuilder, Reader EntryPoint, Error JuvixError, Files, PathResolver] r) =>
Sem (Reader Parser.ParserResult ': Reader Store.ModuleTable ': NameIdGen ': r) a ->
Sem r (PipelineResult a)
processFileUpTo a = do
@ -118,7 +117,7 @@ processFileUpTo a = do
processFile' ::
forall r.
(Members '[HighlightBuilder, Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[HighlightBuilder, Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
EntryPoint ->
Sem r (PipelineResult Parser.ParserResult)
processFile' entry = do
@ -129,7 +128,7 @@ processFile' entry = do
processImports' ::
forall r.
(Members '[Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
EntryPoint ->
[TopModulePath] ->
Sem r Store.ModuleTable
@ -137,7 +136,7 @@ processImports' entry imports = snd <$> processImports'' entry imports
processImports'' ::
forall r.
(Members '[Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
EntryPoint ->
[TopModulePath] ->
Sem r (Bool, Store.ModuleTable)
@ -149,7 +148,7 @@ processImports'' entry imports = do
processImport' ::
forall r a.
(Members '[Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache' a] r) =>
(Members '[Reader ImportParents, Error JuvixError, Files, PathResolver, MCache' a] r) =>
EntryPoint ->
TopModulePath ->
Sem r a
@ -179,7 +178,7 @@ processImport' entry p = do
processFileToStoredCore' ::
forall r.
(Members '[Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
EntryPoint ->
Sem r (PipelineResult Core.CoreResult)
processFileToStoredCore' entry = ignoreHighlightBuilder $ do
@ -194,7 +193,7 @@ processFileToStoredCore' entry = ignoreHighlightBuilder $ do
processModule' ::
forall r.
(Members '[TaggedLock, Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[TaggedLock, Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
EntryIndex ->
Sem r (PipelineResult Store.ModuleInfo)
processModule' (EntryIndex entry) = do
@ -233,7 +232,7 @@ processModule' (EntryIndex entry) = do
processModule'' ::
forall r.
(Members '[Reader ImportParents, Error JuvixError, Files, GitClone, PathResolver, MCache] r) =>
(Members '[Reader ImportParents, Error JuvixError, Files, PathResolver, MCache] r) =>
Text ->
EntryPoint ->
Sem r (PipelineResult Store.ModuleInfo)
@ -256,7 +255,7 @@ processModule'' sha256 entry = over pipelineResult mkModuleInfo <$> processFileT
processRecursiveUpToTyped ::
forall r.
(Members '[Reader EntryPoint, TaggedLock, HighlightBuilder, Error JuvixError, Files, GitClone, PathResolver] r) =>
(Members '[Reader EntryPoint, TaggedLock, HighlightBuilder, Error JuvixError, Files, PathResolver] r) =>
Sem r (InternalTypedResult, [InternalTypedResult])
processRecursiveUpToTyped = do
entry <- ask