GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes for Janna

Browse Source
This commit is contained in:
aarne
2004-08-12 09:02:00 +00:00
parent 4bc5b35bcb
commit 096c861fb4
4 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/GF/Shell/Commands.hs
View File

@@ -144,13 +144,15 @@ execCommand env c s = case c of
CCEnvOpenTerm file -> do
c <- readFileIf file
let (fs,t) = envAndTerm file c
env' <- useIOE env $ foldM (shellStateFromFiles noOptions) env fs
(env',_) <- execCommand env (CCEnvGFShell fs) s
---- env' <- useIOE env $ foldM (shellStateFromFiles noOptions) env fs
return (env', execECommand env' (CNewTree t) s)
CCEnvOpenString file -> do
c <- readFileIf file
let (fs,t) = envAndTerm file c
env' <- useIOE env $ foldM (shellStateFromFiles noOptions) env fs
(env',_) <- execCommand env (CCEnvGFShell fs) s
---- env' <- useIOE env $ foldM (shellStateFromFiles noOptions) env fs
return (env', execECommand env' (CRefineParse t) s)
CCEnvOn name -> return (languageOn (language name) env,s)
@@ -177,9 +179,10 @@ execCommand env c s = case c of
cgr = canCEnv env
opts = globalOptions env
-- format for documents: import lines of form "-- file", then term
-- format for documents:
-- GF commands of form "-- command", then term or text
envAndTerm f s =
(map ((initFilePath f ++) . filter (/=' ') . drop 2) fs, unlines ss) where
(unwords (intersperse ";;" fs), unlines ss) where
(fs,ss) = span isImport (lines s)
isImport l = take 2 l == "--"