From 963f910d54150989f406fdd9f96bd55734716453 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 1 Aug 2010 16:57:11 +0000 Subject: [PATCH] fixed Unit Tests git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6356 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Src/Lexer/VBNet/ExpressionFinder.atg | 42 +- .../Project/Src/Lexer/VBNet/Parser.cs | 4630 ++++++++--------- 2 files changed, 2344 insertions(+), 2328 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg index cab05c8077..93039ab763 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg @@ -278,7 +278,7 @@ ImportsStatement = "Imports" (. PushContext(Context.Importable, la, t); .) (. nextTokenIsStartOfImportsOrAccessExpression = true; .) ( - ( "Global" | Identifier | PrimitiveTypeName ) { TypeSuffix } [ ( "." | "=" ) (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] + ( "Global" | Identifier | PrimitiveTypeName ) { TypeSuffix } [ ( "." | "=" ) TypeName ] | XmlOpenTag Identifier "=" LiteralString XmlCloseTag ) (. PopContext(); .) @@ -401,7 +401,9 @@ GenericTypeParameterDeclaration = DelegateTypeDeclaration = "Delegate" ("Sub" | "Function") (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .) - { "(" [ "Of" GenericTypeParameterDeclaration | ParameterList ] ")" } [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator + { "(" [ "Of" GenericTypeParameterDeclaration | ParameterList ] ")" } + [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] + StatementTerminator . MemberDeclaration = @@ -428,13 +430,21 @@ SubOrFunctionDeclaration = . ExternalMemberDeclaration = - "Declare" [ "Ansi" | "Unicode" | "Auto" ] ( "Sub" | "Function" ) (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) - "Lib" LiteralString [ "Alias" LiteralString ] [ "(" [ ParameterList ] ")" ] [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator + "Declare" [ "Ansi" | "Unicode" | "Auto" ] ( "Sub" | "Function" ) + (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + "Lib" LiteralString + [ "Alias" LiteralString ] + [ "(" [ ParameterList ] ")" ] + [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] + StatementTerminator . EventMemberDeclaration = - "Event" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) ( "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | [ "(" [ ParameterList ] ")" ] ) - [ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ] + "Event" + (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + ( "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | [ "(" [ ParameterList ] ")" ] ) + [ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ + { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ] /* the TypeName production already allows the "." IdentifierOrKeyword syntax, so to avoid an ambiguous grammer we just leave that out */ StatementTerminator . @@ -454,7 +464,8 @@ PropertyDeclaration = (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) [ "(" [ ParameterList ] ")" ] [ "As" { AttributeBlock } ( NewExpression | (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ) ] - [ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ] + [ "Implements" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ + { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) /*"." IdentifierOrKeyword*/ } ] [ "=" Expression ] StatementTerminator (. PopContext(); .) { EXPECTEDCONFLICT("<") AttributeBlock } { EXPECTEDCONFLICT("Public", "Protected", "Private", "Friend") AccessModifier @@ -473,7 +484,9 @@ PropertyDeclaration = . OperatorDeclaration = - "Operator" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .) "(" ParameterList ")" [ "As" { AttributeBlock } (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] + "Operator" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .) + "(" ParameterList ")" + [ "As" (. PushContext(Context.Type, la, t); .) { AttributeBlock } TypeName (. PopContext(); .) ] StatementTerminatorAndBlock "End" "Operator" StatementTerminator . @@ -485,7 +498,7 @@ MemberVariableOrConstantDeclaration = MemberVariableOrConstantDeclarator = [ "Const" ] (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) IdentifierForFieldDeclaration (. PopContext(); .) - [ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ) (. PopContext(); .) ] + [ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | TypeName ) (. PopContext(); .) ] [ "=" Expression ] . @@ -551,7 +564,7 @@ SimpleExpressionWithSuffix = { UnaryOperator } ( SimpleExpression { ExpressionSuffix } - | "TypeOf" SimpleExpressionWithSuffix "Is" TypeName + | "TypeOf" SimpleExpressionWithSuffix "Is" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | NewExpression | CollectionInitializer ) @@ -565,7 +578,7 @@ SimpleExpression = | IdentifierForExpressionStart | PrimitiveTypeName | ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ] - | "GetType" "(" TypeName ")" + | "GetType" "(" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ")" | "GetXmlNamespace" "(" (. readXmlIdentifier = true; .) Identifier ")" | XmlLiteral | LambdaExpression @@ -616,7 +629,10 @@ CollectionInitializer = . ExpressionSuffix = - "(" (. PushContext(Context.Expression, la, t); .) ( "Of" TypeName { "," TypeName } ")" | [ ArgumentList ] (. PopContext(); .) ")" ) + "(" (. PushContext(Context.Expression, la, t); .) + ( "Of" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) + { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) } + | [ ArgumentList ] ) (. PopContext(); .) ")" | ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ] . @@ -815,7 +831,7 @@ PrimitiveTypeName = TypeName = ( "Global" | Identifier | PrimitiveTypeName | "?" /* used for ? = completion */ ) { TypeSuffix } { "." IdentifierOrKeyword { TypeSuffix } } . -TypeSuffix = "(" ( "Of" [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] { "," [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] } | [ ArgumentList ] ) ")" . +TypeSuffix = "(" ( "Of" [ TypeName ] { "," [ TypeName ] } | [ ArgumentList ] ) ")" . IdentifierOrKeyword = ident | "AddHandler" diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs index e1bbf171df..7635a01a27 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs @@ -10,7 +10,7 @@ namespace ICSharpCode.NRefactory.Parser.VB { partial class ExpressionFinder { const int startOfExpression = 56; - const int endOfStatementTerminatorAndBlock = 233; + const int endOfStatementTerminatorAndBlock = 237; static BitArray GetExpectedSet(int state) { switch (state) { @@ -26,8 +26,8 @@ partial class ExpressionFinder { return set[3]; case 6: case 71: - case 234: - case 471: + case 238: + case 473: { BitArray a = new BitArray(239); return a; @@ -45,30 +45,30 @@ partial class ExpressionFinder { return a; } case 11: - case 162: - case 168: - case 174: - case 211: + case 166: + case 172: + case 178: case 215: - case 254: - case 354: - case 363: - case 416: - case 458: - case 468: - case 479: - case 509: - case 544: - case 601: - case 618: - case 687: + case 219: + case 258: + case 358: + case 367: + case 420: + case 460: + case 470: + case 481: + case 511: + case 547: + case 604: + case 621: + case 689: return set[6]; case 12: case 13: - case 510: - case 511: - case 555: - case 565: + case 512: + case 513: + case 558: + case 568: { BitArray a = new BitArray(239); a.Set(1, true); @@ -81,45 +81,44 @@ partial class ExpressionFinder { case 23: case 24: case 36: - case 226: - case 229: case 230: - case 240: - case 255: + case 233: + case 234: + case 244: case 259: - case 281: - case 296: - case 307: - case 310: - case 316: - case 321: - case 330: - case 331: - case 351: - case 371: - case 464: - case 476: - case 482: - case 486: - case 494: - case 502: - case 512: - case 521: - case 538: - case 542: - case 550: - case 556: + case 263: + case 285: + case 300: + case 311: + case 314: + case 320: + case 325: + case 334: + case 335: + case 355: + case 375: + case 466: + case 478: + case 484: + case 488: + case 496: + case 504: + case 514: + case 523: + case 540: + case 545: + case 553: case 559: - case 566: + case 562: case 569: - case 596: + case 572: case 599: - case 626: - case 636: - case 640: - case 666: - case 686: - case 693: + case 602: + case 629: + case 639: + case 643: + case 668: + case 688: { BitArray a = new BitArray(239); a.Set(1, true); @@ -133,27 +132,27 @@ partial class ExpressionFinder { case 18: return set[8]; case 19: - case 227: - case 241: - case 257: - case 311: - case 352: - case 396: - case 519: - case 539: - case 557: - case 561: - case 567: - case 597: - case 637: + case 231: + case 245: + case 261: + case 315: + case 356: + case 400: + case 521: + case 541: + case 560: + case 564: + case 570: + case 600: + case 640: { BitArray a = new BitArray(239); a.Set(113, true); return a; } case 22: - case 487: - case 522: + case 489: + case 524: return set[9]; case 25: { @@ -165,7 +164,7 @@ partial class ExpressionFinder { case 27: return set[10]; case 28: - case 670: + case 672: return set[11]; case 29: return set[12]; @@ -174,64 +173,65 @@ partial class ExpressionFinder { case 31: case 32: case 127: - case 184: - case 185: - case 235: - case 386: - case 387: - case 404: - case 405: - case 406: - case 407: - case 497: - case 498: - case 531: - case 532: - case 632: - case 633: - case 679: - case 680: - return set[14]; - case 33: - case 34: - case 459: - case 460: - case 469: - case 470: + case 188: + case 189: + case 239: + case 390: + case 391: + case 408: + case 409: + case 410: + case 411: case 499: case 500: - case 623: - case 634: + case 533: + case 534: case 635: + case 636: + case 681: + case 682: + return set[14]; + case 33: + case 34: + case 461: + case 462: + case 471: + case 472: + case 501: + case 502: + case 626: + case 637: + case 638: return set[15]; case 35: case 37: case 131: - case 141: - case 157: - case 172: - case 188: - case 266: - case 291: - case 370: - case 383: - case 419: - case 475: - case 493: - case 501: - case 578: + case 142: + case 145: + case 161: + case 176: + case 192: + case 270: + case 295: + case 374: + case 387: + case 423: + case 477: + case 495: + case 503: case 581: - case 605: + case 584: case 608: - case 613: - case 625: - case 639: - case 659: - case 662: - case 665: - case 671: - case 674: - case 692: + case 611: + case 616: + case 628: + case 642: + case 661: + case 664: + case 667: + case 673: + case 676: + case 694: return set[16]; case 38: case 41: @@ -241,21 +241,21 @@ partial class ExpressionFinder { case 40: case 77: case 81: - case 136: - case 346: - case 422: + case 137: + case 350: + case 427: return set[19]; case 42: - case 147: - case 154: + case 151: case 158: - case 220: - case 390: - case 415: - case 418: - case 533: - case 534: - case 593: + case 162: + case 224: + case 394: + case 419: + case 422: + case 535: + case 536: + case 596: { BitArray a = new BitArray(239); a.Set(37, true); @@ -263,29 +263,30 @@ partial class ExpressionFinder { } case 43: case 44: - case 138: case 139: + case 140: return set[20]; case 45: - case 140: - case 223: - case 368: - case 393: - case 417: - case 436: - case 467: - case 474: - case 505: - case 536: - case 572: + case 141: + case 227: + case 372: + case 397: + case 421: + case 424: + case 438: + case 469: + case 476: + case 507: + case 538: case 575: - case 587: - case 595: - case 612: - case 629: - case 643: - case 669: - case 678: + case 578: + case 590: + case 598: + case 615: + case 632: + case 646: + case 671: + case 680: { BitArray a = new BitArray(239); a.Set(38, true); @@ -297,35 +298,35 @@ partial class ExpressionFinder { case 52: case 53: case 55: - case 427: - case 428: + case 432: + case 433: return set[21]; case 48: case 49: return set[22]; case 50: - case 149: - case 156: - case 349: + case 153: + case 160: + case 353: { BitArray a = new BitArray(239); a.Set(22, true); return a; } case 54: - case 142: - case 151: - case 367: - case 369: + case 143: + case 144: + case 146: + case 155: + case 371: case 373: - case 381: - case 426: - case 430: - case 432: - case 433: - case 443: - case 450: - case 457: + case 377: + case 385: + case 431: + case 435: + case 445: + case 452: + case 459: { BitArray a = new BitArray(239); a.Set(22, true); @@ -340,40 +341,41 @@ partial class ExpressionFinder { case 64: case 79: case 129: - case 148: - case 150: case 152: - case 155: - case 164: - case 166: - case 206: - case 239: + case 154: + case 156: + case 159: + case 168: + case 170: + case 210: case 243: - case 245: - case 246: - case 263: - case 280: - case 285: - case 294: - case 300: - case 302: + case 247: + case 249: + case 250: + case 267: + case 284: + case 289: + case 298: + case 304: case 306: - case 309: - case 315: - case 326: - case 328: - case 334: - case 348: - case 350: - case 382: - case 409: - case 424: - case 425: - case 492: - case 577: + case 310: + case 313: + case 319: + case 330: + case 332: + case 338: + case 352: + case 354: + case 386: + case 413: + case 429: + case 430: + case 494: + case 580: return set[23]; case 58: case 62: + case 132: return set[24]; case 63: case 73: @@ -385,7 +387,7 @@ partial class ExpressionFinder { } case 65: case 80: - case 453: + case 455: { BitArray a = new BitArray(239); a.Set(22, true); @@ -431,18 +433,18 @@ partial class ExpressionFinder { return a; } case 78: - case 187: - case 189: - case 190: - case 293: - case 688: + case 191: + case 193: + case 194: + case 297: + case 690: { BitArray a = new BitArray(239); a.Set(20, true); return a; } case 83: - case 312: + case 316: { BitArray a = new BitArray(239); a.Set(231, true); @@ -467,7 +469,7 @@ partial class ExpressionFinder { return a; } case 87: - case 258: + case 262: { BitArray a = new BitArray(239); a.Set(218, true); @@ -492,7 +494,7 @@ partial class ExpressionFinder { return a; } case 91: - case 397: + case 401: { BitArray a = new BitArray(239); a.Set(210, true); @@ -517,15 +519,15 @@ partial class ExpressionFinder { return a; } case 95: - case 318: + case 322: { BitArray a = new BitArray(239); a.Set(197, true); return a; } case 96: - case 543: - case 562: + case 546: + case 565: { BitArray a = new BitArray(239); a.Set(186, true); @@ -550,9 +552,9 @@ partial class ExpressionFinder { return a; } case 100: - case 275: - case 282: - case 297: + case 279: + case 286: + case 301: { BitArray a = new BitArray(239); a.Set(163, true); @@ -565,17 +567,17 @@ partial class ExpressionFinder { return a; } case 103: - case 193: - case 198: - case 200: + case 197: + case 202: + case 204: { BitArray a = new BitArray(239); a.Set(146, true); return a; } case 104: - case 195: case 199: + case 203: { BitArray a = new BitArray(239); a.Set(143, true); @@ -594,14 +596,14 @@ partial class ExpressionFinder { return a; } case 107: - case 228: + case 232: { BitArray a = new BitArray(239); a.Set(127, true); return a; } case 108: - case 218: + case 222: { BitArray a = new BitArray(239); a.Set(126, true); @@ -620,7 +622,7 @@ partial class ExpressionFinder { return a; } case 111: - case 165: + case 169: { BitArray a = new BitArray(239); a.Set(116, true); @@ -645,7 +647,7 @@ partial class ExpressionFinder { return a; } case 115: - case 588: + case 591: { BitArray a = new BitArray(239); a.Set(98, true); @@ -664,8 +666,8 @@ partial class ExpressionFinder { return a; } case 118: - case 177: - case 205: + case 181: + case 209: { BitArray a = new BitArray(239); a.Set(70, true); @@ -702,7 +704,7 @@ partial class ExpressionFinder { return a; } case 124: - case 217: + case 221: { BitArray a = new BitArray(239); a.Set(58, true); @@ -724,189 +726,189 @@ partial class ExpressionFinder { a.Set(144, true); return a; } - case 132: - return set[29]; case 133: - return set[30]; + return set[29]; case 134: + return set[30]; case 135: - case 420: - case 421: + case 136: + case 425: + case 426: return set[31]; - case 137: + case 138: return set[32]; - case 143: - case 144: - case 278: - case 287: + case 147: + case 148: + case 282: + case 291: return set[33]; - case 145: - case 399: + case 149: + case 403: return set[34]; - case 146: - case 333: + case 150: + case 337: { BitArray a = new BitArray(239); a.Set(135, true); return a; } - case 153: + case 157: return set[35]; - case 159: + case 163: { BitArray a = new BitArray(239); a.Set(58, true); a.Set(126, true); return a; } - case 160: - case 161: + case 164: + case 165: return set[36]; - case 163: + case 167: { BitArray a = new BitArray(239); a.Set(171, true); return a; } - case 167: - case 181: - case 197: - case 202: - case 208: - case 210: + case 171: + case 185: + case 201: + case 206: + case 212: case 214: - case 216: + case 218: + case 220: return set[37]; - case 169: - case 170: + case 173: + case 174: { BitArray a = new BitArray(239); a.Set(63, true); a.Set(138, true); return a; } - case 171: - case 173: - case 279: + case 175: + case 177: + case 283: { BitArray a = new BitArray(239); a.Set(138, true); return a; } - case 175: - case 176: - case 178: + case 179: case 180: case 182: - case 183: - case 191: - case 196: - case 201: - case 209: + case 184: + case 186: + case 187: + case 195: + case 200: + case 205: case 213: + case 217: return set[38]; - case 179: + case 183: { BitArray a = new BitArray(239); a.Set(22, true); a.Set(143, true); return a; } - case 186: + case 190: return set[39]; - case 192: + case 196: { BitArray a = new BitArray(239); a.Set(22, true); a.Set(70, true); return a; } - case 194: + case 198: { BitArray a = new BitArray(239); a.Set(133, true); a.Set(143, true); a.Set(146, true); - return a; - } - case 203: - case 204: - return set[40]; + return a; + } case 207: + case 208: + return set[40]; + case 211: { BitArray a = new BitArray(239); a.Set(64, true); a.Set(104, true); return a; } - case 212: + case 216: return set[41]; - case 219: - case 496: - case 617: - case 631: - case 638: + case 223: + case 498: + case 620: + case 634: + case 641: { BitArray a = new BitArray(239); a.Set(127, true); a.Set(210, true); return a; } - case 221: - case 222: - case 391: - case 392: - case 465: - case 466: - case 472: - case 473: - case 570: - case 571: + case 225: + case 226: + case 395: + case 396: + case 467: + case 468: + case 474: + case 475: case 573: case 574: - case 585: - case 586: - case 610: - case 611: - case 627: - case 628: + case 576: + case 577: + case 588: + case 589: + case 613: + case 614: + case 630: + case 631: return set[42]; - case 224: - case 225: + case 228: + case 229: return set[43]; - case 231: - case 232: + case 235: + case 236: return set[44]; - case 233: + case 237: return set[45]; - case 236: + case 240: return set[46]; - case 237: - case 238: - case 339: - return set[47]; + case 241: case 242: + case 343: + return set[47]; + case 246: { BitArray a = new BitArray(239); a.Set(226, true); return a; } - case 244: - case 286: - case 301: - return set[48]; - case 247: case 248: - case 268: - case 269: - case 283: - case 284: - case 298: - case 299: + case 290: + case 305: + return set[48]; + case 251: + case 252: + case 272: + case 273: + case 287: + case 288: + case 302: + case 303: return set[49]; - case 249: - case 340: - case 343: + case 253: + case 344: + case 347: { BitArray a = new BitArray(239); a.Set(1, true); @@ -914,7 +916,7 @@ partial class ExpressionFinder { a.Set(111, true); return a; } - case 250: + case 254: { BitArray a = new BitArray(239); a.Set(108, true); @@ -922,18 +924,18 @@ partial class ExpressionFinder { a.Set(231, true); return a; } - case 251: + case 255: return set[50]; - case 252: - case 271: + case 256: + case 275: return set[51]; - case 253: + case 257: { BitArray a = new BitArray(239); a.Set(5, true); return a; } - case 256: + case 260: { BitArray a = new BitArray(239); a.Set(75, true); @@ -941,11 +943,11 @@ partial class ExpressionFinder { a.Set(123, true); return a; } - case 260: - case 261: + case 264: + case 265: return set[52]; - case 262: - case 267: + case 266: + case 271: { BitArray a = new BitArray(239); a.Set(1, true); @@ -953,36 +955,36 @@ partial class ExpressionFinder { a.Set(229, true); return a; } - case 264: - case 265: + case 268: + case 269: return set[53]; - case 270: + case 274: return set[54]; - case 272: + case 276: { BitArray a = new BitArray(239); a.Set(118, true); return a; } - case 273: - case 274: - return set[55]; - case 276: case 277: + case 278: + return set[55]; + case 280: + case 281: return set[56]; - case 288: - case 289: + case 292: + case 293: return set[57]; - case 290: + case 294: return set[58]; - case 292: + case 296: { BitArray a = new BitArray(239); a.Set(20, true); a.Set(138, true); return a; } - case 295: + case 299: { BitArray a = new BitArray(239); a.Set(1, true); @@ -990,44 +992,44 @@ partial class ExpressionFinder { a.Set(205, true); return a; } - case 303: + case 307: return set[59]; - case 304: case 308: + case 312: { BitArray a = new BitArray(239); a.Set(152, true); return a; } - case 305: + case 309: return set[60]; - case 313: - case 314: - return set[61]; case 317: + case 318: + return set[61]; + case 321: { BitArray a = new BitArray(239); a.Set(74, true); a.Set(113, true); return a; } - case 319: - case 320: - return set[62]; - case 322: case 323: - return set[63]; case 324: - case 606: - case 607: + return set[62]; + case 326: + case 327: + return set[63]; + case 328: case 609: - case 646: - case 660: - case 661: + case 610: + case 612: + case 649: + case 662: case 663: - case 672: - case 673: + case 665: + case 674: case 675: + case 677: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1035,11 +1037,11 @@ partial class ExpressionFinder { a.Set(22, true); return a; } - case 325: - case 327: - return set[64]; case 329: - case 335: + case 331: + return set[64]; + case 333: + case 339: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1047,7 +1049,7 @@ partial class ExpressionFinder { a.Set(214, true); return a; } - case 332: + case 336: { BitArray a = new BitArray(239); a.Set(111, true); @@ -1055,7 +1057,7 @@ partial class ExpressionFinder { a.Set(113, true); return a; } - case 336: + case 340: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1063,57 +1065,57 @@ partial class ExpressionFinder { a.Set(135, true); return a; } - case 337: - case 338: - case 394: - case 395: - return set[65]; case 341: case 342: - case 344: + case 398: + case 399: + return set[65]; case 345: + case 346: + case 348: + case 349: return set[66]; - case 347: + case 351: return set[67]; - case 353: + case 357: { BitArray a = new BitArray(239); a.Set(211, true); a.Set(233, true); return a; } - case 355: - case 356: - case 364: - case 365: + case 359: + case 360: + case 368: + case 369: return set[68]; - case 357: - case 366: + case 361: + case 370: return set[69]; - case 358: - return set[70]; - case 359: case 362: + return set[70]; + case 363: + case 366: return set[71]; - case 360: - case 361: - case 652: - case 653: + case 364: + case 365: + case 655: + case 656: return set[72]; - case 372: - case 374: - case 375: - case 535: - case 594: - return set[73]; case 376: - case 377: - return set[74]; case 378: case 379: - return set[75]; + case 537: + case 597: + return set[73]; case 380: + case 381: + return set[74]; + case 382: + case 383: + return set[75]; case 384: + case 388: { BitArray a = new BitArray(239); a.Set(20, true); @@ -1121,76 +1123,75 @@ partial class ExpressionFinder { a.Set(38, true); return a; } - case 385: + case 389: { BitArray a = new BitArray(239); a.Set(40, true); return a; } - case 388: - case 389: + case 392: + case 393: return set[76]; - case 398: + case 402: return set[77]; - case 400: - case 413: + case 404: + case 417: return set[78]; - case 401: - case 414: + case 405: + case 418: return set[79]; - case 402: - case 403: + case 406: + case 407: { BitArray a = new BitArray(239); a.Set(10, true); return a; } - case 408: + case 412: { BitArray a = new BitArray(239); a.Set(12, true); return a; } - case 410: + case 414: { BitArray a = new BitArray(239); a.Set(13, true); return a; } - case 411: + case 415: return set[80]; - case 412: + case 416: return set[81]; - case 423: + case 428: return set[82]; - case 429: - case 431: - return set[83]; case 434: - case 435: - case 503: - case 504: - case 641: - case 642: - return set[84]; + return set[83]; + case 436: case 437: - case 438: - case 439: - case 444: - case 445: + case 505: case 506: case 644: - case 668: - case 677: - return set[85]; + case 645: + return set[84]; + case 439: case 440: - case 446: - case 455: - return set[86]; case 441: - case 442: + case 446: case 447: + case 508: + case 647: + case 670: + case 679: + return set[85]; + case 442: case 448: + case 457: + return set[86]; + case 443: + case 444: + case 449: + case 450: { BitArray a = new BitArray(239); a.Set(22, true); @@ -1198,18 +1199,18 @@ partial class ExpressionFinder { a.Set(63, true); return a; } - case 449: case 451: - case 456: + case 453: + case 458: return set[87]; - case 452: case 454: + case 456: return set[88]; - case 461: - case 480: - case 481: - case 537: - case 624: + case 463: + case 482: + case 483: + case 539: + case 627: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1217,27 +1218,28 @@ partial class ExpressionFinder { a.Set(63, true); return a; } - case 462: - case 463: - case 541: + case 464: + case 465: + case 543: + case 544: return set[89]; - case 477: - case 478: - case 485: + case 479: + case 480: + case 487: { BitArray a = new BitArray(239); a.Set(115, true); return a; } - case 483: - case 484: + case 485: + case 486: return set[90]; - case 488: - case 489: - return set[91]; case 490: case 491: - case 549: + return set[91]; + case 492: + case 493: + case 552: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1245,15 +1247,15 @@ partial class ExpressionFinder { a.Set(21, true); return a; } - case 495: + case 497: { BitArray a = new BitArray(239); a.Set(103, true); return a; } - case 507: - case 508: - case 520: + case 509: + case 510: + case 522: { BitArray a = new BitArray(239); a.Set(84, true); @@ -1261,84 +1263,83 @@ partial class ExpressionFinder { a.Set(209, true); return a; } - case 513: - case 514: - return set[92]; case 515: case 516: - return set[93]; + return set[92]; case 517: case 518: - case 529: + return set[93]; + case 519: + case 520: + case 531: return set[94]; - case 523: - case 524: - return set[95]; case 525: case 526: - case 657: - return set[96]; + return set[95]; case 527: - return set[97]; case 528: - return set[98]; + case 659: + return set[96]; + case 529: + return set[97]; case 530: - case 540: + return set[98]; + case 532: + case 542: { BitArray a = new BitArray(239); a.Set(172, true); return a; } - case 545: - case 546: + case 548: + case 549: return set[99]; - case 547: + case 550: return set[100]; - case 548: - case 584: - return set[101]; case 551: - case 552: - case 553: - case 576: - return set[102]; + case 587: + return set[101]; case 554: - case 558: - case 568: + case 555: + case 556: + case 579: + return set[102]; + case 557: + case 561: + case 571: { BitArray a = new BitArray(239); a.Set(128, true); a.Set(198, true); return a; } - case 560: - return set[103]; case 563: + return set[103]; + case 566: return set[104]; - case 564: + case 567: return set[105]; - case 579: - case 580: case 582: - case 651: + case 583: + case 585: case 654: - case 655: + case 657: return set[106]; - case 583: + case 586: return set[107]; - case 589: - case 591: - case 600: + case 592: + case 594: + case 603: { BitArray a = new BitArray(239); a.Set(119, true); return a; } - case 590: + case 593: return set[108]; - case 592: + case 595: return set[109]; - case 598: + case 601: { BitArray a = new BitArray(239); a.Set(56, true); @@ -1346,11 +1347,11 @@ partial class ExpressionFinder { a.Set(193, true); return a; } - case 602: - case 603: + case 605: + case 606: return set[110]; - case 604: - case 614: + case 607: + case 617: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1358,100 +1359,100 @@ partial class ExpressionFinder { a.Set(136, true); return a; } - case 615: + case 618: { BitArray a = new BitArray(239); a.Set(101, true); return a; } - case 616: - return set[111]; case 619: - case 620: + return set[111]; + case 622: + case 623: { BitArray a = new BitArray(239); a.Set(149, true); return a; } - case 621: - case 630: - case 689: + case 624: + case 633: + case 691: { BitArray a = new BitArray(239); a.Set(3, true); return a; } - case 622: + case 625: return set[112]; - case 645: - case 647: - return set[113]; case 648: - case 656: - return set[114]; - case 649: case 650: - return set[115]; + return set[113]; + case 651: case 658: + return set[114]; + case 652: + case 653: + return set[115]; + case 660: { BitArray a = new BitArray(239); a.Set(136, true); return a; } - case 664: + case 666: { BitArray a = new BitArray(239); a.Set(140, true); return a; } - case 667: - case 676: + case 669: + case 678: { BitArray a = new BitArray(239); a.Set(169, true); return a; } - case 681: + case 683: return set[116]; - case 682: + case 684: { BitArray a = new BitArray(239); a.Set(160, true); return a; } - case 683: + case 685: { BitArray a = new BitArray(239); a.Set(137, true); return a; } - case 684: - case 685: + case 686: + case 687: return set[117]; - case 690: + case 692: { BitArray a = new BitArray(239); a.Set(11, true); return a; } - case 691: + case 693: return set[118]; - case 694: + case 695: { BitArray a = new BitArray(239); a.Set(173, true); return a; } - case 695: - return set[119]; case 696: + return set[119]; + case 697: { BitArray a = new BitArray(239); a.Set(67, true); a.Set(213, true); return a; } - case 697: + case 698: return set[120]; default: throw new InvalidOperationException(); } @@ -1506,7 +1507,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 1; break; } if (la.kind == 173) { stateStack.Push(1); - goto case 694; + goto case 695; } else { goto case 2; } @@ -1515,7 +1516,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 2; break; } if (la.kind == 137) { stateStack.Push(2); - goto case 683; + goto case 685; } else { goto case 3; } @@ -1524,7 +1525,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 3; break; } if (la.kind == 40) { stateStack.Push(3); - goto case 385; + goto case 389; } else { goto case 4; } @@ -1543,7 +1544,7 @@ partial class ExpressionFinder { case 5: { if (la == null) { currentState = 5; break; } if (la.kind == 160) { - currentState = 679; + currentState = 681; break; } else { if (set[4].Get(la.kind)) { @@ -1562,7 +1563,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 7; break; } if (la.kind == 40) { stateStack.Push(7); - goto case 385; + goto case 389; } else { goto case 8; } @@ -1574,14 +1575,14 @@ partial class ExpressionFinder { break; } else { if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - goto case 507; + goto case 509; } else { if (la.kind == 103) { - currentState = 496; + currentState = 498; break; } else { if (la.kind == 115) { - goto case 477; + goto case 479; } else { if (la.kind == 142) { goto case 9; @@ -1607,7 +1608,7 @@ partial class ExpressionFinder { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); stateStack.Push(12); - goto case 174; + goto case 178; } case 12: { PopContext(); @@ -1616,7 +1617,7 @@ partial class ExpressionFinder { case 13: { if (la == null) { currentState = 13; break; } if (la.kind == 37) { - currentState = 676; + currentState = 678; break; } else { goto case 14; @@ -1633,7 +1634,7 @@ partial class ExpressionFinder { case 16: { if (la == null) { currentState = 16; break; } if (la.kind == 140) { - currentState = 671; + currentState = 673; break; } else { goto case 17; @@ -1703,7 +1704,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 27; break; } if (la.kind == 40) { stateStack.Push(26); - goto case 385; + goto case 389; } else { isMissingModifier = true; goto case 28; @@ -1712,7 +1713,7 @@ partial class ExpressionFinder { case 28: { if (la == null) { currentState = 28; break; } if (set[122].Get(la.kind)) { - currentState = 670; + currentState = 672; break; } else { isMissingModifier = false; @@ -1723,15 +1724,15 @@ partial class ExpressionFinder { if (la == null) { currentState = 29; break; } if (la.kind == 84 || la.kind == 155 || la.kind == 209) { stateStack.Push(17); - goto case 507; + goto case 509; } else { if (la.kind == 103) { stateStack.Push(17); - goto case 495; + goto case 497; } else { if (la.kind == 115) { stateStack.Push(17); - goto case 477; + goto case 479; } else { if (la.kind == 142) { stateStack.Push(17); @@ -1752,11 +1753,11 @@ partial class ExpressionFinder { case 30: { if (la == null) { currentState = 30; break; } if (la.kind == 119) { - currentState = 468; + currentState = 470; break; } else { if (la.kind == 186) { - currentState = 458; + currentState = 460; break; } else { if (la.kind == 127 || la.kind == 210) { @@ -1785,7 +1786,7 @@ partial class ExpressionFinder { case 34: { if (la == null) { currentState = 34; break; } if (la.kind == 37) { - currentState = 434; + currentState = 436; break; } else { if (la.kind == 63) { @@ -1875,7 +1876,7 @@ partial class ExpressionFinder { case 44: { if (la == null) { currentState = 44; break; } if (la.kind == 169) { - currentState = 429; + currentState = 434; break; } else { if (set[21].Get(la.kind)) { @@ -1913,7 +1914,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 49; break; } if (set[23].Get(la.kind)) { activeArgument = 0; - goto case 425; + goto case 430; } else { if (la.kind == 22) { activeArgument = 0; @@ -1994,8 +1995,8 @@ partial class ExpressionFinder { break; } else { if (set[33].Get(la.kind)) { - stateStack.Push(132); - goto case 143; + stateStack.Push(133); + goto case 147; } else { if (la.kind == 220) { currentState = 129; @@ -3273,51 +3274,56 @@ partial class ExpressionFinder { break; } case 131: { - stateStack.Push(62); + PushContext(Context.Type, la, t); + stateStack.Push(132); goto case 37; } case 132: { - if (la == null) { currentState = 132; break; } + PopContext(); + goto case 62; + } + case 133: { + if (la == null) { currentState = 133; break; } if (set[30].Get(la.kind)) { - stateStack.Push(132); - goto case 133; + stateStack.Push(133); + goto case 134; } else { goto case 62; } } - case 133: { - if (la == null) { currentState = 133; break; } + case 134: { + if (la == null) { currentState = 134; break; } if (la.kind == 37) { - currentState = 138; + currentState = 139; break; } else { if (set[126].Get(la.kind)) { - currentState = 134; + currentState = 135; break; } else { goto case 6; } } } - case 134: { + case 135: { nextTokenIsStartOfImportsOrAccessExpression = true; - goto case 135; + goto case 136; } - case 135: { - if (la == null) { currentState = 135; break; } + case 136: { + if (la == null) { currentState = 136; break; } if (la.kind == 10) { - currentState = 136; + currentState = 137; break; } else { - goto case 136; + goto case 137; } } - case 136: { - stateStack.Push(137); + case 137: { + stateStack.Push(138); goto case 81; } - case 137: { - if (la == null) { currentState = 137; break; } + case 138: { + if (la == null) { currentState = 138; break; } if (la.kind == 11) { currentState = stateStack.Pop(); break; @@ -3326,106 +3332,121 @@ partial class ExpressionFinder { goto switchlbl; } } - case 138: { + case 139: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 139; + goto case 140; } - case 139: { - if (la == null) { currentState = 139; break; } + case 140: { + if (la == null) { currentState = 140; break; } if (la.kind == 169) { - currentState = 141; + currentState = 142; break; } else { if (set[21].Get(la.kind)) { if (set[22].Get(la.kind)) { - stateStack.Push(140); + stateStack.Push(141); goto case 48; } else { - goto case 140; + goto case 141; } } else { - goto case 6; + Error(la); + goto case 141; } } } - case 140: { + case 141: { PopContext(); goto case 45; } - case 141: { - stateStack.Push(142); + case 142: { + PushContext(Context.Type, la, t); + stateStack.Push(143); goto case 37; } - case 142: { - if (la == null) { currentState = 142; break; } + case 143: { + PopContext(); + goto case 144; + } + case 144: { + if (la == null) { currentState = 144; break; } if (la.kind == 22) { - currentState = 141; + currentState = 145; break; } else { - goto case 45; + goto case 141; } } - case 143: { + case 145: { + PushContext(Context.Type, la, t); + stateStack.Push(146); + goto case 37; + } + case 146: { + PopContext(); + goto case 144; + } + case 147: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 144; + goto case 148; } - case 144: { - if (la == null) { currentState = 144; break; } + case 148: { + if (la == null) { currentState = 148; break; } if (set[127].Get(la.kind)) { - currentState = 145; + currentState = 149; break; } else { if (la.kind == 37) { - currentState = 424; + currentState = 429; break; } else { if (set[128].Get(la.kind)) { - currentState = 145; + currentState = 149; break; } else { if (set[123].Get(la.kind)) { - currentState = 145; + currentState = 149; break; } else { if (set[126].Get(la.kind)) { - currentState = 420; + currentState = 425; break; } else { if (la.kind == 129) { - currentState = 418; + currentState = 422; break; } else { if (la.kind == 237) { - currentState = 415; + currentState = 419; break; } else { if (set[77].Get(la.kind)) { - stateStack.Push(145); + stateStack.Push(149); nextTokenIsPotentialStartOfExpression = true; PushContext(Context.Xml, la, t); - goto case 398; + goto case 402; } else { if (la.kind == 127 || la.kind == 210) { - stateStack.Push(145); - goto case 219; + stateStack.Push(149); + goto case 223; } else { if (la.kind == 58 || la.kind == 126) { - stateStack.Push(145); + stateStack.Push(149); PushContext(Context.Query, la, t); - goto case 159; + goto case 163; } else { if (set[35].Get(la.kind)) { - stateStack.Push(145); - goto case 153; + stateStack.Push(149); + goto case 157; } else { if (la.kind == 135) { - stateStack.Push(145); - goto case 146; + stateStack.Push(149); + goto case 150; } else { Error(la); - goto case 145; + goto case 149; } } } @@ -3439,128 +3460,128 @@ partial class ExpressionFinder { } } } - case 145: { + case 149: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 146: { - if (la == null) { currentState = 146; break; } + case 150: { + if (la == null) { currentState = 150; break; } Expect(135, la); // "If" - currentState = 147; + currentState = 151; break; } - case 147: { - if (la == null) { currentState = 147; break; } + case 151: { + if (la == null) { currentState = 151; break; } Expect(37, la); // "(" - currentState = 148; + currentState = 152; break; } - case 148: { - stateStack.Push(149); + case 152: { + stateStack.Push(153); goto case 56; } - case 149: { - if (la == null) { currentState = 149; break; } + case 153: { + if (la == null) { currentState = 153; break; } Expect(22, la); // "," - currentState = 150; + currentState = 154; break; } - case 150: { - stateStack.Push(151); + case 154: { + stateStack.Push(155); goto case 56; } - case 151: { - if (la == null) { currentState = 151; break; } + case 155: { + if (la == null) { currentState = 155; break; } if (la.kind == 22) { - currentState = 152; + currentState = 156; break; } else { goto case 45; } } - case 152: { + case 156: { stateStack.Push(45); goto case 56; } - case 153: { - if (la == null) { currentState = 153; break; } + case 157: { + if (la == null) { currentState = 157; break; } if (set[129].Get(la.kind)) { - currentState = 158; + currentState = 162; break; } else { if (la.kind == 94 || la.kind == 106 || la.kind == 219) { - currentState = 154; + currentState = 158; break; } else { goto case 6; } } } - case 154: { - if (la == null) { currentState = 154; break; } + case 158: { + if (la == null) { currentState = 158; break; } Expect(37, la); // "(" - currentState = 155; + currentState = 159; break; } - case 155: { - stateStack.Push(156); + case 159: { + stateStack.Push(160); goto case 56; } - case 156: { - if (la == null) { currentState = 156; break; } + case 160: { + if (la == null) { currentState = 160; break; } Expect(22, la); // "," - currentState = 157; + currentState = 161; break; } - case 157: { + case 161: { stateStack.Push(45); goto case 37; } - case 158: { - if (la == null) { currentState = 158; break; } + case 162: { + if (la == null) { currentState = 162; break; } Expect(37, la); // "(" - currentState = 152; + currentState = 156; break; } - case 159: { - if (la == null) { currentState = 159; break; } + case 163: { + if (la == null) { currentState = 163; break; } if (la.kind == 126) { - stateStack.Push(160); - goto case 218; + stateStack.Push(164); + goto case 222; } else { if (la.kind == 58) { - stateStack.Push(160); - goto case 217; + stateStack.Push(164); + goto case 221; } else { Error(la); - goto case 160; + goto case 164; } } } - case 160: { - if (la == null) { currentState = 160; break; } + case 164: { + if (la == null) { currentState = 164; break; } if (set[36].Get(la.kind)) { - stateStack.Push(160); - goto case 161; + stateStack.Push(164); + goto case 165; } else { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } } - case 161: { - if (la == null) { currentState = 161; break; } + case 165: { + if (la == null) { currentState = 165; break; } if (la.kind == 126) { - currentState = 215; + currentState = 219; break; } else { if (la.kind == 58) { - currentState = 211; + currentState = 215; break; } else { if (la.kind == 197) { - currentState = 209; + currentState = 213; break; } else { if (la.kind == 107) { @@ -3571,23 +3592,23 @@ partial class ExpressionFinder { break; } else { if (la.kind == 176) { - currentState = 205; + currentState = 209; break; } else { if (la.kind == 203 || la.kind == 212) { - currentState = 203; + currentState = 207; break; } else { if (la.kind == 148) { - currentState = 201; + currentState = 205; break; } else { if (la.kind == 133) { - currentState = 175; + currentState = 179; break; } else { if (la.kind == 146) { - currentState = 162; + currentState = 166; break; } else { goto case 6; @@ -3602,76 +3623,76 @@ partial class ExpressionFinder { } } } - case 162: { - stateStack.Push(163); - goto case 168; + case 166: { + stateStack.Push(167); + goto case 172; } - case 163: { - if (la == null) { currentState = 163; break; } + case 167: { + if (la == null) { currentState = 167; break; } Expect(171, la); // "On" - currentState = 164; + currentState = 168; break; } - case 164: { - stateStack.Push(165); + case 168: { + stateStack.Push(169); goto case 56; } - case 165: { - if (la == null) { currentState = 165; break; } + case 169: { + if (la == null) { currentState = 169; break; } Expect(116, la); // "Equals" - currentState = 166; + currentState = 170; break; } - case 166: { - stateStack.Push(167); + case 170: { + stateStack.Push(171); goto case 56; } - case 167: { - if (la == null) { currentState = 167; break; } + case 171: { + if (la == null) { currentState = 171; break; } if (la.kind == 22) { - currentState = 164; + currentState = 168; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 168: { + case 172: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(169); - goto case 174; + stateStack.Push(173); + goto case 178; } - case 169: { + case 173: { PopContext(); - goto case 170; + goto case 174; } - case 170: { - if (la == null) { currentState = 170; break; } + case 174: { + if (la == null) { currentState = 174; break; } if (la.kind == 63) { - currentState = 172; + currentState = 176; break; } else { - goto case 171; + goto case 175; } } - case 171: { - if (la == null) { currentState = 171; break; } + case 175: { + if (la == null) { currentState = 175; break; } Expect(138, la); // "In" currentState = 56; break; } - case 172: { + case 176: { PushContext(Context.Type, la, t); - stateStack.Push(173); + stateStack.Push(177); goto case 37; } - case 173: { + case 177: { PopContext(); - goto case 171; + goto case 175; } - case 174: { - if (la == null) { currentState = 174; break; } + case 178: { + if (la == null) { currentState = 178; break; } if (set[114].Get(la.kind)) { currentState = stateStack.Pop(); break; @@ -3683,26 +3704,26 @@ partial class ExpressionFinder { } } } - case 175: { + case 179: { SetIdentifierExpected(la); nextTokenIsPotentialStartOfExpression = true; - goto case 176; + goto case 180; } - case 176: { - if (la == null) { currentState = 176; break; } + case 180: { + if (la == null) { currentState = 180; break; } if (la.kind == 146) { - goto case 193; + goto case 197; } else { if (set[38].Get(la.kind)) { if (la.kind == 70) { - currentState = 178; + currentState = 182; break; } else { if (set[38].Get(la.kind)) { - goto case 191; + goto case 195; } else { Error(la); - goto case 177; + goto case 181; } } } else { @@ -3710,69 +3731,69 @@ partial class ExpressionFinder { } } } - case 177: { - if (la == null) { currentState = 177; break; } + case 181: { + if (la == null) { currentState = 181; break; } Expect(70, la); // "By" - currentState = 178; + currentState = 182; break; } - case 178: { - stateStack.Push(179); - goto case 182; + case 182: { + stateStack.Push(183); + goto case 186; } - case 179: { - if (la == null) { currentState = 179; break; } + case 183: { + if (la == null) { currentState = 183; break; } if (la.kind == 22) { - currentState = 178; + currentState = 182; break; } else { Expect(143, la); // "Into" - currentState = 180; + currentState = 184; break; } } - case 180: { - stateStack.Push(181); - goto case 182; + case 184: { + stateStack.Push(185); + goto case 186; } - case 181: { - if (la == null) { currentState = 181; break; } + case 185: { + if (la == null) { currentState = 185; break; } if (la.kind == 22) { - currentState = 180; + currentState = 184; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 182: { + case 186: { SetIdentifierExpected(la); nextTokenIsPotentialStartOfExpression = true; - goto case 183; + goto case 187; } - case 183: { - if (la == null) { currentState = 183; break; } + case 187: { + if (la == null) { currentState = 187; break; } if (set[6].Get(la.kind)) { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(184); - goto case 174; + stateStack.Push(188); + goto case 178; } else { goto case 56; } } - case 184: { + case 188: { PopContext(); - goto case 185; + goto case 189; } - case 185: { - if (la == null) { currentState = 185; break; } + case 189: { + if (la == null) { currentState = 189; break; } if (la.kind == 63) { - currentState = 188; + currentState = 192; break; } else { if (la.kind == 20) { - goto case 187; + goto case 191; } else { if (set[39].Get(la.kind)) { currentState = endOfStatementTerminatorAndBlock; /* leave this block */ @@ -3787,120 +3808,120 @@ partial class ExpressionFinder { } } } - case 186: { - if (la == null) { currentState = 186; break; } + case 190: { + if (la == null) { currentState = 190; break; } currentState = 56; break; } - case 187: { - if (la == null) { currentState = 187; break; } + case 191: { + if (la == null) { currentState = 191; break; } currentState = 56; break; } - case 188: { + case 192: { PushContext(Context.Type, la, t); - stateStack.Push(189); + stateStack.Push(193); goto case 37; } - case 189: { + case 193: { PopContext(); - goto case 190; + goto case 194; } - case 190: { - if (la == null) { currentState = 190; break; } + case 194: { + if (la == null) { currentState = 194; break; } Expect(20, la); // "=" currentState = 56; break; } - case 191: { - stateStack.Push(192); - goto case 182; + case 195: { + stateStack.Push(196); + goto case 186; } - case 192: { - if (la == null) { currentState = 192; break; } + case 196: { + if (la == null) { currentState = 196; break; } if (la.kind == 22) { - currentState = 191; + currentState = 195; break; } else { - goto case 177; + goto case 181; } } - case 193: { - stateStack.Push(194); - goto case 200; + case 197: { + stateStack.Push(198); + goto case 204; } - case 194: { - if (la == null) { currentState = 194; break; } + case 198: { + if (la == null) { currentState = 198; break; } if (la.kind == 133 || la.kind == 146) { if (la.kind == 133) { - currentState = 198; + currentState = 202; break; } else { if (la.kind == 146) { - goto case 193; + goto case 197; } else { Error(la); - goto case 194; + goto case 198; } } } else { - goto case 195; + goto case 199; } } - case 195: { - if (la == null) { currentState = 195; break; } + case 199: { + if (la == null) { currentState = 199; break; } Expect(143, la); // "Into" - currentState = 196; + currentState = 200; break; } - case 196: { - stateStack.Push(197); - goto case 182; + case 200: { + stateStack.Push(201); + goto case 186; } - case 197: { - if (la == null) { currentState = 197; break; } + case 201: { + if (la == null) { currentState = 201; break; } if (la.kind == 22) { - currentState = 196; + currentState = 200; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 198: { - stateStack.Push(199); - goto case 200; + case 202: { + stateStack.Push(203); + goto case 204; } - case 199: { - stateStack.Push(194); - goto case 195; + case 203: { + stateStack.Push(198); + goto case 199; } - case 200: { - if (la == null) { currentState = 200; break; } + case 204: { + if (la == null) { currentState = 204; break; } Expect(146, la); // "Join" - currentState = 162; + currentState = 166; break; } - case 201: { - stateStack.Push(202); - goto case 182; + case 205: { + stateStack.Push(206); + goto case 186; } - case 202: { - if (la == null) { currentState = 202; break; } + case 206: { + if (la == null) { currentState = 206; break; } if (la.kind == 22) { - currentState = 201; + currentState = 205; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 203: { + case 207: { nextTokenIsPotentialStartOfExpression = true; - goto case 204; + goto case 208; } - case 204: { - if (la == null) { currentState = 204; break; } + case 208: { + if (la == null) { currentState = 208; break; } if (la.kind == 231) { currentState = 56; break; @@ -3908,233 +3929,233 @@ partial class ExpressionFinder { goto case 56; } } - case 205: { - if (la == null) { currentState = 205; break; } + case 209: { + if (la == null) { currentState = 209; break; } Expect(70, la); // "By" - currentState = 206; + currentState = 210; break; } - case 206: { - stateStack.Push(207); + case 210: { + stateStack.Push(211); goto case 56; } - case 207: { - if (la == null) { currentState = 207; break; } + case 211: { + if (la == null) { currentState = 211; break; } if (la.kind == 64) { - currentState = 208; + currentState = 212; break; } else { if (la.kind == 104) { - currentState = 208; + currentState = 212; break; } else { Error(la); - goto case 208; + goto case 212; } } } - case 208: { - if (la == null) { currentState = 208; break; } + case 212: { + if (la == null) { currentState = 212; break; } if (la.kind == 22) { - currentState = 206; + currentState = 210; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 209: { - stateStack.Push(210); - goto case 182; + case 213: { + stateStack.Push(214); + goto case 186; } - case 210: { - if (la == null) { currentState = 210; break; } + case 214: { + if (la == null) { currentState = 214; break; } if (la.kind == 22) { - currentState = 209; + currentState = 213; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 211: { - stateStack.Push(212); - goto case 168; + case 215: { + stateStack.Push(216); + goto case 172; } - case 212: { - if (la == null) { currentState = 212; break; } + case 216: { + if (la == null) { currentState = 216; break; } if (set[36].Get(la.kind)) { - stateStack.Push(212); - goto case 161; + stateStack.Push(216); + goto case 165; } else { Expect(143, la); // "Into" - currentState = 213; + currentState = 217; break; } } - case 213: { - stateStack.Push(214); - goto case 182; + case 217: { + stateStack.Push(218); + goto case 186; } - case 214: { - if (la == null) { currentState = 214; break; } + case 218: { + if (la == null) { currentState = 218; break; } if (la.kind == 22) { - currentState = 213; + currentState = 217; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 215: { - stateStack.Push(216); - goto case 168; + case 219: { + stateStack.Push(220); + goto case 172; } - case 216: { - if (la == null) { currentState = 216; break; } + case 220: { + if (la == null) { currentState = 220; break; } if (la.kind == 22) { - currentState = 215; + currentState = 219; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 217: { - if (la == null) { currentState = 217; break; } + case 221: { + if (la == null) { currentState = 221; break; } Expect(58, la); // "Aggregate" - currentState = 211; + currentState = 215; break; } - case 218: { - if (la == null) { currentState = 218; break; } + case 222: { + if (la == null) { currentState = 222; break; } Expect(126, la); // "From" - currentState = 215; + currentState = 219; break; } - case 219: { - if (la == null) { currentState = 219; break; } + case 223: { + if (la == null) { currentState = 223; break; } if (la.kind == 210) { - currentState = 390; + currentState = 394; break; } else { if (la.kind == 127) { - currentState = 220; + currentState = 224; break; } else { goto case 6; } } } - case 220: { - if (la == null) { currentState = 220; break; } + case 224: { + if (la == null) { currentState = 224; break; } Expect(37, la); // "(" - currentState = 221; + currentState = 225; break; } - case 221: { + case 225: { SetIdentifierExpected(la); - goto case 222; + goto case 226; } - case 222: { - if (la == null) { currentState = 222; break; } + case 226: { + if (la == null) { currentState = 226; break; } if (set[73].Get(la.kind)) { - stateStack.Push(223); - goto case 372; + stateStack.Push(227); + goto case 376; } else { - goto case 223; + goto case 227; } } - case 223: { - if (la == null) { currentState = 223; break; } + case 227: { + if (la == null) { currentState = 227; break; } Expect(38, la); // ")" - currentState = 224; + currentState = 228; break; } - case 224: { + case 228: { nextTokenIsPotentialStartOfExpression = true; - goto case 225; + goto case 229; } - case 225: { - if (la == null) { currentState = 225; break; } + case 229: { + if (la == null) { currentState = 229; break; } if (set[23].Get(la.kind)) { goto case 56; } else { if (la.kind == 1 || la.kind == 21 || la.kind == 63) { if (la.kind == 63) { - currentState = 370; + currentState = 374; break; } else { - goto case 226; + goto case 230; } } else { goto case 6; } } } - case 226: { - stateStack.Push(227); - goto case 229; + case 230: { + stateStack.Push(231); + goto case 233; } - case 227: { - if (la == null) { currentState = 227; break; } + case 231: { + if (la == null) { currentState = 231; break; } Expect(113, la); // "End" - currentState = 228; + currentState = 232; break; } - case 228: { - if (la == null) { currentState = 228; break; } + case 232: { + if (la == null) { currentState = 232; break; } Expect(127, la); // "Function" currentState = stateStack.Pop(); break; } - case 229: { + case 233: { PushContext(Context.Body, la, t); - goto case 230; + goto case 234; } - case 230: { - stateStack.Push(231); + case 234: { + stateStack.Push(235); goto case 23; } - case 231: { + case 235: { nextTokenIsPotentialStartOfExpression = true; - goto case 232; + goto case 236; } - case 232: { - if (la == null) { currentState = 232; break; } + case 236: { + if (la == null) { currentState = 236; break; } if (set[130].Get(la.kind)) { if (set[65].Get(la.kind)) { if (set[47].Get(la.kind)) { - stateStack.Push(230); - goto case 237; + stateStack.Push(234); + goto case 241; } else { - goto case 230; + goto case 234; } } else { if (la.kind == 113) { - currentState = 235; + currentState = 239; break; } else { - goto case 234; + goto case 238; } } } else { - goto case 233; + goto case 237; } } - case 233: { + case 237: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 234: { + case 238: { Error(la); - goto case 231; + goto case 235; } - case 235: { - if (la == null) { currentState = 235; break; } + case 239: { + if (la == null) { currentState = 239; break; } if (la.kind == 1 || la.kind == 21) { - goto case 230; + goto case 234; } else { if (set[46].Get(la.kind)) { currentState = endOfStatementTerminatorAndBlock; /* leave this block */ @@ -4143,68 +4164,68 @@ partial class ExpressionFinder { goto switchlbl; } else { - goto case 234; + goto case 238; } } } - case 236: { - if (la == null) { currentState = 236; break; } - currentState = 231; + case 240: { + if (la == null) { currentState = 240; break; } + currentState = 235; break; } - case 237: { + case 241: { nextTokenIsPotentialStartOfExpression = true; - goto case 238; + goto case 242; } - case 238: { - if (la == null) { currentState = 238; break; } + case 242: { + if (la == null) { currentState = 242; break; } if (la.kind == 88 || la.kind == 105 || la.kind == 204) { - currentState = 354; + currentState = 358; break; } else { if (la.kind == 211 || la.kind == 233) { - currentState = 350; + currentState = 354; break; } else { if (la.kind == 56 || la.kind == 193) { - currentState = 348; + currentState = 352; break; } else { if (la.kind == 189) { - currentState = 346; + currentState = 350; break; } else { if (la.kind == 135) { - currentState = 328; + currentState = 332; break; } else { if (la.kind == 197) { - currentState = 313; + currentState = 317; break; } else { if (la.kind == 231) { - currentState = 309; + currentState = 313; break; } else { if (la.kind == 108) { - currentState = 303; + currentState = 307; break; } else { if (la.kind == 124) { - currentState = 276; + currentState = 280; break; } else { if (la.kind == 118 || la.kind == 171 || la.kind == 194) { if (la.kind == 118 || la.kind == 171) { if (la.kind == 171) { - currentState = 272; + currentState = 276; break; } else { - goto case 272; + goto case 276; } } else { if (la.kind == 194) { - currentState = 270; + currentState = 274; break; } else { goto case 6; @@ -4212,31 +4233,31 @@ partial class ExpressionFinder { } } else { if (la.kind == 215) { - currentState = 268; + currentState = 272; break; } else { if (la.kind == 218) { - currentState = 255; + currentState = 259; break; } else { if (set[131].Get(la.kind)) { if (la.kind == 132) { - currentState = 252; + currentState = 256; break; } else { if (la.kind == 120) { - currentState = 251; + currentState = 255; break; } else { if (la.kind == 89) { - currentState = 250; + currentState = 254; break; } else { if (la.kind == 206) { goto case 93; } else { if (la.kind == 195) { - currentState = 247; + currentState = 251; break; } else { goto case 6; @@ -4247,15 +4268,15 @@ partial class ExpressionFinder { } } else { if (la.kind == 191) { - currentState = 245; + currentState = 249; break; } else { if (la.kind == 117) { - currentState = 243; + currentState = 247; break; } else { if (la.kind == 226) { - currentState = 239; + currentState = 243; break; } else { if (set[132].Get(la.kind)) { @@ -4285,46 +4306,46 @@ partial class ExpressionFinder { } } } - case 239: { - stateStack.Push(240); + case 243: { + stateStack.Push(244); goto case 56; } - case 240: { - stateStack.Push(241); - goto case 229; + case 244: { + stateStack.Push(245); + goto case 233; } - case 241: { - if (la == null) { currentState = 241; break; } + case 245: { + if (la == null) { currentState = 245; break; } Expect(113, la); // "End" - currentState = 242; + currentState = 246; break; } - case 242: { - if (la == null) { currentState = 242; break; } + case 246: { + if (la == null) { currentState = 246; break; } Expect(226, la); // "Using" currentState = stateStack.Pop(); break; } - case 243: { - stateStack.Push(244); + case 247: { + stateStack.Push(248); goto case 56; } - case 244: { - if (la == null) { currentState = 244; break; } + case 248: { + if (la == null) { currentState = 248; break; } if (la.kind == 22) { - currentState = 243; + currentState = 247; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 245: { + case 249: { nextTokenIsPotentialStartOfExpression = true; - goto case 246; + goto case 250; } - case 246: { - if (la == null) { currentState = 246; break; } + case 250: { + if (la == null) { currentState = 250; break; } if (la.kind == 184) { currentState = 56; break; @@ -4332,27 +4353,27 @@ partial class ExpressionFinder { goto case 56; } } - case 247: { + case 251: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 248; + goto case 252; } - case 248: { - if (la == null) { currentState = 248; break; } + case 252: { + if (la == null) { currentState = 252; break; } if (set[23].Get(la.kind)) { - stateStack.Push(249); + stateStack.Push(253); goto case 56; } else { - goto case 249; + goto case 253; } } - case 249: { + case 253: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 250: { - if (la == null) { currentState = 250; break; } + case 254: { + if (la == null) { currentState = 254; break; } if (la.kind == 108) { goto case 112; } else { @@ -4367,8 +4388,8 @@ partial class ExpressionFinder { } } } - case 251: { - if (la == null) { currentState = 251; break; } + case 255: { + if (la == null) { currentState = 255; break; } if (la.kind == 108) { goto case 112; } else { @@ -4403,118 +4424,118 @@ partial class ExpressionFinder { } } } - case 252: { - if (la == null) { currentState = 252; break; } + case 256: { + if (la == null) { currentState = 256; break; } if (set[6].Get(la.kind)) { - goto case 254; + goto case 258; } else { if (la.kind == 5) { - goto case 253; + goto case 257; } else { goto case 6; } } } - case 253: { - if (la == null) { currentState = 253; break; } + case 257: { + if (la == null) { currentState = 257; break; } currentState = stateStack.Pop(); break; } - case 254: { - if (la == null) { currentState = 254; break; } + case 258: { + if (la == null) { currentState = 258; break; } currentState = stateStack.Pop(); break; } - case 255: { - stateStack.Push(256); - goto case 229; + case 259: { + stateStack.Push(260); + goto case 233; } - case 256: { - if (la == null) { currentState = 256; break; } + case 260: { + if (la == null) { currentState = 260; break; } if (la.kind == 75) { - currentState = 260; + currentState = 264; break; } else { if (la.kind == 123) { - currentState = 259; + currentState = 263; break; } else { - goto case 257; + goto case 261; } } } - case 257: { - if (la == null) { currentState = 257; break; } + case 261: { + if (la == null) { currentState = 261; break; } Expect(113, la); // "End" - currentState = 258; + currentState = 262; break; } - case 258: { - if (la == null) { currentState = 258; break; } + case 262: { + if (la == null) { currentState = 262; break; } Expect(218, la); // "Try" currentState = stateStack.Pop(); break; } - case 259: { - stateStack.Push(257); - goto case 229; + case 263: { + stateStack.Push(261); + goto case 233; } - case 260: { + case 264: { SetIdentifierExpected(la); - goto case 261; + goto case 265; } - case 261: { - if (la == null) { currentState = 261; break; } + case 265: { + if (la == null) { currentState = 265; break; } if (set[6].Get(la.kind)) { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(264); - goto case 174; + stateStack.Push(268); + goto case 178; } else { - goto case 262; + goto case 266; } } - case 262: { - if (la == null) { currentState = 262; break; } + case 266: { + if (la == null) { currentState = 266; break; } if (la.kind == 229) { - currentState = 263; + currentState = 267; break; } else { - goto case 255; + goto case 259; } } - case 263: { - stateStack.Push(255); + case 267: { + stateStack.Push(259); goto case 56; } - case 264: { + case 268: { PopContext(); - goto case 265; + goto case 269; } - case 265: { - if (la == null) { currentState = 265; break; } + case 269: { + if (la == null) { currentState = 269; break; } if (la.kind == 63) { - currentState = 266; + currentState = 270; break; } else { - goto case 262; + goto case 266; } } - case 266: { + case 270: { PushContext(Context.Type, la, t); - stateStack.Push(267); + stateStack.Push(271); goto case 37; } - case 267: { + case 271: { PopContext(); - goto case 262; + goto case 266; } - case 268: { + case 272: { nextTokenIsPotentialStartOfExpression = true; - goto case 269; + goto case 273; } - case 269: { - if (la == null) { currentState = 269; break; } + case 273: { + if (la == null) { currentState = 273; break; } if (set[23].Get(la.kind)) { goto case 56; } else { @@ -4522,47 +4543,47 @@ partial class ExpressionFinder { goto switchlbl; } } - case 270: { - if (la == null) { currentState = 270; break; } + case 274: { + if (la == null) { currentState = 274; break; } if (la.kind == 163) { goto case 100; } else { - goto case 271; + goto case 275; } } - case 271: { - if (la == null) { currentState = 271; break; } + case 275: { + if (la == null) { currentState = 275; break; } if (la.kind == 5) { - goto case 253; + goto case 257; } else { if (set[6].Get(la.kind)) { - goto case 254; + goto case 258; } else { goto case 6; } } } - case 272: { - if (la == null) { currentState = 272; break; } + case 276: { + if (la == null) { currentState = 276; break; } Expect(118, la); // "Error" - currentState = 273; + currentState = 277; break; } - case 273: { + case 277: { nextTokenIsPotentialStartOfExpression = true; - goto case 274; + goto case 278; } - case 274: { - if (la == null) { currentState = 274; break; } + case 278: { + if (la == null) { currentState = 278; break; } if (set[23].Get(la.kind)) { goto case 56; } else { if (la.kind == 132) { - currentState = 271; + currentState = 275; break; } else { if (la.kind == 194) { - currentState = 275; + currentState = 279; break; } else { goto case 6; @@ -4570,109 +4591,109 @@ partial class ExpressionFinder { } } } - case 275: { - if (la == null) { currentState = 275; break; } + case 279: { + if (la == null) { currentState = 279; break; } Expect(163, la); // "Next" currentState = stateStack.Pop(); break; } - case 276: { + case 280: { nextTokenIsPotentialStartOfExpression = true; SetIdentifierExpected(la); - goto case 277; + goto case 281; } - case 277: { - if (la == null) { currentState = 277; break; } + case 281: { + if (la == null) { currentState = 281; break; } if (set[33].Get(la.kind)) { - stateStack.Push(293); - goto case 287; + stateStack.Push(297); + goto case 291; } else { if (la.kind == 110) { - currentState = 278; + currentState = 282; break; } else { goto case 6; } } } - case 278: { - stateStack.Push(279); - goto case 287; + case 282: { + stateStack.Push(283); + goto case 291; } - case 279: { - if (la == null) { currentState = 279; break; } + case 283: { + if (la == null) { currentState = 283; break; } Expect(138, la); // "In" - currentState = 280; + currentState = 284; break; } - case 280: { - stateStack.Push(281); + case 284: { + stateStack.Push(285); goto case 56; } - case 281: { - stateStack.Push(282); - goto case 229; + case 285: { + stateStack.Push(286); + goto case 233; } - case 282: { - if (la == null) { currentState = 282; break; } + case 286: { + if (la == null) { currentState = 286; break; } Expect(163, la); // "Next" - currentState = 283; + currentState = 287; break; } - case 283: { + case 287: { nextTokenIsPotentialStartOfExpression = true; - goto case 284; + goto case 288; } - case 284: { - if (la == null) { currentState = 284; break; } + case 288: { + if (la == null) { currentState = 288; break; } if (set[23].Get(la.kind)) { - goto case 285; + goto case 289; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 285: { - stateStack.Push(286); + case 289: { + stateStack.Push(290); goto case 56; } - case 286: { - if (la == null) { currentState = 286; break; } + case 290: { + if (la == null) { currentState = 290; break; } if (la.kind == 22) { - currentState = 285; + currentState = 289; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 287: { + case 291: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(288); - goto case 143; + stateStack.Push(292); + goto case 147; } - case 288: { + case 292: { PopContext(); - goto case 289; + goto case 293; } - case 289: { - if (la == null) { currentState = 289; break; } + case 293: { + if (la == null) { currentState = 293; break; } if (la.kind == 33) { - currentState = 290; + currentState = 294; break; } else { - goto case 290; + goto case 294; } } - case 290: { - if (la == null) { currentState = 290; break; } + case 294: { + if (la == null) { currentState = 294; break; } if (set[30].Get(la.kind)) { - stateStack.Push(290); - goto case 133; + stateStack.Push(294); + goto case 134; } else { if (la.kind == 63) { - currentState = 291; + currentState = 295; break; } else { currentState = stateStack.Pop(); @@ -4680,98 +4701,98 @@ partial class ExpressionFinder { } } } - case 291: { + case 295: { PushContext(Context.Type, la, t); - stateStack.Push(292); + stateStack.Push(296); goto case 37; } - case 292: { + case 296: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 293: { - if (la == null) { currentState = 293; break; } + case 297: { + if (la == null) { currentState = 297; break; } Expect(20, la); // "=" - currentState = 294; + currentState = 298; break; } - case 294: { - stateStack.Push(295); + case 298: { + stateStack.Push(299); goto case 56; } - case 295: { - if (la == null) { currentState = 295; break; } + case 299: { + if (la == null) { currentState = 299; break; } if (la.kind == 205) { - currentState = 302; + currentState = 306; break; } else { - goto case 296; + goto case 300; } } - case 296: { - stateStack.Push(297); - goto case 229; + case 300: { + stateStack.Push(301); + goto case 233; } - case 297: { - if (la == null) { currentState = 297; break; } + case 301: { + if (la == null) { currentState = 301; break; } Expect(163, la); // "Next" - currentState = 298; + currentState = 302; break; } - case 298: { + case 302: { nextTokenIsPotentialStartOfExpression = true; - goto case 299; + goto case 303; } - case 299: { - if (la == null) { currentState = 299; break; } + case 303: { + if (la == null) { currentState = 303; break; } if (set[23].Get(la.kind)) { - goto case 300; + goto case 304; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 300: { - stateStack.Push(301); + case 304: { + stateStack.Push(305); goto case 56; } - case 301: { - if (la == null) { currentState = 301; break; } + case 305: { + if (la == null) { currentState = 305; break; } if (la.kind == 22) { - currentState = 300; + currentState = 304; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 302: { - stateStack.Push(296); + case 306: { + stateStack.Push(300); goto case 56; } - case 303: { - if (la == null) { currentState = 303; break; } + case 307: { + if (la == null) { currentState = 307; break; } if (la.kind == 224 || la.kind == 231) { - currentState = 306; + currentState = 310; break; } else { if (la.kind == 1 || la.kind == 21) { - stateStack.Push(304); - goto case 229; + stateStack.Push(308); + goto case 233; } else { goto case 6; } } } - case 304: { - if (la == null) { currentState = 304; break; } + case 308: { + if (la == null) { currentState = 308; break; } Expect(152, la); // "Loop" - currentState = 305; + currentState = 309; break; } - case 305: { - if (la == null) { currentState = 305; break; } + case 309: { + if (la == null) { currentState = 309; break; } if (la.kind == 224 || la.kind == 231) { currentState = 56; break; @@ -4780,142 +4801,142 @@ partial class ExpressionFinder { goto switchlbl; } } - case 306: { - stateStack.Push(307); + case 310: { + stateStack.Push(311); goto case 56; } - case 307: { - stateStack.Push(308); - goto case 229; + case 311: { + stateStack.Push(312); + goto case 233; } - case 308: { - if (la == null) { currentState = 308; break; } + case 312: { + if (la == null) { currentState = 312; break; } Expect(152, la); // "Loop" currentState = stateStack.Pop(); break; } - case 309: { - stateStack.Push(310); + case 313: { + stateStack.Push(314); goto case 56; } - case 310: { - stateStack.Push(311); - goto case 229; + case 314: { + stateStack.Push(315); + goto case 233; } - case 311: { - if (la == null) { currentState = 311; break; } + case 315: { + if (la == null) { currentState = 315; break; } Expect(113, la); // "End" - currentState = 312; + currentState = 316; break; } - case 312: { - if (la == null) { currentState = 312; break; } + case 316: { + if (la == null) { currentState = 316; break; } Expect(231, la); // "While" currentState = stateStack.Pop(); break; } - case 313: { + case 317: { nextTokenIsPotentialStartOfExpression = true; - goto case 314; + goto case 318; } - case 314: { - if (la == null) { currentState = 314; break; } + case 318: { + if (la == null) { currentState = 318; break; } if (la.kind == 74) { - currentState = 315; + currentState = 319; break; } else { - goto case 315; + goto case 319; } } - case 315: { - stateStack.Push(316); + case 319: { + stateStack.Push(320); goto case 56; } - case 316: { - stateStack.Push(317); + case 320: { + stateStack.Push(321); goto case 23; } - case 317: { - if (la == null) { currentState = 317; break; } + case 321: { + if (la == null) { currentState = 321; break; } if (la.kind == 74) { - currentState = 319; + currentState = 323; break; } else { Expect(113, la); // "End" - currentState = 318; + currentState = 322; break; } } - case 318: { - if (la == null) { currentState = 318; break; } + case 322: { + if (la == null) { currentState = 322; break; } Expect(197, la); // "Select" currentState = stateStack.Pop(); break; } - case 319: { + case 323: { nextTokenIsPotentialStartOfExpression = true; - goto case 320; + goto case 324; } - case 320: { - if (la == null) { currentState = 320; break; } + case 324: { + if (la == null) { currentState = 324; break; } if (la.kind == 111) { - currentState = 321; + currentState = 325; break; } else { if (set[63].Get(la.kind)) { - goto case 322; + goto case 326; } else { Error(la); - goto case 321; + goto case 325; } } } - case 321: { - stateStack.Push(317); - goto case 229; + case 325: { + stateStack.Push(321); + goto case 233; } - case 322: { + case 326: { nextTokenIsPotentialStartOfExpression = true; - goto case 323; + goto case 327; } - case 323: { - if (la == null) { currentState = 323; break; } + case 327: { + if (la == null) { currentState = 327; break; } if (set[133].Get(la.kind)) { if (la.kind == 144) { - currentState = 325; + currentState = 329; break; } else { - goto case 325; + goto case 329; } } else { if (set[23].Get(la.kind)) { - stateStack.Push(324); + stateStack.Push(328); goto case 56; } else { Error(la); - goto case 324; + goto case 328; } } } - case 324: { - if (la == null) { currentState = 324; break; } + case 328: { + if (la == null) { currentState = 328; break; } if (la.kind == 22) { - currentState = 322; + currentState = 326; break; } else { - goto case 321; + goto case 325; } } - case 325: { - stateStack.Push(326); - goto case 327; + case 329: { + stateStack.Push(330); + goto case 331; } - case 326: { - stateStack.Push(324); + case 330: { + stateStack.Push(328); goto case 59; } - case 327: { - if (la == null) { currentState = 327; break; } + case 331: { + if (la == null) { currentState = 331; break; } if (la.kind == 20) { currentState = stateStack.Pop(); break; @@ -4948,104 +4969,104 @@ partial class ExpressionFinder { } } } - case 328: { - stateStack.Push(329); + case 332: { + stateStack.Push(333); goto case 56; } - case 329: { - if (la == null) { currentState = 329; break; } + case 333: { + if (la == null) { currentState = 333; break; } if (la.kind == 214) { - currentState = 337; + currentState = 341; break; } else { - goto case 330; + goto case 334; } } - case 330: { - if (la == null) { currentState = 330; break; } + case 334: { + if (la == null) { currentState = 334; break; } if (la.kind == 1 || la.kind == 21) { - goto case 331; + goto case 335; } else { goto case 6; } } - case 331: { - stateStack.Push(332); - goto case 229; + case 335: { + stateStack.Push(336); + goto case 233; } - case 332: { - if (la == null) { currentState = 332; break; } + case 336: { + if (la == null) { currentState = 336; break; } if (la.kind == 111 || la.kind == 112) { if (la.kind == 111) { - currentState = 336; + currentState = 340; break; } else { if (la.kind == 112) { - currentState = 334; + currentState = 338; break; } else { Error(la); - goto case 331; + goto case 335; } } } else { Expect(113, la); // "End" - currentState = 333; + currentState = 337; break; } } - case 333: { - if (la == null) { currentState = 333; break; } + case 337: { + if (la == null) { currentState = 337; break; } Expect(135, la); // "If" currentState = stateStack.Pop(); break; } - case 334: { - stateStack.Push(335); + case 338: { + stateStack.Push(339); goto case 56; } - case 335: { - if (la == null) { currentState = 335; break; } + case 339: { + if (la == null) { currentState = 339; break; } if (la.kind == 214) { - currentState = 331; + currentState = 335; break; } else { - goto case 331; + goto case 335; } } - case 336: { - if (la == null) { currentState = 336; break; } + case 340: { + if (la == null) { currentState = 340; break; } if (la.kind == 135) { - currentState = 334; + currentState = 338; break; } else { - goto case 331; + goto case 335; } } - case 337: { + case 341: { nextTokenIsPotentialStartOfExpression = true; - goto case 338; + goto case 342; } - case 338: { - if (la == null) { currentState = 338; break; } + case 342: { + if (la == null) { currentState = 342; break; } if (set[47].Get(la.kind)) { - goto case 339; + goto case 343; } else { - goto case 330; + goto case 334; } } - case 339: { - stateStack.Push(340); - goto case 237; + case 343: { + stateStack.Push(344); + goto case 241; } - case 340: { - if (la == null) { currentState = 340; break; } + case 344: { + if (la == null) { currentState = 344; break; } if (la.kind == 21) { - currentState = 344; + currentState = 348; break; } else { if (la.kind == 111) { - currentState = 341; + currentState = 345; break; } else { currentState = stateStack.Pop(); @@ -5053,47 +5074,47 @@ partial class ExpressionFinder { } } } - case 341: { + case 345: { nextTokenIsPotentialStartOfExpression = true; - goto case 342; + goto case 346; } - case 342: { - if (la == null) { currentState = 342; break; } + case 346: { + if (la == null) { currentState = 346; break; } if (set[47].Get(la.kind)) { - stateStack.Push(343); - goto case 237; + stateStack.Push(347); + goto case 241; } else { - goto case 343; + goto case 347; } } - case 343: { - if (la == null) { currentState = 343; break; } + case 347: { + if (la == null) { currentState = 347; break; } if (la.kind == 21) { - currentState = 341; + currentState = 345; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 344: { + case 348: { nextTokenIsPotentialStartOfExpression = true; - goto case 345; + goto case 349; } - case 345: { - if (la == null) { currentState = 345; break; } + case 349: { + if (la == null) { currentState = 349; break; } if (set[47].Get(la.kind)) { - goto case 339; + goto case 343; } else { - goto case 340; + goto case 344; } } - case 346: { - stateStack.Push(347); + case 350: { + stateStack.Push(351); goto case 81; } - case 347: { - if (la == null) { currentState = 347; break; } + case 351: { + if (la == null) { currentState = 351; break; } if (la.kind == 37) { currentState = 46; break; @@ -5102,32 +5123,32 @@ partial class ExpressionFinder { goto switchlbl; } } - case 348: { - stateStack.Push(349); + case 352: { + stateStack.Push(353); goto case 56; } - case 349: { - if (la == null) { currentState = 349; break; } + case 353: { + if (la == null) { currentState = 353; break; } Expect(22, la); // "," currentState = 56; break; } - case 350: { - stateStack.Push(351); + case 354: { + stateStack.Push(355); goto case 56; } - case 351: { - stateStack.Push(352); - goto case 229; + case 355: { + stateStack.Push(356); + goto case 233; } - case 352: { - if (la == null) { currentState = 352; break; } + case 356: { + if (la == null) { currentState = 356; break; } Expect(113, la); // "End" - currentState = 353; + currentState = 357; break; } - case 353: { - if (la == null) { currentState = 353; break; } + case 357: { + if (la == null) { currentState = 357; break; } if (la.kind == 233) { goto case 82; } else { @@ -5138,252 +5159,252 @@ partial class ExpressionFinder { } } } - case 354: { + case 358: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(355); - goto case 174; + stateStack.Push(359); + goto case 178; } - case 355: { + case 359: { PopContext(); - goto case 356; + goto case 360; } - case 356: { - if (la == null) { currentState = 356; break; } + case 360: { + if (la == null) { currentState = 360; break; } if (la.kind == 33) { - currentState = 357; + currentState = 361; break; } else { - goto case 357; + goto case 361; } } - case 357: { - if (la == null) { currentState = 357; break; } + case 361: { + if (la == null) { currentState = 361; break; } if (la.kind == 37) { - currentState = 369; + currentState = 373; break; } else { - goto case 358; + goto case 362; } } - case 358: { - if (la == null) { currentState = 358; break; } + case 362: { + if (la == null) { currentState = 362; break; } if (la.kind == 22) { - currentState = 363; + currentState = 367; break; } else { if (la.kind == 63) { - currentState = 360; + currentState = 364; break; } else { - goto case 359; + goto case 363; } } } - case 359: { - if (la == null) { currentState = 359; break; } + case 363: { + if (la == null) { currentState = 363; break; } if (la.kind == 20) { - goto case 187; + goto case 191; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 360: { + case 364: { PushContext(Context.Type, la, t); - goto case 361; + goto case 365; } - case 361: { - if (la == null) { currentState = 361; break; } + case 365: { + if (la == null) { currentState = 365; break; } if (la.kind == 162) { - stateStack.Push(362); + stateStack.Push(366); goto case 67; } else { if (set[16].Get(la.kind)) { - stateStack.Push(362); + stateStack.Push(366); goto case 37; } else { Error(la); - goto case 362; + goto case 366; } } } - case 362: { + case 366: { PopContext(); - goto case 359; + goto case 363; } - case 363: { + case 367: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(364); - goto case 174; + stateStack.Push(368); + goto case 178; } - case 364: { + case 368: { PopContext(); - goto case 365; + goto case 369; } - case 365: { - if (la == null) { currentState = 365; break; } + case 369: { + if (la == null) { currentState = 369; break; } if (la.kind == 33) { - currentState = 366; + currentState = 370; break; } else { - goto case 366; + goto case 370; } } - case 366: { - if (la == null) { currentState = 366; break; } + case 370: { + if (la == null) { currentState = 370; break; } if (la.kind == 37) { - currentState = 367; + currentState = 371; break; } else { - goto case 358; + goto case 362; } } - case 367: { - if (la == null) { currentState = 367; break; } + case 371: { + if (la == null) { currentState = 371; break; } if (la.kind == 22) { - currentState = 367; + currentState = 371; break; } else { - goto case 368; + goto case 372; } } - case 368: { - if (la == null) { currentState = 368; break; } + case 372: { + if (la == null) { currentState = 372; break; } Expect(38, la); // ")" - currentState = 358; + currentState = 362; break; } - case 369: { - if (la == null) { currentState = 369; break; } + case 373: { + if (la == null) { currentState = 373; break; } if (la.kind == 22) { - currentState = 369; + currentState = 373; break; } else { - goto case 368; + goto case 372; } } - case 370: { + case 374: { PushContext(Context.Type, la, t); - stateStack.Push(371); + stateStack.Push(375); goto case 37; } - case 371: { + case 375: { PopContext(); - goto case 226; + goto case 230; } - case 372: { - stateStack.Push(373); + case 376: { + stateStack.Push(377); PushContext(Context.Parameter, la, t); - goto case 374; + goto case 378; } - case 373: { - if (la == null) { currentState = 373; break; } + case 377: { + if (la == null) { currentState = 377; break; } if (la.kind == 22) { - currentState = 372; + currentState = 376; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 374: { + case 378: { SetIdentifierExpected(la); - goto case 375; + goto case 379; } - case 375: { - if (la == null) { currentState = 375; break; } + case 379: { + if (la == null) { currentState = 379; break; } if (la.kind == 40) { - stateStack.Push(374); - goto case 385; + stateStack.Push(378); + goto case 389; } else { - goto case 376; + goto case 380; } } - case 376: { + case 380: { SetIdentifierExpected(la); - goto case 377; + goto case 381; } - case 377: { - if (la == null) { currentState = 377; break; } + case 381: { + if (la == null) { currentState = 381; break; } if (set[134].Get(la.kind)) { - currentState = 376; + currentState = 380; break; } else { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(378); - goto case 174; + stateStack.Push(382); + goto case 178; } } - case 378: { + case 382: { PopContext(); - goto case 379; + goto case 383; } - case 379: { - if (la == null) { currentState = 379; break; } + case 383: { + if (la == null) { currentState = 383; break; } if (la.kind == 63) { - currentState = 383; + currentState = 387; break; } else { - goto case 380; + goto case 384; } } - case 380: { - if (la == null) { currentState = 380; break; } + case 384: { + if (la == null) { currentState = 384; break; } if (la.kind == 20) { - currentState = 382; + currentState = 386; break; } else { - goto case 381; + goto case 385; } } - case 381: { + case 385: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 382: { - stateStack.Push(381); + case 386: { + stateStack.Push(385); goto case 56; } - case 383: { + case 387: { PushContext(Context.Type, la, t); - stateStack.Push(384); + stateStack.Push(388); goto case 37; } - case 384: { + case 388: { PopContext(); - goto case 380; + goto case 384; } - case 385: { - if (la == null) { currentState = 385; break; } + case 389: { + if (la == null) { currentState = 389; break; } Expect(40, la); // "<" - currentState = 386; + currentState = 390; break; } - case 386: { + case 390: { PushContext(Context.Attribute, la, t); - goto case 387; + goto case 391; } - case 387: { - if (la == null) { currentState = 387; break; } + case 391: { + if (la == null) { currentState = 391; break; } if (set[135].Get(la.kind)) { - currentState = 387; + currentState = 391; break; } else { Expect(39, la); // ">" - currentState = 388; + currentState = 392; break; } } - case 388: { + case 392: { PopContext(); - goto case 389; + goto case 393; } - case 389: { - if (la == null) { currentState = 389; break; } + case 393: { + if (la == null) { currentState = 393; break; } if (la.kind == 1) { goto case 25; } else { @@ -5391,512 +5412,498 @@ partial class ExpressionFinder { goto switchlbl; } } - case 390: { - if (la == null) { currentState = 390; break; } + case 394: { + if (la == null) { currentState = 394; break; } Expect(37, la); // "(" - currentState = 391; + currentState = 395; break; } - case 391: { + case 395: { SetIdentifierExpected(la); - goto case 392; + goto case 396; } - case 392: { - if (la == null) { currentState = 392; break; } + case 396: { + if (la == null) { currentState = 396; break; } if (set[73].Get(la.kind)) { - stateStack.Push(393); - goto case 372; + stateStack.Push(397); + goto case 376; } else { - goto case 393; + goto case 397; } } - case 393: { - if (la == null) { currentState = 393; break; } + case 397: { + if (la == null) { currentState = 397; break; } Expect(38, la); // ")" - currentState = 394; + currentState = 398; break; } - case 394: { + case 398: { nextTokenIsPotentialStartOfExpression = true; - goto case 395; + goto case 399; } - case 395: { - if (la == null) { currentState = 395; break; } + case 399: { + if (la == null) { currentState = 399; break; } if (set[47].Get(la.kind)) { - goto case 237; + goto case 241; } else { if (la.kind == 1 || la.kind == 21) { - stateStack.Push(396); - goto case 229; + stateStack.Push(400); + goto case 233; } else { goto case 6; } } } - case 396: { - if (la == null) { currentState = 396; break; } + case 400: { + if (la == null) { currentState = 400; break; } Expect(113, la); // "End" - currentState = 397; + currentState = 401; break; } - case 397: { - if (la == null) { currentState = 397; break; } + case 401: { + if (la == null) { currentState = 401; break; } Expect(210, la); // "Sub" currentState = stateStack.Pop(); break; } - case 398: { - if (la == null) { currentState = 398; break; } + case 402: { + if (la == null) { currentState = 402; break; } if (la.kind == 17 || la.kind == 18 || la.kind == 19) { - currentState = 411; + currentState = 415; break; } else { if (la.kind == 10) { - stateStack.Push(400); - goto case 402; + stateStack.Push(404); + goto case 406; } else { Error(la); - goto case 399; + goto case 403; } } } - case 399: { + case 403: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 400: { - if (la == null) { currentState = 400; break; } + case 404: { + if (la == null) { currentState = 404; break; } if (la.kind == 17) { - currentState = 401; + currentState = 405; break; } else { - goto case 399; + goto case 403; } } - case 401: { - if (la == null) { currentState = 401; break; } + case 405: { + if (la == null) { currentState = 405; break; } if (la.kind == 16) { - currentState = 400; + currentState = 404; break; } else { - goto case 400; + goto case 404; } } - case 402: { + case 406: { PushContext(Context.Xml, la, t); - goto case 403; + goto case 407; } - case 403: { - if (la == null) { currentState = 403; break; } + case 407: { + if (la == null) { currentState = 407; break; } Expect(10, la); // XmlOpenTag - currentState = 404; + currentState = 408; break; } - case 404: { - if (la == null) { currentState = 404; break; } + case 408: { + if (la == null) { currentState = 408; break; } if (set[136].Get(la.kind)) { if (set[137].Get(la.kind)) { - currentState = 404; + currentState = 408; break; } else { if (la.kind == 12) { - stateStack.Push(404); - goto case 408; + stateStack.Push(408); + goto case 412; } else { Error(la); - goto case 404; + goto case 408; } } } else { if (la.kind == 14) { - currentState = 405; + currentState = 409; break; } else { if (la.kind == 11) { - currentState = 406; + currentState = 410; break; } else { Error(la); - goto case 405; + goto case 409; } } } } - case 405: { + case 409: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 406: { - if (la == null) { currentState = 406; break; } + case 410: { + if (la == null) { currentState = 410; break; } if (set[138].Get(la.kind)) { if (set[139].Get(la.kind)) { - currentState = 406; + currentState = 410; break; } else { if (la.kind == 12) { - stateStack.Push(406); - goto case 408; + stateStack.Push(410); + goto case 412; } else { if (la.kind == 10) { - stateStack.Push(406); - goto case 402; + stateStack.Push(410); + goto case 406; } else { Error(la); - goto case 406; + goto case 410; } } } } else { Expect(15, la); // XmlOpenEndTag - currentState = 407; + currentState = 411; break; } } - case 407: { - if (la == null) { currentState = 407; break; } + case 411: { + if (la == null) { currentState = 411; break; } if (set[140].Get(la.kind)) { if (set[141].Get(la.kind)) { - currentState = 407; + currentState = 411; break; } else { if (la.kind == 12) { - stateStack.Push(407); - goto case 408; + stateStack.Push(411); + goto case 412; } else { Error(la); - goto case 407; + goto case 411; } } } else { Expect(11, la); // XmlCloseTag - currentState = 405; + currentState = 409; break; } } - case 408: { - if (la == null) { currentState = 408; break; } + case 412: { + if (la == null) { currentState = 412; break; } Expect(12, la); // XmlStartInlineVB - currentState = 409; + currentState = 413; break; } - case 409: { - stateStack.Push(410); + case 413: { + stateStack.Push(414); goto case 56; } - case 410: { - if (la == null) { currentState = 410; break; } + case 414: { + if (la == null) { currentState = 414; break; } Expect(13, la); // XmlEndInlineVB currentState = stateStack.Pop(); break; } - case 411: { - if (la == null) { currentState = 411; break; } + case 415: { + if (la == null) { currentState = 415; break; } if (la.kind == 16) { - currentState = 412; + currentState = 416; break; } else { - goto case 412; + goto case 416; } } - case 412: { - if (la == null) { currentState = 412; break; } + case 416: { + if (la == null) { currentState = 416; break; } if (la.kind == 17 || la.kind == 19) { - currentState = 411; + currentState = 415; break; } else { if (la.kind == 10) { - stateStack.Push(413); - goto case 402; + stateStack.Push(417); + goto case 406; } else { - goto case 399; + goto case 403; } } } - case 413: { - if (la == null) { currentState = 413; break; } + case 417: { + if (la == null) { currentState = 417; break; } if (la.kind == 17) { - currentState = 414; + currentState = 418; break; } else { - goto case 399; + goto case 403; } } - case 414: { - if (la == null) { currentState = 414; break; } + case 418: { + if (la == null) { currentState = 418; break; } if (la.kind == 16) { - currentState = 413; + currentState = 417; break; } else { - goto case 413; + goto case 417; } } - case 415: { - if (la == null) { currentState = 415; break; } + case 419: { + if (la == null) { currentState = 419; break; } Expect(37, la); // "(" - currentState = 416; + currentState = 420; break; } - case 416: { + case 420: { readXmlIdentifier = true; - stateStack.Push(417); - goto case 174; + stateStack.Push(421); + goto case 178; } - case 417: { - if (la == null) { currentState = 417; break; } + case 421: { + if (la == null) { currentState = 421; break; } Expect(38, la); // ")" - currentState = 145; + currentState = 149; break; } - case 418: { - if (la == null) { currentState = 418; break; } + case 422: { + if (la == null) { currentState = 422; break; } Expect(37, la); // "(" - currentState = 419; + currentState = 423; break; } - case 419: { - stateStack.Push(417); + case 423: { + PushContext(Context.Type, la, t); + stateStack.Push(424); goto case 37; } - case 420: { - nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true; + case 424: { + PopContext(); goto case 421; } - case 421: { - if (la == null) { currentState = 421; break; } + case 425: { + nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true; + goto case 426; + } + case 426: { + if (la == null) { currentState = 426; break; } if (la.kind == 10) { - currentState = 422; + currentState = 427; break; } else { - goto case 422; + goto case 427; } } - case 422: { - stateStack.Push(423); + case 427: { + stateStack.Push(428); goto case 81; } - case 423: { - if (la == null) { currentState = 423; break; } + case 428: { + if (la == null) { currentState = 428; break; } if (la.kind == 11) { - currentState = 145; + currentState = 149; break; } else { - goto case 145; + goto case 149; } } - case 424: { - stateStack.Push(417); + case 429: { + stateStack.Push(421); goto case 56; } - case 425: { - stateStack.Push(426); + case 430: { + stateStack.Push(431); goto case 56; } - case 426: { - if (la == null) { currentState = 426; break; } + case 431: { + if (la == null) { currentState = 431; break; } if (la.kind == 22) { - currentState = 427; + currentState = 432; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 427: { + case 432: { activeArgument++; nextTokenIsPotentialStartOfExpression = true; - goto case 428; + goto case 433; } - case 428: { - if (la == null) { currentState = 428; break; } + case 433: { + if (la == null) { currentState = 433; break; } if (set[23].Get(la.kind)) { - goto case 425; + goto case 430; } else { - goto case 426; + goto case 431; } } - case 429: { - if (la == null) { currentState = 429; break; } + case 434: { + if (la == null) { currentState = 434; break; } if (set[16].Get(la.kind)) { - PushContext(Context.Type, la, t); - stateStack.Push(433); + stateStack.Push(435); goto case 37; } else { - goto case 430; + goto case 435; } } - case 430: { - if (la == null) { currentState = 430; break; } + case 435: { + if (la == null) { currentState = 435; break; } if (la.kind == 22) { - currentState = 431; + currentState = 434; break; } else { goto case 45; } } - case 431: { - if (la == null) { currentState = 431; break; } - if (set[16].Get(la.kind)) { - PushContext(Context.Type, la, t); - stateStack.Push(432); - goto case 37; - } else { - goto case 430; - } - } - case 432: { - PopContext(); - goto case 430; - } - case 433: { - PopContext(); - goto case 430; - } - case 434: { + case 436: { SetIdentifierExpected(la); - goto case 435; + goto case 437; } - case 435: { - if (la == null) { currentState = 435; break; } + case 437: { + if (la == null) { currentState = 437; break; } if (set[142].Get(la.kind)) { if (la.kind == 169) { - currentState = 437; + currentState = 439; break; } else { if (set[73].Get(la.kind)) { - stateStack.Push(436); - goto case 372; + stateStack.Push(438); + goto case 376; } else { Error(la); - goto case 436; + goto case 438; } } } else { - goto case 436; + goto case 438; } } - case 436: { - if (la == null) { currentState = 436; break; } + case 438: { + if (la == null) { currentState = 438; break; } Expect(38, la); // ")" currentState = 34; break; } - case 437: { - stateStack.Push(436); - goto case 438; + case 439: { + stateStack.Push(438); + goto case 440; } - case 438: { + case 440: { SetIdentifierExpected(la); - goto case 439; + goto case 441; } - case 439: { - if (la == null) { currentState = 439; break; } + case 441: { + if (la == null) { currentState = 441; break; } if (la.kind == 138 || la.kind == 178) { - currentState = 440; + currentState = 442; break; } else { - goto case 440; + goto case 442; } } - case 440: { + case 442: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(441); - goto case 455; + stateStack.Push(443); + goto case 457; } - case 441: { + case 443: { PopContext(); - goto case 442; + goto case 444; } - case 442: { - if (la == null) { currentState = 442; break; } + case 444: { + if (la == null) { currentState = 444; break; } if (la.kind == 63) { - currentState = 456; + currentState = 458; break; } else { - goto case 443; + goto case 445; } } - case 443: { - if (la == null) { currentState = 443; break; } + case 445: { + if (la == null) { currentState = 445; break; } if (la.kind == 22) { - currentState = 444; + currentState = 446; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 444: { + case 446: { SetIdentifierExpected(la); - goto case 445; + goto case 447; } - case 445: { - if (la == null) { currentState = 445; break; } + case 447: { + if (la == null) { currentState = 447; break; } if (la.kind == 138 || la.kind == 178) { - currentState = 446; + currentState = 448; break; } else { - goto case 446; + goto case 448; } } - case 446: { + case 448: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(447); - goto case 455; + stateStack.Push(449); + goto case 457; } - case 447: { + case 449: { PopContext(); - goto case 448; + goto case 450; } - case 448: { - if (la == null) { currentState = 448; break; } + case 450: { + if (la == null) { currentState = 450; break; } if (la.kind == 63) { - currentState = 449; + currentState = 451; break; } else { - goto case 443; + goto case 445; } } - case 449: { + case 451: { PushContext(Context.Type, la, t); - stateStack.Push(450); - goto case 451; + stateStack.Push(452); + goto case 453; } - case 450: { + case 452: { PopContext(); - goto case 443; + goto case 445; } - case 451: { - if (la == null) { currentState = 451; break; } + case 453: { + if (la == null) { currentState = 453; break; } if (set[88].Get(la.kind)) { - goto case 454; + goto case 456; } else { if (la.kind == 35) { - currentState = 452; + currentState = 454; break; } else { goto case 6; } } } - case 452: { - stateStack.Push(453); - goto case 454; + case 454: { + stateStack.Push(455); + goto case 456; } - case 453: { - if (la == null) { currentState = 453; break; } + case 455: { + if (la == null) { currentState = 455; break; } if (la.kind == 22) { - currentState = 452; + currentState = 454; break; } else { goto case 66; } } - case 454: { - if (la == null) { currentState = 454; break; } + case 456: { + if (la == null) { currentState = 456; break; } if (set[16].Get(la.kind)) { currentState = 38; break; @@ -5916,8 +5923,8 @@ partial class ExpressionFinder { } } } - case 455: { - if (la == null) { currentState = 455; break; } + case 457: { + if (la == null) { currentState = 457; break; } if (la.kind == 2) { goto case 125; } else { @@ -6024,395 +6031,381 @@ partial class ExpressionFinder { } } } - case 456: { + case 458: { PushContext(Context.Type, la, t); - stateStack.Push(457); - goto case 451; + stateStack.Push(459); + goto case 453; } - case 457: { + case 459: { PopContext(); - goto case 443; + goto case 445; } - case 458: { + case 460: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(459); - goto case 174; + stateStack.Push(461); + goto case 178; } - case 459: { + case 461: { PopContext(); - goto case 460; + goto case 462; } - case 460: { - if (la == null) { currentState = 460; break; } + case 462: { + if (la == null) { currentState = 462; break; } if (la.kind == 37) { - currentState = 465; + currentState = 467; break; } else { - goto case 461; + goto case 463; } } - case 461: { - if (la == null) { currentState = 461; break; } + case 463: { + if (la == null) { currentState = 463; break; } if (la.kind == 63) { - currentState = 462; + currentState = 464; break; } else { goto case 23; } } - case 462: { + case 464: { PushContext(Context.Type, la, t); - goto case 463; + goto case 465; } - case 463: { - if (la == null) { currentState = 463; break; } + case 465: { + if (la == null) { currentState = 465; break; } if (la.kind == 40) { - stateStack.Push(463); - goto case 385; + stateStack.Push(465); + goto case 389; } else { - stateStack.Push(464); + stateStack.Push(466); goto case 37; } } - case 464: { + case 466: { PopContext(); goto case 23; } - case 465: { + case 467: { SetIdentifierExpected(la); - goto case 466; + goto case 468; } - case 466: { - if (la == null) { currentState = 466; break; } + case 468: { + if (la == null) { currentState = 468; break; } if (set[73].Get(la.kind)) { - stateStack.Push(467); - goto case 372; + stateStack.Push(469); + goto case 376; } else { - goto case 467; + goto case 469; } } - case 467: { - if (la == null) { currentState = 467; break; } + case 469: { + if (la == null) { currentState = 469; break; } Expect(38, la); // ")" - currentState = 461; + currentState = 463; break; } - case 468: { + case 470: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(469); - goto case 174; + stateStack.Push(471); + goto case 178; } - case 469: { + case 471: { PopContext(); - goto case 470; + goto case 472; } - case 470: { - if (la == null) { currentState = 470; break; } + case 472: { + if (la == null) { currentState = 472; break; } if (la.kind == 37 || la.kind == 63) { if (la.kind == 63) { - currentState = 475; + currentState = 477; break; } else { if (la.kind == 37) { - currentState = 472; + currentState = 474; break; } else { - goto case 471; + goto case 473; } } } else { goto case 23; } } - case 471: { + case 473: { Error(la); goto case 23; } - case 472: { + case 474: { SetIdentifierExpected(la); - goto case 473; + goto case 475; } - case 473: { - if (la == null) { currentState = 473; break; } + case 475: { + if (la == null) { currentState = 475; break; } if (set[73].Get(la.kind)) { - stateStack.Push(474); - goto case 372; + stateStack.Push(476); + goto case 376; } else { - goto case 474; + goto case 476; } } - case 474: { - if (la == null) { currentState = 474; break; } + case 476: { + if (la == null) { currentState = 476; break; } Expect(38, la); // ")" currentState = 23; break; } - case 475: { + case 477: { PushContext(Context.Type, la, t); - stateStack.Push(476); + stateStack.Push(478); goto case 37; } - case 476: { + case 478: { PopContext(); goto case 23; } - case 477: { + case 479: { PushContext(Context.TypeDeclaration, la, t); - goto case 478; + goto case 480; } - case 478: { - if (la == null) { currentState = 478; break; } + case 480: { + if (la == null) { currentState = 480; break; } Expect(115, la); // "Enum" - currentState = 479; + currentState = 481; break; } - case 479: { + case 481: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(480); - goto case 174; + stateStack.Push(482); + goto case 178; } - case 480: { + case 482: { PopContext(); - goto case 481; + goto case 483; } - case 481: { - if (la == null) { currentState = 481; break; } + case 483: { + if (la == null) { currentState = 483; break; } if (la.kind == 63) { - currentState = 493; + currentState = 495; break; } else { - goto case 482; + goto case 484; } } - case 482: { - stateStack.Push(483); + case 484: { + stateStack.Push(485); goto case 23; } - case 483: { + case 485: { SetIdentifierExpected(la); - goto case 484; + goto case 486; } - case 484: { - if (la == null) { currentState = 484; break; } + case 486: { + if (la == null) { currentState = 486; break; } if (set[91].Get(la.kind)) { - goto case 488; + goto case 490; } else { Expect(113, la); // "End" - currentState = 485; + currentState = 487; break; } } - case 485: { - if (la == null) { currentState = 485; break; } + case 487: { + if (la == null) { currentState = 487; break; } Expect(115, la); // "Enum" - currentState = 486; + currentState = 488; break; } - case 486: { - stateStack.Push(487); + case 488: { + stateStack.Push(489); goto case 23; } - case 487: { + case 489: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 488: { + case 490: { SetIdentifierExpected(la); - goto case 489; + goto case 491; } - case 489: { - if (la == null) { currentState = 489; break; } + case 491: { + if (la == null) { currentState = 491; break; } if (la.kind == 40) { - stateStack.Push(488); - goto case 385; + stateStack.Push(490); + goto case 389; } else { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(490); - goto case 174; + stateStack.Push(492); + goto case 178; } } - case 490: { + case 492: { PopContext(); - goto case 491; + goto case 493; } - case 491: { - if (la == null) { currentState = 491; break; } + case 493: { + if (la == null) { currentState = 493; break; } if (la.kind == 20) { - currentState = 492; + currentState = 494; break; } else { - goto case 482; + goto case 484; } } - case 492: { - stateStack.Push(482); + case 494: { + stateStack.Push(484); goto case 56; } - case 493: { + case 495: { PushContext(Context.Type, la, t); - stateStack.Push(494); + stateStack.Push(496); goto case 37; } - case 494: { + case 496: { PopContext(); - goto case 482; + goto case 484; } - case 495: { - if (la == null) { currentState = 495; break; } + case 497: { + if (la == null) { currentState = 497; break; } Expect(103, la); // "Delegate" - currentState = 496; + currentState = 498; break; } - case 496: { - if (la == null) { currentState = 496; break; } + case 498: { + if (la == null) { currentState = 498; break; } if (la.kind == 210) { - currentState = 497; + currentState = 499; break; } else { if (la.kind == 127) { - currentState = 497; + currentState = 499; break; } else { Error(la); - goto case 497; + goto case 499; } } } - case 497: { + case 499: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 498; + goto case 500; } - case 498: { - if (la == null) { currentState = 498; break; } - currentState = 499; + case 500: { + if (la == null) { currentState = 500; break; } + currentState = 501; break; } - case 499: { + case 501: { PopContext(); - goto case 500; + goto case 502; } - case 500: { - if (la == null) { currentState = 500; break; } + case 502: { + if (la == null) { currentState = 502; break; } if (la.kind == 37) { - currentState = 503; + currentState = 505; break; } else { if (la.kind == 63) { - currentState = 501; + currentState = 503; break; } else { goto case 23; } } } - case 501: { + case 503: { PushContext(Context.Type, la, t); - stateStack.Push(502); + stateStack.Push(504); goto case 37; } - case 502: { + case 504: { PopContext(); goto case 23; } - case 503: { + case 505: { SetIdentifierExpected(la); - goto case 504; + goto case 506; } - case 504: { - if (la == null) { currentState = 504; break; } + case 506: { + if (la == null) { currentState = 506; break; } if (set[142].Get(la.kind)) { if (la.kind == 169) { - currentState = 506; + currentState = 508; break; } else { if (set[73].Get(la.kind)) { - stateStack.Push(505); - goto case 372; + stateStack.Push(507); + goto case 376; } else { Error(la); - goto case 505; + goto case 507; } } } else { - goto case 505; + goto case 507; } } - case 505: { - if (la == null) { currentState = 505; break; } + case 507: { + if (la == null) { currentState = 507; break; } Expect(38, la); // ")" - currentState = 500; + currentState = 502; break; } - case 506: { - stateStack.Push(505); - goto case 438; + case 508: { + stateStack.Push(507); + goto case 440; } - case 507: { + case 509: { PushContext(Context.TypeDeclaration, la, t); - goto case 508; + goto case 510; } - case 508: { - if (la == null) { currentState = 508; break; } + case 510: { + if (la == null) { currentState = 510; break; } if (la.kind == 155) { - currentState = 509; + currentState = 511; break; } else { if (la.kind == 84) { - currentState = 509; + currentState = 511; break; } else { if (la.kind == 209) { - currentState = 509; + currentState = 511; break; } else { Error(la); - goto case 509; + goto case 511; } } } } - case 509: { + case 511: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(510); - goto case 174; + stateStack.Push(512); + goto case 178; } - case 510: { + case 512: { PopContext(); - goto case 511; + goto case 513; } - case 511: { - if (la == null) { currentState = 511; break; } + case 513: { + if (la == null) { currentState = 513; break; } if (la.kind == 37) { - currentState = 667; + currentState = 669; break; } else { - goto case 512; + goto case 514; } } - case 512: { - stateStack.Push(513); - goto case 23; - } - case 513: { - SetIdentifierExpected(la); - isMissingModifier = true; - goto case 514; - } case 514: { - if (la == null) { currentState = 514; break; } - if (la.kind == 140) { - isMissingModifier = false; - goto case 664; - } else { - goto case 515; - } + stateStack.Push(515); + goto case 23; } case 515: { SetIdentifierExpected(la); @@ -6421,9 +6414,9 @@ partial class ExpressionFinder { } case 516: { if (la == null) { currentState = 516; break; } - if (la.kind == 136) { + if (la.kind == 140) { isMissingModifier = false; - goto case 658; + goto case 666; } else { goto case 517; } @@ -6435,142 +6428,156 @@ partial class ExpressionFinder { } case 518: { if (la == null) { currentState = 518; break; } - if (set[95].Get(la.kind)) { - goto case 523; - } else { + if (la.kind == 136) { isMissingModifier = false; + goto case 660; + } else { goto case 519; } } case 519: { - if (la == null) { currentState = 519; break; } - Expect(113, la); // "End" - currentState = 520; - break; + SetIdentifierExpected(la); + isMissingModifier = true; + goto case 520; } case 520: { if (la == null) { currentState = 520; break; } + if (set[95].Get(la.kind)) { + goto case 525; + } else { + isMissingModifier = false; + goto case 521; + } + } + case 521: { + if (la == null) { currentState = 521; break; } + Expect(113, la); // "End" + currentState = 522; + break; + } + case 522: { + if (la == null) { currentState = 522; break; } if (la.kind == 155) { - currentState = 521; + currentState = 523; break; } else { if (la.kind == 84) { - currentState = 521; + currentState = 523; break; } else { if (la.kind == 209) { - currentState = 521; + currentState = 523; break; } else { Error(la); - goto case 521; + goto case 523; } } } } - case 521: { - stateStack.Push(522); + case 523: { + stateStack.Push(524); goto case 23; } - case 522: { + case 524: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 523: { + case 525: { SetIdentifierExpected(la); isMissingModifier = true; - goto case 524; + goto case 526; } - case 524: { - if (la == null) { currentState = 524; break; } + case 526: { + if (la == null) { currentState = 526; break; } if (la.kind == 40) { - stateStack.Push(523); - goto case 385; + stateStack.Push(525); + goto case 389; } else { isMissingModifier = true; - goto case 525; + goto case 527; } } - case 525: { + case 527: { SetIdentifierExpected(la); - goto case 526; + goto case 528; } - case 526: { - if (la == null) { currentState = 526; break; } + case 528: { + if (la == null) { currentState = 528; break; } if (set[122].Get(la.kind)) { - currentState = 657; + currentState = 659; break; } else { isMissingModifier = false; SetIdentifierExpected(la); - goto case 527; + goto case 529; } } - case 527: { - if (la == null) { currentState = 527; break; } + case 529: { + if (la == null) { currentState = 529; break; } if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - stateStack.Push(517); - goto case 507; + stateStack.Push(519); + goto case 509; } else { if (la.kind == 103) { - stateStack.Push(517); - goto case 495; + stateStack.Push(519); + goto case 497; } else { if (la.kind == 115) { - stateStack.Push(517); - goto case 477; + stateStack.Push(519); + goto case 479; } else { if (la.kind == 142) { - stateStack.Push(517); + stateStack.Push(519); goto case 9; } else { if (set[98].Get(la.kind)) { - stateStack.Push(517); + stateStack.Push(519); PushContext(Context.Member, la, t); SetIdentifierExpected(la); - goto case 528; + goto case 530; } else { Error(la); - goto case 517; + goto case 519; } } } } } } - case 528: { - if (la == null) { currentState = 528; break; } + case 530: { + if (la == null) { currentState = 530; break; } if (set[113].Get(la.kind)) { - stateStack.Push(529); - goto case 645; + stateStack.Push(531); + goto case 648; } else { if (la.kind == 127 || la.kind == 210) { - stateStack.Push(529); - goto case 631; + stateStack.Push(531); + goto case 634; } else { if (la.kind == 101) { - stateStack.Push(529); - goto case 615; + stateStack.Push(531); + goto case 618; } else { if (la.kind == 119) { - stateStack.Push(529); - goto case 600; + stateStack.Push(531); + goto case 603; } else { if (la.kind == 98) { - stateStack.Push(529); - goto case 588; + stateStack.Push(531); + goto case 591; } else { if (la.kind == 186) { - stateStack.Push(529); - goto case 543; + stateStack.Push(531); + goto case 546; } else { if (la.kind == 172) { - stateStack.Push(529); - goto case 530; + stateStack.Push(531); + goto case 532; } else { Error(la); - goto case 529; + goto case 531; } } } @@ -6579,329 +6586,313 @@ partial class ExpressionFinder { } } } - case 529: { + case 531: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 530: { - if (la == null) { currentState = 530; break; } - Expect(172, la); // "Operator" - currentState = 531; - break; - } - case 531: { - PushContext(Context.Identifier, la, t); - SetIdentifierExpected(la); - goto case 532; - } case 532: { if (la == null) { currentState = 532; break; } + Expect(172, la); // "Operator" currentState = 533; break; } case 533: { - PopContext(); + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); goto case 534; } case 534: { if (la == null) { currentState = 534; break; } - Expect(37, la); // "(" currentState = 535; break; } case 535: { - stateStack.Push(536); - goto case 372; + PopContext(); + goto case 536; } case 536: { if (la == null) { currentState = 536; break; } - Expect(38, la); // ")" + Expect(37, la); // "(" currentState = 537; break; } case 537: { - if (la == null) { currentState = 537; break; } + stateStack.Push(538); + goto case 376; + } + case 538: { + if (la == null) { currentState = 538; break; } + Expect(38, la); // ")" + currentState = 539; + break; + } + case 539: { + if (la == null) { currentState = 539; break; } if (la.kind == 63) { - currentState = 541; + currentState = 543; break; } else { - goto case 538; + goto case 540; } } - case 538: { - stateStack.Push(539); - goto case 229; + case 540: { + stateStack.Push(541); + goto case 233; } - case 539: { - if (la == null) { currentState = 539; break; } + case 541: { + if (la == null) { currentState = 541; break; } Expect(113, la); // "End" - currentState = 540; + currentState = 542; break; } - case 540: { - if (la == null) { currentState = 540; break; } + case 542: { + if (la == null) { currentState = 542; break; } Expect(172, la); // "Operator" currentState = 23; break; } - case 541: { - if (la == null) { currentState = 541; break; } + case 543: { + PushContext(Context.Type, la, t); + goto case 544; + } + case 544: { + if (la == null) { currentState = 544; break; } if (la.kind == 40) { - stateStack.Push(541); - goto case 385; + stateStack.Push(544); + goto case 389; } else { - PushContext(Context.Type, la, t); - stateStack.Push(542); + stateStack.Push(545); goto case 37; } } - case 542: { + case 545: { PopContext(); - goto case 538; + goto case 540; } - case 543: { - if (la == null) { currentState = 543; break; } + case 546: { + if (la == null) { currentState = 546; break; } Expect(186, la); // "Property" - currentState = 544; + currentState = 547; break; } - case 544: { + case 547: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(545); - goto case 174; + stateStack.Push(548); + goto case 178; } - case 545: { + case 548: { PopContext(); - goto case 546; + goto case 549; } - case 546: { - if (la == null) { currentState = 546; break; } + case 549: { + if (la == null) { currentState = 549; break; } if (la.kind == 37) { - currentState = 585; + currentState = 588; break; } else { - goto case 547; + goto case 550; } } - case 547: { - if (la == null) { currentState = 547; break; } + case 550: { + if (la == null) { currentState = 550; break; } if (la.kind == 63) { - currentState = 583; + currentState = 586; break; } else { - goto case 548; + goto case 551; } } - case 548: { - if (la == null) { currentState = 548; break; } + case 551: { + if (la == null) { currentState = 551; break; } if (la.kind == 136) { - currentState = 578; + currentState = 581; break; } else { - goto case 549; + goto case 552; } } - case 549: { - if (la == null) { currentState = 549; break; } + case 552: { + if (la == null) { currentState = 552; break; } if (la.kind == 20) { - currentState = 577; + currentState = 580; break; } else { - goto case 550; + goto case 553; } } - case 550: { - stateStack.Push(551); + case 553: { + stateStack.Push(554); goto case 23; } - case 551: { + case 554: { PopContext(); - goto case 552; + goto case 555; } - case 552: { - if (la == null) { currentState = 552; break; } + case 555: { + if (la == null) { currentState = 555; break; } if (la.kind == 40) { - stateStack.Push(552); - goto case 385; + stateStack.Push(555); + goto case 389; } else { - goto case 553; + goto case 556; } } - case 553: { - if (la == null) { currentState = 553; break; } + case 556: { + if (la == null) { currentState = 556; break; } if (set[143].Get(la.kind)) { - currentState = 576; + currentState = 579; break; } else { if (la.kind == 128 || la.kind == 198) { PushContext(Context.Member, la, t); - goto case 554; + goto case 557; } else { currentState = stateStack.Pop(); goto switchlbl; } } } - case 554: { - if (la == null) { currentState = 554; break; } + case 557: { + if (la == null) { currentState = 557; break; } if (la.kind == 128) { - currentState = 555; + currentState = 558; break; } else { if (la.kind == 198) { - currentState = 555; + currentState = 558; break; } else { Error(la); - goto case 555; + goto case 558; } } } - case 555: { - if (la == null) { currentState = 555; break; } + case 558: { + if (la == null) { currentState = 558; break; } if (la.kind == 37) { - currentState = 573; + currentState = 576; break; } else { - goto case 556; + goto case 559; } } - case 556: { - stateStack.Push(557); - goto case 229; + case 559: { + stateStack.Push(560); + goto case 233; } - case 557: { - if (la == null) { currentState = 557; break; } + case 560: { + if (la == null) { currentState = 560; break; } Expect(113, la); // "End" - currentState = 558; + currentState = 561; break; } - case 558: { - if (la == null) { currentState = 558; break; } + case 561: { + if (la == null) { currentState = 561; break; } if (la.kind == 128) { - currentState = 559; + currentState = 562; break; } else { if (la.kind == 198) { - currentState = 559; + currentState = 562; break; } else { Error(la); - goto case 559; + goto case 562; } } } - case 559: { - stateStack.Push(560); + case 562: { + stateStack.Push(563); goto case 23; } - case 560: { - if (la == null) { currentState = 560; break; } + case 563: { + if (la == null) { currentState = 563; break; } if (set[104].Get(la.kind)) { - goto case 563; + goto case 566; } else { - goto case 561; + goto case 564; } } - case 561: { - if (la == null) { currentState = 561; break; } + case 564: { + if (la == null) { currentState = 564; break; } Expect(113, la); // "End" - currentState = 562; + currentState = 565; break; } - case 562: { - if (la == null) { currentState = 562; break; } + case 565: { + if (la == null) { currentState = 565; break; } Expect(186, la); // "Property" currentState = 23; break; } - case 563: { - if (la == null) { currentState = 563; break; } + case 566: { + if (la == null) { currentState = 566; break; } if (la.kind == 40) { - stateStack.Push(563); - goto case 385; + stateStack.Push(566); + goto case 389; } else { - goto case 564; + goto case 567; } } - case 564: { - if (la == null) { currentState = 564; break; } + case 567: { + if (la == null) { currentState = 567; break; } if (set[143].Get(la.kind)) { - currentState = 564; + currentState = 567; break; } else { if (la.kind == 128) { - currentState = 565; + currentState = 568; break; } else { if (la.kind == 198) { - currentState = 565; + currentState = 568; break; } else { Error(la); - goto case 565; + goto case 568; } } } } - case 565: { - if (la == null) { currentState = 565; break; } + case 568: { + if (la == null) { currentState = 568; break; } if (la.kind == 37) { - currentState = 570; + currentState = 573; break; } else { - goto case 566; + goto case 569; } } - case 566: { - stateStack.Push(567); - goto case 229; + case 569: { + stateStack.Push(570); + goto case 233; } - case 567: { - if (la == null) { currentState = 567; break; } + case 570: { + if (la == null) { currentState = 570; break; } Expect(113, la); // "End" - currentState = 568; + currentState = 571; break; } - case 568: { - if (la == null) { currentState = 568; break; } + case 571: { + if (la == null) { currentState = 571; break; } if (la.kind == 128) { - currentState = 569; + currentState = 572; break; } else { if (la.kind == 198) { - currentState = 569; + currentState = 572; break; } else { Error(la); - goto case 569; + goto case 572; } } } - case 569: { - stateStack.Push(561); - goto case 23; - } - case 570: { - SetIdentifierExpected(la); - goto case 571; - } - case 571: { - if (la == null) { currentState = 571; break; } - if (set[73].Get(la.kind)) { - stateStack.Push(572); - goto case 372; - } else { - goto case 572; - } - } case 572: { - if (la == null) { currentState = 572; break; } - Expect(38, la); // ")" - currentState = 566; - break; + stateStack.Push(564); + goto case 23; } case 573: { SetIdentifierExpected(la); @@ -6911,7 +6902,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 574; break; } if (set[73].Get(la.kind)) { stateStack.Push(575); - goto case 372; + goto case 376; } else { goto case 575; } @@ -6919,34 +6910,35 @@ partial class ExpressionFinder { case 575: { if (la == null) { currentState = 575; break; } Expect(38, la); // ")" - currentState = 556; + currentState = 569; break; } case 576: { SetIdentifierExpected(la); - goto case 553; + goto case 577; } case 577: { - stateStack.Push(550); - goto case 56; + if (la == null) { currentState = 577; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(578); + goto case 376; + } else { + goto case 578; + } } case 578: { - PushContext(Context.Type, la, t); - stateStack.Push(579); - goto case 37; + if (la == null) { currentState = 578; break; } + Expect(38, la); // ")" + currentState = 559; + break; } case 579: { - PopContext(); - goto case 580; + SetIdentifierExpected(la); + goto case 556; } case 580: { - if (la == null) { currentState = 580; break; } - if (la.kind == 22) { - currentState = 581; - break; - } else { - goto case 549; - } + stateStack.Push(553); + goto case 56; } case 581: { PushContext(Context.Type, la, t); @@ -6955,420 +6947,438 @@ partial class ExpressionFinder { } case 582: { PopContext(); - goto case 580; + goto case 583; } case 583: { if (la == null) { currentState = 583; break; } + if (la.kind == 22) { + currentState = 584; + break; + } else { + goto case 552; + } + } + case 584: { + PushContext(Context.Type, la, t); + stateStack.Push(585); + goto case 37; + } + case 585: { + PopContext(); + goto case 583; + } + case 586: { + if (la == null) { currentState = 586; break; } if (la.kind == 40) { - stateStack.Push(583); - goto case 385; + stateStack.Push(586); + goto case 389; } else { if (la.kind == 162) { - stateStack.Push(548); + stateStack.Push(551); goto case 67; } else { if (set[16].Get(la.kind)) { PushContext(Context.Type, la, t); - stateStack.Push(584); + stateStack.Push(587); goto case 37; } else { Error(la); - goto case 548; + goto case 551; } } } } - case 584: { + case 587: { PopContext(); - goto case 548; + goto case 551; } - case 585: { + case 588: { SetIdentifierExpected(la); - goto case 586; + goto case 589; } - case 586: { - if (la == null) { currentState = 586; break; } + case 589: { + if (la == null) { currentState = 589; break; } if (set[73].Get(la.kind)) { - stateStack.Push(587); - goto case 372; + stateStack.Push(590); + goto case 376; } else { - goto case 587; + goto case 590; } } - case 587: { - if (la == null) { currentState = 587; break; } + case 590: { + if (la == null) { currentState = 590; break; } Expect(38, la); // ")" - currentState = 547; + currentState = 550; break; } - case 588: { - if (la == null) { currentState = 588; break; } + case 591: { + if (la == null) { currentState = 591; break; } Expect(98, la); // "Custom" - currentState = 589; + currentState = 592; break; } - case 589: { - stateStack.Push(590); - goto case 600; + case 592: { + stateStack.Push(593); + goto case 603; } - case 590: { - if (la == null) { currentState = 590; break; } + case 593: { + if (la == null) { currentState = 593; break; } if (set[109].Get(la.kind)) { - goto case 592; + goto case 595; } else { Expect(113, la); // "End" - currentState = 591; + currentState = 594; break; } } - case 591: { - if (la == null) { currentState = 591; break; } + case 594: { + if (la == null) { currentState = 594; break; } Expect(119, la); // "Event" currentState = 23; break; } - case 592: { - if (la == null) { currentState = 592; break; } + case 595: { + if (la == null) { currentState = 595; break; } if (la.kind == 40) { - stateStack.Push(592); - goto case 385; + stateStack.Push(595); + goto case 389; } else { if (la.kind == 56) { - currentState = 593; + currentState = 596; break; } else { if (la.kind == 193) { - currentState = 593; + currentState = 596; break; } else { if (la.kind == 189) { - currentState = 593; + currentState = 596; break; } else { Error(la); - goto case 593; + goto case 596; } } } } } - case 593: { - if (la == null) { currentState = 593; break; } + case 596: { + if (la == null) { currentState = 596; break; } Expect(37, la); // "(" - currentState = 594; + currentState = 597; break; } - case 594: { - stateStack.Push(595); - goto case 372; + case 597: { + stateStack.Push(598); + goto case 376; } - case 595: { - if (la == null) { currentState = 595; break; } + case 598: { + if (la == null) { currentState = 598; break; } Expect(38, la); // ")" - currentState = 596; + currentState = 599; break; } - case 596: { - stateStack.Push(597); - goto case 229; + case 599: { + stateStack.Push(600); + goto case 233; } - case 597: { - if (la == null) { currentState = 597; break; } + case 600: { + if (la == null) { currentState = 600; break; } Expect(113, la); // "End" - currentState = 598; + currentState = 601; break; } - case 598: { - if (la == null) { currentState = 598; break; } + case 601: { + if (la == null) { currentState = 601; break; } if (la.kind == 56) { - currentState = 599; + currentState = 602; break; } else { if (la.kind == 193) { - currentState = 599; + currentState = 602; break; } else { if (la.kind == 189) { - currentState = 599; + currentState = 602; break; } else { Error(la); - goto case 599; + goto case 602; } } } } - case 599: { - stateStack.Push(590); + case 602: { + stateStack.Push(593); goto case 23; } - case 600: { - if (la == null) { currentState = 600; break; } + case 603: { + if (la == null) { currentState = 603; break; } Expect(119, la); // "Event" - currentState = 601; + currentState = 604; break; } - case 601: { + case 604: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(602); - goto case 174; + stateStack.Push(605); + goto case 178; } - case 602: { + case 605: { PopContext(); - goto case 603; + goto case 606; } - case 603: { - if (la == null) { currentState = 603; break; } + case 606: { + if (la == null) { currentState = 606; break; } if (la.kind == 63) { - currentState = 613; + currentState = 616; break; } else { if (set[144].Get(la.kind)) { if (la.kind == 37) { - currentState = 610; + currentState = 613; break; } else { - goto case 604; + goto case 607; } } else { Error(la); - goto case 604; + goto case 607; } } } - case 604: { - if (la == null) { currentState = 604; break; } + case 607: { + if (la == null) { currentState = 607; break; } if (la.kind == 136) { - currentState = 605; + currentState = 608; break; } else { goto case 23; } } - case 605: { + case 608: { PushContext(Context.Type, la, t); - stateStack.Push(606); + stateStack.Push(609); goto case 37; } - case 606: { + case 609: { PopContext(); - goto case 607; + goto case 610; } - case 607: { - if (la == null) { currentState = 607; break; } + case 610: { + if (la == null) { currentState = 610; break; } if (la.kind == 22) { - currentState = 608; + currentState = 611; break; } else { goto case 23; } } - case 608: { + case 611: { PushContext(Context.Type, la, t); - stateStack.Push(609); + stateStack.Push(612); goto case 37; } - case 609: { + case 612: { PopContext(); - goto case 607; + goto case 610; } - case 610: { + case 613: { SetIdentifierExpected(la); - goto case 611; + goto case 614; } - case 611: { - if (la == null) { currentState = 611; break; } + case 614: { + if (la == null) { currentState = 614; break; } if (set[73].Get(la.kind)) { - stateStack.Push(612); - goto case 372; + stateStack.Push(615); + goto case 376; } else { - goto case 612; + goto case 615; } } - case 612: { - if (la == null) { currentState = 612; break; } + case 615: { + if (la == null) { currentState = 615; break; } Expect(38, la); // ")" - currentState = 604; + currentState = 607; break; } - case 613: { + case 616: { PushContext(Context.Type, la, t); - stateStack.Push(614); + stateStack.Push(617); goto case 37; } - case 614: { + case 617: { PopContext(); - goto case 604; + goto case 607; } - case 615: { - if (la == null) { currentState = 615; break; } + case 618: { + if (la == null) { currentState = 618; break; } Expect(101, la); // "Declare" - currentState = 616; + currentState = 619; break; } - case 616: { - if (la == null) { currentState = 616; break; } + case 619: { + if (la == null) { currentState = 619; break; } if (la.kind == 62 || la.kind == 66 || la.kind == 223) { - currentState = 617; + currentState = 620; break; } else { - goto case 617; + goto case 620; } } - case 617: { - if (la == null) { currentState = 617; break; } + case 620: { + if (la == null) { currentState = 620; break; } if (la.kind == 210) { - currentState = 618; + currentState = 621; break; } else { if (la.kind == 127) { - currentState = 618; + currentState = 621; break; } else { Error(la); - goto case 618; + goto case 621; } } } - case 618: { + case 621: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(619); - goto case 174; + stateStack.Push(622); + goto case 178; } - case 619: { + case 622: { PopContext(); - goto case 620; + goto case 623; } - case 620: { - if (la == null) { currentState = 620; break; } + case 623: { + if (la == null) { currentState = 623; break; } Expect(149, la); // "Lib" - currentState = 621; + currentState = 624; break; } - case 621: { - if (la == null) { currentState = 621; break; } + case 624: { + if (la == null) { currentState = 624; break; } Expect(3, la); // LiteralString - currentState = 622; + currentState = 625; break; } - case 622: { - if (la == null) { currentState = 622; break; } + case 625: { + if (la == null) { currentState = 625; break; } if (la.kind == 59) { - currentState = 630; + currentState = 633; break; } else { - goto case 623; + goto case 626; } } - case 623: { - if (la == null) { currentState = 623; break; } + case 626: { + if (la == null) { currentState = 626; break; } if (la.kind == 37) { - currentState = 627; + currentState = 630; break; } else { - goto case 624; + goto case 627; } } - case 624: { - if (la == null) { currentState = 624; break; } + case 627: { + if (la == null) { currentState = 627; break; } if (la.kind == 63) { - currentState = 625; + currentState = 628; break; } else { goto case 23; } } - case 625: { + case 628: { PushContext(Context.Type, la, t); - stateStack.Push(626); + stateStack.Push(629); goto case 37; } - case 626: { + case 629: { PopContext(); goto case 23; } - case 627: { + case 630: { SetIdentifierExpected(la); - goto case 628; + goto case 631; } - case 628: { - if (la == null) { currentState = 628; break; } + case 631: { + if (la == null) { currentState = 631; break; } if (set[73].Get(la.kind)) { - stateStack.Push(629); - goto case 372; + stateStack.Push(632); + goto case 376; } else { - goto case 629; + goto case 632; } } - case 629: { - if (la == null) { currentState = 629; break; } + case 632: { + if (la == null) { currentState = 632; break; } Expect(38, la); // ")" - currentState = 624; + currentState = 627; break; } - case 630: { - if (la == null) { currentState = 630; break; } + case 633: { + if (la == null) { currentState = 633; break; } Expect(3, la); // LiteralString - currentState = 623; + currentState = 626; break; } - case 631: { - if (la == null) { currentState = 631; break; } + case 634: { + if (la == null) { currentState = 634; break; } if (la.kind == 210) { - currentState = 632; + currentState = 635; break; } else { if (la.kind == 127) { - currentState = 632; + currentState = 635; break; } else { Error(la); - goto case 632; + goto case 635; } } } - case 632: { + case 635: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 633; + goto case 636; } - case 633: { - if (la == null) { currentState = 633; break; } - currentState = 634; + case 636: { + if (la == null) { currentState = 636; break; } + currentState = 637; break; } - case 634: { + case 637: { PopContext(); - goto case 635; + goto case 638; } - case 635: { - if (la == null) { currentState = 635; break; } + case 638: { + if (la == null) { currentState = 638; break; } if (la.kind == 37) { - currentState = 641; + currentState = 644; break; } else { if (la.kind == 63) { - currentState = 639; + currentState = 642; break; } else { - goto case 636; + goto case 639; } } } - case 636: { - stateStack.Push(637); - goto case 229; + case 639: { + stateStack.Push(640); + goto case 233; } - case 637: { - if (la == null) { currentState = 637; break; } + case 640: { + if (la == null) { currentState = 640; break; } Expect(113, la); // "End" - currentState = 638; + currentState = 641; break; } - case 638: { - if (la == null) { currentState = 638; break; } + case 641: { + if (la == null) { currentState = 641; break; } if (la.kind == 210) { currentState = 23; break; @@ -7377,133 +7387,128 @@ partial class ExpressionFinder { currentState = 23; break; } else { - goto case 471; + goto case 473; } } } - case 639: { + case 642: { PushContext(Context.Type, la, t); - stateStack.Push(640); + stateStack.Push(643); goto case 37; } - case 640: { + case 643: { PopContext(); - goto case 636; + goto case 639; } - case 641: { + case 644: { SetIdentifierExpected(la); - goto case 642; + goto case 645; } - case 642: { - if (la == null) { currentState = 642; break; } + case 645: { + if (la == null) { currentState = 645; break; } if (set[142].Get(la.kind)) { if (la.kind == 169) { - currentState = 644; + currentState = 647; break; } else { if (set[73].Get(la.kind)) { - stateStack.Push(643); - goto case 372; + stateStack.Push(646); + goto case 376; } else { Error(la); - goto case 643; + goto case 646; } } } else { - goto case 643; + goto case 646; } } - case 643: { - if (la == null) { currentState = 643; break; } + case 646: { + if (la == null) { currentState = 646; break; } Expect(38, la); // ")" - currentState = 635; + currentState = 638; break; } - case 644: { - stateStack.Push(643); - goto case 438; - } - case 645: { + case 647: { stateStack.Push(646); + goto case 440; + } + case 648: { + stateStack.Push(649); SetIdentifierExpected(la); - goto case 647; + goto case 650; } - case 646: { - if (la == null) { currentState = 646; break; } + case 649: { + if (la == null) { currentState = 649; break; } if (la.kind == 22) { - currentState = 645; + currentState = 648; break; } else { goto case 23; } } - case 647: { - if (la == null) { currentState = 647; break; } + case 650: { + if (la == null) { currentState = 650; break; } if (la.kind == 88) { - currentState = 648; + currentState = 651; break; } else { - goto case 648; + goto case 651; } } - case 648: { + case 651: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(649); - goto case 656; + stateStack.Push(652); + goto case 658; } - case 649: { + case 652: { PopContext(); - goto case 650; + goto case 653; } - case 650: { - if (la == null) { currentState = 650; break; } + case 653: { + if (la == null) { currentState = 653; break; } if (la.kind == 63) { - currentState = 652; + currentState = 655; break; } else { - goto case 651; + goto case 654; } } - case 651: { - if (la == null) { currentState = 651; break; } + case 654: { + if (la == null) { currentState = 654; break; } if (la.kind == 20) { - goto case 187; + goto case 191; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 652: { + case 655: { PushContext(Context.Type, la, t); - goto case 653; + goto case 656; } - case 653: { - if (la == null) { currentState = 653; break; } + case 656: { + if (la == null) { currentState = 656; break; } if (la.kind == 162) { - stateStack.Push(654); + stateStack.Push(657); goto case 67; } else { if (set[16].Get(la.kind)) { - PushContext(Context.Type, la, t); - stateStack.Push(655); + stateStack.Push(657); goto case 37; } else { Error(la); - goto case 654; + goto case 657; } } } - case 654: { - PopContext(); - goto case 651; - } - case 655: { + case 657: { PopContext(); goto case 654; } - case 656: { - if (la == null) { currentState = 656; break; } + case 658: { + if (la == null) { currentState = 658; break; } if (set[128].Get(la.kind)) { currentState = stateStack.Pop(); break; @@ -7519,254 +7524,249 @@ partial class ExpressionFinder { } } } - case 657: { + case 659: { isMissingModifier = false; - goto case 525; + goto case 527; } - case 658: { - if (la == null) { currentState = 658; break; } + case 660: { + if (la == null) { currentState = 660; break; } Expect(136, la); // "Implements" - currentState = 659; + currentState = 661; break; } - case 659: { + case 661: { PushContext(Context.Type, la, t); - stateStack.Push(660); + stateStack.Push(662); goto case 37; } - case 660: { + case 662: { PopContext(); - goto case 661; + goto case 663; } - case 661: { - if (la == null) { currentState = 661; break; } + case 663: { + if (la == null) { currentState = 663; break; } if (la.kind == 22) { - currentState = 662; + currentState = 664; break; } else { - stateStack.Push(517); + stateStack.Push(519); goto case 23; } } - case 662: { + case 664: { PushContext(Context.Type, la, t); - stateStack.Push(663); + stateStack.Push(665); goto case 37; } - case 663: { + case 665: { PopContext(); - goto case 661; + goto case 663; } - case 664: { - if (la == null) { currentState = 664; break; } + case 666: { + if (la == null) { currentState = 666; break; } Expect(140, la); // "Inherits" - currentState = 665; + currentState = 667; break; } - case 665: { + case 667: { PushContext(Context.Type, la, t); - stateStack.Push(666); + stateStack.Push(668); goto case 37; } - case 666: { + case 668: { PopContext(); - stateStack.Push(515); + stateStack.Push(517); goto case 23; } - case 667: { - if (la == null) { currentState = 667; break; } + case 669: { + if (la == null) { currentState = 669; break; } Expect(169, la); // "Of" - currentState = 668; + currentState = 670; break; } - case 668: { - stateStack.Push(669); - goto case 438; + case 670: { + stateStack.Push(671); + goto case 440; } - case 669: { - if (la == null) { currentState = 669; break; } + case 671: { + if (la == null) { currentState = 671; break; } Expect(38, la); // ")" - currentState = 512; + currentState = 514; break; } - case 670: { + case 672: { isMissingModifier = false; goto case 28; } - case 671: { + case 673: { PushContext(Context.Type, la, t); - stateStack.Push(672); + stateStack.Push(674); goto case 37; } - case 672: { + case 674: { PopContext(); - goto case 673; + goto case 675; } - case 673: { - if (la == null) { currentState = 673; break; } + case 675: { + if (la == null) { currentState = 675; break; } if (la.kind == 22) { - currentState = 674; + currentState = 676; break; } else { stateStack.Push(17); goto case 23; } } - case 674: { + case 676: { PushContext(Context.Type, la, t); - stateStack.Push(675); + stateStack.Push(677); goto case 37; } - case 675: { + case 677: { PopContext(); - goto case 673; + goto case 675; } - case 676: { - if (la == null) { currentState = 676; break; } + case 678: { + if (la == null) { currentState = 678; break; } Expect(169, la); // "Of" - currentState = 677; + currentState = 679; break; } - case 677: { - stateStack.Push(678); - goto case 438; + case 679: { + stateStack.Push(680); + goto case 440; } - case 678: { - if (la == null) { currentState = 678; break; } + case 680: { + if (la == null) { currentState = 680; break; } Expect(38, la); // ")" currentState = 14; break; } - case 679: { + case 681: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 680; + goto case 682; } - case 680: { - if (la == null) { currentState = 680; break; } + case 682: { + if (la == null) { currentState = 682; break; } if (set[46].Get(la.kind)) { - currentState = 680; + currentState = 682; break; } else { PopContext(); - stateStack.Push(681); + stateStack.Push(683); goto case 23; } } - case 681: { - if (la == null) { currentState = 681; break; } + case 683: { + if (la == null) { currentState = 683; break; } if (set[3].Get(la.kind)) { - stateStack.Push(681); + stateStack.Push(683); goto case 5; } else { Expect(113, la); // "End" - currentState = 682; + currentState = 684; break; } } - case 682: { - if (la == null) { currentState = 682; break; } + case 684: { + if (la == null) { currentState = 684; break; } Expect(160, la); // "Namespace" currentState = 23; break; } - case 683: { - if (la == null) { currentState = 683; break; } + case 685: { + if (la == null) { currentState = 685; break; } Expect(137, la); // "Imports" - currentState = 684; + currentState = 686; break; } - case 684: { + case 686: { PushContext(Context.Importable, la, t); nextTokenIsStartOfImportsOrAccessExpression = true; - goto case 685; + goto case 687; } - case 685: { - if (la == null) { currentState = 685; break; } + case 687: { + if (la == null) { currentState = 687; break; } if (set[145].Get(la.kind)) { - currentState = 691; + currentState = 693; break; } else { if (la.kind == 10) { - currentState = 687; + currentState = 689; break; } else { Error(la); - goto case 686; + goto case 688; } } } - case 686: { + case 688: { PopContext(); goto case 23; } - case 687: { - stateStack.Push(688); - goto case 174; + case 689: { + stateStack.Push(690); + goto case 178; } - case 688: { - if (la == null) { currentState = 688; break; } + case 690: { + if (la == null) { currentState = 690; break; } Expect(20, la); // "=" - currentState = 689; + currentState = 691; break; } - case 689: { - if (la == null) { currentState = 689; break; } + case 691: { + if (la == null) { currentState = 691; break; } Expect(3, la); // LiteralString - currentState = 690; + currentState = 692; break; } - case 690: { - if (la == null) { currentState = 690; break; } + case 692: { + if (la == null) { currentState = 692; break; } Expect(11, la); // XmlCloseTag - currentState = 686; + currentState = 688; break; } - case 691: { - if (la == null) { currentState = 691; break; } + case 693: { + if (la == null) { currentState = 693; break; } if (la.kind == 37) { - stateStack.Push(691); + stateStack.Push(693); goto case 42; } else { if (la.kind == 20 || la.kind == 26) { - currentState = 692; + currentState = 694; break; } else { - goto case 686; + goto case 688; } } } - case 692: { - PushContext(Context.Type, la, t); - stateStack.Push(693); + case 694: { + stateStack.Push(688); goto case 37; } - case 693: { - PopContext(); - goto case 686; - } - case 694: { - if (la == null) { currentState = 694; break; } + case 695: { + if (la == null) { currentState = 695; break; } Expect(173, la); // "Option" - currentState = 695; + currentState = 696; break; } - case 695: { - if (la == null) { currentState = 695; break; } + case 696: { + if (la == null) { currentState = 696; break; } if (la.kind == 121 || la.kind == 139 || la.kind == 207) { - currentState = 697; + currentState = 698; break; } else { if (la.kind == 87) { - currentState = 696; + currentState = 697; break; } else { - goto case 471; + goto case 473; } } } - case 696: { - if (la == null) { currentState = 696; break; } + case 697: { + if (la == null) { currentState = 697; break; } if (la.kind == 213) { currentState = 23; break; @@ -7775,12 +7775,12 @@ partial class ExpressionFinder { currentState = 23; break; } else { - goto case 471; + goto case 473; } } } - case 697: { - if (la == null) { currentState = 697; break; } + case 698: { + if (la == null) { currentState = 698; break; } if (la.kind == 170 || la.kind == 171) { currentState = 23; break;