Skip to content

Commit

Permalink
Alpha rename some functions for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian Lynagh committed Jul 7, 2013
1 parent 195626f commit b16cb73
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ghc/InteractiveUI.hs
Expand Up @@ -146,7 +146,7 @@ ghciCommands = [
("cd", keepGoing' changeDirectory, completeFilename),
("check", keepGoing' checkModule, completeHomeModule),
("continue", keepGoing continueCmd, noCompletion),
("complete", keepGoing completeCmd', noCompletion),
("complete", keepGoing completeCmd, noCompletion),
("cmd", keepGoing cmdCmd, completeExpression),
("ctags", keepGoing createCTagsWithLineNumbersCmd, completeFilename),
("ctags!", keepGoing createCTagsWithRegExesCmd, completeFilename),
Expand Down Expand Up @@ -2296,8 +2296,8 @@ showLanguages' show_all dflags =
-- -----------------------------------------------------------------------------
-- Completion

completeCmd' :: String -> GHCi ()
completeCmd' argLine0 = case parseLine argLine0 of
completeCmd :: String -> GHCi ()
completeCmd argLine0 = case parseLine argLine0 of
Just ("repl", resultRange, left) -> do
(unusedLine,compls) <- ghciCompleteWord (reverse left,"")
let compls' = takeRange resultRange compls
Expand Down Expand Up @@ -2334,15 +2334,15 @@ completeCmd' argLine0 = case parseLine argLine0 of



completeCmd, completeMacro, completeIdentifier, completeModule,
completeGhciCommand, completeMacro, completeIdentifier, completeModule,
completeSetModule, completeSeti, completeShowiOptions,
completeHomeModule, completeSetOptions, completeShowOptions,
completeHomeModuleOrFile, completeExpression
:: CompletionFunc GHCi

ghciCompleteWord :: CompletionFunc GHCi
ghciCompleteWord line@(left,_) = case firstWord of
':':cmd | null rest -> completeCmd line
':':cmd | null rest -> completeGhciCommand line
| otherwise -> do
completion <- lookupCompletion cmd
completion line
Expand All @@ -2357,7 +2357,7 @@ ghciCompleteWord line@(left,_) = case firstWord of
Just (_,_,f) -> return f
Nothing -> return completeFilename

completeCmd = wrapCompleter " " $ \w -> do
completeGhciCommand = wrapCompleter " " $ \w -> do
macros <- liftIO $ readIORef macros_ref
cmds <- ghci_commands `fmap` getGHCiState
let macro_names = map (':':) . map cmdName $ macros
Expand Down

0 comments on commit b16cb73

Please sign in to comment.