@@ -1,6 +1,7 @@ -module Usage (fromFile) where +module Usage (Environment, commands, fromFile, lookupCommand) where import qualified Completer as C +import Data.List (nub, sort) import Text.ParserCombinators.Parsec import Text.ParserCombinators.Parsec.Language (javaStyle) import qualified Text.ParserCombinators.Parsec.Token as T @@ -12,11 +13,11 @@ data Usage = Primitive C.Completer | Var String | Choice [Usage] | Sequence [Usage] | Many Usage | Many1 Usage | Optional Usage -fromFile :: String -> String -> IO C.Completer -fromFile fileName command = do +fromFile :: String -> IO Environment +fromFile fileName = do result <- parseFromFile usage fileName case result of - Right env -> return (run env command) + Right env -> return env Left err -> error (show err) -- Evaluator @@ -25,8 +26,8 @@ type Environment = [(EnvName,Usage)] -- Associates variables with values. data EnvName = VarName String | CommandName String deriving Eq -run :: Environment -> String -> C.Completer -run env command = eval env (main env) +lookupCommand :: Environment -> String -> C.Completer +lookupCommand env command = eval env (main env) where main env = Choice $ map snd $ filter ((CommandName command ==) . fst) env eval :: Environment -> Usage -> C.Completer @@ -40,6 +41,9 @@ eval env (Var s) = case lookup (VarName s) env of Just u -> eval env u Nothing -> C.skip +commands :: Environment -> [String] +commands env = nub $ sort [s | (CommandName s, _) <- env] + -- Top-level parser usage :: Parser Environment Usage.hs @@ -3,13 +3,22 @@ import Numeric (readDec) import System (getArgs) import System.Environment (getEnv) import Tokenize (tokenize) -import Usage (fromFile) +import Usage (Environment, commands, fromFile, lookupCommand) +-- Parse the usage file from the first argument. If there is a second argument, +-- it is a command-name; find the usage rules for that command and use them to +-- complete the input line. Otherwise, list all command names in the usage file. main = do - line <- getInput args <- getArgs - let command = args !! 1 - completer <- fromFile (head args) command + env <- fromFile (head args) + if length args > 1 + then completeLine env (args !! 1) + else listCommands env + +completeLine :: Environment -> String -> IO () +completeLine env command = do + line <- getInput + let completer = lookupCommand env command suggestions <- run completer (tokenize line) mapM_ putStrLn suggestions @@ -19,3 +28,6 @@ getInput = do point <- getEnv "COMP_POINT" let [(n,[])] = readDec point return (take n line) + +listCommands :: Environment -> IO () +listCommands = mapM_ putStrLn . commands compleat.hs @@ -4,8 +4,9 @@ for DIR in $COMPLEAT_SYSTEM_DIR $COMPLEAT_USER_DIR; do if [ -d $DIR -a -r $DIR -a -x $DIR ]; then for FILE in $DIR/*.usage; do - COMMAND=`basename $FILE .usage` - complete -o nospace -o default -C "compleat $FILE" $COMMAND + for COMMAND in `compleat $FILE`; do + complete -o nospace -o default -C "compleat $FILE" $COMMAND + done done fi done compleat_setup 0313d3ca33f0b9f448a8f1542d2d06ca80f36c0e Matt Brubeck mbrubeck@limpet.net http://github.com/mbrubeck/compleat/commit/1d58f7bf979d46f6666d1cddc72ab76987824f19 1d58f7bf979d46f6666d1cddc72ab76987824f19 2009-10-29T06:47:22-07:00 2009-10-29T06:47:22-07:00 Allow multiple command names per file. 17ea57f71f0d2ec88fc7abbaa5bd4814a69b71d7 Matt Brubeck mbrubeck@limpet.net