From ab3cc776566847998fdca67714d40693f3f7b26c Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 7 Apr 2016 13:40:05 +0000 Subject: GF shell: fix a parsing problem with the cc command This patch fixes a problem introduced last year when the GF shell was refactored to allow more commands to be treated uniformly and be part of pipes. The cc command was one of those commands, but unfortunately this introduced a parsing problem, e.g. > cc "last" constant not found: last > cc "last"++"year" command not parsed: cc "last"++"year" This happened because the generic command line parser in GF.Command.{Abstract,Parse} assumes that all commands have an argument of type PGF.Expr. Commands that expect other types of arguments have to use PGF.showExpr combined with other conversion to the argument type they expect. The cc command excpets a GF.Grammar.Term, and unfortunately not all terms survice the roundtrip through PGF.Expr, in part because of an additional hack to allow strings to be roundtripped through PGF.Expr without adding superfluous double quotes. To solve the problem, this patch + makes room for arguments of type Term in the Argument type in GF.Command.Abstract. + makes a special case for the cc command in GF.Command.Parse, by calling the partial parser 'runPartial pTerm' recently added in GF.Grammar.Lexer and GF.Grammar.Parser. Care was taken so that that "|" and ";" can be used both inside terms and as separators between commands in the shell, e.g. things like the following now work: > cc ("a"|"b") | ps -lexcode variants { "a" ; "b" } + introduces a type CommandArgument that replaces [Expr] as the type of values passed between commands in pipes. It has room for values of type [Expr], [String] and Term, thus eliminating the need to roundtrip through the Expr type all the time. The hack to avoid adding superfluous quotes when strings are roundtripped through Expr has been left in place for now, but can probably be removed. --- src/compiler/GF/Command/Help.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/compiler/GF/Command/Help.hs') diff --git a/src/compiler/GF/Command/Help.hs b/src/compiler/GF/Command/Help.hs index 2a736088d..eb50c6d35 100644 --- a/src/compiler/GF/Command/Help.hs +++ b/src/compiler/GF/Command/Help.hs @@ -1,6 +1,6 @@ module GF.Command.Help where import GF.Command.Messages -import GF.Command.Abstract(isOpt,getCommandOp,showExpr) +import GF.Command.Abstract(isOpt,getCommandOp) import GF.Command.CommandInfo import GF.Data.Operations((++++)) @@ -75,13 +75,13 @@ helpCommand allCommands = ("license","show copyright and license information"), ("t2t","output help in txt2tags format") ], - exec = \opts ts -> + exec = \opts args -> let - msg = case ts of + msg = case toStrings args of _ | isOpt "changes" opts -> changesMsg _ | isOpt "coding" opts -> codingMsg _ | isOpt "license" opts -> licenseMsg - [t] -> let co = getCommandOp (showExpr [] t) in + [s] -> let co = getCommandOp s in case Map.lookup co allCommands of Just info -> commandHelp' opts True (co,info) _ -> "command not found" -- cgit v1.2.3