From 41075fb50a846ef0ae9851b99a3468bc0e405988 Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 18 Aug 2015 13:13:31 +0000 Subject: GF shell: restore the eh command to working order and document it Also, when the command line parser fails, append the problematic command line to the error message "command not parsed". --- src/compiler/GF/Command/CommonCommands.hs | 5 +++++ src/compiler/GF/Command/Interpreter.hs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/compiler/GF/Command') diff --git a/src/compiler/GF/Command/CommonCommands.hs b/src/compiler/GF/Command/CommonCommands.hs index 8774c0a8d..63dba526d 100644 --- a/src/compiler/GF/Command/CommonCommands.hs +++ b/src/compiler/GF/Command/CommonCommands.hs @@ -71,6 +71,11 @@ commonCommands = fmap (mapCommandExec liftSIO) $ Map.fromList [ longname = "empty", synopsis = "empty the environment" }), + ("eh", emptyCommandInfo { + longname = "execute_history", + syntax = "eh FILE", + synopsis = "read commands from a file and execute them" + }), ("ph", emptyCommandInfo { longname = "print_history", synopsis = "print command history", diff --git a/src/compiler/GF/Command/Interpreter.hs b/src/compiler/GF/Command/Interpreter.hs index 92310048c..b01dc1fc5 100644 --- a/src/compiler/GF/Command/Interpreter.hs +++ b/src/compiler/GF/Command/Interpreter.hs @@ -27,7 +27,7 @@ interpretCommandLine env line = case readCommandLine line of Just [] -> return () Just pipes -> mapM_ (interpretPipe env) pipes - Nothing -> putStrLnE "command not parsed" + Nothing -> putStrLnE $ "command not parsed: "++line interpretPipe env cs = do Piped v@(_,s) <- intercs cs void -- cgit v1.2.3