github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-03 21:16:12 +03:00
Code Issues Projects Releases Wiki Activity

Parse out ImportSymbols for Python

Browse Source
This commit is contained in:
Timothy Clem 2018-01-30 12:39:10 -08:00
parent 9e977ebb71
commit bfdf50b67a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Language/Python/Assignment.hs
View File

@ -372,8 +372,12 @@ comment = makeTerm <$> symbol Comment <*> (Comment.Comment <$> source)
import' :: Assignment
import' = makeTerm'' <$> symbol ImportStatement <*> children (manyTerm (aliasedImport <|> plainImport))
<|> makeTerm <$> symbol ImportFromStatement <*> children (Declaration.Import <$> expression <*> emptyTerm <*> (pure <$> (wildCard <|> expressions)))
-- <|> makeTerm <$> symbol ImportFromStatement <*> children (Declaration.Import <$> expression <*> emptyTerm <*> (pure <$> (wildCard <|> expressions)))
<|> makeTerm <$> symbol ImportFromStatement <*> children (Declaration.Import <$> expression <*> emptyTerm <*> ((pure <$> wildCard <|> importSymbols)))
where
importSymbols = many (makeTerm <$> location <*> (Declaration.ImportSymbol <$> expression <*> emptyTerm))
-- importSymbols = makeTerm'' <$> location <*> fmap (\e -> Declaration.ImportSymbol e emptyTerm) (manyTerm expression)
-- expressions = makeTerm'' <$> location <*> manyTerm expression
aliasedImport = makeTerm <$> symbol AliasedImport <*> children (Declaration.Import <$> expression <*> expression <*> pure [])
plainImport = makeTerm <$> symbol DottedName <*> children (Declaration.Import <$> expression <*> emptyTerm <*> pure [])
wildCard = makeTerm <$> symbol WildcardImport <*> (Syntax.Identifier <$> source)