Remove 'import' as a directive to match ghci

hdgarrood · hdgarrood · commit 9a72e09ef5eb · 2015-03-12T22:04:22.000Z
diff --git a/psci/Directive.hs b/psci/Directive.hs
@@ -21,7 +21,6 @@ data Directive
   = Help
   | Quit
   | Reset
-  | Import
   | Browse
   | Load
   | Type
@@ -36,7 +35,6 @@ commands :: Directive -> [String]
 commands Help = ["?", "help"]
 commands Quit = ["quit"]
 commands Reset = ["reset"]
-commands Import = ["import"]
 commands Browse = ["browse"]
 commands Load = ["load", "module"]
 commands Type = ["type"]
@@ -66,7 +64,6 @@ help =
   [ (Help,   "",         "Show this help menu")
   , (Quit,   "",         "Quit PSCi")
   , (Reset,  "",         "Reset")
-  , (Import, "<module>", "Import <module> for use in PSCI")
   , (Browse, "<module>", "Browse <module>")
   , (Load,   "<file>",   "Load <file> for importing")
   , (Type,   "<expr>",   "Show the type of <expr>")
diff --git a/psci/Main.hs b/psci/Main.hs
@@ -227,7 +227,6 @@ completionContext (':' : cmd) word =
   dstr = takeWhile (not . isSpace) cmd
 
   context :: D.Directive -> Maybe CompletionContext
-  context D.Import = Just Module
   context D.Browse = Just Module
   context D.Load = Just $ FilePath word
   context D.Quit = Nothing
@@ -473,9 +472,10 @@ handleShowImportedModules = do
   where
   showModules = return . unlines . sort . map showModule
   showModule (mn, declType, asQ) =
-    case asQ of
+    "import " ++ case asQ of
       Just mn' -> "qualified " ++ N.runModuleName mn ++ " as " ++ N.runModuleName mn'
       Nothing  -> N.runModuleName mn ++ " " ++ showDeclType declType
+
   showDeclType D.Unqualified = ""
   showDeclType (D.Qualifying refs) = refsList refs
   showDeclType (D.Hiding refs) = "hiding " ++ refsList refs
diff --git a/psci/Parser.hs b/psci/Parser.hs
@@ -38,7 +38,7 @@ parseCommand :: String -> Either String C.Command
 parseCommand cmdString =
   case cmdString of
     (':' : cmd) -> parseDirective cmd
-    _ -> parseRest (psciLet <|> psciExpression) cmdString
+    _ -> parseRest (psciImport <|> psciLet <|> psciExpression) cmdString
   where
   parseRest :: P.TokenParser a -> String -> Either String a
   parseRest p s = either (Left . show) Right $ do
@@ -60,7 +60,6 @@ parseCommand cmdString =
       Just D.Help -> return C.Help
       Just D.Quit -> return C.Quit
       Just D.Reset -> return C.Reset
-      Just D.Import -> C.Import <$> parseRest P.parseImportDeclarationTail arg
       Just D.Browse -> C.Browse <$> parseRest P.moduleName arg
       Just D.Load -> return $ C.LoadFile (trim arg)
       Just D.Show -> return $ C.Show (trim arg)
@@ -86,3 +85,6 @@ parseCommand cmdString =
     where
     manyDecls :: P.TokenParser [P.Declaration]
     manyDecls = C.mark (many1 (C.same *> P.parseDeclaration))
+
+  psciImport :: P.TokenParser C.Command
+  psciImport = C.Import <$> P.parseImportDeclaration'
diff --git a/src/Language/PureScript/Parser/Declarations.hs b/src/Language/PureScript/Parser/Declarations.hs
@@ -24,7 +24,7 @@ module Language.PureScript.Parser.Declarations (
     parseGuard,
     parseBinder,
     parseBinderNoParens,
-    parseImportDeclarationTail,
+    parseImportDeclaration',
 ) where
 
 import Prelude hiding (lex)
@@ -147,15 +147,13 @@ parseFixityDeclaration = do
 
 parseImportDeclaration :: TokenParser Declaration
 parseImportDeclaration = do
-  reserved "import"
-  indented
-  (mn, declType, asQ) <- parseImportDeclarationTail
+  (mn, declType, asQ) <- parseImportDeclaration'
   return $ ImportDeclaration mn declType asQ
 
--- |
--- The part of an import statement following the 'import'.
-parseImportDeclarationTail :: TokenParser (ModuleName, ImportDeclarationType, (Maybe ModuleName))
-parseImportDeclarationTail =
+parseImportDeclaration' :: TokenParser (ModuleName, ImportDeclarationType, (Maybe ModuleName))
+parseImportDeclaration' = do
+  reserved "import"
+  indented
   qualImport <|> stdImport
   where
   stdImport = do
