msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fixed space leaks

Browse Source
This commit is contained in:
Krasimir Angelov
2024-04-06 10:59:37 +02:00
parent 6126d36a54
commit 81717e7822
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/api/GF/Interactive.hs
View File

@@ -1,4 +1,4 @@
{-# LANGUAGE CPP, ScopedTypeVariables, FlexibleInstances #-} {-# LANGUAGE CPP, ScopedTypeVariables, FlexibleInstances, BangPatterns #-}
-- | GF interactive mode -- | GF interactive mode
module GF.Interactive (mainGFI,mainRunGFI,mainServerGFI) where module GF.Interactive (mainGFI,mainRunGFI,mainServerGFI) where
@@ -262,7 +262,8 @@ pwords s = case words s of
import_ readNGF args = import_ readNGF args =
do case parseOptions args of do case parseOptions args of
Ok (opts',files) -> do Ok (opts',files) -> do
opts <- gets startOpts !opts <- gets startOpts -- use a bang to avoid retaining a reference to the old state,
-- otherwise we leak references to PGF revisions.
curr_dir <- lift getCurrentDirectory curr_dir <- lift getCurrentDirectory
lib_dir <- lift $ getLibraryDirectory (addOptions opts opts') lib_dir <- lift $ getLibraryDirectory (addOptions opts opts')
importInEnv readNGF (addOptions opts (fixRelativeLibPaths curr_dir lib_dir opts')) files importInEnv readNGF (addOptions opts (fixRelativeLibPaths curr_dir lib_dir opts')) files
@@ -448,7 +449,7 @@ importInEnv readNGF opts files =
(RetainSource,mb_txn) -> do src <- lift $ importSource opts pgf0 files (RetainSource,mb_txn) -> do src <- lift $ importSource opts pgf0 files
modify $ \gfenv -> gfenv{pgfenv = (snd src,pgf0,mb_txn)} modify $ \gfenv -> gfenv{pgfenv = (snd src,pgf0,mb_txn)}
(RetainCompiled,Nothing) -> do pgf <- lift $ importPGF pgf0 (RetainCompiled,Nothing) -> do pgf <- lift $ importPGF pgf0
src <- lift $ importSource opts pgf ["prelude/Predef.gfo"] src <- lift $ importSource opts Nothing ["prelude/Predef.gfo"]
modify $ \gfenv -> gfenv{pgfenv = (snd src,pgf,Nothing)} modify $ \gfenv -> gfenv{pgfenv = (snd src,pgf,Nothing)}
_ -> fail "You must commit/rollback the transaction before loading a new grammar" _ -> fail "You must commit/rollback the transaction before loading a new grammar"
where where