git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1746 from purescript/1742
a30de17Gary Burgess
psci/PSCi.hs+1−2
@@ -317,8 +317,7 @@ handleShowImportedModules = do
317 Just mn' -> "qualified " ++ N.runModuleName mn ++ " as " ++ N.runModuleName mn'
317 Just mn' -> "qualified " ++ N.runModuleName mn ++ " as " ++ N.runModuleName mn'
318 Nothing -> N.runModuleName mn ++ " " ++ showDeclType declType
318 Nothing -> N.runModuleName mn ++ " " ++ showDeclType declType
319
319
320− showDeclType (P.Implicit True) = " (..)"
320+ showDeclType (P.Implicit _) = ""
321− showDeclType (P.Implicit False) = ""
322 showDeclType (P.Explicit refs) = refsList refs
321 showDeclType (P.Explicit refs) = refsList refs
323 showDeclType (P.Hiding refs) = " hiding " ++ refsList refs
322 showDeclType (P.Hiding refs) = " hiding " ++ refsList refs
324 refsList refs = " (" ++ commaList (map showRef refs) ++ ")"
323 refsList refs = " (" ++ commaList (map showRef refs) ++ ")"
src/Language/PureScript/AST/Declarations.hs+1−1
@@ -131,7 +131,7 @@ findDuplicateRefs refs =
131data ImportDeclarationType
131data ImportDeclarationType
132 -- |
132 -- |
133 -- An import with no explicit list: `import M`. The boolean signifies whether
133 -- An import with no explicit list: `import M`. The boolean signifies whether
134− -- the import was imported with `(..)` or not. Without `(..)` a warning is
134+ -- the import was generated by the compiler. If not, a warning is
135 -- raised for each member implicitly imported.
135 -- raised for each member implicitly imported.
136 --
136 --
137 = Implicit Bool
137 = Implicit Bool
src/Language/PureScript/Parser/Declarations.hs+1−3
@@ -151,9 +151,7 @@ parseImportDeclaration' = do
151 qName <- qualifiedName
151 qName <- qualifiedName
152 return (moduleName', declType, Just qName, True)
152 return (moduleName', declType, Just qName, True)
153 qualifyingList expectedType = do
153 qualifyingList expectedType = do
154− declType <- P.optionMaybe
155− $ P.try (expectedType <$> (indented *> parens (commaSep parseDeclarationRef)))
154+ declType <- P.optionMaybe (expectedType <$> (indented *> parens (commaSep parseDeclarationRef)))
156− <|> (const (Implicit True) <$> (indented *> parens (symbol' "..")))
157 return $ fromMaybe (Implicit False) declType
155 return $ fromMaybe (Implicit False) declType
158
156
159parseDeclarationRef :: TokenParser DeclarationRef
157parseDeclarationRef :: TokenParser DeclarationRef