[BG 2.3.0] (#1284)

• Handle `is` properly for v8, will change in v9 and hopefully not require fixup
• Add support for disambiguation of type_argument_list with a query_expression
• Add (nonsensical) sample to test the above

Co-authored-by: Nigel-Ecma <[email protected]>

Author: Nigel-Ecma

.github/workflows/dependencies/GrammarTestingEnv.tgz

@@ -1225,7 +1225,7 @@
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎝
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ is
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎛
-⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ pattern
+⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ type
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎛
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ identifier
 ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ ⎜ Action

tools/GrammarTesting/Tests/Parsing/Samples/v6/AllInOneNoPreprocessor-v6-split/part-B/Reference/AllInOneNoPreprocessor-v6-part.gruntree.red.txt

@@ -0,0 +1,14 @@
+# Sample: Type argument list disambiguation – Query expressions
+
+Uses modification set Rules which implements the disambiguation algorithm
+to determine whether a sequence of tokens is a *type_argument_list* or some expression
+when it occurs within a *query_expression*.
+
+Disambiguation is applied when a *type_argument_list* appears immediately before
+a contextual query keyword within a query expression. This can happen with
+those query clauses which end in an *expression* (e.g. *where_clause*)
+and those with *expression* followed by a contextual keyword within the clause
+itself (e.g. *join_clause* where the keywords `on` and `in` follow *expression*s).
+
+This is essentially the same process as for disambiguating within expression
+context, but with the addition of additional following tokens within the query context.

tools/GrammarTesting/Tests/Parsing/Samples/v6/AllInOneNoPreprocessor-v6-split/part-B/Reference/AllInOneNoPreprocessor-v6-part.tree.red.txt

@@ -0,0 +1,135 @@
+[@0,0:4='class',<'class'>,1:0]
+[@1,6:27='TypeArgumentListChecks',<Simple_Identifier>,1:6]
+[@2,29:29='{',<'{'>,2:0]
+[@3,34:37='void',<'void'>,3:3]
+[@4,39:60='TypeArgumentListChecks',<Simple_Identifier>,3:8]
+[@5,61:61='(',<'('>,3:30]
+[@6,62:62=')',<')'>,3:31]
+[@7,67:67='{',<'{'>,4:3]
+[@8,1111:1113='var',<'var'>,25:6]
+[@9,1115:1119='query',<Simple_Identifier>,25:10]
+[@10,1121:1121='=',<'='>,25:16]
+[@11,1123:1126='from',<'from'>,25:18]
+[@12,1128:1128='c',<Simple_Identifier>,25:23]
+[@13,1130:1131='in',<'in'>,25:25]
+[@14,1133:1141='customers',<Simple_Identifier>,25:28]
+[@15,1142:1142='<',<'<'>,25:37]
+[@16,1143:1143='A',<Simple_Identifier>,25:38]
+[@17,1144:1144='>',<'>'>,25:39]
+[@18,1164:1166='let',<'let'>,26:18]
+[@19,1168:1168='d',<Simple_Identifier>,26:22]
+[@20,1170:1170='=',<'='>,26:24]
+[@21,1172:1172='c',<Simple_Identifier>,26:26]
+[@22,1173:1173='<',<'<'>,26:27]
+[@23,1174:1174='B',<Simple_Identifier>,26:28]
+[@24,1175:1175='>',<'>'>,26:29]
+[@25,1195:1199='where',<'where'>,27:18]
+[@26,1201:1201='d',<Simple_Identifier>,27:24]
+[@27,1203:1204='!=',<'!='>,27:26]
+[@28,1206:1209='null',<'null'>,27:29]
+[@29,1211:1212='&&',<'&&'>,27:34]
+[@30,1214:1214='d',<Simple_Identifier>,27:37]
+[@31,1215:1215='<',<'<'>,27:38]
+[@32,1216:1216='C',<Simple_Identifier>,27:39]
+[@33,1217:1217=',',<','>,27:40]
+[@34,1218:1218='D',<Simple_Identifier>,27:41]
+[@35,1219:1219='>',<'>'>,27:42]
+[@36,1239:1242='join',<'join'>,28:18]
+[@37,1244:1245='c1',<Simple_Identifier>,28:23]
+[@38,1247:1248='in',<'in'>,28:26]
+[@39,1250:1258='customers',<Simple_Identifier>,28:29]
+[@40,1259:1259='<',<'<'>,28:38]
+[@41,1260:1260='E',<Simple_Identifier>,28:39]
+[@42,1261:1261='>',<'>'>,28:40]
+[@43,1263:1264='on',<'on'>,28:42]
+[@44,1266:1267='c1',<Simple_Identifier>,28:45]
+[@45,1268:1268='.',<'.'>,28:47]
+[@46,1269:1279='GetHashCode',<Simple_Identifier>,28:48]
+[@47,1280:1280='(',<'('>,28:59]
+[@48,1281:1281=')',<')'>,28:60]
+[@49,1283:1284='&&',<'&&'>,28:62]
+[@50,1286:1287='c1',<Simple_Identifier>,28:65]
+[@51,1288:1288='<',<'<'>,28:67]
+[@52,1289:1289='G',<Simple_Identifier>,28:68]
+[@53,1290:1290='>',<'>'>,28:69]
+[@54,1292:1297='equals',<'equals'>,28:71]
+[@55,1299:1299='c',<Simple_Identifier>,28:78]
+[@56,1300:1300='.',<'.'>,28:79]
+[@57,1301:1311='GetHashCode',<Simple_Identifier>,28:80]
+[@58,1312:1312='(',<'('>,28:91]
+[@59,1313:1313=')',<')'>,28:92]
+[@60,1315:1316='&&',<'&&'>,28:94]
+[@61,1318:1318='c',<Simple_Identifier>,28:97]
+[@62,1319:1319='<',<'<'>,28:98]
+[@63,1320:1320='H',<Simple_Identifier>,28:99]
+[@64,1321:1321='>',<'>'>,28:100]
+[@65,1341:1344='join',<'join'>,29:18]
+[@66,1346:1347='c1',<Simple_Identifier>,29:23]
+[@67,1349:1350='in',<'in'>,29:26]
+[@68,1352:1360='customers',<Simple_Identifier>,29:29]
+[@69,1362:1363='on',<'on'>,29:39]
+[@70,1365:1366='c1',<Simple_Identifier>,29:42]
+[@71,1367:1367='.',<'.'>,29:44]
+[@72,1368:1378='GetHashCode',<Simple_Identifier>,29:45]
+[@73,1379:1379='(',<'('>,29:56]
+[@74,1380:1380=')',<')'>,29:57]
+[@75,1382:1387='equals',<'equals'>,29:59]
+[@76,1389:1389='c',<Simple_Identifier>,29:66]
+[@77,1390:1390='.',<'.'>,29:67]
+[@78,1391:1401='GetHashCode',<Simple_Identifier>,29:68]
+[@79,1402:1402='(',<'('>,29:79]
+[@80,1403:1403=')',<')'>,29:80]
+[@81,1405:1408='into',<'into'>,29:82]
+[@82,1410:1410='e',<Simple_Identifier>,29:87]
+[@83,1430:1434='group',<'group'>,30:18]
+[@84,1436:1436='c',<Simple_Identifier>,30:24]
+[@85,1437:1437='<',<'<'>,30:25]
+[@86,1438:1438='K',<Simple_Identifier>,30:26]
+[@87,1439:1439='>',<'>'>,30:27]
+[@88,1441:1442='by',<'by'>,30:29]
+[@89,1444:1444='c',<Simple_Identifier>,30:32]
+[@90,1445:1445='.',<'.'>,30:33]
+[@91,1446:1452='Country',<Simple_Identifier>,30:34]
+[@92,1453:1453='<',<'<'>,30:41]
+[@93,1454:1454='M',<Simple_Identifier>,30:42]
+[@94,1455:1455='>',<'>'>,30:43]
+[@95,1479:1482='into',<'into'>,31:22]
+[@96,1484:1484='g',<Simple_Identifier>,31:27]
+[@97,1508:1514='orderby',<'orderby'>,32:22]
+[@98,1516:1516='g',<Simple_Identifier>,32:30]
+[@99,1517:1517='.',<'.'>,32:31]
+[@100,1518:1522='Count',<Simple_Identifier>,32:32]
+[@101,1523:1523='(',<'('>,32:37]
+[@102,1524:1524=')',<')'>,32:38]
+[@103,1525:1525='.',<'.'>,32:39]
+[@104,1526:1526='O',<Simple_Identifier>,32:40]
+[@105,1527:1527='<',<'<'>,32:41]
+[@106,1528:1528='P',<Simple_Identifier>,32:42]
+[@107,1529:1529='>',<'>'>,32:43]
+[@108,1531:1539='ascending',<'ascending'>,32:45]
+[@109,1563:1569='orderby',<'orderby'>,33:22]
+[@110,1571:1571='g',<Simple_Identifier>,33:30]
+[@111,1572:1572='.',<'.'>,33:31]
+[@112,1573:1575='Key',<Simple_Identifier>,33:32]
+[@113,1577:1586='descending',<'descending'>,33:36]
+[@114,1610:1615='select',<'select'>,34:22]
+[@115,1617:1619='new',<'new'>,34:29]
+[@116,1621:1621='{',<'{'>,34:33]
+[@117,1623:1629='Country',<Simple_Identifier>,34:35]
+[@118,1631:1631='=',<'='>,34:43]
+[@119,1633:1633='g',<Simple_Identifier>,34:45]
+[@120,1634:1634='.',<'.'>,34:46]
+[@121,1635:1637='Key',<Simple_Identifier>,34:47]
+[@122,1638:1638=',',<','>,34:50]
+[@123,1640:1648='CustCount',<Simple_Identifier>,34:52]
+[@124,1650:1650='=',<'='>,34:62]
+[@125,1652:1652='g',<Simple_Identifier>,34:64]
+[@126,1653:1653='.',<'.'>,34:65]
+[@127,1654:1658='Count',<Simple_Identifier>,34:66]
+[@128,1659:1659='(',<'('>,34:71]
+[@129,1660:1660=')',<')'>,34:72]
+[@130,1662:1662='}',<'}'>,34:74]
+[@131,1663:1663=';',<';'>,34:75]
+[@132,1669:1669='}',<'}'>,36:3]
+[@133,1671:1671='}',<'}'>,37:0]
+[@134,1672:1671='<EOF>',<EOF>,37:1]

tools/GrammarTesting/Tests/Parsing/Samples/v6/AllInOneNoPreprocessor-v6-split/part-B/Reference/AllInOneNoPreprocessor-v6-part.tree.svg

@@ -0,0 +1 @@
+(prog (compilation_unit (class_declaration class (identifier TypeArgumentListChecks) (class_body { (class_member_declaration (method_declaration method_modifiers (return_type void) (method_header (member_name (identifier TypeArgumentListChecks)) ( )) (method_body (block { (statement_list (declaration_statement (local_variable_declaration (implicitly_typed_local_variable_declaration var (implicitly_typed_local_variable_declarator (identifier query) = (expression (query_expression (from_clause from (identifier c) in (expression (simple_name (identifier customers) (type_argument_list < (type_arguments (identifier A)) >)))) (query_body (query_body_clauses (query_body_clauses (query_body_clauses (query_body_clauses (let_clause let (identifier d) = (expression (simple_name (identifier c) (type_argument_list < (type_arguments (identifier B)) >))))) (query_body_clause (where_clause where (boolean_expression (conditional_and_expression (conditional_and_expression (equality_expression (equality_expression (identifier d)) != (relational_expression (null_literal null)))) && (inclusive_or_expression (simple_name (identifier d) (type_argument_list < (type_arguments (type_argument (identifier C)) , (type_argument (identifier D))) >)))))))) (query_body_clause (join_clause join (identifier c1) in (expression (simple_name (identifier customers) (type_argument_list < (type_arguments (identifier E)) >))) on (expression (conditional_and_expression (conditional_and_expression (invocation_expression (primary_expression (member_access (primary_expression (identifier c1)) . (identifier GetHashCode))) ( ))) && (inclusive_or_expression (simple_name (identifier c1) (type_argument_list < (type_arguments (identifier G)) >))))) equals (expression (conditional_and_expression (conditional_and_expression (invocation_expression (primary_expression (member_access (primary_expression (identifier c)) . (identifier GetHashCode))) ( ))) && (inclusive_or_expression (simple_name (identifier c) (type_argument_list < (type_arguments (identifier H)) >)))))))) (query_body_clause (join_into_clause join (identifier c1) in (expression (identifier customers)) on (expression (invocation_expression (primary_expression (member_access (primary_expression (identifier c1)) . (identifier GetHashCode))) ( ))) equals (expression (invocation_expression (primary_expression (member_access (primary_expression (identifier c)) . (identifier GetHashCode))) ( ))) into (identifier e)))) (select_or_group_clause (group_clause group (expression (simple_name (identifier c) (type_argument_list < (type_arguments (identifier K)) >))) by (expression (member_access (primary_expression (identifier c)) . (identifier Country) (type_argument_list < (type_arguments (identifier M)) >))))) (query_continuation into (identifier g) (query_body (query_body_clauses (query_body_clauses (orderby_clause orderby (orderings (ordering (expression (member_access (primary_expression (invocation_expression (primary_expression (member_access (primary_expression (identifier g)) . (identifier Count))) ( ))) . (identifier O) (type_argument_list < (type_arguments (identifier P)) >))) (ordering_direction ascending))))) (query_body_clause (orderby_clause orderby (orderings (ordering (expression (member_access (primary_expression (identifier g)) . (identifier Key))) (ordering_direction descending)))))) (select_or_group_clause (select_clause select (expression (anonymous_object_creation_expression new (anonymous_object_initializer { (member_declarator_list (member_declarator (identifier Country) = (expression (member_access (primary_expression (identifier g)) . (identifier Key)))) , (member_declarator (identifier CustCount) = (expression (invocation_expression (primary_expression (member_access (primary_expression (identifier g)) . (identifier Count))) ( ))))) }))))))))))))) ;)) })))) }))))