Skip to content

Commit 12c9233

Browse files
jensjohacommit-bot@chromium.org
jensjoha
authored and
commit-bot@chromium.org
committed
[CFE] Parser test can run scanner in non-nnbd-mode
Tests in the folder "non-nnbd" are run in non-nnbd mode. Change-Id: I27c2acec93f729b76f024f12dcfb84f31903e0b6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/124688 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
1 parent 684c456 commit 12c9233

11 files changed

+312
-6
lines changed

‎pkg/front_end/parser_testcases/nnbd/issue_39326.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}

‎pkg/front_end/parser_testcases/nnbd/issue_39326.dart.expect‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
beginCompilationUnit(main)
2+
beginMetadataStar(main)
3+
endMetadataStar(0)
4+
beginTopLevelMember(main)
5+
beginTopLevelMethod(, null)
6+
handleNoType()
7+
handleIdentifier(main, topLevelFunctionDeclaration)
8+
handleNoTypeVariables(()
9+
beginFormalParameters((, MemberKind.TopLevelMethod)
10+
endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
11+
handleAsyncModifier(null, null)
12+
beginBlockFunctionBody({)
13+
beginMetadataStar(var)
14+
endMetadataStar(0)
15+
handleNoType(var)
16+
beginVariablesDeclaration(c, null, var)
17+
handleIdentifier(c, localVariableDeclaration)
18+
beginInitializedIdentifier(c)
19+
handleNoVariableInitializer(;)
20+
endInitializedIdentifier(c)
21+
endVariablesDeclaration(1, ;)
22+
handleIdentifier(c, expression)
23+
handleNoTypeArguments(?.[)
24+
handleNoArguments(?.[)
25+
handleSend(c, ?.[)
26+
handleLiteralInt(1)
27+
handleIndexedExpression(?.[, ])
28+
handleLiteralInt(42)
29+
handleAssignmentExpression(=)
30+
handleExpressionStatement(;)
31+
endBlockFunctionBody(2, {, })
32+
endTopLevelMethod(main, null, })
33+
endTopLevelDeclaration()
34+
endCompilationUnit(1, )

‎pkg/front_end/parser_testcases/nnbd/issue_39326.dart.intertwined.expect‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
parseUnit(main)
2+
skipErrorTokens(main)
3+
listener: beginCompilationUnit(main)
4+
syntheticPreviousToken(main)
5+
parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
6+
parseMetadataStar()
7+
listener: beginMetadataStar(main)
8+
listener: endMetadataStar(0)
9+
parseTopLevelMemberImpl()
10+
listener: beginTopLevelMember(main)
11+
parseTopLevelMethod(, null, , Instance of 'NoType', null, main)
12+
listener: beginTopLevelMethod(, null)
13+
listener: handleNoType()
14+
ensureIdentifier(, topLevelFunctionDeclaration)
15+
listener: handleIdentifier(main, topLevelFunctionDeclaration)
16+
parseMethodTypeVar(main)
17+
listener: handleNoTypeVariables(()
18+
parseGetterOrFormalParameters(main, main, false, MemberKind.TopLevelMethod)
19+
parseFormalParameters(main, MemberKind.TopLevelMethod)
20+
parseFormalParametersRest((, MemberKind.TopLevelMethod)
21+
listener: beginFormalParameters((, MemberKind.TopLevelMethod)
22+
listener: endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
23+
parseAsyncModifierOpt())
24+
listener: handleAsyncModifier(null, null)
25+
inPlainSync()
26+
parseFunctionBody(), false, false)
27+
listener: beginBlockFunctionBody({)
28+
notEofOrValue(}, var)
29+
parseStatement({)
30+
parseStatementX({)
31+
parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false)
32+
looksLikeLocalFunction(c)
33+
listener: beginMetadataStar(var)
34+
listener: endMetadataStar(0)
35+
listener: handleNoType(var)
36+
listener: beginVariablesDeclaration(c, null, var)
37+
parseVariablesDeclarationRest(var, true)
38+
parseOptionallyInitializedIdentifier(var)
39+
ensureIdentifier(var, localVariableDeclaration)
40+
listener: handleIdentifier(c, localVariableDeclaration)
41+
listener: beginInitializedIdentifier(c)
42+
parseVariableInitializerOpt(c)
43+
listener: handleNoVariableInitializer(;)
44+
listener: endInitializedIdentifier(c)
45+
ensureSemicolon(c)
46+
listener: endVariablesDeclaration(1, ;)
47+
notEofOrValue(}, c)
48+
parseStatement(;)
49+
parseStatementX(;)
50+
parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false)
51+
looksLikeLocalFunction(c)
52+
parseExpressionStatement(;)
53+
parseExpression(;)
54+
parsePrecedenceExpression(;, 1, true)
55+
parseUnaryExpression(;, true)
56+
parsePrimary(;, expression)
57+
parseSendOrFunctionLiteral(;, expression)
58+
parseSend(;, expression)
59+
ensureIdentifier(;, expression)
60+
listener: handleIdentifier(c, expression)
61+
listener: handleNoTypeArguments(?.[)
62+
parseArgumentsOpt(c)
63+
listener: handleNoArguments(?.[)
64+
listener: handleSend(c, ?.[)
65+
parseArgumentOrIndexStar(c, Instance of 'NoTypeParamOrArg')
66+
parseExpression(?.[)
67+
parsePrecedenceExpression(?.[, 1, true)
68+
parseUnaryExpression(?.[, true)
69+
parsePrimary(?.[, expression)
70+
parseLiteralInt(?.[)
71+
listener: handleLiteralInt(1)
72+
listener: handleIndexedExpression(?.[, ])
73+
parsePrecedenceExpression(=, 1, true)
74+
parseUnaryExpression(=, true)
75+
parsePrimary(=, expression)
76+
parseLiteralInt(=)
77+
listener: handleLiteralInt(42)
78+
listener: handleAssignmentExpression(=)
79+
ensureSemicolon(42)
80+
listener: handleExpressionStatement(;)
81+
notEofOrValue(}, })
82+
listener: endBlockFunctionBody(2, {, })
83+
listener: endTopLevelMethod(main, null, })
84+
listener: endTopLevelDeclaration()
85+
reportAllErrorTokens(main)
86+
listener: endCompilationUnit(1, )

‎pkg/front_end/parser_testcases/nnbd/issue_39326.dart.parser.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}
5+
6+
main[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
7+
var[KeywordToken] c[StringToken];[SimpleToken]
8+
c[StringToken]?.[[BeginToken]1[StringToken]][SimpleToken] =[SimpleToken] 42[StringToken];[SimpleToken]
9+
}[SimpleToken][SimpleToken]

‎pkg/front_end/parser_testcases/nnbd/issue_39326.dart.scanner.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}
5+
6+
main[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
7+
var[KeywordToken] c[StringToken];[SimpleToken]
8+
c[StringToken]?.[[BeginToken]1[StringToken]][SimpleToken] =[SimpleToken] 42[StringToken];[SimpleToken]
9+
}[SimpleToken][SimpleToken]

‎pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}

‎pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.expect‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
beginCompilationUnit(main)
2+
beginMetadataStar(main)
3+
endMetadataStar(0)
4+
beginTopLevelMember(main)
5+
beginTopLevelMethod(, null)
6+
handleNoType()
7+
handleIdentifier(main, topLevelFunctionDeclaration)
8+
handleNoTypeVariables(()
9+
beginFormalParameters((, MemberKind.TopLevelMethod)
10+
endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
11+
handleAsyncModifier(null, null)
12+
beginBlockFunctionBody({)
13+
beginMetadataStar(var)
14+
endMetadataStar(0)
15+
handleNoType(var)
16+
beginVariablesDeclaration(c, null, var)
17+
handleIdentifier(c, localVariableDeclaration)
18+
beginInitializedIdentifier(c)
19+
handleNoVariableInitializer(;)
20+
endInitializedIdentifier(c)
21+
endVariablesDeclaration(1, ;)
22+
handleIdentifier(c, expression)
23+
handleNoTypeArguments(?.)
24+
handleNoArguments(?.)
25+
handleSend(c, ?.)
26+
handleNoTypeArguments([)
27+
handleLiteralInt(1)
28+
handleLiteralList(1, [, null, ])
29+
endBinaryExpression(?.)
30+
handleLiteralInt(42)
31+
handleAssignmentExpression(=)
32+
handleExpressionStatement(;)
33+
endBlockFunctionBody(2, {, })
34+
endTopLevelMethod(main, null, })
35+
endTopLevelDeclaration()
36+
endCompilationUnit(1, )

‎pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.intertwined.expect‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
parseUnit(main)
2+
skipErrorTokens(main)
3+
listener: beginCompilationUnit(main)
4+
syntheticPreviousToken(main)
5+
parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext')
6+
parseMetadataStar()
7+
listener: beginMetadataStar(main)
8+
listener: endMetadataStar(0)
9+
parseTopLevelMemberImpl()
10+
listener: beginTopLevelMember(main)
11+
parseTopLevelMethod(, null, , Instance of 'NoType', null, main)
12+
listener: beginTopLevelMethod(, null)
13+
listener: handleNoType()
14+
ensureIdentifier(, topLevelFunctionDeclaration)
15+
listener: handleIdentifier(main, topLevelFunctionDeclaration)
16+
parseMethodTypeVar(main)
17+
listener: handleNoTypeVariables(()
18+
parseGetterOrFormalParameters(main, main, false, MemberKind.TopLevelMethod)
19+
parseFormalParameters(main, MemberKind.TopLevelMethod)
20+
parseFormalParametersRest((, MemberKind.TopLevelMethod)
21+
listener: beginFormalParameters((, MemberKind.TopLevelMethod)
22+
listener: endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
23+
parseAsyncModifierOpt())
24+
listener: handleAsyncModifier(null, null)
25+
inPlainSync()
26+
parseFunctionBody(), false, false)
27+
listener: beginBlockFunctionBody({)
28+
notEofOrValue(}, var)
29+
parseStatement({)
30+
parseStatementX({)
31+
parseExpressionStatementOrDeclarationAfterModifiers(var, {, null, var, null, false)
32+
looksLikeLocalFunction(c)
33+
listener: beginMetadataStar(var)
34+
listener: endMetadataStar(0)
35+
listener: handleNoType(var)
36+
listener: beginVariablesDeclaration(c, null, var)
37+
parseVariablesDeclarationRest(var, true)
38+
parseOptionallyInitializedIdentifier(var)
39+
ensureIdentifier(var, localVariableDeclaration)
40+
listener: handleIdentifier(c, localVariableDeclaration)
41+
listener: beginInitializedIdentifier(c)
42+
parseVariableInitializerOpt(c)
43+
listener: handleNoVariableInitializer(;)
44+
listener: endInitializedIdentifier(c)
45+
ensureSemicolon(c)
46+
listener: endVariablesDeclaration(1, ;)
47+
notEofOrValue(}, c)
48+
parseStatement(;)
49+
parseStatementX(;)
50+
parseExpressionStatementOrDeclarationAfterModifiers(;, ;, null, null, null, false)
51+
looksLikeLocalFunction(c)
52+
parseExpressionStatement(;)
53+
parseExpression(;)
54+
parsePrecedenceExpression(;, 1, true)
55+
parseUnaryExpression(;, true)
56+
parsePrimary(;, expression)
57+
parseSendOrFunctionLiteral(;, expression)
58+
parseSend(;, expression)
59+
ensureIdentifier(;, expression)
60+
listener: handleIdentifier(c, expression)
61+
listener: handleNoTypeArguments(?.)
62+
parseArgumentsOpt(c)
63+
listener: handleNoArguments(?.)
64+
listener: handleSend(c, ?.)
65+
parsePrimary(?., expressionContinuation)
66+
listener: handleNoTypeArguments([)
67+
parseLiteralListSuffix(?., null)
68+
parseExpression([)
69+
parsePrecedenceExpression([, 1, true)
70+
parseUnaryExpression([, true)
71+
parsePrimary([, expression)
72+
parseLiteralInt([)
73+
listener: handleLiteralInt(1)
74+
listener: handleLiteralList(1, [, null, ])
75+
listener: endBinaryExpression(?.)
76+
parsePrecedenceExpression(=, 1, true)
77+
parseUnaryExpression(=, true)
78+
parsePrimary(=, expression)
79+
parseLiteralInt(=)
80+
listener: handleLiteralInt(42)
81+
listener: handleAssignmentExpression(=)
82+
ensureSemicolon(42)
83+
listener: handleExpressionStatement(;)
84+
notEofOrValue(}, })
85+
listener: endBlockFunctionBody(2, {, })
86+
listener: endTopLevelMethod(main, null, })
87+
listener: endTopLevelDeclaration()
88+
reportAllErrorTokens(main)
89+
listener: endCompilationUnit(1, )

‎pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.parser.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}
5+
6+
main[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
7+
var[KeywordToken] c[StringToken];[SimpleToken]
8+
c[StringToken]?.[SimpleToken][[BeginToken]1[StringToken]][SimpleToken] =[SimpleToken] 42[StringToken];[SimpleToken]
9+
}[SimpleToken][SimpleToken]

‎pkg/front_end/parser_testcases/non-nnbd/issue_39326.dart.scanner.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
main() {
2+
var c;
3+
c?.[1] = 42;
4+
}
5+
6+
main[StringToken]([BeginToken])[SimpleToken] {[BeginToken]
7+
var[KeywordToken] c[StringToken];[SimpleToken]
8+
c[StringToken]?.[SimpleToken][[BeginToken]1[StringToken]][SimpleToken] =[SimpleToken] 42[StringToken];[SimpleToken]
9+
}[SimpleToken][SimpleToken]

0 commit comments

Comments
 (0)