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

Merge pull request #1763 from github/revert-parens-fix

Browse Source 
Remove explicit Paren node from syntax trees.
This commit is contained in:
Josh Vera 2018-04-23 12:06:17 -04:00 committed by GitHub
commit d381721530
87 changed files with 322 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Data/Syntax.hs
View File

@ -148,17 +148,6 @@ instance Show1 Empty where liftShowsPrec _ _ _ _ = showString "Empty"
instance Evaluatable Empty where
eval _ = unit
-- | A parenthesized expression or statement. All the languages we target support this concept.
newtype Paren a = Paren a
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Mergeable, Ord, Show, Traversable, FreeVariables1, Declarations1)
instance Eq1 Paren where liftEq = genericLiftEq
instance Ord1 Paren where liftCompare = genericLiftCompare
instance Show1 Paren where liftShowsPrec = genericLiftShowsPrec
instance Evaluatable Paren where
eval (Paren a) = subtermValue a
-- | Syntax representing a parsing or assignment error.
data Error a = Error { errorCallStack :: ErrorStack, errorExpected :: [String], errorActual :: Maybe String, errorChildren :: [a] }

3
src/Language/Go/Assignment.hs
View File

@ -89,7 +89,6 @@ type Syntax =
, Syntax.Error
, Syntax.Empty
, Syntax.Identifier
, Syntax.Paren
, Syntax.Program
, Type.Annotation
, Type.Array
@ -429,7 +428,7 @@ parameterDeclaration :: Assignment
parameterDeclaration = makeTerm <$> symbol ParameterDeclaration <*> children (manyTerm expression)
parenthesizedExpression :: Assignment
parenthesizedExpression = makeTerm <$> symbol ParenthesizedExpression <*> (Syntax.Paren <$> children expressions)
parenthesizedExpression = symbol ParenthesizedExpression *> children expressions
selectorExpression :: Assignment
selectorExpression = makeTerm <$> symbol SelectorExpression <*> children (Expression.MemberAccess <$> expression <*> expression)

3
src/Language/PHP/Assignment.hs
View File

@ -103,7 +103,6 @@ type Syntax = '[
, Syntax.NamespaceUseDeclaration
, Syntax.NamespaceUseGroupClause
, Syntax.NewVariable
, Syntax.Paren
, Syntax.PrintIntrinsic
, Syntax.Program
, Syntax.PropertyDeclaration
@ -288,7 +287,7 @@ primaryExpression = choice [
]
parenthesizedExpression :: Assignment
parenthesizedExpression = makeTerm <$> symbol ParenthesizedExpression <*> (Syntax.Paren <$> children (term expression))
parenthesizedExpression = symbol ParenthesizedExpression *> children (term expression)
classConstantAccessExpression :: Assignment
classConstantAccessExpression = makeTerm <$> symbol ClassConstantAccessExpression <*> children (Expression.MemberAccess <$> term scopeResolutionQualifier <*> term name)

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

@ -79,7 +79,6 @@ type Syntax =
, Syntax.Empty
, Syntax.Error
, Syntax.Identifier
, Syntax.Paren
, Syntax.Program
, Type.Annotation
, []
@ -191,7 +190,7 @@ keywordArgument :: Assignment
keywordArgument = makeTerm <$> symbol KeywordArgument <*> children (Statement.Assignment [] <$> term expression <*> term expression)
parenthesizedExpression :: Assignment
parenthesizedExpression = makeTerm <$> symbol ParenthesizedExpression <*> (Syntax.Paren <$> children expressions)
parenthesizedExpression = symbol ParenthesizedExpression *> children expressions
parameter :: Assignment
parameter = makeTerm <$> symbol DefaultParameter <*> children (Statement.Assignment [] <$> term expression <*> term expression)

3
src/Language/Ruby/Assignment.hs
View File

@ -72,7 +72,6 @@ type Syntax = '[
, Syntax.Empty
, Syntax.Error
, Syntax.Identifier
, Syntax.Paren
, Syntax.Program
, Ruby.Syntax.Send
, Ruby.Syntax.Class
@ -144,7 +143,7 @@ expressions :: Assignment
expressions = makeTerm'' <$> location <*> many expression
parenthesizedExpressions :: Assignment
parenthesizedExpressions = makeTerm'' <$> symbol ParenthesizedStatements <*> children (Syntax.Paren <$> expressions)
parenthesizedExpressions = makeTerm'' <$> symbol ParenthesizedStatements <*> children (many expression)
withExtendedScope :: Assignment' a -> Assignment' a
withExtendedScope inner = do

3
src/Language/TypeScript/Assignment.hs
View File

@ -87,7 +87,6 @@ type Syntax = '[
, Syntax.Empty
, Syntax.Error
, Syntax.Identifier
, Syntax.Paren
, Syntax.Program
, Syntax.Context
, Type.Readonly
@ -803,7 +802,7 @@ variableDeclarator =
parenthesizedExpression :: Assignment
parenthesizedExpression = makeTerm <$> symbol ParenthesizedExpression <*> (Syntax.Paren <$> children (term expressions))
parenthesizedExpression = symbol ParenthesizedExpression *> children (term expressions)
switchStatement :: Assignment
switchStatement = makeTerm <$> symbol SwitchStatement <*> children (Statement.Match <$> term parenthesizedExpression <*> term switchBody)

7
test/fixtures/go/corpus/constructors.diffA-B.txt vendored
View File

@ -18,10 +18,9 @@
(SendChannel
{ (Identifier)
->(Identifier) })
(Paren
(Minus
(Identifier)
(Identifier))))
(Minus
(Identifier)
(Identifier)))
(Empty))
(Call
(Identifier)

7
test/fixtures/go/corpus/constructors.diffB-A.txt vendored
View File

@ -18,10 +18,9 @@
(SendChannel
{ (Identifier)
->(Identifier) })
(Paren
(Minus
(Identifier)
(Identifier))))
(Minus
(Identifier)
(Identifier)))
(Empty))
(Call
(Identifier)

7
test/fixtures/go/corpus/constructors.parseA.txt vendored
View File

@ -16,10 +16,9 @@
(
(SendChannel
(Identifier))
(Paren
(Minus
(Identifier)
(Identifier))))
(Minus
(Identifier)
(Identifier)))
(Empty))
(Call
(Identifier)

7
test/fixtures/go/corpus/constructors.parseB.txt vendored
View File

@ -16,10 +16,9 @@
(
(SendChannel
(Identifier))
(Paren
(Minus
(Identifier)
(Identifier))))
(Minus
(Identifier)
(Identifier)))
(Empty))
(Call
(Identifier)

108
test/fixtures/go/corpus/type-conversion-expressions.diffA-B.txt vendored
View File

@ -13,9 +13,8 @@
->(Identifier) }
(Empty)))
(Call
(Paren
(Pointer
(Identifier)))
(Pointer
(Identifier))
{ (Identifier)
->(Identifier) }
(Empty))
@ -56,63 +55,46 @@
(Identifier))
{ (Identifier)
->(Identifier) })
{+(TypeConversion
{+(Slice
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(TypeConversion
{+(Parenthesized
{+(Slice
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+})+}
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(Call
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+}
{+(Identifier)+}
{+(Empty)+})+}
{+(Call
{+(Paren
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(Identifier)+}
{+(Empty)+})+}
{-(TypeConversion
{-(Slice
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(TypeConversion
{-(Parenthesized
{-(Slice
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-})-}
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Call
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-}
{-(Empty)-})-}
{-(Call
{-(Paren
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Identifier)-}
{-(Empty)-})-})))
(TypeConversion
(Slice
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(TypeConversion
(Parenthesized
(Slice
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Call
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(Empty))
(Call
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(Empty)))))

94
test/fixtures/go/corpus/type-conversion-expressions.diffB-A.txt vendored
View File

@ -13,9 +13,8 @@
->(Identifier) }
(Empty)))
(Call
(Paren
(Pointer
(Identifier)))
(Pointer
(Identifier))
{ (Identifier)
->(Identifier) }
(Empty))
@ -56,61 +55,46 @@
(Identifier))
{ (Identifier)
->(Identifier) })
{+(TypeConversion
{+(Slice
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
(TypeConversion
{ (Slice
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})
->(Parenthesized
{+(Slice
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}) }
(Slice
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
{+(Call
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+}
{+(Identifier)+}
{+(Empty)+})+}
{+(Call
{+(Paren
{+(MemberAccess
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(Identifier)+}
{+(Empty)+})+}
{-(TypeConversion
{-(Parenthesized
{-(Slice
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-})-}
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Call
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-}
{-(Empty)-})-}
{-(Call
{-(Paren
{-(MemberAccess
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Identifier)-}
{-(Empty)-})-})))
(TypeConversion
(Parenthesized
(Slice
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })))
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }))
(Call
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(Empty))
(Call
(MemberAccess
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(Empty)))))

12
test/fixtures/go/corpus/type-conversion-expressions.parseA.txt vendored
View File

@ -12,9 +12,8 @@
(Identifier)
(Empty)))
(Call
(Paren
(Pointer
(Identifier)))
(Pointer
(Identifier))
(Identifier)
(Empty))
(TypeConversion
@ -72,9 +71,8 @@
(Identifier)
(Empty))
(Call
(Paren
(MemberAccess
(Identifier)
(Identifier)))
(MemberAccess
(Identifier)
(Identifier))
(Identifier)
(Empty)))))

12
test/fixtures/go/corpus/type-conversion-expressions.parseB.txt vendored
View File

@ -12,9 +12,8 @@
(Identifier)
(Empty)))
(Call
(Paren
(Pointer
(Identifier)))
(Pointer
(Identifier))
(Identifier)
(Empty))
(TypeConversion
@ -72,9 +71,8 @@
(Identifier)
(Empty))
(Call
(Paren
(MemberAccess
(Identifier)
(Identifier)))
(MemberAccess
(Identifier)
(Identifier))
(Identifier)
(Empty)))))

7
test/fixtures/javascript/corpus/break.diffA-B.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Continue
{+(Empty)+})+}

7
test/fixtures/javascript/corpus/break.diffB-A.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Break
{+(Empty)+})+}

7
test/fixtures/javascript/corpus/break.parseA.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Break
(Empty)))

7
test/fixtures/javascript/corpus/break.parseB.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Continue
(Empty)))

13
test/fixtures/javascript/corpus/comma-operator.diffA-B.txt vendored
View File

@ -4,14 +4,13 @@
{+(Hash
{+(KeyValue
{+(Identifier)+}
{+(Paren
{+(SequenceExpression
{+(Float)+}
{+(SequenceExpression
{+(Float)+}
{+(SequenceExpression
{+(Plus
{+(Float)+}
{+(Float)+})+}
{+(Float)+})+})+})+})+})+})+}
{+(Plus
{+(Float)+}
{+(Float)+})+}
{+(Float)+})+})+})+})+})+}
{-(SequenceExpression
{-(Assignment
{-(Identifier)-}

13
test/fixtures/javascript/corpus/comma-operator.diffB-A.txt vendored
View File

@ -11,11 +11,10 @@
{-(Hash
{-(KeyValue
{-(Identifier)-}
{-(Paren
{-(SequenceExpression
{-(Float)-}
{-(SequenceExpression
{-(Float)-}
{-(SequenceExpression
{-(Plus
{-(Float)-}
{-(Float)-})-}
{-(Float)-})-})-})-})-})-})-})
{-(Plus
{-(Float)-}
{-(Float)-})-}
{-(Float)-})-})-})-})-})-})

13
test/fixtures/javascript/corpus/comma-operator.parseB.txt vendored
View File

@ -4,11 +4,10 @@
(Hash
(KeyValue
(Identifier)
(Paren
(SequenceExpression
(Float)
(SequenceExpression
(Float)
(SequenceExpression
(Plus
(Float)
(Float))
(Float))))))))
(Plus
(Float)
(Float))
(Float)))))))

7
test/fixtures/javascript/corpus/continue.diffA-B.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Break
{+(Empty)+})+}

7
test/fixtures/javascript/corpus/continue.diffB-A.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Continue
{+(Empty)+})+}

7
test/fixtures/javascript/corpus/continue.parseA.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Continue
(Empty)))

7
test/fixtures/javascript/corpus/continue.parseB.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Break
(Empty)))

5
test/fixtures/javascript/corpus/do-while-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(DoWhile
(Paren
{ (Boolean)
->(Boolean) })
{ (Boolean)
->(Boolean) }
(
(Call
(MemberAccess

5
test/fixtures/javascript/corpus/do-while-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(DoWhile
(Paren
{ (Boolean)
->(Boolean) })
{ (Boolean)
->(Boolean) }
(
(Call
(MemberAccess

3
test/fixtures/javascript/corpus/do-while-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(DoWhile
(Paren
(Boolean))
(Boolean)
(
(Call
(MemberAccess

3
test/fixtures/javascript/corpus/do-while-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(DoWhile
(Paren
(Boolean))
(Boolean)
(
(Call
(MemberAccess

20
test/fixtures/javascript/corpus/if-else.diffA-B.txt vendored
View File

@ -1,27 +1,23 @@
(Program
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(
{+(Identifier)+}) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(
{+(Identifier)+}) }

20
test/fixtures/javascript/corpus/if-else.diffB-A.txt vendored
View File

@ -1,27 +1,23 @@
(Program
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (
{-(Identifier)-})
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (
{-(Identifier)-})
->(Identifier) }

12
test/fixtures/javascript/corpus/if-else.parseA.txt vendored
View File

@ -1,18 +1,14 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(Identifier))))))

12
test/fixtures/javascript/corpus/if-else.parseB.txt vendored
View File

@ -1,20 +1,16 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(
(Identifier))
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(
(Identifier))
(Identifier))))))

9
test/fixtures/javascript/corpus/if.diffA-B.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(If
(Paren
{ (Identifier)
->(MemberAccess
{+(Identifier)+}
{+(Identifier)+}) })
{ (Identifier)
->(MemberAccess
{+(Identifier)+}
{+(Identifier)+}) }
(
(Call
(Identifier)

9
test/fixtures/javascript/corpus/if.diffB-A.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(If
(Paren
{ (MemberAccess
{-(Identifier)-}
{-(Identifier)-})
->(Identifier) })
{ (MemberAccess
{-(Identifier)-}
{-(Identifier)-})
->(Identifier) }
(
(Call
(Identifier)

3
test/fixtures/javascript/corpus/if.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

7
test/fixtures/javascript/corpus/if.parseB.txt vendored
View File

@ -1,9 +1,8 @@
(Program
(If
(Paren
(MemberAccess
(Identifier)
(Identifier)))
(MemberAccess
(Identifier)
(Identifier))
(
(Call
(Identifier)

5
test/fixtures/javascript/corpus/nested-do-while-in-function.diffA-B.txt vendored
View File

@ -19,9 +19,8 @@
(Empty)))
(
(DoWhile
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
(Identifier)

5
test/fixtures/javascript/corpus/nested-do-while-in-function.diffB-A.txt vendored
View File

@ -19,9 +19,8 @@
(Empty)))
(
(DoWhile
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
(Identifier)

3
test/fixtures/javascript/corpus/nested-do-while-in-function.parseA.txt vendored
View File

@ -19,8 +19,7 @@
(Empty)))
(
(DoWhile
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

3
test/fixtures/javascript/corpus/nested-do-while-in-function.parseB.txt vendored
View File

@ -19,8 +19,7 @@
(Empty)))
(
(DoWhile
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

5
test/fixtures/javascript/corpus/switch-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(Match
(Paren
{ (Float)
->(Float) })
{ (Float)
->(Float) }
(
(Pattern
(Float)

5
test/fixtures/javascript/corpus/switch-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(Match
(Paren
{ (Float)
->(Float) })
{ (Float)
->(Float) }
(
(Pattern
(Float)

3
test/fixtures/javascript/corpus/switch-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Match
(Paren
(Float))
(Float)
(
(Pattern
(Float)

3
test/fixtures/javascript/corpus/switch-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Match
(Paren
(Float))
(Float)
(
(Pattern
(Float)

5
test/fixtures/javascript/corpus/while-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(While
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
{ (Identifier)

5
test/fixtures/javascript/corpus/while-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(While
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
{ (Identifier)

3
test/fixtures/javascript/corpus/while-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(While
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

3
test/fixtures/javascript/corpus/while-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(While
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

3
test/fixtures/python/corpus/tuple.diffA-B.txt vendored
View File

@ -7,8 +7,7 @@
{-(Identifier)-}
(Identifier)
{+(Identifier)+})
{+(Paren
{+(Identifier)+})+}
{+(Identifier)+}
{-(Tuple
{-(Identifier)-}
{-(Identifier)-}

14
test/fixtures/python/corpus/tuple.diffB-A.txt vendored
View File

@ -2,16 +2,12 @@
{+(Tuple
{+(Identifier)+}
{+(Identifier)+})+}
{+(Tuple
(Tuple
{+(Identifier)+}
{+(Identifier)+}
{+(Identifier)+})+}
{-(Tuple
{-(Identifier)-}
{-(Identifier)-}
{-(Identifier)-})-}
(Identifier)
(Identifier)
{-(Identifier)-})
{-(Tuple
{-(Identifier)-}
{-(Identifier)-})-}
{-(Paren
{-(Identifier)-})-})
{-(Identifier)-})

3
test/fixtures/python/corpus/tuple.parseB.txt vendored
View File

@ -6,5 +6,4 @@
(Tuple
(Identifier)
(Identifier))
(Paren
(Identifier)))
(Identifier))

7
test/fixtures/typescript/corpus/break.diffA-B.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Continue
{+(Empty)+})+}

7
test/fixtures/typescript/corpus/break.diffB-A.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Break
{+(Empty)+})+}

7
test/fixtures/typescript/corpus/break.parseA.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Break
(Empty)))

7
test/fixtures/typescript/corpus/break.parseB.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Continue
(Empty)))

13
test/fixtures/typescript/corpus/comma-operator.diffA-B.txt vendored
View File

@ -4,14 +4,13 @@
{+(Hash
{+(KeyValue
{+(Identifier)+}
{+(Paren
{+(SequenceExpression
{+(Float)+}
{+(SequenceExpression
{+(Float)+}
{+(SequenceExpression
{+(Plus
{+(Float)+}
{+(Float)+})+}
{+(Float)+})+})+})+})+})+})+}
{+(Plus
{+(Float)+}
{+(Float)+})+}
{+(Float)+})+})+})+})+})+}
{-(SequenceExpression
{-(Assignment
{-(Identifier)-}

13
test/fixtures/typescript/corpus/comma-operator.diffB-A.txt vendored
View File

@ -11,11 +11,10 @@
{-(Hash
{-(KeyValue
{-(Identifier)-}
{-(Paren
{-(SequenceExpression
{-(Float)-}
{-(SequenceExpression
{-(Float)-}
{-(SequenceExpression
{-(Plus
{-(Float)-}
{-(Float)-})-}
{-(Float)-})-})-})-})-})-})-})
{-(Plus
{-(Float)-}
{-(Float)-})-}
{-(Float)-})-})-})-})-})-})

13
test/fixtures/typescript/corpus/comma-operator.parseB.txt vendored
View File

@ -4,11 +4,10 @@
(Hash
(KeyValue
(Identifier)
(Paren
(SequenceExpression
(Float)
(SequenceExpression
(Float)
(SequenceExpression
(Plus
(Float)
(Float))
(Float))))))))
(Plus
(Float)
(Float))
(Float)))))))

7
test/fixtures/typescript/corpus/continue.diffA-B.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Break
{+(Empty)+})+}

7
test/fixtures/typescript/corpus/continue.diffB-A.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
{+(Continue
{+(Empty)+})+}

7
test/fixtures/typescript/corpus/continue.parseA.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Continue
(Empty)))

7
test/fixtures/typescript/corpus/continue.parseB.txt vendored
View File

@ -10,10 +10,9 @@
(Identifier))
(
(If
(Paren
(Equal
(Identifier)
(Float)))
(Equal
(Identifier)
(Float))
(
(Break
(Empty)))

5
test/fixtures/typescript/corpus/do-while-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(DoWhile
(Paren
{ (Boolean)
->(Boolean) })
{ (Boolean)
->(Boolean) }
(
(Call
(MemberAccess

5
test/fixtures/typescript/corpus/do-while-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(DoWhile
(Paren
{ (Boolean)
->(Boolean) })
{ (Boolean)
->(Boolean) }
(
(Call
(MemberAccess

3
test/fixtures/typescript/corpus/do-while-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(DoWhile
(Paren
(Boolean))
(Boolean)
(
(Call
(MemberAccess

3
test/fixtures/typescript/corpus/do-while-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(DoWhile
(Paren
(Boolean))
(Boolean)
(
(Call
(MemberAccess

20
test/fixtures/typescript/corpus/if-else.diffA-B.txt vendored
View File

@ -1,27 +1,23 @@
(Program
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(
{+(Identifier)+}) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(
{+(Identifier)+}) }

20
test/fixtures/typescript/corpus/if-else.diffB-A.txt vendored
View File

@ -1,27 +1,23 @@
(Program
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (
{-(Identifier)-})
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) }
(If
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
{ (
{-(Identifier)-})
->(Identifier) }

12
test/fixtures/typescript/corpus/if-else.parseA.txt vendored
View File

@ -1,18 +1,14 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(Identifier))))))

12
test/fixtures/typescript/corpus/if-else.parseB.txt vendored
View File

@ -1,20 +1,16 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(
(Identifier))
(If
(Paren
(Identifier))
(Identifier)
(Identifier)
(If
(Paren
(Identifier))
(Identifier)
(
(Identifier))
(Identifier))))))

9
test/fixtures/typescript/corpus/if.diffA-B.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(If
(Paren
{ (Identifier)
->(MemberAccess
{+(Identifier)+}
{+(Identifier)+}) })
{ (Identifier)
->(MemberAccess
{+(Identifier)+}
{+(Identifier)+}) }
(
(Call
(Identifier)

9
test/fixtures/typescript/corpus/if.diffB-A.txt vendored
View File

@ -1,10 +1,9 @@
(Program
(If
(Paren
{ (MemberAccess
{-(Identifier)-}
{-(Identifier)-})
->(Identifier) })
{ (MemberAccess
{-(Identifier)-}
{-(Identifier)-})
->(Identifier) }
(
(Call
(Identifier)

3
test/fixtures/typescript/corpus/if.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(If
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

7
test/fixtures/typescript/corpus/if.parseB.txt vendored
View File

@ -1,9 +1,8 @@
(Program
(If
(Paren
(MemberAccess
(Identifier)
(Identifier)))
(MemberAccess
(Identifier)
(Identifier))
(
(Call
(Identifier)

5
test/fixtures/typescript/corpus/nested-do-while-in-function.diffA-B.txt vendored
View File

@ -19,9 +19,8 @@
(Empty)))
(
(DoWhile
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
(Identifier)

5
test/fixtures/typescript/corpus/nested-do-while-in-function.diffB-A.txt vendored
View File

@ -19,9 +19,8 @@
(Empty)))
(
(DoWhile
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
(Identifier)

3
test/fixtures/typescript/corpus/nested-do-while-in-function.parseA.txt vendored
View File

@ -19,8 +19,7 @@
(Empty)))
(
(DoWhile
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

3
test/fixtures/typescript/corpus/nested-do-while-in-function.parseB.txt vendored
View File

@ -19,8 +19,7 @@
(Empty)))
(
(DoWhile
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

5
test/fixtures/typescript/corpus/switch-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(Match
(Paren
{ (Float)
->(Float) })
{ (Float)
->(Float) }
(
(Pattern
(Float)

5
test/fixtures/typescript/corpus/switch-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(Match
(Paren
{ (Float)
->(Float) })
{ (Float)
->(Float) }
(
(Pattern
(Float)

3
test/fixtures/typescript/corpus/switch-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Match
(Paren
(Float))
(Float)
(
(Pattern
(Float)

3
test/fixtures/typescript/corpus/switch-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(Match
(Paren
(Float))
(Float)
(
(Pattern
(Float)

5
test/fixtures/typescript/corpus/while-statement.diffA-B.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(While
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
{ (Identifier)

5
test/fixtures/typescript/corpus/while-statement.diffB-A.txt vendored
View File

@ -1,8 +1,7 @@
(Program
(While
(Paren
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }
(
(Call
{ (Identifier)

3
test/fixtures/typescript/corpus/while-statement.parseA.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(While
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)

3
test/fixtures/typescript/corpus/while-statement.parseB.txt vendored
View File

@ -1,7 +1,6 @@
(Program
(While
(Paren
(Identifier))
(Identifier)
(
(Call
(Identifier)