git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
fixes #1502: make `qualified` keyword optional in qualified imports
46ded7dMichael Ficarra
examples/passing/OptionalQualified.pursnew file+13
compare with golang
unifiedsplit
@@ -0,0 +1,13 @@
1+module Main where
2+
3+-- qualified import with the "qualified" keyword
4+import qualified Prelude as P
5+
6+-- qualified import without the "qualified" keyword
7+import Control.Monad.Eff.Console as Console
8+
9+bind = P.bind
10+
11+main = do
12+ message <- P.return "success!"
13+ Console.log message
examples/passing/QualifiedQualifiedImports.pursnew file+6
@@ -0,0 +1,6 @@
1+module Main where
2+
3+-- qualified import with qualified imported names
4+import qualified Control.Monad.Eff.Console (log) as Console
5+
6+main = Console.log "Success!"
src/Language/PureScript/Parser/Declarations.hs+12−11
@@ -151,24 +151,25 @@ parseImportDeclaration' = do
151 where
151 where
152 stdImport = do
152 stdImport = do
153 moduleName' <- moduleName
153 moduleName' <- moduleName
154− stdImportHiding moduleName' <|> stdImportQualifying moduleName'
154+ suffixHiding moduleName' <|> suffixQualifyingList moduleName'
155 where
155 where
156− stdImportHiding mn = do
156+ suffixHiding mn = do
157 reserved "hiding"
157 reserved "hiding"
158− declType <- importDeclarationType Hiding
158+ declType <- qualifyingList Hiding
159− return (mn, declType, Nothing)
160− stdImportQualifying mn = do
161− declType <- importDeclarationType Explicit
162 return (mn, declType, Nothing)
159 return (mn, declType, Nothing)
160+ suffixQualifyingList mn = do
161+ declType <- qualifyingList Explicit
162+ qName <- P.optionMaybe qualifiedName
163+ return (mn, declType, qName)
164+ qualifiedName = reserved "as" *> moduleName
163 qualImport = do
165 qualImport = do
164 reserved "qualified"
166 reserved "qualified"
165 indented
167 indented
166 moduleName' <- moduleName
168 moduleName' <- moduleName
167− declType <- importDeclarationType Explicit
169+ declType <- qualifyingList Explicit
168− reserved "as"
170+ qName <- qualifiedName
169− asQ <- moduleName
170− return (moduleName', declType, Just asQ)
171+ return (moduleName', declType, Just qName)
171− importDeclarationType expectedType = do
172+ qualifyingList expectedType = do
172 idents <- P.optionMaybe $ indented *> parens (commaSep parseDeclarationRef)
173 idents <- P.optionMaybe $ indented *> parens (commaSep parseDeclarationRef)
173 return $ fromMaybe Implicit (expectedType <$> idents)
174 return $ fromMaybe Implicit (expectedType <$> idents)
174
175