a30de17 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge pull request #1746 from purescript/1742

Fix #1742, revert import (..) change

commita30de17e088c7df11a77f4a3ad32ccf8eb2ecc9b authorGary Burgess <gary.burgess@gmail.com> dateSun 20 Dec 2015, 12:38 (11 years ago) parent1e8f4aa 9d0a9ea

3 files changed+3−6

compare with golang

unifiedsplit

psci/PSCi.hs+1−2 src/Language/PureScript/AST/Declarations.hs+1−1 src/Language/PureScript/Parser/Declarations.hs+1−3

psci/PSCi.hs+1−2

@@ -317,8 +317,7 @@ handleShowImportedModules = do

317317 Just mn' -> "qualified " ++ N.runModuleName mn ++ " as " ++ N.runModuleName mn'

318318 Nothing -> N.runModuleName mn ++ " " ++ showDeclType declType

319319

320− showDeclType (P.Implicit True) = " (..)"

321− showDeclType (P.Implicit False) = ""

320+ showDeclType (P.Implicit _) = ""

322321 showDeclType (P.Explicit refs) = refsList refs

323322 showDeclType (P.Hiding refs) = " hiding " ++ refsList refs

324323 refsList refs = " (" ++ commaList (map showRef refs) ++ ")"

src/Language/PureScript/AST/Declarations.hs+1−1

@@ -131,7 +131,7 @@ findDuplicateRefs refs =

131131data ImportDeclarationType

132132 -- |

133133 -- 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

135135 -- raised for each member implicitly imported.

136136 --

137137 = Implicit Bool

src/Language/PureScript/Parser/Declarations.hs+1−3

@@ -151,9 +151,7 @@ parseImportDeclaration' = do

151151 qName <- qualifiedName

152152 return (moduleName', declType, Just qName, True)

153153 qualifyingList expectedType = do

154− declType <- P.optionMaybe

155− $ P.try (expectedType <$> (indented *> parens (commaSep parseDeclarationRef)))

156− <|> (const (Implicit True) <$> (indented *> parens (symbol' "..")))

154+ declType <- P.optionMaybe (expectedType <$> (indented *> parens (commaSep parseDeclarationRef)))

157155 return $ fromMaybe (Implicit False) declType

158156

159157parseDeclarationRef :: TokenParser DeclarationRef