GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 00:52:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

the import command can also boot images from .pgf files now

Browse Source
This commit is contained in:
krangelov
2021-12-24 12:52:29 +01:00
parent cf87f55fa0
commit 67a7e928f6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/GF/Command/Importing.hs
View File

@@ -16,6 +16,7 @@ import GF.Infra.Option
import GF.Data.ErrM import GF.Data.ErrM
import System.FilePath import System.FilePath
import System.Directory
import qualified Data.Set as Set import qualified Data.Set as Set
import qualified Data.Map as Map import qualified Data.Map as Map
import Control.Monad(foldM) import Control.Monad(foldM)
@@ -45,7 +46,7 @@ importGrammar pgf0 opts fs
Ok pgf -> return (Just pgf) Ok pgf -> return (Just pgf)
Bad msg -> do putStrLn ('\n':'\n':msg) Bad msg -> do putStrLn ('\n':'\n':msg)
return pgf0 return pgf0
| all (extensionIs ".pgf") fs = foldM importPGF pgf0 fs | all (extensionIs ".pgf") fs = foldM (importPGF opts) pgf0 fs
| all (extensionIs ".ngf") fs = do | all (extensionIs ".ngf") fs = do
case fs of case fs of
[f] -> fmap Just $ readNGF f [f] -> fmap Just $ readNGF f
@@ -54,9 +55,17 @@ importGrammar pgf0 opts fs
where where
extensionIs ext = (== ext) . takeExtension extensionIs ext = (== ext) . takeExtension
importPGF :: Maybe PGF -> FilePath -> IO (Maybe PGF) importPGF :: Options -> Maybe PGF -> FilePath -> IO (Maybe PGF)
importPGF Nothing f = fmap Just (readPGF f) importPGF opts Nothing f
importPGF (Just pgf) f = fmap Just (modifyPGF pgf (mergePGF f)) | snd (flag optLinkTargets opts) = do let f' = replaceExtension f ".ngf"
exists <- doesFileExist f'
if exists
then removeFile f'
else return ()
putStr ("(Boot image "++f'++") ")
fmap Just (bootNGF f f')
| otherwise = fmap Just (readPGF f)
importPGF opts (Just pgf) f = fmap Just (modifyPGF pgf (mergePGF f))
importSource :: Options -> [FilePath] -> IO SourceGrammar importSource :: Options -> [FilePath] -> IO SourceGrammar
importSource opts files = fmap (snd.snd) (batchCompile opts files) importSource opts files = fmap (snd.snd) (batchCompile opts files)