Commit 90a47350 authored by John van Groningen's avatar John van Groningen

pass World to QuitCleanCompiler

parent 4f9039f3
...@@ -659,9 +659,9 @@ where ...@@ -659,9 +659,9 @@ where
# (method,ps) = getCurrentMeth ps # (method,ps) = getCurrentMeth ps
# use_compiler_process_ids = case method of CompileAsync _ -> True ; _ -> False # use_compiler_process_ids = case method of CompileAsync _ -> True ; _ -> False
# (compiler_process_ids,ps) = getCompilerProcessIds ps # (compiler_process_ids,ps) = getCompilerProcessIds ps
# ps = appPIO (QuitCleanCompiler use_compiler_process_ids compiler_process_ids) ps # ps = app_world_instead_of_ps (QuitCleanCompiler use_compiler_process_ids compiler_process_ids) ps
= closeProcess ps = closeProcess ps
//--- Window rotating //--- Window rotating
nextWindow :: *(PSt .a) -> *PSt .a nextWindow :: *(PSt .a) -> *PSt .a
......
...@@ -376,7 +376,7 @@ step intr (DComp force dircache (AsyncWin [] {win_compiler_process_ids}) Nil ds) ...@@ -376,7 +376,7 @@ step intr (DComp force dircache (AsyncWin [] {win_compiler_process_ids}) Nil ds)
# project = PR_SetBuilt ds.modpaths ds.project // removes unused modules # project = PR_SetBuilt ds.modpaths ds.project // removes unused modules
# (modpaths,project) = PR_GetModulenames True IclMod project # (modpaths,project) = PR_GetModulenames True IclMod project
# ds = {ds & modpaths = modpaths, project = project} # ds = {ds & modpaths = modpaths, project = project}
# ps = {ps & io=QuitCleanCompiler True win_compiler_process_ids ps.io}; # ps = app_world_instead_of_ps (QuitCleanCompiler True win_compiler_process_ids) ps;
# ps = showInfo (Level1 "Generating...") ps # ps = showInfo (Level1 "Generating...") ps
# (paths,ds) = ds!modpaths # (paths,ds) = ds!modpaths
= step intr (DGene paths SyncCodeGeneration ds) ps = step intr (DGene paths SyncCodeGeneration ds) ps
...@@ -524,7 +524,7 @@ step intr state=:(DComp force dircache compinfo=:(AsyncWin _ _) rest ds) ps ...@@ -524,7 +524,7 @@ step intr state=:(DComp force dircache compinfo=:(AsyncWin _ _) rest ds) ps
= (DComp force dircache (AsyncWin current {win_max_n_processes=win_max_n_processes,win_compiler_process_ids=win_compiler_process_ids}) (Concat deps todo) ds, ps) = (DComp force dircache (AsyncWin current {win_max_n_processes=win_max_n_processes,win_compiler_process_ids=win_compiler_process_ids}) (Concat deps todo) ds, ps)
// not ok // not ok
# (paths,ds) = ds!modpaths # (paths,ds) = ds!modpaths
# ps = {ps & io=QuitCleanCompiler True win_compiler_process_ids ps.io}; # ps = app_world_instead_of_ps (QuitCleanCompiler True win_compiler_process_ids) ps;
= (DGene paths SyncCodeGeneration ds, ps) = (DGene paths SyncCodeGeneration ds, ps)
where where
removeFromCurrent :: Int [CurrentlyCompiled] -> (CurrentlyCompiled, [CurrentlyCompiled]) removeFromCurrent :: Int [CurrentlyCompiled] -> (CurrentlyCompiled, [CurrentlyCompiled])
...@@ -555,7 +555,7 @@ step intr state=:(DComp force dircache compinfo=:(AsyncWin _ _) rest ds) ps ...@@ -555,7 +555,7 @@ step intr state=:(DComp force dircache compinfo=:(AsyncWin _ _) rest ds) ps
# ds = {ds & ok = ok} # ds = {ds & ok = ok}
| not ok | not ok
#! (paths,ds) = ds!modpaths #! (paths,ds) = ds!modpaths
# ps = {ps & io=QuitCleanCompiler True win_compiler_process_ids ps.io}; # ps = app_world_instead_of_ps (QuitCleanCompiler True win_compiler_process_ids) ps;
= (DGene paths SyncCodeGeneration ds, ps) = (DGene paths SyncCodeGeneration ds, ps)
= start_compilations (DComp force dircache compinfo rest ds) ps = start_compilations (DComp force dircache compinfo rest ds) ps
start_compilations state=:(DComp force dircache (AsyncWin [] _) Nil ds) ps start_compilations state=:(DComp force dircache (AsyncWin [] _) Nil ds) ps
......
...@@ -20,7 +20,7 @@ NoCompilerProcessIds :: CompilerProcessIds ...@@ -20,7 +20,7 @@ NoCompilerProcessIds :: CompilerProcessIds
ClearCompilerCache :: !String !String !.a -> (!Int,!.a) ClearCompilerCache :: !String !String !.a -> (!Int,!.a)
ClearCompilerCaches :: !CompilerProcessIds !.a -> (!Int,!.a) ClearCompilerCaches :: !CompilerProcessIds !.a -> (!Int,!.a)
QuitCleanCompiler :: !Bool !CompilerProcessIds !.env -> .env QuitCleanCompiler :: !Bool !CompilerProcessIds !*World -> *World
//:: CompileClearCache = ClearCache | Don`tClearCache //:: CompileClearCache = ClearCache | Don`tClearCache
//instance == CompileClearCache //instance == CompileClearCache
......
...@@ -81,7 +81,7 @@ ClearCompilerCache _ _ ps = (0,ps) ...@@ -81,7 +81,7 @@ ClearCompilerCache _ _ ps = (0,ps)
ClearCompilerCaches :: !CompilerProcessIds !.a -> (!Int,!.a) ClearCompilerCaches :: !CompilerProcessIds !.a -> (!Int,!.a)
ClearCompilerCaches _ ps = (0,ps) ClearCompilerCaches _ ps = (0,ps)
QuitCleanCompiler :: !Bool !CompilerProcessIds !.env -> .env QuitCleanCompiler :: !Bool !CompilerProcessIds !*World -> *World
QuitCleanCompiler async compiler_process_ids io QuitCleanCompiler async compiler_process_ids io
| async | async
= quit_compilers compiler_process_ids io; = quit_compilers compiler_process_ids io;
......
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