github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-24 23:42:31 +03:00
Code Issues Projects Releases Wiki Activity

Fix up Python tests for new structure of Import

Browse Source
This commit is contained in:
Timothy Clem 2018-01-15 20:14:50 -07:00
parent 9b3cc349d3
commit ea5d7437d4
9 changed files with 152 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,9 +169,9 @@ expressionChoices =
]
expressions :: Assignment
expressions = mk <$> location <*> manyTerm expression
where mk _ [child] = child
mk location children = makeTerm location children
expressions = makeTerm <$> location <*> manyTerm expression
-- where mk _ [child] = child
-- mk location children = makeTerm location children
expressionStatement :: Assignment
expressionStatement = mk <$> symbol ExpressionStatement <*> children (someTerm expression)

38
test/fixtures/python/import-from-statement.diffA-B.txt vendored
View File

@ -1,22 +1,28 @@
(Program
(Import
{-(ScopeResolution
{-(Identifier)-})-}
(ScopeResolution
(Identifier))
{+(ScopeResolution
{+(Identifier)+})+})
(Import
{-(ScopeResolution
{-(Identifier)-})-}
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))
{+(ScopeResolution
{+(Identifier)+})+})
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(
(ScopeResolution
{ (Identifier)
->(Identifier) })))
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(
{-(ScopeResolution
{-(Identifier)-})-}
(ScopeResolution
(Identifier))
{+(ScopeResolution
{+(Identifier)+})+}))
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(Identifier)))

38
test/fixtures/python/import-from-statement.diffB-A.txt vendored
View File

@ -1,22 +1,28 @@
(Program
(Import
{-(ScopeResolution
{-(Identifier)-})-}
(ScopeResolution
(Identifier))
{+(ScopeResolution
{+(Identifier)+})+})
(Import
{+(ScopeResolution
{+(Identifier)+})+}
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))
{-(ScopeResolution
{-(Identifier)-})-})
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(
(ScopeResolution
{ (Identifier)
->(Identifier) })))
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(
{+(ScopeResolution
{+(Identifier)+})+}
(ScopeResolution
(Identifier))
{-(ScopeResolution
{-(Identifier)-})-}))
(Import
(ScopeResolution
{ (Identifier)
->(Identifier) })
(Empty)
(Identifier)))

17
test/fixtures/python/import-from-statement.parseA.txt vendored
View File

@ -2,16 +2,21 @@
(Import
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier)))
(Empty)
(
(ScopeResolution
(Identifier))))
(Import
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier)))
(Empty)
(
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))))
(Import
(ScopeResolution
(Identifier))
(Empty)
(Identifier)))

17
test/fixtures/python/import-from-statement.parseB.txt vendored
View File

@ -2,16 +2,21 @@
(Import
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier)))
(Empty)
(
(ScopeResolution
(Identifier))))
(Import
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier)))
(Empty)
(
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier))))
(Import
(ScopeResolution
(Identifier))
(Empty)
(Identifier)))

46
test/fixtures/python/import-statement.diffA-B.txt vendored
View File

@ -1,22 +1,32 @@
(Program
(Import
{+(ScopeResolution
{+(Identifier)+})+}
(ScopeResolution
(Identifier))
{-(Let
{-(Identifier)-}
(
{+(Import
{+(Identifier)+}
{+(Empty)+}
{+(Empty)+})+}
(Import
(Identifier)
(Empty)
(Empty))
{-(Import
{-(ScopeResolution
{-(Identifier)-})-}
{-(Identifier)-}
{-(Empty)-})-})
(Import
(Let
{ (Identifier)
->(Identifier) }
(ScopeResolution
{ (Identifier)
->(Identifier) }
(Identifier))
(Empty))
{-(ScopeResolution
{-(Identifier)-})-}))
{+(Import
{+(ScopeResolution
{+(Identifier)+}
{+(Identifier)+})+}
{+(Identifier)+}
{+(Empty)+})+}
{-(
{-(Import
{-(ScopeResolution
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-}
{-(Empty)-})-}
{-(Import
{-(Identifier)-}
{-(Empty)-}
{-(Empty)-})-})-})

46
test/fixtures/python/import-statement.diffB-A.txt vendored
View File

@ -1,22 +1,32 @@
(Program
(Import
{-(ScopeResolution
{-(Identifier)-})-}
(ScopeResolution
(Identifier))
{+(Let
{+(Identifier)+}
(
{-(Import
{-(Identifier)-}
{-(Empty)-}
{-(Empty)-})-}
(Import
(Identifier)
(Empty)
(Empty))
{+(Import
{+(ScopeResolution
{+(Identifier)+})+}
{+(Identifier)+}
{+(Empty)+})+})
(Import
(Let
{ (Identifier)
->(Identifier) }
(ScopeResolution
{ (Identifier)
->(Identifier) }
(Identifier))
(Empty))
{+(ScopeResolution
{+(Identifier)+})+}))
{+(
{+(Import
{+(ScopeResolution
{+(Identifier)+}
{+(Identifier)+})+}
{+(Identifier)+}
{+(Empty)+})+}
{+(Import
{+(Identifier)+}
{+(Empty)+}
{+(Empty)+})+})+}
{-(Import
{-(ScopeResolution
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-}
{-(Empty)-})-})

22
test/fixtures/python/import-statement.parseA.txt vendored
View File

@ -1,18 +1,22 @@
(Program
(Import
(ScopeResolution
(Identifier))
(Let
(
(Import
(Identifier)
(Empty)
(Empty))
(Import
(ScopeResolution
(Identifier))
(Empty)))
(Import
(Let
(Identifier)
(Empty)))
(
(Import
(ScopeResolution
(Identifier)
(Identifier))
(Identifier)
(Empty))
(ScopeResolution
(Identifier))))
(Import
(Identifier)
(Empty)
(Empty))))

25
test/fixtures/python/import-statement.parseB.txt vendored
View File

@ -1,13 +1,16 @@
(Program
(Import
(ScopeResolution
(Identifier))
(ScopeResolution
(Identifier)))
(Import
(Let
(
(Import
(Identifier)
(ScopeResolution
(Identifier)
(Identifier))
(Empty))))
(Empty)
(Empty))
(Import
(Identifier)
(Empty)
(Empty)))
(Import
(ScopeResolution
(Identifier)
(Identifier))
(Identifier)
(Empty)))