diff options
| -rw-r--r-- | src/compiler/GF/Command/Messages.hs | 25 | ||||
| -rw-r--r-- | src/compiler/GF/Interactive.hs | 23 | ||||
| -rw-r--r-- | src/compiler/GF/Interactive2.hs | 26 |
3 files changed, 28 insertions, 46 deletions
diff --git a/src/compiler/GF/Command/Messages.hs b/src/compiler/GF/Command/Messages.hs index abde8b1f7..7d7eff7fa 100644 --- a/src/compiler/GF/Command/Messages.hs +++ b/src/compiler/GF/Command/Messages.hs @@ -1,5 +1,30 @@ module GF.Command.Messages where +import GF.Infra.BuildInfo(buildInfo) +import Data.Version(showVersion) +import Paths_gf(version) + + +welcome = unlines [ + " ", + " * * * ", + " * * ", + " * * ", + " * ", + " * ", + " * * * * * * * ", + " * * * ", + " * * * * * * ", + " * * * ", + " * * * ", + " ", + "This is GF version "++showVersion version++". ", + buildInfo, + "License: see help -license. "--, + -- Google Code is shutting down August 2015 +--"Bug reports: http://code.google.com/p/grammatical-framework/issues/list" + ] + licenseMsg = unlines [ "Copyright (c)", "Krasimir Angelov, Bj\246rn Bringert, H\229kan Burden, Hans-Joachim Daniels,", diff --git a/src/compiler/GF/Interactive.hs b/src/compiler/GF/Interactive.hs index 57dfa5f57..d0311479f 100644 --- a/src/compiler/GF/Interactive.hs +++ b/src/compiler/GF/Interactive.hs @@ -49,9 +49,7 @@ import GF.Server(server) #endif import GF.System.Console(changeConsoleEncoding) -import GF.Infra.BuildInfo(buildInfo) -import Data.Version(showVersion) -import Paths_gf(version) +import GF.Command.Messages(welcome) -- | Run the GF Shell in quiet mode (@gf -run@). mainRunGFI :: Options -> [FilePath] -> IO () @@ -378,25 +376,6 @@ tryGetLine = do Left (e :: SomeException) -> return "q" Right l -> return l -welcome = unlines [ - " ", - " * * * ", - " * * ", - " * * ", - " * ", - " * ", - " * * * * * * * ", - " * * * ", - " * * * * * * ", - " * * * ", - " * * * ", - " ", - "This is GF version "++showVersion version++". ", - buildInfo, - "License: see help -license. ", - "Bug reports: http://code.google.com/p/grammatical-framework/issues/list" - ] - prompt env | retain env || abs == wildCId = "> " | otherwise = showCId abs ++ "> " diff --git a/src/compiler/GF/Interactive2.hs b/src/compiler/GF/Interactive2.hs index ed850cb2b..03d91d2a2 100644 --- a/src/compiler/GF/Interactive2.hs +++ b/src/compiler/GF/Interactive2.hs @@ -53,9 +53,7 @@ import GF.Server(server) -} import GF.System.Console(changeConsoleEncoding) -import GF.Infra.BuildInfo(buildInfo) -import Data.Version(showVersion) -import Paths_gf(version) +import GF.Command.Messages(welcome) -- | Run the GF Shell in quiet mode (@gf -run@). mainRunGFI :: Options -> [FilePath] -> IO () @@ -67,6 +65,7 @@ beQuiet = addOptions (modifyFlags (\f -> f{optVerbosity=Quiet})) mainGFI :: Options -> [FilePath] -> IO () mainGFI opts files = do P.putStrLn welcome + P.putStrLn "This shell uses the C run-time system. See help for available commands." shell opts files shell opts files = loop opts =<< runSIO (importInEnv emptyGFEnv opts files) @@ -383,27 +382,6 @@ tryGetLine = do Left (e :: SomeException) -> return "q" Right l -> return l -welcome = unlines [ - " ", - " * * * ", - " * * ", - " * * ", - " * ", - " * ", - " * * * * * * * ", - " * * * ", - " * * * * * * ", - " * * * ", - " * * * ", - " ", - "This is GF version "++showVersion version++". ", - buildInfo, - "License: see help -license. ", ---"Bug reports: http://code.google.com/p/grammatical-framework/issues/list", - "", - "This shell uses the C run-time system. See help for available commands." - ] - prompt env = abs ++ "> " where abs = maybe "" C.abstractName (multigrammar (commandenv env)) |