diff options
Diffstat (limited to 'src-3.0/GF/Command')
| -rw-r--r-- | src-3.0/GF/Command/Interpreter.hs | 13 | ||||
| -rw-r--r-- | src-3.0/GF/Command/Parse.hs | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src-3.0/GF/Command/Interpreter.hs b/src-3.0/GF/Command/Interpreter.hs index 5663d12b3..9c0d32849 100644 --- a/src-3.0/GF/Command/Interpreter.hs +++ b/src-3.0/GF/Command/Interpreter.hs @@ -1,7 +1,8 @@ module GF.Command.Interpreter ( CommandEnv (..), mkCommandEnv, - interpretCommandLine + interpretCommandLine, + getCommandOp ) where import GF.Command.Commands @@ -71,11 +72,11 @@ interpret env trees0 comm = case lookCommand co comms of -- analyse command parse tree to a uniform datastructure, normalizing comm name getCommand :: Command -> [Exp] -> (String,[Option],[Exp]) getCommand co ts = case co of - Command c opts (AExp t) -> (getOp c,opts,[t]) -- ignore piped - Command c opts ANoArg -> (getOp c,opts,ts) -- use piped - where - -- abbreviation convention from gf - getOp s = case break (=='_') s of + Command c opts (AExp t) -> (getCommandOp c,opts,[t]) -- ignore piped + Command c opts ANoArg -> (getCommandOp c,opts,ts) -- use piped + +-- abbreviation convention from gf commands +getCommandOp s = case break (=='_') s of (a:_,_:b:_) -> [a,b] -- axx_byy --> ab _ -> case s of [a,b] -> s -- ab --> ab diff --git a/src-3.0/GF/Command/Parse.hs b/src-3.0/GF/Command/Parse.hs index b5a76ed3e..f209b713b 100644 --- a/src-3.0/GF/Command/Parse.hs +++ b/src-3.0/GF/Command/Parse.hs @@ -23,7 +23,6 @@ pCommand = do cmd <- pIdent RP.skipSpaces opts <- RP.sepBy pOption RP.skipSpaces --- opts <- RP.many pOption arg <- RP.option ANoArg (fmap AExp (pExp False)) return (Command cmd opts arg) |
