diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs index 66a22f77e5..b4ac1dcb00 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs @@ -81,7 +81,7 @@ namespace ICSharpCode.VBNetBinding CodeCompletionItemProvider.ConvertCompletionData(result, data, expressionResult.Context); - if (addedKeywords) + if (addedKeywords && result.Items.Any()) AddTemplates(editor, result); string word = editor.GetWordBeforeCaret().Trim(); diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs index 6b4fc0183e..d027ad4a37 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs @@ -44,7 +44,7 @@ namespace ICSharpCode.VBNetBinding static List blockTokens = new List( new int[] { Tokens.Class, Tokens.Module, Tokens.Namespace, Tokens.Interface, Tokens.Structure, - Tokens.Sub, Tokens.Function, Tokens.Operator, + Tokens.Sub, Tokens.Function, Tokens.Operator, Tokens.Enum, Tokens.If, Tokens.For, Tokens.Do, Tokens.While, Tokens.With, Tokens.Select, Tokens.Try, Tokens.Property, Tokens.Get, Tokens.Set }); @@ -421,6 +421,7 @@ namespace ICSharpCode.VBNetBinding return (type == Tokens.Class) || (type == Tokens.Module) || (type == Tokens.Structure) || + (type == Tokens.Enum) || (type == Tokens.Interface); } diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/TextEditorOptions.xaml b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/TextEditorOptions.xaml index b6ccf42697..871e587d54 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/TextEditorOptions.xaml +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/TextEditorOptions.xaml @@ -1,11 +1,10 @@ - - + - + - + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs index 32ee8243ab..6f83015ff9 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs @@ -80,8 +80,8 @@ namespace ICSharpCode.VBNetBinding insightHandler.HighlightParameter(insightWindow, GetArgumentIndex(editor) + 1); insightWindow.CaretPositionChanged += delegate { Run(insightWindow, editor); };; } - return CodeCompletionKeyPressResult.EatKey; } + return CodeCompletionKeyPressResult.EatKey; } break; case '\n': diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj index eeab5954c8..3c1f739245 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj @@ -129,6 +129,10 @@ ICSharpCode.SharpDevelop.Dom False + + {8035765F-D51F-4A0C-A746-2FD100E19419} + ICSharpCode.SharpDevelop.Widgets + diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg index b5072ec09c..cab05c8077 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 } [ ( "." | "=" ) TypeName ] + ( "Global" | Identifier | PrimitiveTypeName ) { TypeSuffix } [ ( "." | "=" ) (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] | XmlOpenTag Identifier "=" LiteralString XmlCloseTag ) (. PopContext(); .) @@ -328,14 +328,24 @@ ClassOrModuleOrStructureTypeDeclaration = . EnumTypeDeclaration = - "Enum" Identifier [ "As" TypeName ] StatementTerminator - { { AttributeBlock } Identifier [ "=" Expression ] StatementTerminator } + (. PushContext(Context.TypeDeclaration, la, t); .) + "Enum" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator + { + { AttributeBlock } + (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "=" Expression ] + StatementTerminator + } "End" "Enum" StatementTerminator + (. PopContext(); .) . InterfaceDeclaration = - "Interface" Identifier [ "(" "Of" GenericTypeParameterDeclaration ")" ] StatementTerminator - [ (. PushContext(Context.Type, la, t); .) "Inherits" TypeName (. PopContext(); .) { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) } StatementTerminator ] + (. PushContext(Context.TypeDeclaration, la, t); .) + "Interface" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "(" "Of" GenericTypeParameterDeclaration ")" ] StatementTerminator + [ "Inherits" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) { "," (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) } StatementTerminator ] { { AttributeBlock } (.OnEachPossiblePath: isMissingModifier = true; .) { TypeOrMemberModifier (. isMissingModifier = false; .) } (. isMissingModifier = false; .) @@ -343,7 +353,8 @@ InterfaceDeclaration = | InterfaceDeclaration | InterfaceMemberDeclaration ) } (. isMissingModifier = false; .) - "End" "Interface" StatementTerminator + "End" "Interface" StatementTerminator + (. PopContext(); .) . InterfaceMemberDeclaration = @@ -355,11 +366,15 @@ TypeOrMemberModifier = . InterfaceEvent = - "Event" Identifier [ "As" TypeName | "(" [ ParameterList ] ")" ] StatementTerminator + "Event" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | "(" [ ParameterList ] ")" ] + StatementTerminator . InterfaceProperty = - "Property" Identifier [ "(" [ ParameterList ] ")" ] [ "As" { AttributeBlock } TypeName ] StatementTerminator + "Property" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "(" [ ParameterList ] ")" ] [ "As" (. PushContext(Context.Type, la, t); .) { AttributeBlock } TypeName (. PopContext(); .) ] + StatementTerminator . InterfaceSubOrFunction = @@ -386,7 +401,7 @@ GenericTypeParameterDeclaration = DelegateTypeDeclaration = "Delegate" ("Sub" | "Function") (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) ANY (. PopContext(); .) - [ "(" [ ParameterList ] ")" ] [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator + { "(" [ "Of" GenericTypeParameterDeclaration | ParameterList ] ")" } [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] StatementTerminator . MemberDeclaration = @@ -419,7 +434,7 @@ ExternalMemberDeclaration = EventMemberDeclaration = "Event" (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) ( "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) | [ "(" [ ParameterList ] ")" ] ) - [ "Implements" TypeName /*"." IdentifierOrKeyword*/ { "," TypeName /*"." IdentifierOrKeyword*/ } ] + [ "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 . @@ -439,7 +454,7 @@ PropertyDeclaration = (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) [ "(" [ ParameterList ] ")" ] [ "As" { AttributeBlock } ( NewExpression | (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ) ] - [ "Implements" TypeName /*"." IdentifierOrKeyword*/ { "," TypeName /*"." 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 @@ -470,7 +485,7 @@ MemberVariableOrConstantDeclaration = MemberVariableOrConstantDeclarator = [ "Const" ] (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) IdentifierForFieldDeclaration (. PopContext(); .) - [ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | TypeName ) (. PopContext(); .) ] + [ "As" (. PushContext(Context.Type, la, t); .) ( NewExpression | (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ) (. PopContext(); .) ] [ "=" Expression ] . @@ -800,7 +815,7 @@ PrimitiveTypeName = TypeName = ( "Global" | Identifier | PrimitiveTypeName | "?" /* used for ? = completion */ ) { TypeSuffix } { "." IdentifierOrKeyword { TypeSuffix } } . -TypeSuffix = "(" ( "Of" [ TypeName ] { "," [ TypeName ] } | [ ArgumentList ] ) ")" . +TypeSuffix = "(" ( "Of" [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] { "," [ (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] } | [ ArgumentList ] ) ")" . IdentifierOrKeyword = ident | "AddHandler" @@ -1141,7 +1156,9 @@ TryStatement = StatementTerminatorAndBlock { "Catch" - [ (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] ] + [ (. PushContext(Context.Identifier, la, t); .) (.OnEachPossiblePath: SetIdentifierExpected(la); .) Identifier (. PopContext(); .) + [ "As" (. PushContext(Context.Type, la, t); .) TypeName (. PopContext(); .) ] + ] [ "When" Expression ] StatementTerminatorAndBlock } diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs index 7bc83a7b3b..e1bbf171df 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs @@ -9,8 +9,8 @@ namespace ICSharpCode.NRefactory.Parser.VB { partial class ExpressionFinder { - const int startOfExpression = 51; - const int endOfStatementTerminatorAndBlock = 228; + const int startOfExpression = 56; + const int endOfStatementTerminatorAndBlock = 233; static BitArray GetExpectedSet(int state) { switch (state) { @@ -25,9 +25,9 @@ partial class ExpressionFinder { case 5: return set[3]; case 6: - case 66: - case 229: - case 460: + case 71: + case 234: + case 471: { BitArray a = new BitArray(239); return a; @@ -37,773 +37,791 @@ partial class ExpressionFinder { case 8: return set[5]; case 9: - case 157: - case 163: - case 169: - case 206: - case 210: - case 249: - case 349: - case 358: - case 411: - case 450: - case 458: - case 466: - case 489: - case 524: - case 578: - case 592: - case 661: - return set[6]; case 10: - case 490: - case 491: - case 535: - case 545: + case 20: { BitArray a = new BitArray(239); - a.Set(1, true); - a.Set(21, true); - a.Set(37, true); + a.Set(142, true); return a; } case 11: - case 18: - case 19: - case 31: - case 221: - case 224: - case 225: - case 235: - case 250: + case 162: + case 168: + case 174: + case 211: + case 215: case 254: - case 276: - case 291: - case 302: - case 305: - case 311: - case 316: - case 325: - case 326: - case 346: - case 366: + case 354: + case 363: + case 416: + case 458: case 468: - case 483: - case 492: - case 501: - case 518: - case 522: - case 530: - case 536: - case 539: - case 546: - case 549: - case 573: - case 576: - case 600: - case 610: - case 614: - case 639: - case 660: + case 479: + case 509: + case 544: + case 601: + case 618: + case 687: + return set[6]; + case 12: + case 13: + case 510: + case 511: + case 555: + case 565: { BitArray a = new BitArray(239); a.Set(1, true); a.Set(21, true); + a.Set(37, true); return a; } - case 12: - case 13: - return set[7]; case 14: - case 15: - return set[8]; - case 16: - case 222: - case 236: - case 252: - case 306: - case 347: - case 391: - case 499: - case 519: - case 537: - case 541: - case 547: - case 574: - case 611: + case 21: + case 23: + case 24: + case 36: + case 226: + case 229: + case 230: + case 240: + case 255: + 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 559: + case 566: + case 569: + case 596: + case 599: + case 626: + case 636: + case 640: + case 666: + case 686: + case 693: { BitArray a = new BitArray(239); - a.Set(113, true); + a.Set(1, true); + a.Set(21, true); return a; } + case 15: + case 16: + return set[7]; case 17: - case 464: + 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: { BitArray a = new BitArray(239); - a.Set(142, true); + a.Set(113, true); return a; } - case 20: + case 22: + case 487: + case 522: + return set[9]; + case 25: { BitArray a = new BitArray(239); a.Set(1, true); return a; } - case 21: - case 22: - return set[9]; - case 23: - case 643: - return set[10]; - case 24: - return set[11]; - case 25: - return set[12]; case 26: case 27: - case 122: - case 179: - case 180: - case 230: - case 381: - case 382: - case 399: - case 400: - case 401: - case 402: - case 477: - case 478: - case 511: - case 512: - case 606: - case 607: - case 653: - case 654: - return set[13]; + return set[10]; case 28: + case 670: + return set[11]; case 29: - case 451: - case 459: - case 479: - case 480: - case 597: - case 608: - case 609: - return set[14]; + return set[12]; case 30: + return set[13]; + case 31: case 32: - case 126: - case 136: - case 152: - case 167: - case 183: - case 261: - case 286: - case 365: - case 378: - case 414: - case 454: - case 474: - case 482: - case 558: - case 582: - case 587: - case 599: - case 613: + 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 635: - case 638: - case 645: - case 648: - case 666: - return set[15]; + case 633: + case 679: + case 680: + return set[14]; case 33: - case 36: - return set[16]; case 34: - return set[17]; + case 459: + case 460: + case 469: + case 470: + case 499: + case 500: + case 623: + case 634: + case 635: + return set[15]; case 35: - case 72: - case 76: + case 37: case 131: - case 341: - case 417: + 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 581: + case 605: + case 608: + case 613: + case 625: + case 639: + case 659: + case 662: + case 665: + case 671: + case 674: + case 692: + return set[16]; + case 38: + case 41: + return set[17]; + case 39: return set[18]; - case 37: - case 142: - case 149: - case 153: - case 215: - case 385: - case 410: - case 413: - case 513: - case 514: - case 570: + case 40: + case 77: + case 81: + case 136: + case 346: + case 422: + return set[19]; + case 42: + case 147: + case 154: + case 158: + case 220: + case 390: + case 415: + case 418: + case 533: + case 534: + case 593: { BitArray a = new BitArray(239); a.Set(37, true); return a; } - case 38: - case 39: - case 133: - case 134: - return set[19]; - case 40: - case 135: - case 218: - case 363: - case 388: - case 412: - case 428: - case 457: - case 463: - case 486: - case 516: - case 552: - case 555: - case 564: + case 43: + case 44: + case 138: + case 139: + 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 586: - case 603: - case 617: - case 642: - case 652: + case 575: + case 587: + case 595: + case 612: + case 629: + case 643: + case 669: + case 678: { BitArray a = new BitArray(239); a.Set(38, true); return a; } - case 41: - case 42: case 46: case 47: - case 48: - case 50: - case 422: - case 423: - return set[20]; - case 43: - case 44: + case 51: + case 52: + case 53: + case 55: + case 427: + case 428: return set[21]; - case 45: - case 144: - case 151: - case 344: - { - BitArray a = new BitArray(239); - a.Set(22, true); - return a; - } + case 48: case 49: - case 137: - case 146: - case 362: - case 364: - case 368: - case 376: - case 421: - case 425: - case 435: - case 442: - case 449: + return set[22]; + case 50: + case 149: + case 156: + case 349: { BitArray a = new BitArray(239); a.Set(22, true); - a.Set(38, true); return a; } - case 51: - case 52: case 54: - case 55: - case 56: - case 59: - case 74: - case 124: - case 143: - case 145: - case 147: - case 150: - case 159: - case 161: - case 201: - case 234: - case 238: - case 240: - case 241: - case 258: - case 275: - case 280: - case 289: - case 295: - case 297: - case 301: - case 304: - case 310: - case 321: - case 323: - case 329: - case 343: - case 345: - case 377: - case 404: - case 419: - case 420: - case 473: - case 557: - return set[22]; - case 53: + case 142: + case 151: + case 367: + case 369: + case 373: + case 381: + case 426: + case 430: + case 432: + case 433: + case 443: + case 450: + case 457: + { + BitArray a = new BitArray(239); + a.Set(22, true); + a.Set(38, true); + return a; + } + case 56: case 57: + case 59: + case 60: + case 61: + case 64: + case 79: + case 129: + case 148: + case 150: + case 152: + case 155: + case 164: + case 166: + case 206: + case 239: + case 243: + case 245: + case 246: + case 263: + case 280: + case 285: + case 294: + case 300: + case 302: + 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: return set[23]; case 58: - case 68: - case 69: + case 62: + return set[24]; + case 63: + case 73: + case 74: { BitArray a = new BitArray(239); a.Set(35, true); return a; } - case 60: - case 75: - case 445: + case 65: + case 80: + case 453: { BitArray a = new BitArray(239); a.Set(22, true); a.Set(36, true); return a; } - case 61: + case 66: { BitArray a = new BitArray(239); a.Set(36, true); return a; } - case 62: - case 96: + case 67: + case 101: { BitArray a = new BitArray(239); a.Set(162, true); return a; } - case 63: - case 64: - return set[24]; - case 65: - case 77: + case 68: + case 69: + return set[25]; + case 70: + case 82: { BitArray a = new BitArray(239); a.Set(233, true); return a; } - case 67: - return set[25]; - case 70: + case 72: + return set[26]; + case 75: { BitArray a = new BitArray(239); a.Set(26, true); a.Set(147, true); return a; } - case 71: + case 76: { BitArray a = new BitArray(239); a.Set(26, true); return a; } - case 73: - case 182: - case 184: - case 185: - case 288: - case 662: + case 78: + case 187: + case 189: + case 190: + case 293: + case 688: { BitArray a = new BitArray(239); a.Set(20, true); return a; } - case 78: - case 307: + case 83: + case 312: { BitArray a = new BitArray(239); a.Set(231, true); return a; } - case 79: + case 84: { BitArray a = new BitArray(239); a.Set(230, true); return a; } - case 80: + case 85: { BitArray a = new BitArray(239); a.Set(224, true); return a; } - case 81: + case 86: { BitArray a = new BitArray(239); a.Set(223, true); return a; } - case 82: - case 253: + case 87: + case 258: { BitArray a = new BitArray(239); a.Set(218, true); return a; } - case 83: + case 88: { BitArray a = new BitArray(239); a.Set(213, true); return a; } - case 84: + case 89: { BitArray a = new BitArray(239); a.Set(212, true); return a; } - case 85: + case 90: { BitArray a = new BitArray(239); a.Set(211, true); return a; } - case 86: - case 392: + case 91: + case 397: { BitArray a = new BitArray(239); a.Set(210, true); return a; } - case 87: + case 92: { BitArray a = new BitArray(239); a.Set(209, true); return a; } - case 88: + case 93: { BitArray a = new BitArray(239); a.Set(206, true); return a; } - case 89: + case 94: { BitArray a = new BitArray(239); a.Set(203, true); return a; } - case 90: - case 313: + case 95: + case 318: { BitArray a = new BitArray(239); a.Set(197, true); return a; } - case 91: - case 523: - case 542: + case 96: + case 543: + case 562: { BitArray a = new BitArray(239); a.Set(186, true); return a; } - case 92: + case 97: { BitArray a = new BitArray(239); a.Set(184, true); return a; } - case 93: + case 98: { BitArray a = new BitArray(239); a.Set(176, true); return a; } - case 94: + case 99: { BitArray a = new BitArray(239); a.Set(170, true); return a; } - case 95: - case 270: - case 277: - case 292: + case 100: + case 275: + case 282: + case 297: { BitArray a = new BitArray(239); a.Set(163, true); return a; } - case 97: + case 102: { BitArray a = new BitArray(239); a.Set(147, true); return a; } - case 98: - case 188: + case 103: case 193: - case 195: + case 198: + case 200: { BitArray a = new BitArray(239); a.Set(146, true); return a; } - case 99: - case 190: - case 194: + case 104: + case 195: + case 199: { BitArray a = new BitArray(239); a.Set(143, true); return a; } - case 100: + case 105: { BitArray a = new BitArray(239); a.Set(139, true); return a; } - case 101: + case 106: { BitArray a = new BitArray(239); a.Set(133, true); return a; } - case 102: - case 223: + case 107: + case 228: { BitArray a = new BitArray(239); a.Set(127, true); return a; } - case 103: - case 213: + case 108: + case 218: { BitArray a = new BitArray(239); a.Set(126, true); return a; } - case 104: + case 109: { BitArray a = new BitArray(239); a.Set(124, true); return a; } - case 105: + case 110: { BitArray a = new BitArray(239); a.Set(121, true); return a; } - case 106: - case 160: + case 111: + case 165: { BitArray a = new BitArray(239); a.Set(116, true); return a; } - case 107: + case 112: { BitArray a = new BitArray(239); a.Set(108, true); return a; } - case 108: + case 113: { BitArray a = new BitArray(239); a.Set(107, true); return a; } - case 109: + case 114: { BitArray a = new BitArray(239); a.Set(104, true); return a; } - case 110: - case 565: + case 115: + case 588: { BitArray a = new BitArray(239); a.Set(98, true); return a; } - case 111: + case 116: { BitArray a = new BitArray(239); a.Set(87, true); return a; } - case 112: + case 117: { BitArray a = new BitArray(239); a.Set(84, true); return a; } - case 113: - case 172: - case 200: + case 118: + case 177: + case 205: { BitArray a = new BitArray(239); a.Set(70, true); return a; } - case 114: + case 119: { BitArray a = new BitArray(239); a.Set(67, true); return a; } - case 115: + case 120: { BitArray a = new BitArray(239); a.Set(66, true); return a; } - case 116: + case 121: { BitArray a = new BitArray(239); a.Set(65, true); return a; } - case 117: + case 122: { BitArray a = new BitArray(239); a.Set(64, true); return a; } - case 118: + case 123: { BitArray a = new BitArray(239); a.Set(62, true); return a; } - case 119: - case 212: + case 124: + case 217: { BitArray a = new BitArray(239); a.Set(58, true); return a; } - case 120: + case 125: { BitArray a = new BitArray(239); a.Set(2, true); return a; } - case 121: - return set[26]; - case 123: + case 126: return set[27]; - case 125: + case 128: + return set[28]; + case 130: { BitArray a = new BitArray(239); a.Set(144, true); return a; } - case 127: - return set[28]; - case 128: + case 132: return set[29]; - case 129: - case 130: - case 415: - case 416: + case 133: return set[30]; - case 132: + case 134: + case 135: + case 420: + case 421: return set[31]; - case 138: - case 139: - case 273: - case 282: + case 137: return set[32]; - case 140: - case 394: + case 143: + case 144: + case 278: + case 287: return set[33]; - case 141: - case 328: + case 145: + case 399: + return set[34]; + case 146: + case 333: { BitArray a = new BitArray(239); a.Set(135, true); return a; } - case 148: - return set[34]; - case 154: + case 153: + return set[35]; + case 159: { BitArray a = new BitArray(239); a.Set(58, true); a.Set(126, true); return a; } - case 155: - case 156: - return set[35]; - case 158: + case 160: + case 161: + return set[36]; + case 163: { BitArray a = new BitArray(239); a.Set(171, true); return a; } - case 162: - case 176: - case 192: + case 167: + case 181: case 197: - case 203: - case 205: - case 209: - case 211: - return set[36]; - case 164: - case 165: + case 202: + case 208: + case 210: + case 214: + case 216: + return set[37]; + case 169: + case 170: { BitArray a = new BitArray(239); a.Set(63, true); a.Set(138, true); return a; } - case 166: - case 168: - case 274: + case 171: + case 173: + case 279: { BitArray a = new BitArray(239); a.Set(138, true); return a; } - case 170: - case 171: - case 173: case 175: - case 177: + case 176: case 178: - case 186: + case 180: + case 182: + case 183: case 191: case 196: - case 204: - case 208: - return set[37]; - case 174: + case 201: + case 209: + case 213: + return set[38]; + case 179: { BitArray a = new BitArray(239); a.Set(22, true); a.Set(143, true); return a; } - case 181: - return set[38]; - case 187: + case 186: + return set[39]; + case 192: { BitArray a = new BitArray(239); a.Set(22, true); a.Set(70, true); return a; } - case 189: + case 194: { BitArray a = new BitArray(239); a.Set(133, true); @@ -811,86 +829,84 @@ partial class ExpressionFinder { a.Set(146, true); return a; } - case 198: - case 199: - return set[39]; - case 202: + case 203: + case 204: + return set[40]; + case 207: { BitArray a = new BitArray(239); a.Set(64, true); a.Set(104, true); return a; } - case 207: - return set[40]; - case 214: - case 476: - case 591: - case 605: - case 612: + case 212: + return set[41]; + case 219: + case 496: + case 617: + case 631: + case 638: { BitArray a = new BitArray(239); a.Set(127, true); a.Set(210, true); return a; } - case 216: - case 217: - case 386: - case 387: - case 455: - case 456: - case 461: - case 462: - case 484: - case 485: - case 550: - case 551: - case 553: - case 554: - case 562: - case 563: - case 584: + case 221: + case 222: + case 391: + case 392: + case 465: + case 466: + case 472: + case 473: + case 570: + case 571: + case 573: + case 574: case 585: - case 601: - case 602: - return set[41]; - case 219: - case 220: + case 586: + case 610: + case 611: + case 627: + case 628: return set[42]; - case 226: - case 227: + case 224: + case 225: return set[43]; - case 228: - return set[44]; case 231: - return set[45]; case 232: + return set[44]; case 233: - case 334: + return set[45]; + case 236: return set[46]; case 237: + case 238: + case 339: + return set[47]; + case 242: { BitArray a = new BitArray(239); a.Set(226, true); return a; } - case 239: - case 281: - case 296: - return set[47]; - case 242: - case 243: - case 263: - case 264: - case 278: - case 279: - case 293: - case 294: - return set[48]; case 244: - case 335: - case 338: + case 286: + case 301: + return set[48]; + case 247: + case 248: + case 268: + case 269: + case 283: + case 284: + case 298: + case 299: + return set[49]; + case 249: + case 340: + case 343: { BitArray a = new BitArray(239); a.Set(1, true); @@ -898,7 +914,7 @@ partial class ExpressionFinder { a.Set(111, true); return a; } - case 245: + case 250: { BitArray a = new BitArray(239); a.Set(108, true); @@ -906,18 +922,18 @@ partial class ExpressionFinder { a.Set(231, true); return a; } - case 246: - return set[49]; - case 247: - case 266: + case 251: return set[50]; - case 248: + case 252: + case 271: + return set[51]; + case 253: { BitArray a = new BitArray(239); a.Set(5, true); return a; } - case 251: + case 256: { BitArray a = new BitArray(239); a.Set(75, true); @@ -925,11 +941,11 @@ partial class ExpressionFinder { a.Set(123, true); return a; } - case 255: - case 256: - return set[51]; - case 257: + case 260: + case 261: + return set[52]; case 262: + case 267: { BitArray a = new BitArray(239); a.Set(1, true); @@ -937,36 +953,36 @@ partial class ExpressionFinder { a.Set(229, true); return a; } - case 259: - case 260: - return set[52]; + case 264: case 265: return set[53]; - case 267: + case 270: + return set[54]; + case 272: { BitArray a = new BitArray(239); a.Set(118, true); return a; } - case 268: - case 269: - return set[54]; - case 271: - case 272: + case 273: + case 274: return set[55]; - case 283: - case 284: + case 276: + case 277: return set[56]; - case 285: + case 288: + case 289: return set[57]; - case 287: + case 290: + return set[58]; + case 292: { BitArray a = new BitArray(239); a.Set(20, true); a.Set(138, true); return a; } - case 290: + case 295: { BitArray a = new BitArray(239); a.Set(1, true); @@ -974,42 +990,44 @@ partial class ExpressionFinder { a.Set(205, true); return a; } - case 298: - return set[58]; - case 299: case 303: + return set[59]; + case 304: + case 308: { BitArray a = new BitArray(239); a.Set(152, true); return a; } - case 300: - return set[59]; - case 308: - case 309: + case 305: return set[60]; - case 312: + case 313: + case 314: + return set[61]; + case 317: { BitArray a = new BitArray(239); a.Set(74, true); a.Set(113, true); return a; } - case 314: - case 315: - return set[61]; - case 317: - case 318: - return set[62]; case 319: - case 583: - case 620: - case 633: - case 634: - case 636: + case 320: + return set[62]; + case 322: + case 323: + return set[63]; + case 324: + case 606: + case 607: + case 609: case 646: - case 647: - case 649: + case 660: + case 661: + case 663: + case 672: + case 673: + case 675: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1017,11 +1035,11 @@ partial class ExpressionFinder { a.Set(22, true); return a; } - case 320: - case 322: - return set[63]; - case 324: - case 330: + case 325: + case 327: + return set[64]; + case 329: + case 335: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1029,7 +1047,7 @@ partial class ExpressionFinder { a.Set(214, true); return a; } - case 327: + case 332: { BitArray a = new BitArray(239); a.Set(111, true); @@ -1037,7 +1055,7 @@ partial class ExpressionFinder { a.Set(113, true); return a; } - case 331: + case 336: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1045,57 +1063,57 @@ partial class ExpressionFinder { a.Set(135, true); return a; } - case 332: - case 333: - case 389: - case 390: - return set[64]; - case 336: case 337: - case 339: - case 340: + case 338: + case 394: + case 395: return set[65]; + case 341: case 342: + case 344: + case 345: return set[66]; - case 348: + case 347: + return set[67]; + case 353: { BitArray a = new BitArray(239); a.Set(211, true); a.Set(233, true); return a; } - case 350: - case 351: - case 359: - case 360: - return set[67]; - case 352: - case 361: + case 355: + case 356: + case 364: + case 365: return set[68]; - case 353: - return set[69]; - case 354: case 357: + case 366: + return set[69]; + case 358: return set[70]; - case 355: - case 356: - case 626: - case 627: + case 359: + case 362: return set[71]; - case 367: - case 369: - case 370: - case 515: - case 571: + case 360: + case 361: + case 652: + case 653: return set[72]; - case 371: case 372: - return set[73]; - case 373: case 374: - return set[74]; case 375: + case 535: + case 594: + return set[73]; + case 376: + case 377: + return set[74]; + case 378: case 379: + return set[75]; + case 380: + case 384: { BitArray a = new BitArray(239); a.Set(20, true); @@ -1103,72 +1121,76 @@ partial class ExpressionFinder { a.Set(38, true); return a; } - case 380: + case 385: { BitArray a = new BitArray(239); a.Set(40, true); return a; } - case 383: - case 384: - return set[75]; - case 393: + case 388: + case 389: return set[76]; - case 395: - case 408: + case 398: return set[77]; - case 396: - case 409: + case 400: + case 413: return set[78]; - case 397: - case 398: + case 401: + case 414: + return set[79]; + case 402: + case 403: { BitArray a = new BitArray(239); a.Set(10, true); return a; } - case 403: + case 408: { BitArray a = new BitArray(239); a.Set(12, true); return a; } - case 405: + case 410: { BitArray a = new BitArray(239); a.Set(13, true); return a; } - case 406: - return set[79]; - case 407: + case 411: return set[80]; - case 418: + case 412: return set[81]; - case 424: + case 423: return set[82]; - case 426: - case 427: - case 615: - case 616: - return set[83]; case 429: - case 430: case 431: - case 436: - case 437: - case 618: + return set[83]; + case 434: + case 435: + case 503: + case 504: case 641: - case 651: + case 642: return set[84]; - case 432: + case 437: case 438: - case 447: - return set[85]; - case 433: - case 434: case 439: + case 444: + case 445: + case 506: + case 644: + case 668: + case 677: + return set[85]; case 440: + case 446: + case 455: + return set[86]; + case 441: + case 442: + case 447: + case 448: { BitArray a = new BitArray(239); a.Set(22, true); @@ -1176,18 +1198,18 @@ partial class ExpressionFinder { a.Set(63, true); return a; } - case 441: - case 443: - case 448: - return set[86]; - case 444: - case 446: + case 449: + case 451: + case 456: return set[87]; case 452: - case 467: + case 454: + return set[88]; + case 461: + case 480: case 481: - case 517: - case 598: + case 537: + case 624: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1195,22 +1217,27 @@ partial class ExpressionFinder { a.Set(63, true); return a; } - case 453: - case 521: - return set[88]; - case 465: - case 470: + case 462: + case 463: + case 541: + return set[89]; + case 477: + case 478: + case 485: { BitArray a = new BitArray(239); a.Set(115, true); return a; } - case 469: - return set[89]; - case 471: + case 483: + case 484: return set[90]; - case 472: - case 529: + case 488: + case 489: + return set[91]; + case 490: + case 491: + case 549: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1218,15 +1245,15 @@ partial class ExpressionFinder { a.Set(21, true); return a; } - case 475: + case 495: { BitArray a = new BitArray(239); a.Set(103, true); return a; } - case 487: - case 488: - case 500: + case 507: + case 508: + case 520: { BitArray a = new BitArray(239); a.Set(84, true); @@ -1234,83 +1261,84 @@ partial class ExpressionFinder { a.Set(209, true); return a; } - case 493: - case 494: - return set[91]; - case 495: - case 496: + case 513: + case 514: return set[92]; - case 497: - case 498: - case 509: + case 515: + case 516: return set[93]; - case 502: + case 517: + case 518: + case 529: return set[94]; - case 503: - case 504: + case 523: + case 524: return set[95]; - case 505: - case 506: - case 630: + case 525: + case 526: + case 657: return set[96]; - case 507: + case 527: return set[97]; - case 508: + case 528: return set[98]; - case 510: - case 520: + case 530: + case 540: { BitArray a = new BitArray(239); a.Set(172, true); return a; } - case 525: - case 526: + case 545: + case 546: return set[99]; - case 527: + case 547: return set[100]; - case 528: - case 561: + case 548: + case 584: return set[101]; - case 531: - case 532: - case 533: - case 556: + case 551: + case 552: + case 553: + case 576: return set[102]; - case 534: - case 538: - case 548: + case 554: + case 558: + case 568: { BitArray a = new BitArray(239); a.Set(128, true); a.Set(198, true); return a; } - case 540: + case 560: return set[103]; - case 543: + case 563: return set[104]; - case 544: + case 564: return set[105]; - case 559: - case 625: - case 628: + case 579: + case 580: + case 582: + case 651: + case 654: + case 655: return set[106]; - case 560: + case 583: return set[107]; - case 566: - case 568: - case 577: + case 589: + case 591: + case 600: { BitArray a = new BitArray(239); a.Set(119, true); return a; } - case 567: + case 590: return set[108]; - case 569: + case 592: return set[109]; - case 575: + case 598: { BitArray a = new BitArray(239); a.Set(56, true); @@ -1318,11 +1346,11 @@ partial class ExpressionFinder { a.Set(193, true); return a; } - case 579: - case 580: + case 602: + case 603: return set[110]; - case 581: - case 588: + case 604: + case 614: { BitArray a = new BitArray(239); a.Set(1, true); @@ -1330,101 +1358,100 @@ partial class ExpressionFinder { a.Set(136, true); return a; } - case 589: + case 615: { BitArray a = new BitArray(239); a.Set(101, true); return a; } - case 590: + case 616: return set[111]; - case 593: - case 594: + case 619: + case 620: { BitArray a = new BitArray(239); a.Set(149, true); return a; } - case 595: - case 604: - case 663: + case 621: + case 630: + case 689: { BitArray a = new BitArray(239); a.Set(3, true); return a; } - case 596: + case 622: return set[112]; - case 619: - case 621: + case 645: + case 647: return set[113]; - case 622: - case 629: + case 648: + case 656: return set[114]; - case 623: - case 624: + case 649: + case 650: return set[115]; - case 631: + case 658: { BitArray a = new BitArray(239); a.Set(136, true); return a; } - case 637: - case 644: + case 664: { BitArray a = new BitArray(239); a.Set(140, true); return a; } - case 640: - case 650: + case 667: + case 676: { BitArray a = new BitArray(239); a.Set(169, true); return a; } - case 655: + case 681: return set[116]; - case 656: + case 682: { BitArray a = new BitArray(239); a.Set(160, true); return a; } - case 657: + case 683: { BitArray a = new BitArray(239); a.Set(137, true); return a; } - case 658: - case 659: + case 684: + case 685: return set[117]; - case 664: + case 690: { BitArray a = new BitArray(239); a.Set(11, true); return a; } - case 665: + case 691: return set[118]; - case 667: + case 694: { BitArray a = new BitArray(239); a.Set(173, true); return a; } - case 668: + case 695: return set[119]; - case 669: + case 696: { BitArray a = new BitArray(239); a.Set(67, true); a.Set(213, true); return a; } - case 670: + case 697: return set[120]; default: throw new InvalidOperationException(); } @@ -1479,7 +1506,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 1; break; } if (la.kind == 173) { stateStack.Push(1); - goto case 667; + goto case 694; } else { goto case 2; } @@ -1488,7 +1515,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 2; break; } if (la.kind == 137) { stateStack.Push(2); - goto case 657; + goto case 683; } else { goto case 3; } @@ -1497,7 +1524,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 3; break; } if (la.kind == 40) { stateStack.Push(3); - goto case 380; + goto case 385; } else { goto case 4; } @@ -1516,7 +1543,7 @@ partial class ExpressionFinder { case 5: { if (la == null) { currentState = 5; break; } if (la.kind == 160) { - currentState = 653; + currentState = 679; break; } else { if (set[4].Get(la.kind)) { @@ -1535,7 +1562,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 7; break; } if (la.kind == 40) { stateStack.Push(7); - goto case 380; + goto case 385; } else { goto case 8; } @@ -1547,19 +1574,17 @@ partial class ExpressionFinder { break; } else { if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - goto case 487; + goto case 507; } else { if (la.kind == 103) { - currentState = 476; + currentState = 496; break; } else { if (la.kind == 115) { - currentState = 466; - break; + goto case 477; } else { if (la.kind == 142) { - currentState = 9; - break; + goto case 9; } else { goto case 6; } @@ -1569,68 +1594,93 @@ partial class ExpressionFinder { } } case 9: { - stateStack.Push(10); - goto case 169; + PushContext(Context.TypeDeclaration, la, t); + goto case 10; } case 10: { if (la == null) { currentState = 10; break; } - if (la.kind == 37) { - currentState = 650; - break; - } else { - goto case 11; - } + Expect(142, la); // "Interface" + currentState = 11; + break; } case 11: { + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); stateStack.Push(12); - goto case 18; + goto case 174; } case 12: { - isMissingModifier = true; + PopContext(); goto case 13; } case 13: { if (la == null) { currentState = 13; break; } - if (la.kind == 140) { - PushContext(Context.Type, la, t); - goto case 644; + if (la.kind == 37) { + currentState = 676; + break; } else { goto case 14; } } case 14: { - isMissingModifier = true; - goto case 15; + stateStack.Push(15); + goto case 23; } case 15: { - if (la == null) { currentState = 15; break; } - if (set[9].Get(la.kind)) { - goto case 21; + isMissingModifier = true; + goto case 16; + } + case 16: { + if (la == null) { currentState = 16; break; } + if (la.kind == 140) { + currentState = 671; + break; + } else { + goto case 17; + } + } + case 17: { + isMissingModifier = true; + goto case 18; + } + case 18: { + if (la == null) { currentState = 18; break; } + if (set[10].Get(la.kind)) { + goto case 26; } else { isMissingModifier = false; - goto case 16; + goto case 19; } } - case 16: { - if (la == null) { currentState = 16; break; } + case 19: { + if (la == null) { currentState = 19; break; } Expect(113, la); // "End" - currentState = 17; + currentState = 20; break; } - case 17: { - if (la == null) { currentState = 17; break; } + case 20: { + if (la == null) { currentState = 20; break; } Expect(142, la); // "Interface" - currentState = 18; + currentState = 21; break; } - case 18: { + case 21: { + stateStack.Push(22); + goto case 23; + } + case 22: { + PopContext(); + currentState = stateStack.Pop(); + goto switchlbl; + } + case 23: { if (la != null) CurrentBlock.lastExpressionStart = la.Location; - goto case 19; + goto case 24; } - case 19: { - if (la == null) { currentState = 19; break; } + case 24: { + if (la == null) { currentState = 24; break; } if (la.kind == 1) { - goto case 20; + goto case 25; } else { if (la.kind == 21) { currentState = stateStack.Pop(); @@ -1640,77 +1690,77 @@ partial class ExpressionFinder { } } } - case 20: { - if (la == null) { currentState = 20; break; } + case 25: { + if (la == null) { currentState = 25; break; } currentState = stateStack.Pop(); break; } - case 21: { + case 26: { isMissingModifier = true; - goto case 22; + goto case 27; } - case 22: { - if (la == null) { currentState = 22; break; } + case 27: { + if (la == null) { currentState = 27; break; } if (la.kind == 40) { - stateStack.Push(21); - goto case 380; + stateStack.Push(26); + goto case 385; } else { isMissingModifier = true; - goto case 23; + goto case 28; } } - case 23: { - if (la == null) { currentState = 23; break; } + case 28: { + if (la == null) { currentState = 28; break; } if (set[122].Get(la.kind)) { - currentState = 643; + currentState = 670; break; } else { isMissingModifier = false; - goto case 24; + goto case 29; } } - case 24: { - if (la == null) { currentState = 24; break; } + case 29: { + if (la == null) { currentState = 29; break; } if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - stateStack.Push(14); - goto case 487; + stateStack.Push(17); + goto case 507; } else { if (la.kind == 103) { - stateStack.Push(14); - goto case 475; + stateStack.Push(17); + goto case 495; } else { if (la.kind == 115) { - stateStack.Push(14); - goto case 465; + stateStack.Push(17); + goto case 477; } else { if (la.kind == 142) { - stateStack.Push(14); - goto case 464; + stateStack.Push(17); + goto case 9; } else { - if (set[12].Get(la.kind)) { - stateStack.Push(14); - goto case 25; + if (set[13].Get(la.kind)) { + stateStack.Push(17); + goto case 30; } else { Error(la); - goto case 14; + goto case 17; } } } } } } - case 25: { - if (la == null) { currentState = 25; break; } + case 30: { + if (la == null) { currentState = 30; break; } if (la.kind == 119) { - currentState = 458; + currentState = 468; break; } else { if (la.kind == 186) { - currentState = 450; + currentState = 458; break; } else { if (la.kind == 127 || la.kind == 210) { - currentState = 26; + currentState = 31; break; } else { goto case 6; @@ -1718,210 +1768,210 @@ partial class ExpressionFinder { } } } - case 26: { + case 31: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 27; + goto case 32; } - case 27: { - if (la == null) { currentState = 27; break; } - currentState = 28; + case 32: { + if (la == null) { currentState = 32; break; } + currentState = 33; break; } - case 28: { + case 33: { PopContext(); - goto case 29; + goto case 34; } - case 29: { - if (la == null) { currentState = 29; break; } + case 34: { + if (la == null) { currentState = 34; break; } if (la.kind == 37) { - currentState = 426; + currentState = 434; break; } else { if (la.kind == 63) { - currentState = 30; + currentState = 35; break; } else { - goto case 18; + goto case 23; } } } - case 30: { + case 35: { PushContext(Context.Type, la, t); - stateStack.Push(31); - goto case 32; + stateStack.Push(36); + goto case 37; } - case 31: { + case 36: { PopContext(); - goto case 18; + goto case 23; } - case 32: { - if (la == null) { currentState = 32; break; } + case 37: { + if (la == null) { currentState = 37; break; } if (la.kind == 130) { - currentState = 33; + currentState = 38; break; } else { if (set[6].Get(la.kind)) { - currentState = 33; + currentState = 38; break; } else { if (set[123].Get(la.kind)) { - currentState = 33; + currentState = 38; break; } else { if (la.kind == 33) { - currentState = 33; + currentState = 38; break; } else { Error(la); - goto case 33; + goto case 38; } } } } } - case 33: { - if (la == null) { currentState = 33; break; } + case 38: { + if (la == null) { currentState = 38; break; } if (la.kind == 37) { - stateStack.Push(33); - goto case 37; + stateStack.Push(38); + goto case 42; } else { - goto case 34; + goto case 39; } } - case 34: { - if (la == null) { currentState = 34; break; } + case 39: { + if (la == null) { currentState = 39; break; } if (la.kind == 26) { - currentState = 35; + currentState = 40; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 35: { - stateStack.Push(36); - goto case 76; + case 40: { + stateStack.Push(41); + goto case 81; } - case 36: { - if (la == null) { currentState = 36; break; } + case 41: { + if (la == null) { currentState = 41; break; } if (la.kind == 37) { - stateStack.Push(36); - goto case 37; + stateStack.Push(41); + goto case 42; } else { - goto case 34; + goto case 39; } } - case 37: { - if (la == null) { currentState = 37; break; } + case 42: { + if (la == null) { currentState = 42; break; } Expect(37, la); // "(" - currentState = 38; + currentState = 43; break; } - case 38: { + case 43: { nextTokenIsPotentialStartOfExpression = true; - goto case 39; + goto case 44; } - case 39: { - if (la == null) { currentState = 39; break; } + case 44: { + if (la == null) { currentState = 44; break; } if (la.kind == 169) { - currentState = 424; + currentState = 429; break; } else { - if (set[20].Get(la.kind)) { - goto case 41; + if (set[21].Get(la.kind)) { + goto case 46; } else { Error(la); - goto case 40; + goto case 45; } } } - case 40: { - if (la == null) { currentState = 40; break; } + case 45: { + if (la == null) { currentState = 45; break; } Expect(38, la); // ")" currentState = stateStack.Pop(); break; } - case 41: { + case 46: { nextTokenIsPotentialStartOfExpression = true; - goto case 42; + goto case 47; } - case 42: { - if (la == null) { currentState = 42; break; } - if (set[21].Get(la.kind)) { - stateStack.Push(40); - goto case 43; + case 47: { + if (la == null) { currentState = 47; break; } + if (set[22].Get(la.kind)) { + stateStack.Push(45); + goto case 48; } else { - goto case 40; + goto case 45; } } - case 43: { + case 48: { nextTokenIsPotentialStartOfExpression = true; - goto case 44; + goto case 49; } - case 44: { - if (la == null) { currentState = 44; break; } - if (set[22].Get(la.kind)) { + case 49: { + if (la == null) { currentState = 49; break; } + if (set[23].Get(la.kind)) { activeArgument = 0; - goto case 420; + goto case 425; } else { if (la.kind == 22) { activeArgument = 0; - goto case 45; + goto case 50; } else { goto case 6; } } } - case 45: { - if (la == null) { currentState = 45; break; } + case 50: { + if (la == null) { currentState = 50; break; } Expect(22, la); // "," - currentState = 46; + currentState = 51; break; } - case 46: { + case 51: { activeArgument++; - goto case 47; + goto case 52; } - case 47: { + case 52: { nextTokenIsPotentialStartOfExpression = true; - goto case 48; + goto case 53; } - case 48: { - if (la == null) { currentState = 48; break; } - if (set[22].Get(la.kind)) { - stateStack.Push(49); - goto case 51; + case 53: { + if (la == null) { currentState = 53; break; } + if (set[23].Get(la.kind)) { + stateStack.Push(54); + goto case 56; } else { - goto case 49; + goto case 54; } } - case 49: { - if (la == null) { currentState = 49; break; } + case 54: { + if (la == null) { currentState = 54; break; } if (la.kind == 22) { - currentState = 50; + currentState = 55; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 50: { + case 55: { activeArgument++; - goto case 47; + goto case 52; } - case 51: { + case 56: { PushContext(Context.Expression, la, t); - goto case 52; + goto case 57; } - case 52: { - stateStack.Push(53); - goto case 54; + case 57: { + stateStack.Push(58); + goto case 59; } - case 53: { - if (la == null) { currentState = 53; break; } + case 58: { + if (la == null) { currentState = 58; break; } if (set[124].Get(la.kind)) { - currentState = 52; + currentState = 57; break; } else { PopContext(); @@ -1929,163 +1979,163 @@ partial class ExpressionFinder { goto switchlbl; } } - case 54: { + case 59: { PushContext(Context.Expression, la, t); - goto case 55; + goto case 60; } - case 55: { + case 60: { nextTokenIsPotentialStartOfExpression = true; - goto case 56; + goto case 61; } - case 56: { - if (la == null) { currentState = 56; break; } + case 61: { + if (la == null) { currentState = 61; break; } if (set[125].Get(la.kind)) { - currentState = 55; + currentState = 60; break; } else { - if (set[32].Get(la.kind)) { - stateStack.Push(127); - goto case 138; + if (set[33].Get(la.kind)) { + stateStack.Push(132); + goto case 143; } else { if (la.kind == 220) { - currentState = 124; + currentState = 129; break; } else { if (la.kind == 162) { - stateStack.Push(57); - goto case 62; + stateStack.Push(62); + goto case 67; } else { if (la.kind == 35) { - stateStack.Push(57); - goto case 58; + stateStack.Push(62); + goto case 63; } else { Error(la); - goto case 57; + goto case 62; } } } } } } - case 57: { + case 62: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 58: { - if (la == null) { currentState = 58; break; } + case 63: { + if (la == null) { currentState = 63; break; } Expect(35, la); // "{" - currentState = 59; + currentState = 64; break; } - case 59: { - stateStack.Push(60); - goto case 51; + case 64: { + stateStack.Push(65); + goto case 56; } - case 60: { - if (la == null) { currentState = 60; break; } + case 65: { + if (la == null) { currentState = 65; break; } if (la.kind == 22) { - currentState = 59; + currentState = 64; break; } else { - goto case 61; + goto case 66; } } - case 61: { - if (la == null) { currentState = 61; break; } + case 66: { + if (la == null) { currentState = 66; break; } Expect(36, la); // "}" currentState = stateStack.Pop(); break; } - case 62: { - if (la == null) { currentState = 62; break; } + case 67: { + if (la == null) { currentState = 67; break; } Expect(162, la); // "New" - currentState = 63; + currentState = 68; break; } - case 63: { + case 68: { PushContext(Context.ObjectCreation, la, t); - goto case 64; + goto case 69; } - case 64: { - if (la == null) { currentState = 64; break; } - if (set[15].Get(la.kind)) { - stateStack.Push(121); - goto case 32; + case 69: { + if (la == null) { currentState = 69; break; } + if (set[16].Get(la.kind)) { + stateStack.Push(126); + goto case 37; } else { - goto case 65; + goto case 70; } } - case 65: { - if (la == null) { currentState = 65; break; } + case 70: { + if (la == null) { currentState = 70; break; } if (la.kind == 233) { - currentState = 68; + currentState = 73; break; } else { - goto case 66; + goto case 71; } } - case 66: { + case 71: { Error(la); - goto case 67; + goto case 72; } - case 67: { + case 72: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 68: { - stateStack.Push(67); - goto case 69; + case 73: { + stateStack.Push(72); + goto case 74; } - case 69: { - if (la == null) { currentState = 69; break; } + case 74: { + if (la == null) { currentState = 74; break; } Expect(35, la); // "{" - currentState = 70; + currentState = 75; break; } - case 70: { - if (la == null) { currentState = 70; break; } + case 75: { + if (la == null) { currentState = 75; break; } if (la.kind == 147) { - currentState = 71; + currentState = 76; break; } else { - goto case 71; + goto case 76; } } - case 71: { - if (la == null) { currentState = 71; break; } + case 76: { + if (la == null) { currentState = 76; break; } Expect(26, la); // "." - currentState = 72; + currentState = 77; break; } - case 72: { - stateStack.Push(73); - goto case 76; + case 77: { + stateStack.Push(78); + goto case 81; } - case 73: { - if (la == null) { currentState = 73; break; } + case 78: { + if (la == null) { currentState = 78; break; } Expect(20, la); // "=" - currentState = 74; + currentState = 79; break; } - case 74: { - stateStack.Push(75); - goto case 51; + case 79: { + stateStack.Push(80); + goto case 56; } - case 75: { - if (la == null) { currentState = 75; break; } + case 80: { + if (la == null) { currentState = 80; break; } if (la.kind == 22) { - currentState = 70; + currentState = 75; break; } else { - goto case 61; + goto case 66; } } - case 76: { - if (la == null) { currentState = 76; break; } + case 81: { + if (la == null) { currentState = 81; break; } if (la.kind == 2) { - goto case 120; + goto case 125; } else { if (la.kind == 56) { currentState = stateStack.Pop(); @@ -2096,7 +2146,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 58) { - goto case 119; + goto case 124; } else { if (la.kind == 59) { currentState = stateStack.Pop(); @@ -2111,23 +2161,23 @@ partial class ExpressionFinder { break; } else { if (la.kind == 62) { - goto case 118; + goto case 123; } else { if (la.kind == 63) { currentState = stateStack.Pop(); break; } else { if (la.kind == 64) { - goto case 117; + goto case 122; } else { if (la.kind == 65) { - goto case 116; + goto case 121; } else { if (la.kind == 66) { - goto case 115; + goto case 120; } else { if (la.kind == 67) { - goto case 114; + goto case 119; } else { if (la.kind == 68) { currentState = stateStack.Pop(); @@ -2138,7 +2188,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 70) { - goto case 113; + goto case 118; } else { if (la.kind == 71) { currentState = stateStack.Pop(); @@ -2193,7 +2243,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 84) { - goto case 112; + goto case 117; } else { if (la.kind == 85) { currentState = stateStack.Pop(); @@ -2204,7 +2254,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 87) { - goto case 111; + goto case 116; } else { if (la.kind == 88) { currentState = stateStack.Pop(); @@ -2247,7 +2297,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 98) { - goto case 110; + goto case 115; } else { if (la.kind == 99) { currentState = stateStack.Pop(); @@ -2270,7 +2320,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 104) { - goto case 109; + goto case 114; } else { if (la.kind == 105) { currentState = stateStack.Pop(); @@ -2281,10 +2331,10 @@ partial class ExpressionFinder { break; } else { if (la.kind == 107) { - goto case 108; + goto case 113; } else { if (la.kind == 108) { - goto case 107; + goto case 112; } else { if (la.kind == 109) { currentState = stateStack.Pop(); @@ -2315,7 +2365,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 116) { - goto case 106; + goto case 111; } else { if (la.kind == 117) { currentState = stateStack.Pop(); @@ -2334,7 +2384,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 121) { - goto case 105; + goto case 110; } else { if (la.kind == 122) { currentState = stateStack.Pop(); @@ -2345,17 +2395,17 @@ partial class ExpressionFinder { break; } else { if (la.kind == 124) { - goto case 104; + goto case 109; } else { if (la.kind == 125) { currentState = stateStack.Pop(); break; } else { if (la.kind == 126) { - goto case 103; + goto case 108; } else { if (la.kind == 127) { - goto case 102; + goto case 107; } else { if (la.kind == 128) { currentState = stateStack.Pop(); @@ -2378,7 +2428,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 133) { - goto case 101; + goto case 106; } else { if (la.kind == 134) { currentState = stateStack.Pop(); @@ -2401,7 +2451,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 139) { - goto case 100; + goto case 105; } else { if (la.kind == 140) { currentState = stateStack.Pop(); @@ -2416,7 +2466,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 143) { - goto case 99; + goto case 104; } else { if (la.kind == 144) { currentState = stateStack.Pop(); @@ -2427,10 +2477,10 @@ partial class ExpressionFinder { break; } else { if (la.kind == 146) { - goto case 98; + goto case 103; } else { if (la.kind == 147) { - goto case 97; + goto case 102; } else { if (la.kind == 148) { currentState = stateStack.Pop(); @@ -2489,10 +2539,10 @@ partial class ExpressionFinder { break; } else { if (la.kind == 162) { - goto case 96; + goto case 101; } else { if (la.kind == 163) { - goto case 95; + goto case 100; } else { if (la.kind == 164) { currentState = stateStack.Pop(); @@ -2519,7 +2569,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 170) { - goto case 94; + goto case 99; } else { if (la.kind == 171) { currentState = stateStack.Pop(); @@ -2542,7 +2592,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 176) { - goto case 93; + goto case 98; } else { if (la.kind == 177) { currentState = stateStack.Pop(); @@ -2573,14 +2623,14 @@ partial class ExpressionFinder { break; } else { if (la.kind == 184) { - goto case 92; + goto case 97; } else { if (la.kind == 185) { currentState = stateStack.Pop(); break; } else { if (la.kind == 186) { - goto case 91; + goto case 96; } else { if (la.kind == 187) { currentState = stateStack.Pop(); @@ -2623,7 +2673,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 197) { - goto case 90; + goto case 95; } else { if (la.kind == 198) { currentState = stateStack.Pop(); @@ -2646,7 +2696,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 203) { - goto case 89; + goto case 94; } else { if (la.kind == 204) { currentState = stateStack.Pop(); @@ -2657,7 +2707,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 206) { - goto case 88; + goto case 93; } else { if (la.kind == 207) { currentState = stateStack.Pop(); @@ -2668,19 +2718,19 @@ partial class ExpressionFinder { break; } else { if (la.kind == 209) { - goto case 87; + goto case 92; } else { if (la.kind == 210) { - goto case 86; + goto case 91; } else { if (la.kind == 211) { - goto case 85; + goto case 90; } else { if (la.kind == 212) { - goto case 84; + goto case 89; } else { if (la.kind == 213) { - goto case 83; + goto case 88; } else { if (la.kind == 214) { currentState = stateStack.Pop(); @@ -2699,7 +2749,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 218) { - goto case 82; + goto case 87; } else { if (la.kind == 219) { currentState = stateStack.Pop(); @@ -2718,10 +2768,10 @@ partial class ExpressionFinder { break; } else { if (la.kind == 223) { - goto case 81; + goto case 86; } else { if (la.kind == 224) { - goto case 80; + goto case 85; } else { if (la.kind == 225) { currentState = stateStack.Pop(); @@ -2744,17 +2794,17 @@ partial class ExpressionFinder { break; } else { if (la.kind == 230) { - goto case 79; + goto case 84; } else { if (la.kind == 231) { - goto case 78; + goto case 83; } else { if (la.kind == 232) { currentState = stateStack.Pop(); break; } else { if (la.kind == 233) { - goto case 77; + goto case 82; } else { if (la.kind == 234) { currentState = stateStack.Pop(); @@ -2957,31 +3007,6 @@ partial class ExpressionFinder { } } } - case 77: { - if (la == null) { currentState = 77; break; } - currentState = stateStack.Pop(); - break; - } - case 78: { - if (la == null) { currentState = 78; break; } - currentState = stateStack.Pop(); - break; - } - case 79: { - if (la == null) { currentState = 79; break; } - currentState = stateStack.Pop(); - break; - } - case 80: { - if (la == null) { currentState = 80; break; } - currentState = stateStack.Pop(); - break; - } - case 81: { - if (la == null) { currentState = 81; break; } - currentState = stateStack.Pop(); - break; - } case 82: { if (la == null) { currentState = 82; break; } currentState = stateStack.Pop(); @@ -3179,95 +3204,120 @@ partial class ExpressionFinder { } case 121: { if (la == null) { currentState = 121; break; } + currentState = stateStack.Pop(); + break; + } + case 122: { + if (la == null) { currentState = 122; break; } + currentState = stateStack.Pop(); + break; + } + case 123: { + if (la == null) { currentState = 123; break; } + currentState = stateStack.Pop(); + break; + } + case 124: { + if (la == null) { currentState = 124; break; } + currentState = stateStack.Pop(); + break; + } + case 125: { + if (la == null) { currentState = 125; break; } + currentState = stateStack.Pop(); + break; + } + case 126: { + if (la == null) { currentState = 126; break; } if (la.kind == 126 || la.kind == 233) { if (la.kind == 126) { - currentState = 122; + currentState = 127; break; } else { - goto case 65; + goto case 70; } } else { - goto case 67; + goto case 72; } } - case 122: { - if (la == null) { currentState = 122; break; } + case 127: { + if (la == null) { currentState = 127; break; } if (la.kind == 35) { - stateStack.Push(67); - goto case 58; + stateStack.Push(72); + goto case 63; } else { - if (set[27].Get(la.kind)) { + if (set[28].Get(la.kind)) { currentState = endOfStatementTerminatorAndBlock; /* leave this block */ InformToken(t); /* process From again*/ /* for processing current token (la): go to the position after processing End */ goto switchlbl; } else { - goto case 66; + goto case 71; } } } - case 123: { - if (la == null) { currentState = 123; break; } - currentState = 67; + case 128: { + if (la == null) { currentState = 128; break; } + currentState = 72; break; } - case 124: { - stateStack.Push(125); - goto case 54; + case 129: { + stateStack.Push(130); + goto case 59; } - case 125: { - if (la == null) { currentState = 125; break; } + case 130: { + if (la == null) { currentState = 130; break; } Expect(144, la); // "Is" - currentState = 126; + currentState = 131; break; } - case 126: { - stateStack.Push(57); - goto case 32; + case 131: { + stateStack.Push(62); + goto case 37; } - case 127: { - if (la == null) { currentState = 127; break; } - if (set[29].Get(la.kind)) { - stateStack.Push(127); - goto case 128; + case 132: { + if (la == null) { currentState = 132; break; } + if (set[30].Get(la.kind)) { + stateStack.Push(132); + goto case 133; } else { - goto case 57; + goto case 62; } } - case 128: { - if (la == null) { currentState = 128; break; } + case 133: { + if (la == null) { currentState = 133; break; } if (la.kind == 37) { - currentState = 133; + currentState = 138; break; } else { if (set[126].Get(la.kind)) { - currentState = 129; + currentState = 134; break; } else { goto case 6; } } } - case 129: { + case 134: { nextTokenIsStartOfImportsOrAccessExpression = true; - goto case 130; + goto case 135; } - case 130: { - if (la == null) { currentState = 130; break; } + case 135: { + if (la == null) { currentState = 135; break; } if (la.kind == 10) { - currentState = 131; + currentState = 136; break; } else { - goto case 131; + goto case 136; } } - case 131: { - stateStack.Push(132); - goto case 76; + case 136: { + stateStack.Push(137); + goto case 81; } - case 132: { - if (la == null) { currentState = 132; break; } + case 137: { + if (la == null) { currentState = 137; break; } if (la.kind == 11) { currentState = stateStack.Pop(); break; @@ -3276,106 +3326,106 @@ partial class ExpressionFinder { goto switchlbl; } } - case 133: { + case 138: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 134; + goto case 139; } - case 134: { - if (la == null) { currentState = 134; break; } + case 139: { + if (la == null) { currentState = 139; break; } if (la.kind == 169) { - currentState = 136; + currentState = 141; break; } else { - if (set[20].Get(la.kind)) { - if (set[21].Get(la.kind)) { - stateStack.Push(135); - goto case 43; + if (set[21].Get(la.kind)) { + if (set[22].Get(la.kind)) { + stateStack.Push(140); + goto case 48; } else { - goto case 135; + goto case 140; } } else { goto case 6; } } } - case 135: { + case 140: { PopContext(); - goto case 40; + goto case 45; } - case 136: { - stateStack.Push(137); - goto case 32; + case 141: { + stateStack.Push(142); + goto case 37; } - case 137: { - if (la == null) { currentState = 137; break; } + case 142: { + if (la == null) { currentState = 142; break; } if (la.kind == 22) { - currentState = 136; + currentState = 141; break; } else { - goto case 40; + goto case 45; } } - case 138: { + case 143: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 139; + goto case 144; } - case 139: { - if (la == null) { currentState = 139; break; } + case 144: { + if (la == null) { currentState = 144; break; } if (set[127].Get(la.kind)) { - currentState = 140; + currentState = 145; break; } else { if (la.kind == 37) { - currentState = 419; + currentState = 424; break; } else { if (set[128].Get(la.kind)) { - currentState = 140; + currentState = 145; break; } else { if (set[123].Get(la.kind)) { - currentState = 140; + currentState = 145; break; } else { if (set[126].Get(la.kind)) { - currentState = 415; + currentState = 420; break; } else { if (la.kind == 129) { - currentState = 413; + currentState = 418; break; } else { if (la.kind == 237) { - currentState = 410; + currentState = 415; break; } else { - if (set[76].Get(la.kind)) { - stateStack.Push(140); + if (set[77].Get(la.kind)) { + stateStack.Push(145); nextTokenIsPotentialStartOfExpression = true; PushContext(Context.Xml, la, t); - goto case 393; + goto case 398; } else { if (la.kind == 127 || la.kind == 210) { - stateStack.Push(140); - goto case 214; + stateStack.Push(145); + goto case 219; } else { if (la.kind == 58 || la.kind == 126) { - stateStack.Push(140); + stateStack.Push(145); PushContext(Context.Query, la, t); - goto case 154; + goto case 159; } else { - if (set[34].Get(la.kind)) { - stateStack.Push(140); - goto case 148; + if (set[35].Get(la.kind)) { + stateStack.Push(145); + goto case 153; } else { if (la.kind == 135) { - stateStack.Push(140); - goto case 141; + stateStack.Push(145); + goto case 146; } else { Error(la); - goto case 140; + goto case 145; } } } @@ -3389,155 +3439,155 @@ partial class ExpressionFinder { } } } - case 140: { + case 145: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 141: { - if (la == null) { currentState = 141; break; } + case 146: { + if (la == null) { currentState = 146; break; } Expect(135, la); // "If" - currentState = 142; + currentState = 147; break; } - case 142: { - if (la == null) { currentState = 142; break; } + case 147: { + if (la == null) { currentState = 147; break; } Expect(37, la); // "(" - currentState = 143; + currentState = 148; break; } - case 143: { - stateStack.Push(144); - goto case 51; + case 148: { + stateStack.Push(149); + goto case 56; } - case 144: { - if (la == null) { currentState = 144; break; } + case 149: { + if (la == null) { currentState = 149; break; } Expect(22, la); // "," - currentState = 145; + currentState = 150; break; } - case 145: { - stateStack.Push(146); - goto case 51; + case 150: { + stateStack.Push(151); + goto case 56; } - case 146: { - if (la == null) { currentState = 146; break; } + case 151: { + if (la == null) { currentState = 151; break; } if (la.kind == 22) { - currentState = 147; + currentState = 152; break; } else { - goto case 40; + goto case 45; } } - case 147: { - stateStack.Push(40); - goto case 51; + case 152: { + stateStack.Push(45); + goto case 56; } - case 148: { - if (la == null) { currentState = 148; break; } + case 153: { + if (la == null) { currentState = 153; break; } if (set[129].Get(la.kind)) { - currentState = 153; + currentState = 158; break; } else { if (la.kind == 94 || la.kind == 106 || la.kind == 219) { - currentState = 149; + currentState = 154; break; } else { goto case 6; } } } - case 149: { - if (la == null) { currentState = 149; break; } + case 154: { + if (la == null) { currentState = 154; break; } Expect(37, la); // "(" - currentState = 150; + currentState = 155; break; } - case 150: { - stateStack.Push(151); - goto case 51; + case 155: { + stateStack.Push(156); + goto case 56; } - case 151: { - if (la == null) { currentState = 151; break; } + case 156: { + if (la == null) { currentState = 156; break; } Expect(22, la); // "," - currentState = 152; + currentState = 157; break; } - case 152: { - stateStack.Push(40); - goto case 32; + case 157: { + stateStack.Push(45); + goto case 37; } - case 153: { - if (la == null) { currentState = 153; break; } + case 158: { + if (la == null) { currentState = 158; break; } Expect(37, la); // "(" - currentState = 147; + currentState = 152; break; } - case 154: { - if (la == null) { currentState = 154; break; } + case 159: { + if (la == null) { currentState = 159; break; } if (la.kind == 126) { - stateStack.Push(155); - goto case 213; + stateStack.Push(160); + goto case 218; } else { if (la.kind == 58) { - stateStack.Push(155); - goto case 212; + stateStack.Push(160); + goto case 217; } else { Error(la); - goto case 155; + goto case 160; } } } - case 155: { - if (la == null) { currentState = 155; break; } - if (set[35].Get(la.kind)) { - stateStack.Push(155); - goto case 156; + case 160: { + if (la == null) { currentState = 160; break; } + if (set[36].Get(la.kind)) { + stateStack.Push(160); + goto case 161; } else { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } } - case 156: { - if (la == null) { currentState = 156; break; } + case 161: { + if (la == null) { currentState = 161; break; } if (la.kind == 126) { - currentState = 210; + currentState = 215; break; } else { if (la.kind == 58) { - currentState = 206; + currentState = 211; break; } else { if (la.kind == 197) { - currentState = 204; + currentState = 209; break; } else { if (la.kind == 107) { - goto case 108; + goto case 113; } else { if (la.kind == 230) { - currentState = 51; + currentState = 56; break; } else { if (la.kind == 176) { - currentState = 200; + currentState = 205; break; } else { if (la.kind == 203 || la.kind == 212) { - currentState = 198; + currentState = 203; break; } else { if (la.kind == 148) { - currentState = 196; + currentState = 201; break; } else { if (la.kind == 133) { - currentState = 170; + currentState = 175; break; } else { if (la.kind == 146) { - currentState = 157; + currentState = 162; break; } else { goto case 6; @@ -3552,107 +3602,107 @@ partial class ExpressionFinder { } } } - case 157: { - stateStack.Push(158); - goto case 163; + case 162: { + stateStack.Push(163); + goto case 168; } - case 158: { - if (la == null) { currentState = 158; break; } + case 163: { + if (la == null) { currentState = 163; break; } Expect(171, la); // "On" - currentState = 159; + currentState = 164; break; } - case 159: { - stateStack.Push(160); - goto case 51; + case 164: { + stateStack.Push(165); + goto case 56; } - case 160: { - if (la == null) { currentState = 160; break; } + case 165: { + if (la == null) { currentState = 165; break; } Expect(116, la); // "Equals" - currentState = 161; + currentState = 166; break; } - case 161: { - stateStack.Push(162); - goto case 51; + case 166: { + stateStack.Push(167); + goto case 56; } - case 162: { - if (la == null) { currentState = 162; break; } + case 167: { + if (la == null) { currentState = 167; break; } if (la.kind == 22) { - currentState = 159; + currentState = 164; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 163: { + case 168: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(164); - goto case 169; + stateStack.Push(169); + goto case 174; } - case 164: { + case 169: { PopContext(); - goto case 165; + goto case 170; } - case 165: { - if (la == null) { currentState = 165; break; } + case 170: { + if (la == null) { currentState = 170; break; } if (la.kind == 63) { - currentState = 167; + currentState = 172; break; } else { - goto case 166; + goto case 171; } } - case 166: { - if (la == null) { currentState = 166; break; } + case 171: { + if (la == null) { currentState = 171; break; } Expect(138, la); // "In" - currentState = 51; + currentState = 56; break; } - case 167: { + case 172: { PushContext(Context.Type, la, t); - stateStack.Push(168); - goto case 32; + stateStack.Push(173); + goto case 37; } - case 168: { + case 173: { PopContext(); - goto case 166; + goto case 171; } - case 169: { - if (la == null) { currentState = 169; break; } + case 174: { + if (la == null) { currentState = 174; break; } if (set[114].Get(la.kind)) { currentState = stateStack.Pop(); break; } else { if (la.kind == 98) { - goto case 110; + goto case 115; } else { goto case 6; } } } - case 170: { + case 175: { SetIdentifierExpected(la); nextTokenIsPotentialStartOfExpression = true; - goto case 171; + goto case 176; } - case 171: { - if (la == null) { currentState = 171; break; } + case 176: { + if (la == null) { currentState = 176; break; } if (la.kind == 146) { - goto case 188; + goto case 193; } else { - if (set[37].Get(la.kind)) { + if (set[38].Get(la.kind)) { if (la.kind == 70) { - currentState = 173; + currentState = 178; break; } else { - if (set[37].Get(la.kind)) { - goto case 186; + if (set[38].Get(la.kind)) { + goto case 191; } else { Error(la); - goto case 172; + goto case 177; } } } else { @@ -3660,71 +3710,71 @@ partial class ExpressionFinder { } } } - case 172: { - if (la == null) { currentState = 172; break; } + case 177: { + if (la == null) { currentState = 177; break; } Expect(70, la); // "By" - currentState = 173; + currentState = 178; break; } - case 173: { - stateStack.Push(174); - goto case 177; + case 178: { + stateStack.Push(179); + goto case 182; } - case 174: { - if (la == null) { currentState = 174; break; } + case 179: { + if (la == null) { currentState = 179; break; } if (la.kind == 22) { - currentState = 173; + currentState = 178; break; } else { Expect(143, la); // "Into" - currentState = 175; + currentState = 180; break; } } - case 175: { - stateStack.Push(176); - goto case 177; + case 180: { + stateStack.Push(181); + goto case 182; } - case 176: { - if (la == null) { currentState = 176; break; } + case 181: { + if (la == null) { currentState = 181; break; } if (la.kind == 22) { - currentState = 175; + currentState = 180; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 177: { + case 182: { SetIdentifierExpected(la); nextTokenIsPotentialStartOfExpression = true; - goto case 178; + goto case 183; } - case 178: { - if (la == null) { currentState = 178; break; } + case 183: { + if (la == null) { currentState = 183; break; } if (set[6].Get(la.kind)) { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(179); - goto case 169; + stateStack.Push(184); + goto case 174; } else { - goto case 51; + goto case 56; } } - case 179: { + case 184: { PopContext(); - goto case 180; + goto case 185; } - case 180: { - if (la == null) { currentState = 180; break; } + case 185: { + if (la == null) { currentState = 185; break; } if (la.kind == 63) { - currentState = 183; + currentState = 188; break; } else { if (la.kind == 20) { - goto case 182; + goto case 187; } else { - if (set[38].Get(la.kind)) { + if (set[39].Get(la.kind)) { currentState = endOfStatementTerminatorAndBlock; /* leave this block */ InformToken(t); /* process Identifier again*/ /* for processing current token (la): go to the position after processing End */ @@ -3732,429 +3782,429 @@ partial class ExpressionFinder { } else { Error(la); - goto case 51; + goto case 56; } } } } - case 181: { - if (la == null) { currentState = 181; break; } - currentState = 51; + case 186: { + if (la == null) { currentState = 186; break; } + currentState = 56; break; } - case 182: { - if (la == null) { currentState = 182; break; } - currentState = 51; + case 187: { + if (la == null) { currentState = 187; break; } + currentState = 56; break; } - case 183: { + case 188: { PushContext(Context.Type, la, t); - stateStack.Push(184); - goto case 32; + stateStack.Push(189); + goto case 37; } - case 184: { + case 189: { PopContext(); - goto case 185; + goto case 190; } - case 185: { - if (la == null) { currentState = 185; break; } + case 190: { + if (la == null) { currentState = 190; break; } Expect(20, la); // "=" - currentState = 51; + currentState = 56; break; } - case 186: { - stateStack.Push(187); - goto case 177; + case 191: { + stateStack.Push(192); + goto case 182; } - case 187: { - if (la == null) { currentState = 187; break; } + case 192: { + if (la == null) { currentState = 192; break; } if (la.kind == 22) { - currentState = 186; + currentState = 191; break; } else { - goto case 172; + goto case 177; } } - case 188: { - stateStack.Push(189); - goto case 195; + case 193: { + stateStack.Push(194); + goto case 200; } - case 189: { - if (la == null) { currentState = 189; break; } + case 194: { + if (la == null) { currentState = 194; break; } if (la.kind == 133 || la.kind == 146) { if (la.kind == 133) { - currentState = 193; + currentState = 198; break; } else { if (la.kind == 146) { - goto case 188; + goto case 193; } else { Error(la); - goto case 189; + goto case 194; } } } else { - goto case 190; + goto case 195; } } - case 190: { - if (la == null) { currentState = 190; break; } + case 195: { + if (la == null) { currentState = 195; break; } Expect(143, la); // "Into" - currentState = 191; + currentState = 196; break; } - case 191: { - stateStack.Push(192); - goto case 177; + case 196: { + stateStack.Push(197); + goto case 182; } - case 192: { - if (la == null) { currentState = 192; break; } + case 197: { + if (la == null) { currentState = 197; break; } if (la.kind == 22) { - currentState = 191; + currentState = 196; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 193: { + case 198: { + stateStack.Push(199); + goto case 200; + } + case 199: { stateStack.Push(194); goto case 195; } - case 194: { - stateStack.Push(189); - goto case 190; - } - case 195: { - if (la == null) { currentState = 195; break; } + case 200: { + if (la == null) { currentState = 200; break; } Expect(146, la); // "Join" - currentState = 157; + currentState = 162; break; } - case 196: { - stateStack.Push(197); - goto case 177; + case 201: { + stateStack.Push(202); + goto case 182; } - case 197: { - if (la == null) { currentState = 197; break; } + case 202: { + if (la == null) { currentState = 202; break; } if (la.kind == 22) { - currentState = 196; + currentState = 201; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 198: { + case 203: { nextTokenIsPotentialStartOfExpression = true; - goto case 199; + goto case 204; } - case 199: { - if (la == null) { currentState = 199; break; } + case 204: { + if (la == null) { currentState = 204; break; } if (la.kind == 231) { - currentState = 51; + currentState = 56; break; } else { - goto case 51; + goto case 56; } } - case 200: { - if (la == null) { currentState = 200; break; } + case 205: { + if (la == null) { currentState = 205; break; } Expect(70, la); // "By" - currentState = 201; + currentState = 206; break; } - case 201: { - stateStack.Push(202); - goto case 51; + case 206: { + stateStack.Push(207); + goto case 56; } - case 202: { - if (la == null) { currentState = 202; break; } + case 207: { + if (la == null) { currentState = 207; break; } if (la.kind == 64) { - currentState = 203; + currentState = 208; break; } else { if (la.kind == 104) { - currentState = 203; + currentState = 208; break; } else { Error(la); - goto case 203; + goto case 208; } } } - case 203: { - if (la == null) { currentState = 203; break; } + case 208: { + if (la == null) { currentState = 208; break; } if (la.kind == 22) { - currentState = 201; + currentState = 206; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 204: { - stateStack.Push(205); - goto case 177; + case 209: { + stateStack.Push(210); + goto case 182; } - case 205: { - if (la == null) { currentState = 205; break; } + case 210: { + if (la == null) { currentState = 210; break; } if (la.kind == 22) { - currentState = 204; + currentState = 209; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 206: { - stateStack.Push(207); - goto case 163; + case 211: { + stateStack.Push(212); + goto case 168; } - case 207: { - if (la == null) { currentState = 207; break; } - if (set[35].Get(la.kind)) { - stateStack.Push(207); - goto case 156; + case 212: { + if (la == null) { currentState = 212; break; } + if (set[36].Get(la.kind)) { + stateStack.Push(212); + goto case 161; } else { Expect(143, la); // "Into" - currentState = 208; + currentState = 213; break; } } - case 208: { - stateStack.Push(209); - goto case 177; + case 213: { + stateStack.Push(214); + goto case 182; } - case 209: { - if (la == null) { currentState = 209; break; } + case 214: { + if (la == null) { currentState = 214; break; } if (la.kind == 22) { - currentState = 208; + currentState = 213; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 210: { - stateStack.Push(211); - goto case 163; + case 215: { + stateStack.Push(216); + goto case 168; } - case 211: { - if (la == null) { currentState = 211; break; } + case 216: { + if (la == null) { currentState = 216; break; } if (la.kind == 22) { - currentState = 210; + currentState = 215; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 212: { - if (la == null) { currentState = 212; break; } + case 217: { + if (la == null) { currentState = 217; break; } Expect(58, la); // "Aggregate" - currentState = 206; + currentState = 211; break; } - case 213: { - if (la == null) { currentState = 213; break; } + case 218: { + if (la == null) { currentState = 218; break; } Expect(126, la); // "From" - currentState = 210; + currentState = 215; break; } - case 214: { - if (la == null) { currentState = 214; break; } + case 219: { + if (la == null) { currentState = 219; break; } if (la.kind == 210) { - currentState = 385; + currentState = 390; break; } else { if (la.kind == 127) { - currentState = 215; + currentState = 220; break; } else { goto case 6; } } } - case 215: { - if (la == null) { currentState = 215; break; } + case 220: { + if (la == null) { currentState = 220; break; } Expect(37, la); // "(" - currentState = 216; + currentState = 221; break; } - case 216: { + case 221: { SetIdentifierExpected(la); - goto case 217; + goto case 222; } - case 217: { - if (la == null) { currentState = 217; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(218); - goto case 367; + case 222: { + if (la == null) { currentState = 222; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(223); + goto case 372; } else { - goto case 218; + goto case 223; } } - case 218: { - if (la == null) { currentState = 218; break; } + case 223: { + if (la == null) { currentState = 223; break; } Expect(38, la); // ")" - currentState = 219; + currentState = 224; break; } - case 219: { + case 224: { nextTokenIsPotentialStartOfExpression = true; - goto case 220; + goto case 225; } - case 220: { - if (la == null) { currentState = 220; break; } - if (set[22].Get(la.kind)) { - goto case 51; + case 225: { + if (la == null) { currentState = 225; 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 = 365; + currentState = 370; break; } else { - goto case 221; + goto case 226; } } else { goto case 6; } } } - case 221: { - stateStack.Push(222); - goto case 224; + case 226: { + stateStack.Push(227); + goto case 229; } - case 222: { - if (la == null) { currentState = 222; break; } + case 227: { + if (la == null) { currentState = 227; break; } Expect(113, la); // "End" - currentState = 223; + currentState = 228; break; } - case 223: { - if (la == null) { currentState = 223; break; } + case 228: { + if (la == null) { currentState = 228; break; } Expect(127, la); // "Function" currentState = stateStack.Pop(); break; } - case 224: { + case 229: { PushContext(Context.Body, la, t); - goto case 225; + goto case 230; } - case 225: { - stateStack.Push(226); - goto case 18; + case 230: { + stateStack.Push(231); + goto case 23; } - case 226: { + case 231: { nextTokenIsPotentialStartOfExpression = true; - goto case 227; + goto case 232; } - case 227: { - if (la == null) { currentState = 227; break; } + case 232: { + if (la == null) { currentState = 232; break; } if (set[130].Get(la.kind)) { - if (set[64].Get(la.kind)) { - if (set[46].Get(la.kind)) { - stateStack.Push(225); - goto case 232; + if (set[65].Get(la.kind)) { + if (set[47].Get(la.kind)) { + stateStack.Push(230); + goto case 237; } else { - goto case 225; + goto case 230; } } else { if (la.kind == 113) { - currentState = 230; + currentState = 235; break; } else { - goto case 229; + goto case 234; } } } else { - goto case 228; + goto case 233; } } - case 228: { + case 233: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 229: { + case 234: { Error(la); - goto case 226; + goto case 231; } - case 230: { - if (la == null) { currentState = 230; break; } + case 235: { + if (la == null) { currentState = 235; break; } if (la.kind == 1 || la.kind == 21) { - goto case 225; + goto case 230; } else { - if (set[45].Get(la.kind)) { + if (set[46].Get(la.kind)) { currentState = endOfStatementTerminatorAndBlock; /* leave this block */ InformToken(t); /* process End again*/ /* for processing current token (la): go to the position after processing End */ goto switchlbl; } else { - goto case 229; + goto case 234; } } } - case 231: { - if (la == null) { currentState = 231; break; } - currentState = 226; + case 236: { + if (la == null) { currentState = 236; break; } + currentState = 231; break; } - case 232: { + case 237: { nextTokenIsPotentialStartOfExpression = true; - goto case 233; + goto case 238; } - case 233: { - if (la == null) { currentState = 233; break; } + case 238: { + if (la == null) { currentState = 238; break; } if (la.kind == 88 || la.kind == 105 || la.kind == 204) { - currentState = 349; + currentState = 354; break; } else { if (la.kind == 211 || la.kind == 233) { - currentState = 345; + currentState = 350; break; } else { if (la.kind == 56 || la.kind == 193) { - currentState = 343; + currentState = 348; break; } else { if (la.kind == 189) { - currentState = 341; + currentState = 346; break; } else { if (la.kind == 135) { - currentState = 323; + currentState = 328; break; } else { if (la.kind == 197) { - currentState = 308; + currentState = 313; break; } else { if (la.kind == 231) { - currentState = 304; + currentState = 309; break; } else { if (la.kind == 108) { - currentState = 298; + currentState = 303; break; } else { if (la.kind == 124) { - currentState = 271; + currentState = 276; break; } else { if (la.kind == 118 || la.kind == 171 || la.kind == 194) { if (la.kind == 118 || la.kind == 171) { if (la.kind == 171) { - currentState = 267; + currentState = 272; break; } else { - goto case 267; + goto case 272; } } else { if (la.kind == 194) { - currentState = 265; + currentState = 270; break; } else { goto case 6; @@ -4162,31 +4212,31 @@ partial class ExpressionFinder { } } else { if (la.kind == 215) { - currentState = 263; + currentState = 268; break; } else { if (la.kind == 218) { - currentState = 250; + currentState = 255; break; } else { if (set[131].Get(la.kind)) { if (la.kind == 132) { - currentState = 247; + currentState = 252; break; } else { if (la.kind == 120) { - currentState = 246; + currentState = 251; break; } else { if (la.kind == 89) { - currentState = 245; + currentState = 250; break; } else { if (la.kind == 206) { - goto case 88; + goto case 93; } else { if (la.kind == 195) { - currentState = 242; + currentState = 247; break; } else { goto case 6; @@ -4197,23 +4247,23 @@ partial class ExpressionFinder { } } else { if (la.kind == 191) { - currentState = 240; + currentState = 245; break; } else { if (la.kind == 117) { - currentState = 238; + currentState = 243; break; } else { if (la.kind == 226) { - currentState = 234; + currentState = 239; break; } else { if (set[132].Get(la.kind)) { if (la.kind == 73) { - currentState = 51; + currentState = 56; break; } else { - goto case 51; + goto case 56; } } else { goto case 6; @@ -4235,113 +4285,113 @@ partial class ExpressionFinder { } } } - case 234: { - stateStack.Push(235); - goto case 51; + case 239: { + stateStack.Push(240); + goto case 56; } - case 235: { - stateStack.Push(236); - goto case 224; + case 240: { + stateStack.Push(241); + goto case 229; } - case 236: { - if (la == null) { currentState = 236; break; } + case 241: { + if (la == null) { currentState = 241; break; } Expect(113, la); // "End" - currentState = 237; + currentState = 242; break; } - case 237: { - if (la == null) { currentState = 237; break; } + case 242: { + if (la == null) { currentState = 242; break; } Expect(226, la); // "Using" currentState = stateStack.Pop(); break; } - case 238: { - stateStack.Push(239); - goto case 51; + case 243: { + stateStack.Push(244); + goto case 56; } - case 239: { - if (la == null) { currentState = 239; break; } + case 244: { + if (la == null) { currentState = 244; break; } if (la.kind == 22) { - currentState = 238; + currentState = 243; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 240: { + case 245: { nextTokenIsPotentialStartOfExpression = true; - goto case 241; + goto case 246; } - case 241: { - if (la == null) { currentState = 241; break; } + case 246: { + if (la == null) { currentState = 246; break; } if (la.kind == 184) { - currentState = 51; + currentState = 56; break; } else { - goto case 51; + goto case 56; } } - case 242: { + case 247: { PushContext(Context.Expression, la, t); nextTokenIsPotentialStartOfExpression = true; - goto case 243; + goto case 248; } - case 243: { - if (la == null) { currentState = 243; break; } - if (set[22].Get(la.kind)) { - stateStack.Push(244); - goto case 51; + case 248: { + if (la == null) { currentState = 248; break; } + if (set[23].Get(la.kind)) { + stateStack.Push(249); + goto case 56; } else { - goto case 244; + goto case 249; } } - case 244: { + case 249: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 245: { - if (la == null) { currentState = 245; break; } + case 250: { + if (la == null) { currentState = 250; break; } if (la.kind == 108) { - goto case 107; + goto case 112; } else { if (la.kind == 124) { - goto case 104; + goto case 109; } else { if (la.kind == 231) { - goto case 78; + goto case 83; } else { goto case 6; } } } } - case 246: { - if (la == null) { currentState = 246; break; } + case 251: { + if (la == null) { currentState = 251; break; } if (la.kind == 108) { - goto case 107; + goto case 112; } else { if (la.kind == 124) { - goto case 104; + goto case 109; } else { if (la.kind == 231) { - goto case 78; + goto case 83; } else { if (la.kind == 197) { - goto case 90; + goto case 95; } else { if (la.kind == 210) { - goto case 86; + goto case 91; } else { if (la.kind == 127) { - goto case 102; + goto case 107; } else { if (la.kind == 186) { - goto case 91; + goto case 96; } else { if (la.kind == 218) { - goto case 82; + goto case 87; } else { goto case 6; } @@ -4353,166 +4403,166 @@ partial class ExpressionFinder { } } } - case 247: { - if (la == null) { currentState = 247; break; } + case 252: { + if (la == null) { currentState = 252; break; } if (set[6].Get(la.kind)) { - goto case 249; + goto case 254; } else { if (la.kind == 5) { - goto case 248; + goto case 253; } else { goto case 6; } } } - case 248: { - if (la == null) { currentState = 248; break; } + case 253: { + if (la == null) { currentState = 253; break; } currentState = stateStack.Pop(); break; } - case 249: { - if (la == null) { currentState = 249; break; } + case 254: { + if (la == null) { currentState = 254; break; } currentState = stateStack.Pop(); break; } - case 250: { - stateStack.Push(251); - goto case 224; + case 255: { + stateStack.Push(256); + goto case 229; } - case 251: { - if (la == null) { currentState = 251; break; } + case 256: { + if (la == null) { currentState = 256; break; } if (la.kind == 75) { - currentState = 255; + currentState = 260; break; } else { if (la.kind == 123) { - currentState = 254; + currentState = 259; break; } else { - goto case 252; + goto case 257; } } } - case 252: { - if (la == null) { currentState = 252; break; } + case 257: { + if (la == null) { currentState = 257; break; } Expect(113, la); // "End" - currentState = 253; + currentState = 258; break; } - case 253: { - if (la == null) { currentState = 253; break; } + case 258: { + if (la == null) { currentState = 258; break; } Expect(218, la); // "Try" currentState = stateStack.Pop(); break; } - case 254: { - stateStack.Push(252); - goto case 224; + case 259: { + stateStack.Push(257); + goto case 229; } - case 255: { + case 260: { SetIdentifierExpected(la); - goto case 256; + goto case 261; } - case 256: { - if (la == null) { currentState = 256; break; } + case 261: { + if (la == null) { currentState = 261; break; } if (set[6].Get(la.kind)) { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(259); - goto case 169; + stateStack.Push(264); + goto case 174; } else { - goto case 257; + goto case 262; } } - case 257: { - if (la == null) { currentState = 257; break; } + case 262: { + if (la == null) { currentState = 262; break; } if (la.kind == 229) { - currentState = 258; + currentState = 263; break; } else { - goto case 250; + goto case 255; } } - case 258: { - stateStack.Push(250); - goto case 51; + case 263: { + stateStack.Push(255); + goto case 56; } - case 259: { + case 264: { PopContext(); - goto case 260; + goto case 265; } - case 260: { - if (la == null) { currentState = 260; break; } + case 265: { + if (la == null) { currentState = 265; break; } if (la.kind == 63) { - currentState = 261; + currentState = 266; break; } else { - goto case 257; + goto case 262; } } - case 261: { + case 266: { PushContext(Context.Type, la, t); - stateStack.Push(262); - goto case 32; + stateStack.Push(267); + goto case 37; } - case 262: { + case 267: { PopContext(); - goto case 257; + goto case 262; } - case 263: { + case 268: { nextTokenIsPotentialStartOfExpression = true; - goto case 264; + goto case 269; } - case 264: { - if (la == null) { currentState = 264; break; } - if (set[22].Get(la.kind)) { - goto case 51; + case 269: { + if (la == null) { currentState = 269; break; } + if (set[23].Get(la.kind)) { + goto case 56; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 265: { - if (la == null) { currentState = 265; break; } + case 270: { + if (la == null) { currentState = 270; break; } if (la.kind == 163) { - goto case 95; + goto case 100; } else { - goto case 266; + goto case 271; } } - case 266: { - if (la == null) { currentState = 266; break; } + case 271: { + if (la == null) { currentState = 271; break; } if (la.kind == 5) { - goto case 248; + goto case 253; } else { if (set[6].Get(la.kind)) { - goto case 249; + goto case 254; } else { goto case 6; } } } - case 267: { - if (la == null) { currentState = 267; break; } + case 272: { + if (la == null) { currentState = 272; break; } Expect(118, la); // "Error" - currentState = 268; + currentState = 273; break; } - case 268: { + case 273: { nextTokenIsPotentialStartOfExpression = true; - goto case 269; + goto case 274; } - case 269: { - if (la == null) { currentState = 269; break; } - if (set[22].Get(la.kind)) { - goto case 51; + case 274: { + if (la == null) { currentState = 274; break; } + if (set[23].Get(la.kind)) { + goto case 56; } else { if (la.kind == 132) { - currentState = 266; + currentState = 271; break; } else { if (la.kind == 194) { - currentState = 270; + currentState = 275; break; } else { goto case 6; @@ -4520,109 +4570,109 @@ partial class ExpressionFinder { } } } - case 270: { - if (la == null) { currentState = 270; break; } + case 275: { + if (la == null) { currentState = 275; break; } Expect(163, la); // "Next" currentState = stateStack.Pop(); break; } - case 271: { + case 276: { nextTokenIsPotentialStartOfExpression = true; SetIdentifierExpected(la); - goto case 272; + goto case 277; } - case 272: { - if (la == null) { currentState = 272; break; } - if (set[32].Get(la.kind)) { - stateStack.Push(288); - goto case 282; + case 277: { + if (la == null) { currentState = 277; break; } + if (set[33].Get(la.kind)) { + stateStack.Push(293); + goto case 287; } else { if (la.kind == 110) { - currentState = 273; + currentState = 278; break; } else { goto case 6; } } } - case 273: { - stateStack.Push(274); - goto case 282; + case 278: { + stateStack.Push(279); + goto case 287; } - case 274: { - if (la == null) { currentState = 274; break; } + case 279: { + if (la == null) { currentState = 279; break; } Expect(138, la); // "In" - currentState = 275; + currentState = 280; break; } - case 275: { - stateStack.Push(276); - goto case 51; + case 280: { + stateStack.Push(281); + goto case 56; } - case 276: { - stateStack.Push(277); - goto case 224; + case 281: { + stateStack.Push(282); + goto case 229; } - case 277: { - if (la == null) { currentState = 277; break; } + case 282: { + if (la == null) { currentState = 282; break; } Expect(163, la); // "Next" - currentState = 278; + currentState = 283; break; } - case 278: { + case 283: { nextTokenIsPotentialStartOfExpression = true; - goto case 279; + goto case 284; } - case 279: { - if (la == null) { currentState = 279; break; } - if (set[22].Get(la.kind)) { - goto case 280; + case 284: { + if (la == null) { currentState = 284; break; } + if (set[23].Get(la.kind)) { + goto case 285; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 280: { - stateStack.Push(281); - goto case 51; + case 285: { + stateStack.Push(286); + goto case 56; } - case 281: { - if (la == null) { currentState = 281; break; } + case 286: { + if (la == null) { currentState = 286; break; } if (la.kind == 22) { - currentState = 280; + currentState = 285; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 282: { + case 287: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(283); - goto case 138; + stateStack.Push(288); + goto case 143; } - case 283: { + case 288: { PopContext(); - goto case 284; + goto case 289; } - case 284: { - if (la == null) { currentState = 284; break; } + case 289: { + if (la == null) { currentState = 289; break; } if (la.kind == 33) { - currentState = 285; + currentState = 290; break; } else { - goto case 285; + goto case 290; } } - case 285: { - if (la == null) { currentState = 285; break; } - if (set[29].Get(la.kind)) { - stateStack.Push(285); - goto case 128; + case 290: { + if (la == null) { currentState = 290; break; } + if (set[30].Get(la.kind)) { + stateStack.Push(290); + goto case 133; } else { if (la.kind == 63) { - currentState = 286; + currentState = 291; break; } else { currentState = stateStack.Pop(); @@ -4630,242 +4680,242 @@ partial class ExpressionFinder { } } } - case 286: { + case 291: { PushContext(Context.Type, la, t); - stateStack.Push(287); - goto case 32; + stateStack.Push(292); + goto case 37; } - case 287: { + case 292: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 288: { - if (la == null) { currentState = 288; break; } + case 293: { + if (la == null) { currentState = 293; break; } Expect(20, la); // "=" - currentState = 289; + currentState = 294; break; } - case 289: { - stateStack.Push(290); - goto case 51; + case 294: { + stateStack.Push(295); + goto case 56; } - case 290: { - if (la == null) { currentState = 290; break; } + case 295: { + if (la == null) { currentState = 295; break; } if (la.kind == 205) { - currentState = 297; + currentState = 302; break; } else { - goto case 291; + goto case 296; } } - case 291: { - stateStack.Push(292); - goto case 224; + case 296: { + stateStack.Push(297); + goto case 229; } - case 292: { - if (la == null) { currentState = 292; break; } + case 297: { + if (la == null) { currentState = 297; break; } Expect(163, la); // "Next" - currentState = 293; + currentState = 298; break; } - case 293: { + case 298: { nextTokenIsPotentialStartOfExpression = true; - goto case 294; + goto case 299; } - case 294: { - if (la == null) { currentState = 294; break; } - if (set[22].Get(la.kind)) { - goto case 295; + case 299: { + if (la == null) { currentState = 299; break; } + if (set[23].Get(la.kind)) { + goto case 300; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 295: { - stateStack.Push(296); - goto case 51; + case 300: { + stateStack.Push(301); + goto case 56; } - case 296: { - if (la == null) { currentState = 296; break; } + case 301: { + if (la == null) { currentState = 301; break; } if (la.kind == 22) { - currentState = 295; + currentState = 300; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 297: { - stateStack.Push(291); - goto case 51; + case 302: { + stateStack.Push(296); + goto case 56; } - case 298: { - if (la == null) { currentState = 298; break; } + case 303: { + if (la == null) { currentState = 303; break; } if (la.kind == 224 || la.kind == 231) { - currentState = 301; + currentState = 306; break; } else { if (la.kind == 1 || la.kind == 21) { - stateStack.Push(299); - goto case 224; + stateStack.Push(304); + goto case 229; } else { goto case 6; } } } - case 299: { - if (la == null) { currentState = 299; break; } + case 304: { + if (la == null) { currentState = 304; break; } Expect(152, la); // "Loop" - currentState = 300; + currentState = 305; break; } - case 300: { - if (la == null) { currentState = 300; break; } + case 305: { + if (la == null) { currentState = 305; break; } if (la.kind == 224 || la.kind == 231) { - currentState = 51; + currentState = 56; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 301: { - stateStack.Push(302); - goto case 51; + case 306: { + stateStack.Push(307); + goto case 56; } - case 302: { - stateStack.Push(303); - goto case 224; + case 307: { + stateStack.Push(308); + goto case 229; } - case 303: { - if (la == null) { currentState = 303; break; } + case 308: { + if (la == null) { currentState = 308; break; } Expect(152, la); // "Loop" currentState = stateStack.Pop(); break; } - case 304: { - stateStack.Push(305); - goto case 51; + case 309: { + stateStack.Push(310); + goto case 56; } - case 305: { - stateStack.Push(306); - goto case 224; + case 310: { + stateStack.Push(311); + goto case 229; } - case 306: { - if (la == null) { currentState = 306; break; } + case 311: { + if (la == null) { currentState = 311; break; } Expect(113, la); // "End" - currentState = 307; + currentState = 312; break; } - case 307: { - if (la == null) { currentState = 307; break; } + case 312: { + if (la == null) { currentState = 312; break; } Expect(231, la); // "While" currentState = stateStack.Pop(); break; } - case 308: { + case 313: { nextTokenIsPotentialStartOfExpression = true; - goto case 309; + goto case 314; } - case 309: { - if (la == null) { currentState = 309; break; } + case 314: { + if (la == null) { currentState = 314; break; } if (la.kind == 74) { - currentState = 310; + currentState = 315; break; } else { - goto case 310; + goto case 315; } } - case 310: { - stateStack.Push(311); - goto case 51; - } - case 311: { - stateStack.Push(312); - goto case 18; + case 315: { + stateStack.Push(316); + goto case 56; } - case 312: { - if (la == null) { currentState = 312; break; } + case 316: { + stateStack.Push(317); + goto case 23; + } + case 317: { + if (la == null) { currentState = 317; break; } if (la.kind == 74) { - currentState = 314; + currentState = 319; break; } else { Expect(113, la); // "End" - currentState = 313; + currentState = 318; break; } } - case 313: { - if (la == null) { currentState = 313; break; } + case 318: { + if (la == null) { currentState = 318; break; } Expect(197, la); // "Select" currentState = stateStack.Pop(); break; } - case 314: { + case 319: { nextTokenIsPotentialStartOfExpression = true; - goto case 315; + goto case 320; } - case 315: { - if (la == null) { currentState = 315; break; } + case 320: { + if (la == null) { currentState = 320; break; } if (la.kind == 111) { - currentState = 316; + currentState = 321; break; } else { - if (set[62].Get(la.kind)) { - goto case 317; + if (set[63].Get(la.kind)) { + goto case 322; } else { Error(la); - goto case 316; + goto case 321; } } } - case 316: { - stateStack.Push(312); - goto case 224; + case 321: { + stateStack.Push(317); + goto case 229; } - case 317: { + case 322: { nextTokenIsPotentialStartOfExpression = true; - goto case 318; + goto case 323; } - case 318: { - if (la == null) { currentState = 318; break; } + case 323: { + if (la == null) { currentState = 323; break; } if (set[133].Get(la.kind)) { if (la.kind == 144) { - currentState = 320; + currentState = 325; break; } else { - goto case 320; + goto case 325; } } else { - if (set[22].Get(la.kind)) { - stateStack.Push(319); - goto case 51; + if (set[23].Get(la.kind)) { + stateStack.Push(324); + goto case 56; } else { Error(la); - goto case 319; + goto case 324; } } } - case 319: { - if (la == null) { currentState = 319; break; } + case 324: { + if (la == null) { currentState = 324; break; } if (la.kind == 22) { - currentState = 317; + currentState = 322; break; } else { - goto case 316; + goto case 321; } } - case 320: { - stateStack.Push(321); - goto case 322; + case 325: { + stateStack.Push(326); + goto case 327; } - case 321: { - stateStack.Push(319); - goto case 54; + case 326: { + stateStack.Push(324); + goto case 59; } - case 322: { - if (la == null) { currentState = 322; break; } + case 327: { + if (la == null) { currentState = 327; break; } if (la.kind == 20) { currentState = stateStack.Pop(); break; @@ -4898,104 +4948,104 @@ partial class ExpressionFinder { } } } - case 323: { - stateStack.Push(324); - goto case 51; + case 328: { + stateStack.Push(329); + goto case 56; } - case 324: { - if (la == null) { currentState = 324; break; } + case 329: { + if (la == null) { currentState = 329; break; } if (la.kind == 214) { - currentState = 332; + currentState = 337; break; } else { - goto case 325; + goto case 330; } } - case 325: { - if (la == null) { currentState = 325; break; } + case 330: { + if (la == null) { currentState = 330; break; } if (la.kind == 1 || la.kind == 21) { - goto case 326; + goto case 331; } else { goto case 6; } } - case 326: { - stateStack.Push(327); - goto case 224; + case 331: { + stateStack.Push(332); + goto case 229; } - case 327: { - if (la == null) { currentState = 327; break; } + case 332: { + if (la == null) { currentState = 332; break; } if (la.kind == 111 || la.kind == 112) { if (la.kind == 111) { - currentState = 331; + currentState = 336; break; } else { if (la.kind == 112) { - currentState = 329; + currentState = 334; break; } else { Error(la); - goto case 326; + goto case 331; } } } else { Expect(113, la); // "End" - currentState = 328; + currentState = 333; break; } } - case 328: { - if (la == null) { currentState = 328; break; } + case 333: { + if (la == null) { currentState = 333; break; } Expect(135, la); // "If" currentState = stateStack.Pop(); break; } - case 329: { - stateStack.Push(330); - goto case 51; + case 334: { + stateStack.Push(335); + goto case 56; } - case 330: { - if (la == null) { currentState = 330; break; } + case 335: { + if (la == null) { currentState = 335; break; } if (la.kind == 214) { - currentState = 326; + currentState = 331; break; } else { - goto case 326; + goto case 331; } } - case 331: { - if (la == null) { currentState = 331; break; } + case 336: { + if (la == null) { currentState = 336; break; } if (la.kind == 135) { - currentState = 329; + currentState = 334; break; } else { - goto case 326; + goto case 331; } } - case 332: { + case 337: { nextTokenIsPotentialStartOfExpression = true; - goto case 333; + goto case 338; } - case 333: { - if (la == null) { currentState = 333; break; } - if (set[46].Get(la.kind)) { - goto case 334; + case 338: { + if (la == null) { currentState = 338; break; } + if (set[47].Get(la.kind)) { + goto case 339; } else { - goto case 325; + goto case 330; } } - case 334: { - stateStack.Push(335); - goto case 232; + case 339: { + stateStack.Push(340); + goto case 237; } - case 335: { - if (la == null) { currentState = 335; break; } + case 340: { + if (la == null) { currentState = 340; break; } if (la.kind == 21) { - currentState = 339; + currentState = 344; break; } else { if (la.kind == 111) { - currentState = 336; + currentState = 341; break; } else { currentState = stateStack.Pop(); @@ -5003,843 +5053,862 @@ partial class ExpressionFinder { } } } - case 336: { + case 341: { nextTokenIsPotentialStartOfExpression = true; - goto case 337; + goto case 342; } - case 337: { - if (la == null) { currentState = 337; break; } - if (set[46].Get(la.kind)) { - stateStack.Push(338); - goto case 232; + case 342: { + if (la == null) { currentState = 342; break; } + if (set[47].Get(la.kind)) { + stateStack.Push(343); + goto case 237; } else { - goto case 338; + goto case 343; } } - case 338: { - if (la == null) { currentState = 338; break; } + case 343: { + if (la == null) { currentState = 343; break; } if (la.kind == 21) { - currentState = 336; + currentState = 341; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 339: { + case 344: { nextTokenIsPotentialStartOfExpression = true; - goto case 340; + goto case 345; } - case 340: { - if (la == null) { currentState = 340; break; } - if (set[46].Get(la.kind)) { - goto case 334; + case 345: { + if (la == null) { currentState = 345; break; } + if (set[47].Get(la.kind)) { + goto case 339; } else { - goto case 335; + goto case 340; } } - case 341: { - stateStack.Push(342); - goto case 76; + case 346: { + stateStack.Push(347); + goto case 81; } - case 342: { - if (la == null) { currentState = 342; break; } + case 347: { + if (la == null) { currentState = 347; break; } if (la.kind == 37) { - currentState = 41; + currentState = 46; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 343: { - stateStack.Push(344); - goto case 51; + case 348: { + stateStack.Push(349); + goto case 56; } - case 344: { - if (la == null) { currentState = 344; break; } + case 349: { + if (la == null) { currentState = 349; break; } Expect(22, la); // "," - currentState = 51; + currentState = 56; break; } - case 345: { - stateStack.Push(346); - goto case 51; + case 350: { + stateStack.Push(351); + goto case 56; } - case 346: { - stateStack.Push(347); - goto case 224; + case 351: { + stateStack.Push(352); + goto case 229; } - case 347: { - if (la == null) { currentState = 347; break; } + case 352: { + if (la == null) { currentState = 352; break; } Expect(113, la); // "End" - currentState = 348; + currentState = 353; break; } - case 348: { - if (la == null) { currentState = 348; break; } + case 353: { + if (la == null) { currentState = 353; break; } if (la.kind == 233) { - goto case 77; + goto case 82; } else { if (la.kind == 211) { - goto case 85; + goto case 90; } else { goto case 6; } } } - case 349: { + case 354: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(350); - goto case 169; + stateStack.Push(355); + goto case 174; } - case 350: { + case 355: { PopContext(); - goto case 351; + goto case 356; } - case 351: { - if (la == null) { currentState = 351; break; } + case 356: { + if (la == null) { currentState = 356; break; } if (la.kind == 33) { - currentState = 352; + currentState = 357; break; } else { - goto case 352; + goto case 357; } } - case 352: { - if (la == null) { currentState = 352; break; } + case 357: { + if (la == null) { currentState = 357; break; } if (la.kind == 37) { - currentState = 364; + currentState = 369; break; } else { - goto case 353; + goto case 358; } } - case 353: { - if (la == null) { currentState = 353; break; } + case 358: { + if (la == null) { currentState = 358; break; } if (la.kind == 22) { - currentState = 358; + currentState = 363; break; } else { if (la.kind == 63) { - currentState = 355; + currentState = 360; break; } else { - goto case 354; + goto case 359; } } } - case 354: { - if (la == null) { currentState = 354; break; } + case 359: { + if (la == null) { currentState = 359; break; } if (la.kind == 20) { - goto case 182; + goto case 187; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 355: { + case 360: { PushContext(Context.Type, la, t); - goto case 356; + goto case 361; } - case 356: { - if (la == null) { currentState = 356; break; } + case 361: { + if (la == null) { currentState = 361; break; } if (la.kind == 162) { - stateStack.Push(357); - goto case 62; + stateStack.Push(362); + goto case 67; } else { - if (set[15].Get(la.kind)) { - stateStack.Push(357); - goto case 32; + if (set[16].Get(la.kind)) { + stateStack.Push(362); + goto case 37; } else { Error(la); - goto case 357; + goto case 362; } } } - case 357: { + case 362: { PopContext(); - goto case 354; + goto case 359; } - case 358: { + case 363: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(359); - goto case 169; + stateStack.Push(364); + goto case 174; } - case 359: { + case 364: { PopContext(); - goto case 360; + goto case 365; } - case 360: { - if (la == null) { currentState = 360; break; } + case 365: { + if (la == null) { currentState = 365; break; } if (la.kind == 33) { - currentState = 361; + currentState = 366; break; } else { - goto case 361; + goto case 366; } } - case 361: { - if (la == null) { currentState = 361; break; } + case 366: { + if (la == null) { currentState = 366; break; } if (la.kind == 37) { - currentState = 362; + currentState = 367; break; } else { - goto case 353; + goto case 358; } } - case 362: { - if (la == null) { currentState = 362; break; } + case 367: { + if (la == null) { currentState = 367; break; } if (la.kind == 22) { - currentState = 362; + currentState = 367; break; } else { - goto case 363; + goto case 368; } } - case 363: { - if (la == null) { currentState = 363; break; } + case 368: { + if (la == null) { currentState = 368; break; } Expect(38, la); // ")" - currentState = 353; + currentState = 358; break; } - case 364: { - if (la == null) { currentState = 364; break; } + case 369: { + if (la == null) { currentState = 369; break; } if (la.kind == 22) { - currentState = 364; + currentState = 369; break; } else { - goto case 363; + goto case 368; } } - case 365: { + case 370: { PushContext(Context.Type, la, t); - stateStack.Push(366); - goto case 32; + stateStack.Push(371); + goto case 37; } - case 366: { + case 371: { PopContext(); - goto case 221; + goto case 226; } - case 367: { - stateStack.Push(368); + case 372: { + stateStack.Push(373); PushContext(Context.Parameter, la, t); - goto case 369; + goto case 374; } - case 368: { - if (la == null) { currentState = 368; break; } + case 373: { + if (la == null) { currentState = 373; break; } if (la.kind == 22) { - currentState = 367; + currentState = 372; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 369: { + case 374: { SetIdentifierExpected(la); - goto case 370; + goto case 375; } - case 370: { - if (la == null) { currentState = 370; break; } + case 375: { + if (la == null) { currentState = 375; break; } if (la.kind == 40) { - stateStack.Push(369); - goto case 380; + stateStack.Push(374); + goto case 385; } else { - goto case 371; + goto case 376; } } - case 371: { + case 376: { SetIdentifierExpected(la); - goto case 372; + goto case 377; } - case 372: { - if (la == null) { currentState = 372; break; } + case 377: { + if (la == null) { currentState = 377; break; } if (set[134].Get(la.kind)) { - currentState = 371; + currentState = 376; break; } else { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(373); - goto case 169; + stateStack.Push(378); + goto case 174; } } - case 373: { + case 378: { PopContext(); - goto case 374; + goto case 379; } - case 374: { - if (la == null) { currentState = 374; break; } + case 379: { + if (la == null) { currentState = 379; break; } if (la.kind == 63) { - currentState = 378; + currentState = 383; break; } else { - goto case 375; + goto case 380; } } - case 375: { - if (la == null) { currentState = 375; break; } + case 380: { + if (la == null) { currentState = 380; break; } if (la.kind == 20) { - currentState = 377; + currentState = 382; break; } else { - goto case 376; + goto case 381; } } - case 376: { + case 381: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 377: { - stateStack.Push(376); - goto case 51; + case 382: { + stateStack.Push(381); + goto case 56; } - case 378: { + case 383: { PushContext(Context.Type, la, t); - stateStack.Push(379); - goto case 32; + stateStack.Push(384); + goto case 37; } - case 379: { + case 384: { PopContext(); - goto case 375; + goto case 380; } - case 380: { - if (la == null) { currentState = 380; break; } + case 385: { + if (la == null) { currentState = 385; break; } Expect(40, la); // "<" - currentState = 381; + currentState = 386; break; } - case 381: { + case 386: { PushContext(Context.Attribute, la, t); - goto case 382; + goto case 387; } - case 382: { - if (la == null) { currentState = 382; break; } + case 387: { + if (la == null) { currentState = 387; break; } if (set[135].Get(la.kind)) { - currentState = 382; + currentState = 387; break; } else { Expect(39, la); // ">" - currentState = 383; + currentState = 388; break; } } - case 383: { + case 388: { PopContext(); - goto case 384; + goto case 389; } - case 384: { - if (la == null) { currentState = 384; break; } + case 389: { + if (la == null) { currentState = 389; break; } if (la.kind == 1) { - goto case 20; + goto case 25; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 385: { - if (la == null) { currentState = 385; break; } + case 390: { + if (la == null) { currentState = 390; break; } Expect(37, la); // "(" - currentState = 386; + currentState = 391; break; } - case 386: { + case 391: { SetIdentifierExpected(la); - goto case 387; + goto case 392; } - case 387: { - if (la == null) { currentState = 387; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(388); - goto case 367; + case 392: { + if (la == null) { currentState = 392; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(393); + goto case 372; } else { - goto case 388; + goto case 393; } } - case 388: { - if (la == null) { currentState = 388; break; } + case 393: { + if (la == null) { currentState = 393; break; } Expect(38, la); // ")" - currentState = 389; + currentState = 394; break; } - case 389: { + case 394: { nextTokenIsPotentialStartOfExpression = true; - goto case 390; + goto case 395; } - case 390: { - if (la == null) { currentState = 390; break; } - if (set[46].Get(la.kind)) { - goto case 232; + case 395: { + if (la == null) { currentState = 395; break; } + if (set[47].Get(la.kind)) { + goto case 237; } else { if (la.kind == 1 || la.kind == 21) { - stateStack.Push(391); - goto case 224; + stateStack.Push(396); + goto case 229; } else { goto case 6; } } } - case 391: { - if (la == null) { currentState = 391; break; } + case 396: { + if (la == null) { currentState = 396; break; } Expect(113, la); // "End" - currentState = 392; + currentState = 397; break; } - case 392: { - if (la == null) { currentState = 392; break; } + case 397: { + if (la == null) { currentState = 397; break; } Expect(210, la); // "Sub" currentState = stateStack.Pop(); break; } - case 393: { - if (la == null) { currentState = 393; break; } + case 398: { + if (la == null) { currentState = 398; break; } if (la.kind == 17 || la.kind == 18 || la.kind == 19) { - currentState = 406; + currentState = 411; break; } else { if (la.kind == 10) { - stateStack.Push(395); - goto case 397; + stateStack.Push(400); + goto case 402; } else { Error(la); - goto case 394; + goto case 399; } } } - case 394: { + case 399: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 395: { - if (la == null) { currentState = 395; break; } + case 400: { + if (la == null) { currentState = 400; break; } if (la.kind == 17) { - currentState = 396; + currentState = 401; break; } else { - goto case 394; + goto case 399; } } - case 396: { - if (la == null) { currentState = 396; break; } + case 401: { + if (la == null) { currentState = 401; break; } if (la.kind == 16) { - currentState = 395; + currentState = 400; break; } else { - goto case 395; + goto case 400; } } - case 397: { + case 402: { PushContext(Context.Xml, la, t); - goto case 398; + goto case 403; } - case 398: { - if (la == null) { currentState = 398; break; } + case 403: { + if (la == null) { currentState = 403; break; } Expect(10, la); // XmlOpenTag - currentState = 399; + currentState = 404; break; } - case 399: { - if (la == null) { currentState = 399; break; } + case 404: { + if (la == null) { currentState = 404; break; } if (set[136].Get(la.kind)) { if (set[137].Get(la.kind)) { - currentState = 399; + currentState = 404; break; } else { if (la.kind == 12) { - stateStack.Push(399); - goto case 403; + stateStack.Push(404); + goto case 408; } else { Error(la); - goto case 399; + goto case 404; } } } else { if (la.kind == 14) { - currentState = 400; + currentState = 405; break; } else { if (la.kind == 11) { - currentState = 401; + currentState = 406; break; } else { Error(la); - goto case 400; + goto case 405; } } } } - case 400: { + case 405: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 401: { - if (la == null) { currentState = 401; break; } + case 406: { + if (la == null) { currentState = 406; break; } if (set[138].Get(la.kind)) { if (set[139].Get(la.kind)) { - currentState = 401; + currentState = 406; break; } else { if (la.kind == 12) { - stateStack.Push(401); - goto case 403; + stateStack.Push(406); + goto case 408; } else { if (la.kind == 10) { - stateStack.Push(401); - goto case 397; + stateStack.Push(406); + goto case 402; } else { Error(la); - goto case 401; + goto case 406; } } } } else { Expect(15, la); // XmlOpenEndTag - currentState = 402; + currentState = 407; break; } } - case 402: { - if (la == null) { currentState = 402; break; } + case 407: { + if (la == null) { currentState = 407; break; } if (set[140].Get(la.kind)) { if (set[141].Get(la.kind)) { - currentState = 402; + currentState = 407; break; } else { if (la.kind == 12) { - stateStack.Push(402); - goto case 403; + stateStack.Push(407); + goto case 408; } else { Error(la); - goto case 402; + goto case 407; } } } else { Expect(11, la); // XmlCloseTag - currentState = 400; + currentState = 405; break; } } - case 403: { - if (la == null) { currentState = 403; break; } + case 408: { + if (la == null) { currentState = 408; break; } Expect(12, la); // XmlStartInlineVB - currentState = 404; + currentState = 409; break; } - case 404: { - stateStack.Push(405); - goto case 51; + case 409: { + stateStack.Push(410); + goto case 56; } - case 405: { - if (la == null) { currentState = 405; break; } + case 410: { + if (la == null) { currentState = 410; break; } Expect(13, la); // XmlEndInlineVB currentState = stateStack.Pop(); break; } - case 406: { - if (la == null) { currentState = 406; break; } + case 411: { + if (la == null) { currentState = 411; break; } if (la.kind == 16) { - currentState = 407; + currentState = 412; break; } else { - goto case 407; + goto case 412; } } - case 407: { - if (la == null) { currentState = 407; break; } + case 412: { + if (la == null) { currentState = 412; break; } if (la.kind == 17 || la.kind == 19) { - currentState = 406; + currentState = 411; break; } else { if (la.kind == 10) { - stateStack.Push(408); - goto case 397; + stateStack.Push(413); + goto case 402; } else { - goto case 394; + goto case 399; } } } - case 408: { - if (la == null) { currentState = 408; break; } + case 413: { + if (la == null) { currentState = 413; break; } if (la.kind == 17) { - currentState = 409; + currentState = 414; break; } else { - goto case 394; + goto case 399; } } - case 409: { - if (la == null) { currentState = 409; break; } + case 414: { + if (la == null) { currentState = 414; break; } if (la.kind == 16) { - currentState = 408; + currentState = 413; break; } else { - goto case 408; + goto case 413; } } - case 410: { - if (la == null) { currentState = 410; break; } + case 415: { + if (la == null) { currentState = 415; break; } Expect(37, la); // "(" - currentState = 411; + currentState = 416; break; } - case 411: { + case 416: { readXmlIdentifier = true; - stateStack.Push(412); - goto case 169; + stateStack.Push(417); + goto case 174; } - case 412: { - if (la == null) { currentState = 412; break; } + case 417: { + if (la == null) { currentState = 417; break; } Expect(38, la); // ")" - currentState = 140; + currentState = 145; break; } - case 413: { - if (la == null) { currentState = 413; break; } + case 418: { + if (la == null) { currentState = 418; break; } Expect(37, la); // "(" - currentState = 414; + currentState = 419; break; } - case 414: { - stateStack.Push(412); - goto case 32; + case 419: { + stateStack.Push(417); + goto case 37; } - case 415: { + case 420: { nextTokenIsStartOfImportsOrAccessExpression = true; wasQualifierTokenAtStart = true; - goto case 416; + goto case 421; } - case 416: { - if (la == null) { currentState = 416; break; } + case 421: { + if (la == null) { currentState = 421; break; } if (la.kind == 10) { - currentState = 417; + currentState = 422; break; } else { - goto case 417; + goto case 422; } } - case 417: { - stateStack.Push(418); - goto case 76; + case 422: { + stateStack.Push(423); + goto case 81; } - case 418: { - if (la == null) { currentState = 418; break; } + case 423: { + if (la == null) { currentState = 423; break; } if (la.kind == 11) { - currentState = 140; + currentState = 145; break; } else { - goto case 140; + goto case 145; } } - case 419: { - stateStack.Push(412); - goto case 51; + case 424: { + stateStack.Push(417); + goto case 56; } - case 420: { - stateStack.Push(421); - goto case 51; + case 425: { + stateStack.Push(426); + goto case 56; } - case 421: { - if (la == null) { currentState = 421; break; } + case 426: { + if (la == null) { currentState = 426; break; } if (la.kind == 22) { - currentState = 422; + currentState = 427; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 422: { + case 427: { activeArgument++; nextTokenIsPotentialStartOfExpression = true; - goto case 423; + goto case 428; } - case 423: { - if (la == null) { currentState = 423; break; } - if (set[22].Get(la.kind)) { - goto case 420; + case 428: { + if (la == null) { currentState = 428; break; } + if (set[23].Get(la.kind)) { + goto case 425; } else { - goto case 421; + goto case 426; } } - case 424: { - if (la == null) { currentState = 424; break; } - if (set[15].Get(la.kind)) { - stateStack.Push(425); - goto case 32; + case 429: { + if (la == null) { currentState = 429; break; } + if (set[16].Get(la.kind)) { + PushContext(Context.Type, la, t); + stateStack.Push(433); + goto case 37; } else { - goto case 425; + goto case 430; } } - case 425: { - if (la == null) { currentState = 425; break; } + case 430: { + if (la == null) { currentState = 430; break; } if (la.kind == 22) { - currentState = 424; + currentState = 431; break; } else { - goto case 40; + goto case 45; } } - case 426: { + 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: { SetIdentifierExpected(la); - goto case 427; + goto case 435; } - case 427: { - if (la == null) { currentState = 427; break; } + case 435: { + if (la == null) { currentState = 435; break; } if (set[142].Get(la.kind)) { if (la.kind == 169) { - currentState = 429; + currentState = 437; break; } else { - if (set[72].Get(la.kind)) { - stateStack.Push(428); - goto case 367; + if (set[73].Get(la.kind)) { + stateStack.Push(436); + goto case 372; } else { Error(la); - goto case 428; + goto case 436; } } } else { - goto case 428; + goto case 436; } } - case 428: { - if (la == null) { currentState = 428; break; } + case 436: { + if (la == null) { currentState = 436; break; } Expect(38, la); // ")" - currentState = 29; + currentState = 34; break; } - case 429: { - stateStack.Push(428); - goto case 430; + case 437: { + stateStack.Push(436); + goto case 438; } - case 430: { + case 438: { SetIdentifierExpected(la); - goto case 431; + goto case 439; } - case 431: { - if (la == null) { currentState = 431; break; } + case 439: { + if (la == null) { currentState = 439; break; } if (la.kind == 138 || la.kind == 178) { - currentState = 432; + currentState = 440; break; } else { - goto case 432; + goto case 440; } } - case 432: { + case 440: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(433); - goto case 447; + stateStack.Push(441); + goto case 455; } - case 433: { + case 441: { PopContext(); - goto case 434; + goto case 442; } - case 434: { - if (la == null) { currentState = 434; break; } + case 442: { + if (la == null) { currentState = 442; break; } if (la.kind == 63) { - currentState = 448; + currentState = 456; break; } else { - goto case 435; + goto case 443; } } - case 435: { - if (la == null) { currentState = 435; break; } + case 443: { + if (la == null) { currentState = 443; break; } if (la.kind == 22) { - currentState = 436; + currentState = 444; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 436: { + case 444: { SetIdentifierExpected(la); - goto case 437; + goto case 445; } - case 437: { - if (la == null) { currentState = 437; break; } + case 445: { + if (la == null) { currentState = 445; break; } if (la.kind == 138 || la.kind == 178) { - currentState = 438; + currentState = 446; break; } else { - goto case 438; + goto case 446; } } - case 438: { + case 446: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(439); - goto case 447; + stateStack.Push(447); + goto case 455; } - case 439: { + case 447: { PopContext(); - goto case 440; + goto case 448; } - case 440: { - if (la == null) { currentState = 440; break; } + case 448: { + if (la == null) { currentState = 448; break; } if (la.kind == 63) { - currentState = 441; + currentState = 449; break; } else { - goto case 435; + goto case 443; } } - case 441: { + case 449: { PushContext(Context.Type, la, t); - stateStack.Push(442); - goto case 443; + stateStack.Push(450); + goto case 451; } - case 442: { + case 450: { PopContext(); - goto case 435; + goto case 443; } - case 443: { - if (la == null) { currentState = 443; break; } - if (set[87].Get(la.kind)) { - goto case 446; + case 451: { + if (la == null) { currentState = 451; break; } + if (set[88].Get(la.kind)) { + goto case 454; } else { if (la.kind == 35) { - currentState = 444; + currentState = 452; break; } else { goto case 6; } } } - case 444: { - stateStack.Push(445); - goto case 446; + case 452: { + stateStack.Push(453); + goto case 454; } - case 445: { - if (la == null) { currentState = 445; break; } + case 453: { + if (la == null) { currentState = 453; break; } if (la.kind == 22) { - currentState = 444; + currentState = 452; break; } else { - goto case 61; + goto case 66; } } - case 446: { - if (la == null) { currentState = 446; break; } - if (set[15].Get(la.kind)) { - currentState = 33; + case 454: { + if (la == null) { currentState = 454; break; } + if (set[16].Get(la.kind)) { + currentState = 38; break; } else { if (la.kind == 162) { - goto case 96; + goto case 101; } else { if (la.kind == 84) { - goto case 112; + goto case 117; } else { if (la.kind == 209) { - goto case 87; + goto case 92; } else { goto case 6; } @@ -5847,85 +5916,85 @@ partial class ExpressionFinder { } } } - case 447: { - if (la == null) { currentState = 447; break; } + case 455: { + if (la == null) { currentState = 455; break; } if (la.kind == 2) { - goto case 120; + goto case 125; } else { if (la.kind == 62) { - goto case 118; + goto case 123; } else { if (la.kind == 64) { - goto case 117; + goto case 122; } else { if (la.kind == 65) { - goto case 116; + goto case 121; } else { if (la.kind == 66) { - goto case 115; + goto case 120; } else { if (la.kind == 67) { - goto case 114; + goto case 119; } else { if (la.kind == 70) { - goto case 113; + goto case 118; } else { if (la.kind == 87) { - goto case 111; + goto case 116; } else { if (la.kind == 104) { - goto case 109; + goto case 114; } else { if (la.kind == 107) { - goto case 108; + goto case 113; } else { if (la.kind == 116) { - goto case 106; + goto case 111; } else { if (la.kind == 121) { - goto case 105; + goto case 110; } else { if (la.kind == 133) { - goto case 101; + goto case 106; } else { if (la.kind == 139) { - goto case 100; + goto case 105; } else { if (la.kind == 143) { - goto case 99; + goto case 104; } else { if (la.kind == 146) { - goto case 98; + goto case 103; } else { if (la.kind == 147) { - goto case 97; + goto case 102; } else { if (la.kind == 170) { - goto case 94; + goto case 99; } else { if (la.kind == 176) { - goto case 93; + goto case 98; } else { if (la.kind == 184) { - goto case 92; + goto case 97; } else { if (la.kind == 203) { - goto case 89; + goto case 94; } else { if (la.kind == 212) { - goto case 84; + goto case 89; } else { if (la.kind == 213) { - goto case 83; + goto case 88; } else { if (la.kind == 223) { - goto case 81; + goto case 86; } else { if (la.kind == 224) { - goto case 80; + goto case 85; } else { if (la.kind == 230) { - goto case 79; + goto case 84; } else { goto case 6; } @@ -5955,485 +6024,553 @@ partial class ExpressionFinder { } } } - case 448: { + case 456: { PushContext(Context.Type, la, t); - stateStack.Push(449); - goto case 443; + stateStack.Push(457); + goto case 451; } - case 449: { + case 457: { PopContext(); - goto case 435; + goto case 443; } - case 450: { - stateStack.Push(451); - goto case 169; + case 458: { + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); + stateStack.Push(459); + goto case 174; } - case 451: { - if (la == null) { currentState = 451; break; } + case 459: { + PopContext(); + goto case 460; + } + case 460: { + if (la == null) { currentState = 460; break; } if (la.kind == 37) { - currentState = 455; + currentState = 465; break; } else { - goto case 452; + goto case 461; } } - case 452: { - if (la == null) { currentState = 452; break; } + case 461: { + if (la == null) { currentState = 461; break; } if (la.kind == 63) { - currentState = 453; + currentState = 462; break; } else { - goto case 18; + goto case 23; } } - case 453: { - if (la == null) { currentState = 453; break; } + case 462: { + PushContext(Context.Type, la, t); + goto case 463; + } + case 463: { + if (la == null) { currentState = 463; break; } if (la.kind == 40) { - stateStack.Push(453); - goto case 380; + stateStack.Push(463); + goto case 385; } else { - goto case 454; + stateStack.Push(464); + goto case 37; } } - case 454: { - stateStack.Push(18); - goto case 32; + case 464: { + PopContext(); + goto case 23; } - case 455: { + case 465: { SetIdentifierExpected(la); - goto case 456; + goto case 466; } - case 456: { - if (la == null) { currentState = 456; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(457); - goto case 367; + case 466: { + if (la == null) { currentState = 466; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(467); + goto case 372; } else { - goto case 457; + goto case 467; } } - case 457: { - if (la == null) { currentState = 457; break; } + case 467: { + if (la == null) { currentState = 467; break; } Expect(38, la); // ")" - currentState = 452; + currentState = 461; break; } - case 458: { - stateStack.Push(459); - goto case 169; + case 468: { + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); + stateStack.Push(469); + goto case 174; } - case 459: { - if (la == null) { currentState = 459; break; } + case 469: { + PopContext(); + goto case 470; + } + case 470: { + if (la == null) { currentState = 470; break; } if (la.kind == 37 || la.kind == 63) { if (la.kind == 63) { - currentState = 454; + currentState = 475; break; } else { if (la.kind == 37) { - currentState = 461; + currentState = 472; break; } else { - goto case 460; + goto case 471; } } } else { - goto case 18; + goto case 23; } } - case 460: { + case 471: { Error(la); - goto case 18; + goto case 23; } - case 461: { + case 472: { SetIdentifierExpected(la); - goto case 462; + goto case 473; } - case 462: { - if (la == null) { currentState = 462; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(463); - goto case 367; + case 473: { + if (la == null) { currentState = 473; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(474); + goto case 372; } else { - goto case 463; + goto case 474; } } - case 463: { - if (la == null) { currentState = 463; break; } + case 474: { + if (la == null) { currentState = 474; break; } Expect(38, la); // ")" - currentState = 18; + currentState = 23; break; } - case 464: { - if (la == null) { currentState = 464; break; } - Expect(142, la); // "Interface" - currentState = 9; - break; + case 475: { + PushContext(Context.Type, la, t); + stateStack.Push(476); + goto case 37; } - case 465: { - if (la == null) { currentState = 465; break; } + case 476: { + PopContext(); + goto case 23; + } + case 477: { + PushContext(Context.TypeDeclaration, la, t); + goto case 478; + } + case 478: { + if (la == null) { currentState = 478; break; } Expect(115, la); // "Enum" - currentState = 466; + currentState = 479; break; } - case 466: { - stateStack.Push(467); - goto case 169; + case 479: { + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); + stateStack.Push(480); + goto case 174; } - case 467: { - if (la == null) { currentState = 467; break; } + case 480: { + PopContext(); + goto case 481; + } + case 481: { + if (la == null) { currentState = 481; break; } if (la.kind == 63) { - currentState = 474; + currentState = 493; break; } else { - goto case 468; + goto case 482; } } - case 468: { - stateStack.Push(469); - goto case 18; + case 482: { + stateStack.Push(483); + goto case 23; } - case 469: { - if (la == null) { currentState = 469; break; } - if (set[90].Get(la.kind)) { - goto case 471; + case 483: { + SetIdentifierExpected(la); + goto case 484; + } + case 484: { + if (la == null) { currentState = 484; break; } + if (set[91].Get(la.kind)) { + goto case 488; } else { Expect(113, la); // "End" - currentState = 470; + currentState = 485; break; } } - case 470: { - if (la == null) { currentState = 470; break; } + case 485: { + if (la == null) { currentState = 485; break; } Expect(115, la); // "Enum" - currentState = 18; + currentState = 486; break; } - case 471: { - if (la == null) { currentState = 471; break; } + case 486: { + stateStack.Push(487); + goto case 23; + } + case 487: { + PopContext(); + currentState = stateStack.Pop(); + goto switchlbl; + } + case 488: { + SetIdentifierExpected(la); + goto case 489; + } + case 489: { + if (la == null) { currentState = 489; break; } if (la.kind == 40) { - stateStack.Push(471); - goto case 380; + stateStack.Push(488); + goto case 385; } else { - stateStack.Push(472); - goto case 169; + PushContext(Context.Identifier, la, t); + SetIdentifierExpected(la); + stateStack.Push(490); + goto case 174; } } - case 472: { - if (la == null) { currentState = 472; break; } + case 490: { + PopContext(); + goto case 491; + } + case 491: { + if (la == null) { currentState = 491; break; } if (la.kind == 20) { - currentState = 473; + currentState = 492; break; } else { - goto case 468; + goto case 482; } } - case 473: { - stateStack.Push(468); - goto case 51; + case 492: { + stateStack.Push(482); + goto case 56; } - case 474: { - stateStack.Push(468); - goto case 32; + case 493: { + PushContext(Context.Type, la, t); + stateStack.Push(494); + goto case 37; } - case 475: { - if (la == null) { currentState = 475; break; } + case 494: { + PopContext(); + goto case 482; + } + case 495: { + if (la == null) { currentState = 495; break; } Expect(103, la); // "Delegate" - currentState = 476; + currentState = 496; break; } - case 476: { - if (la == null) { currentState = 476; break; } + case 496: { + if (la == null) { currentState = 496; break; } if (la.kind == 210) { - currentState = 477; + currentState = 497; break; } else { if (la.kind == 127) { - currentState = 477; + currentState = 497; break; } else { Error(la); - goto case 477; + goto case 497; } } } - case 477: { + case 497: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 478; + goto case 498; } - case 478: { - if (la == null) { currentState = 478; break; } - currentState = 479; + case 498: { + if (la == null) { currentState = 498; break; } + currentState = 499; break; } - case 479: { + case 499: { PopContext(); - goto case 480; + goto case 500; } - case 480: { - if (la == null) { currentState = 480; break; } + case 500: { + if (la == null) { currentState = 500; break; } if (la.kind == 37) { - currentState = 484; - break; - } else { - goto case 481; - } - } - case 481: { - if (la == null) { currentState = 481; break; } - if (la.kind == 63) { - currentState = 482; + currentState = 503; break; } else { - goto case 18; + if (la.kind == 63) { + currentState = 501; + break; + } else { + goto case 23; + } } } - case 482: { + case 501: { PushContext(Context.Type, la, t); - stateStack.Push(483); - goto case 32; + stateStack.Push(502); + goto case 37; } - case 483: { + case 502: { PopContext(); - goto case 18; + goto case 23; } - case 484: { + case 503: { SetIdentifierExpected(la); - goto case 485; + goto case 504; } - case 485: { - if (la == null) { currentState = 485; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(486); - goto case 367; + case 504: { + if (la == null) { currentState = 504; break; } + if (set[142].Get(la.kind)) { + if (la.kind == 169) { + currentState = 506; + break; + } else { + if (set[73].Get(la.kind)) { + stateStack.Push(505); + goto case 372; + } else { + Error(la); + goto case 505; + } + } } else { - goto case 486; + goto case 505; } } - case 486: { - if (la == null) { currentState = 486; break; } + case 505: { + if (la == null) { currentState = 505; break; } Expect(38, la); // ")" - currentState = 481; + currentState = 500; break; } - case 487: { + case 506: { + stateStack.Push(505); + goto case 438; + } + case 507: { PushContext(Context.TypeDeclaration, la, t); - goto case 488; + goto case 508; } - case 488: { - if (la == null) { currentState = 488; break; } + case 508: { + if (la == null) { currentState = 508; break; } if (la.kind == 155) { - currentState = 489; + currentState = 509; break; } else { if (la.kind == 84) { - currentState = 489; + currentState = 509; break; } else { if (la.kind == 209) { - currentState = 489; + currentState = 509; break; } else { Error(la); - goto case 489; + goto case 509; } } } } - case 489: { + case 509: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(490); - goto case 169; + stateStack.Push(510); + goto case 174; } - case 490: { + case 510: { PopContext(); - goto case 491; + goto case 511; } - case 491: { - if (la == null) { currentState = 491; break; } + case 511: { + if (la == null) { currentState = 511; break; } if (la.kind == 37) { - currentState = 640; + currentState = 667; break; } else { - goto case 492; + goto case 512; } } - case 492: { - stateStack.Push(493); - goto case 18; + case 512: { + stateStack.Push(513); + goto case 23; } - case 493: { + case 513: { SetIdentifierExpected(la); isMissingModifier = true; - goto case 494; + goto case 514; } - case 494: { - if (la == null) { currentState = 494; break; } + case 514: { + if (la == null) { currentState = 514; break; } if (la.kind == 140) { isMissingModifier = false; - goto case 637; + goto case 664; } else { - goto case 495; + goto case 515; } } - case 495: { + case 515: { SetIdentifierExpected(la); isMissingModifier = true; - goto case 496; + goto case 516; } - case 496: { - if (la == null) { currentState = 496; break; } + case 516: { + if (la == null) { currentState = 516; break; } if (la.kind == 136) { isMissingModifier = false; - goto case 631; + goto case 658; } else { - goto case 497; + goto case 517; } } - case 497: { + case 517: { SetIdentifierExpected(la); isMissingModifier = true; - goto case 498; + goto case 518; } - case 498: { - if (la == null) { currentState = 498; break; } + case 518: { + if (la == null) { currentState = 518; break; } if (set[95].Get(la.kind)) { - goto case 503; + goto case 523; } else { isMissingModifier = false; - goto case 499; + goto case 519; } } - case 499: { - if (la == null) { currentState = 499; break; } + case 519: { + if (la == null) { currentState = 519; break; } Expect(113, la); // "End" - currentState = 500; + currentState = 520; break; } - case 500: { - if (la == null) { currentState = 500; break; } + case 520: { + if (la == null) { currentState = 520; break; } if (la.kind == 155) { - currentState = 501; + currentState = 521; break; } else { if (la.kind == 84) { - currentState = 501; + currentState = 521; break; } else { if (la.kind == 209) { - currentState = 501; + currentState = 521; break; } else { Error(la); - goto case 501; + goto case 521; } } } } - case 501: { - stateStack.Push(502); - goto case 18; + case 521: { + stateStack.Push(522); + goto case 23; } - case 502: { + case 522: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 503: { + case 523: { SetIdentifierExpected(la); isMissingModifier = true; - goto case 504; + goto case 524; } - case 504: { - if (la == null) { currentState = 504; break; } + case 524: { + if (la == null) { currentState = 524; break; } if (la.kind == 40) { - stateStack.Push(503); - goto case 380; + stateStack.Push(523); + goto case 385; } else { isMissingModifier = true; - goto case 505; + goto case 525; } } - case 505: { + case 525: { SetIdentifierExpected(la); - goto case 506; + goto case 526; } - case 506: { - if (la == null) { currentState = 506; break; } + case 526: { + if (la == null) { currentState = 526; break; } if (set[122].Get(la.kind)) { - currentState = 630; + currentState = 657; break; } else { isMissingModifier = false; SetIdentifierExpected(la); - goto case 507; + goto case 527; } } - case 507: { - if (la == null) { currentState = 507; break; } + case 527: { + if (la == null) { currentState = 527; break; } if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - stateStack.Push(497); - goto case 487; + stateStack.Push(517); + goto case 507; } else { if (la.kind == 103) { - stateStack.Push(497); - goto case 475; + stateStack.Push(517); + goto case 495; } else { if (la.kind == 115) { - stateStack.Push(497); - goto case 465; + stateStack.Push(517); + goto case 477; } else { if (la.kind == 142) { - stateStack.Push(497); - goto case 464; + stateStack.Push(517); + goto case 9; } else { if (set[98].Get(la.kind)) { - stateStack.Push(497); + stateStack.Push(517); PushContext(Context.Member, la, t); SetIdentifierExpected(la); - goto case 508; + goto case 528; } else { Error(la); - goto case 497; + goto case 517; } } } } } } - case 508: { - if (la == null) { currentState = 508; break; } + case 528: { + if (la == null) { currentState = 528; break; } if (set[113].Get(la.kind)) { - stateStack.Push(509); - goto case 619; + stateStack.Push(529); + goto case 645; } else { if (la.kind == 127 || la.kind == 210) { - stateStack.Push(509); - goto case 605; + stateStack.Push(529); + goto case 631; } else { if (la.kind == 101) { - stateStack.Push(509); - goto case 589; + stateStack.Push(529); + goto case 615; } else { if (la.kind == 119) { - stateStack.Push(509); - goto case 577; + stateStack.Push(529); + goto case 600; } else { if (la.kind == 98) { - stateStack.Push(509); - goto case 565; + stateStack.Push(529); + goto case 588; } else { if (la.kind == 186) { - stateStack.Push(509); - goto case 523; + stateStack.Push(529); + goto case 543; } else { if (la.kind == 172) { - stateStack.Push(509); - goto case 510; + stateStack.Push(529); + goto case 530; } else { Error(la); - goto case 509; + goto case 529; } } } @@ -6442,1180 +6579,1213 @@ partial class ExpressionFinder { } } } - case 509: { + case 529: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 510: { - if (la == null) { currentState = 510; break; } + case 530: { + if (la == null) { currentState = 530; break; } Expect(172, la); // "Operator" - currentState = 511; + currentState = 531; break; } - case 511: { + case 531: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 512; + goto case 532; } - case 512: { - if (la == null) { currentState = 512; break; } - currentState = 513; + case 532: { + if (la == null) { currentState = 532; break; } + currentState = 533; break; } - case 513: { + case 533: { PopContext(); - goto case 514; + goto case 534; } - case 514: { - if (la == null) { currentState = 514; break; } + case 534: { + if (la == null) { currentState = 534; break; } Expect(37, la); // "(" - currentState = 515; + currentState = 535; break; } - case 515: { - stateStack.Push(516); - goto case 367; + case 535: { + stateStack.Push(536); + goto case 372; } - case 516: { - if (la == null) { currentState = 516; break; } + case 536: { + if (la == null) { currentState = 536; break; } Expect(38, la); // ")" - currentState = 517; + currentState = 537; break; } - case 517: { - if (la == null) { currentState = 517; break; } + case 537: { + if (la == null) { currentState = 537; break; } if (la.kind == 63) { - currentState = 521; + currentState = 541; break; } else { - goto case 518; + goto case 538; } } - case 518: { - stateStack.Push(519); - goto case 224; + case 538: { + stateStack.Push(539); + goto case 229; } - case 519: { - if (la == null) { currentState = 519; break; } + case 539: { + if (la == null) { currentState = 539; break; } Expect(113, la); // "End" - currentState = 520; + currentState = 540; break; } - case 520: { - if (la == null) { currentState = 520; break; } + case 540: { + if (la == null) { currentState = 540; break; } Expect(172, la); // "Operator" - currentState = 18; + currentState = 23; break; } - case 521: { - if (la == null) { currentState = 521; break; } + case 541: { + if (la == null) { currentState = 541; break; } if (la.kind == 40) { - stateStack.Push(521); - goto case 380; + stateStack.Push(541); + goto case 385; } else { PushContext(Context.Type, la, t); - stateStack.Push(522); - goto case 32; + stateStack.Push(542); + goto case 37; } } - case 522: { + case 542: { PopContext(); - goto case 518; + goto case 538; } - case 523: { - if (la == null) { currentState = 523; break; } + case 543: { + if (la == null) { currentState = 543; break; } Expect(186, la); // "Property" - currentState = 524; + currentState = 544; break; } - case 524: { + case 544: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(525); - goto case 169; + stateStack.Push(545); + goto case 174; } - case 525: { + case 545: { PopContext(); - goto case 526; + goto case 546; } - case 526: { - if (la == null) { currentState = 526; break; } + case 546: { + if (la == null) { currentState = 546; break; } if (la.kind == 37) { - currentState = 562; + currentState = 585; break; } else { - goto case 527; + goto case 547; } } - case 527: { - if (la == null) { currentState = 527; break; } + case 547: { + if (la == null) { currentState = 547; break; } if (la.kind == 63) { - currentState = 560; + currentState = 583; break; } else { - goto case 528; + goto case 548; } } - case 528: { - if (la == null) { currentState = 528; break; } + case 548: { + if (la == null) { currentState = 548; break; } if (la.kind == 136) { - currentState = 558; + currentState = 578; break; } else { - goto case 529; + goto case 549; } } - case 529: { - if (la == null) { currentState = 529; break; } + case 549: { + if (la == null) { currentState = 549; break; } if (la.kind == 20) { - currentState = 557; + currentState = 577; break; } else { - goto case 530; + goto case 550; } } - case 530: { - stateStack.Push(531); - goto case 18; + case 550: { + stateStack.Push(551); + goto case 23; } - case 531: { + case 551: { PopContext(); - goto case 532; + goto case 552; } - case 532: { - if (la == null) { currentState = 532; break; } + case 552: { + if (la == null) { currentState = 552; break; } if (la.kind == 40) { - stateStack.Push(532); - goto case 380; + stateStack.Push(552); + goto case 385; } else { - goto case 533; + goto case 553; } } - case 533: { - if (la == null) { currentState = 533; break; } + case 553: { + if (la == null) { currentState = 553; break; } if (set[143].Get(la.kind)) { - currentState = 556; + currentState = 576; break; } else { if (la.kind == 128 || la.kind == 198) { PushContext(Context.Member, la, t); - goto case 534; + goto case 554; } else { currentState = stateStack.Pop(); goto switchlbl; } } } - case 534: { - if (la == null) { currentState = 534; break; } + case 554: { + if (la == null) { currentState = 554; break; } if (la.kind == 128) { - currentState = 535; + currentState = 555; break; } else { if (la.kind == 198) { - currentState = 535; + currentState = 555; break; } else { Error(la); - goto case 535; + goto case 555; } } } - case 535: { - if (la == null) { currentState = 535; break; } + case 555: { + if (la == null) { currentState = 555; break; } if (la.kind == 37) { - currentState = 553; + currentState = 573; break; } else { - goto case 536; + goto case 556; } } - case 536: { - stateStack.Push(537); - goto case 224; + case 556: { + stateStack.Push(557); + goto case 229; } - case 537: { - if (la == null) { currentState = 537; break; } + case 557: { + if (la == null) { currentState = 557; break; } Expect(113, la); // "End" - currentState = 538; + currentState = 558; break; } - case 538: { - if (la == null) { currentState = 538; break; } + case 558: { + if (la == null) { currentState = 558; break; } if (la.kind == 128) { - currentState = 539; + currentState = 559; break; } else { if (la.kind == 198) { - currentState = 539; + currentState = 559; break; } else { Error(la); - goto case 539; + goto case 559; } } } - case 539: { - stateStack.Push(540); - goto case 18; + case 559: { + stateStack.Push(560); + goto case 23; } - case 540: { - if (la == null) { currentState = 540; break; } + case 560: { + if (la == null) { currentState = 560; break; } if (set[104].Get(la.kind)) { - goto case 543; + goto case 563; } else { - goto case 541; + goto case 561; } } - case 541: { - if (la == null) { currentState = 541; break; } + case 561: { + if (la == null) { currentState = 561; break; } Expect(113, la); // "End" - currentState = 542; + currentState = 562; break; } - case 542: { - if (la == null) { currentState = 542; break; } + case 562: { + if (la == null) { currentState = 562; break; } Expect(186, la); // "Property" - currentState = 18; + currentState = 23; break; } - case 543: { - if (la == null) { currentState = 543; break; } + case 563: { + if (la == null) { currentState = 563; break; } if (la.kind == 40) { - stateStack.Push(543); - goto case 380; + stateStack.Push(563); + goto case 385; } else { - goto case 544; + goto case 564; } } - case 544: { - if (la == null) { currentState = 544; break; } + case 564: { + if (la == null) { currentState = 564; break; } if (set[143].Get(la.kind)) { - currentState = 544; + currentState = 564; break; } else { if (la.kind == 128) { - currentState = 545; + currentState = 565; break; } else { if (la.kind == 198) { - currentState = 545; + currentState = 565; break; } else { Error(la); - goto case 545; + goto case 565; } } } } - case 545: { - if (la == null) { currentState = 545; break; } + case 565: { + if (la == null) { currentState = 565; break; } if (la.kind == 37) { - currentState = 550; + currentState = 570; break; } else { - goto case 546; + goto case 566; } } - case 546: { - stateStack.Push(547); - goto case 224; + case 566: { + stateStack.Push(567); + goto case 229; } - case 547: { - if (la == null) { currentState = 547; break; } + case 567: { + if (la == null) { currentState = 567; break; } Expect(113, la); // "End" - currentState = 548; + currentState = 568; break; } - case 548: { - if (la == null) { currentState = 548; break; } + case 568: { + if (la == null) { currentState = 568; break; } if (la.kind == 128) { - currentState = 549; + currentState = 569; break; } else { if (la.kind == 198) { - currentState = 549; + currentState = 569; break; } else { Error(la); - goto case 549; + goto case 569; } } } - case 549: { - stateStack.Push(541); - goto case 18; + case 569: { + stateStack.Push(561); + goto case 23; } - case 550: { + case 570: { SetIdentifierExpected(la); - goto case 551; + goto case 571; } - case 551: { - if (la == null) { currentState = 551; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(552); - goto case 367; + case 571: { + if (la == null) { currentState = 571; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(572); + goto case 372; } else { - goto case 552; + goto case 572; } } - case 552: { - if (la == null) { currentState = 552; break; } + case 572: { + if (la == null) { currentState = 572; break; } Expect(38, la); // ")" - currentState = 546; + currentState = 566; break; } - case 553: { + case 573: { SetIdentifierExpected(la); - goto case 554; + goto case 574; } - case 554: { - if (la == null) { currentState = 554; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(555); - goto case 367; + case 574: { + if (la == null) { currentState = 574; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(575); + goto case 372; } else { - goto case 555; + goto case 575; } } - case 555: { - if (la == null) { currentState = 555; break; } + case 575: { + if (la == null) { currentState = 575; break; } Expect(38, la); // ")" - currentState = 536; + currentState = 556; break; } - case 556: { + case 576: { SetIdentifierExpected(la); - goto case 533; + goto case 553; } - case 557: { - stateStack.Push(530); - goto case 51; + case 577: { + stateStack.Push(550); + goto case 56; } - case 558: { - stateStack.Push(559); - goto case 32; + case 578: { + PushContext(Context.Type, la, t); + stateStack.Push(579); + goto case 37; } - case 559: { - if (la == null) { currentState = 559; break; } + case 579: { + PopContext(); + goto case 580; + } + case 580: { + if (la == null) { currentState = 580; break; } if (la.kind == 22) { - currentState = 558; + currentState = 581; break; } else { - goto case 529; + goto case 549; } } - case 560: { - if (la == null) { currentState = 560; break; } + case 581: { + PushContext(Context.Type, la, t); + stateStack.Push(582); + goto case 37; + } + case 582: { + PopContext(); + goto case 580; + } + case 583: { + if (la == null) { currentState = 583; break; } if (la.kind == 40) { - stateStack.Push(560); - goto case 380; + stateStack.Push(583); + goto case 385; } else { if (la.kind == 162) { - stateStack.Push(528); - goto case 62; + stateStack.Push(548); + goto case 67; } else { - if (set[15].Get(la.kind)) { + if (set[16].Get(la.kind)) { PushContext(Context.Type, la, t); - stateStack.Push(561); - goto case 32; + stateStack.Push(584); + goto case 37; } else { Error(la); - goto case 528; + goto case 548; } } } } - case 561: { + case 584: { PopContext(); - goto case 528; + goto case 548; } - case 562: { + case 585: { SetIdentifierExpected(la); - goto case 563; + goto case 586; } - case 563: { - if (la == null) { currentState = 563; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(564); - goto case 367; + case 586: { + if (la == null) { currentState = 586; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(587); + goto case 372; } else { - goto case 564; + goto case 587; } } - case 564: { - if (la == null) { currentState = 564; break; } + case 587: { + if (la == null) { currentState = 587; break; } Expect(38, la); // ")" - currentState = 527; + currentState = 547; break; } - case 565: { - if (la == null) { currentState = 565; break; } + case 588: { + if (la == null) { currentState = 588; break; } Expect(98, la); // "Custom" - currentState = 566; + currentState = 589; break; } - case 566: { - stateStack.Push(567); - goto case 577; + case 589: { + stateStack.Push(590); + goto case 600; } - case 567: { - if (la == null) { currentState = 567; break; } + case 590: { + if (la == null) { currentState = 590; break; } if (set[109].Get(la.kind)) { - goto case 569; + goto case 592; } else { Expect(113, la); // "End" - currentState = 568; + currentState = 591; break; } } - case 568: { - if (la == null) { currentState = 568; break; } + case 591: { + if (la == null) { currentState = 591; break; } Expect(119, la); // "Event" - currentState = 18; + currentState = 23; break; } - case 569: { - if (la == null) { currentState = 569; break; } + case 592: { + if (la == null) { currentState = 592; break; } if (la.kind == 40) { - stateStack.Push(569); - goto case 380; + stateStack.Push(592); + goto case 385; } else { if (la.kind == 56) { - currentState = 570; + currentState = 593; break; } else { if (la.kind == 193) { - currentState = 570; + currentState = 593; break; } else { if (la.kind == 189) { - currentState = 570; + currentState = 593; break; } else { Error(la); - goto case 570; + goto case 593; } } } } } - case 570: { - if (la == null) { currentState = 570; break; } + case 593: { + if (la == null) { currentState = 593; break; } Expect(37, la); // "(" - currentState = 571; + currentState = 594; break; } - case 571: { - stateStack.Push(572); - goto case 367; + case 594: { + stateStack.Push(595); + goto case 372; } - case 572: { - if (la == null) { currentState = 572; break; } + case 595: { + if (la == null) { currentState = 595; break; } Expect(38, la); // ")" - currentState = 573; + currentState = 596; break; } - case 573: { - stateStack.Push(574); - goto case 224; + case 596: { + stateStack.Push(597); + goto case 229; } - case 574: { - if (la == null) { currentState = 574; break; } + case 597: { + if (la == null) { currentState = 597; break; } Expect(113, la); // "End" - currentState = 575; + currentState = 598; break; } - case 575: { - if (la == null) { currentState = 575; break; } + case 598: { + if (la == null) { currentState = 598; break; } if (la.kind == 56) { - currentState = 576; + currentState = 599; break; } else { if (la.kind == 193) { - currentState = 576; + currentState = 599; break; } else { if (la.kind == 189) { - currentState = 576; + currentState = 599; break; } else { Error(la); - goto case 576; + goto case 599; } } } } - case 576: { - stateStack.Push(567); - goto case 18; + case 599: { + stateStack.Push(590); + goto case 23; } - case 577: { - if (la == null) { currentState = 577; break; } + case 600: { + if (la == null) { currentState = 600; break; } Expect(119, la); // "Event" - currentState = 578; + currentState = 601; break; } - case 578: { + case 601: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(579); - goto case 169; + stateStack.Push(602); + goto case 174; } - case 579: { + case 602: { PopContext(); - goto case 580; + goto case 603; } - case 580: { - if (la == null) { currentState = 580; break; } + case 603: { + if (la == null) { currentState = 603; break; } if (la.kind == 63) { - currentState = 587; + currentState = 613; break; } else { if (set[144].Get(la.kind)) { if (la.kind == 37) { - currentState = 584; + currentState = 610; break; } else { - goto case 581; + goto case 604; } } else { Error(la); - goto case 581; + goto case 604; } } } - case 581: { - if (la == null) { currentState = 581; break; } + case 604: { + if (la == null) { currentState = 604; break; } if (la.kind == 136) { - currentState = 582; + currentState = 605; break; } else { - goto case 18; + goto case 23; } } - case 582: { - stateStack.Push(583); - goto case 32; + case 605: { + PushContext(Context.Type, la, t); + stateStack.Push(606); + goto case 37; } - case 583: { - if (la == null) { currentState = 583; break; } + case 606: { + PopContext(); + goto case 607; + } + case 607: { + if (la == null) { currentState = 607; break; } if (la.kind == 22) { - currentState = 582; + currentState = 608; break; } else { - goto case 18; + goto case 23; } } - case 584: { + case 608: { + PushContext(Context.Type, la, t); + stateStack.Push(609); + goto case 37; + } + case 609: { + PopContext(); + goto case 607; + } + case 610: { SetIdentifierExpected(la); - goto case 585; + goto case 611; } - case 585: { - if (la == null) { currentState = 585; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(586); - goto case 367; + case 611: { + if (la == null) { currentState = 611; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(612); + goto case 372; } else { - goto case 586; + goto case 612; } - } - case 586: { - if (la == null) { currentState = 586; break; } + } + case 612: { + if (la == null) { currentState = 612; break; } Expect(38, la); // ")" - currentState = 581; + currentState = 604; break; } - case 587: { + case 613: { PushContext(Context.Type, la, t); - stateStack.Push(588); - goto case 32; + stateStack.Push(614); + goto case 37; } - case 588: { + case 614: { PopContext(); - goto case 581; + goto case 604; } - case 589: { - if (la == null) { currentState = 589; break; } + case 615: { + if (la == null) { currentState = 615; break; } Expect(101, la); // "Declare" - currentState = 590; + currentState = 616; break; } - case 590: { - if (la == null) { currentState = 590; break; } + case 616: { + if (la == null) { currentState = 616; break; } if (la.kind == 62 || la.kind == 66 || la.kind == 223) { - currentState = 591; + currentState = 617; break; } else { - goto case 591; + goto case 617; } } - case 591: { - if (la == null) { currentState = 591; break; } + case 617: { + if (la == null) { currentState = 617; break; } if (la.kind == 210) { - currentState = 592; + currentState = 618; break; } else { if (la.kind == 127) { - currentState = 592; + currentState = 618; break; } else { Error(la); - goto case 592; + goto case 618; } } } - case 592: { + case 618: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(593); - goto case 169; + stateStack.Push(619); + goto case 174; } - case 593: { + case 619: { PopContext(); - goto case 594; + goto case 620; } - case 594: { - if (la == null) { currentState = 594; break; } + case 620: { + if (la == null) { currentState = 620; break; } Expect(149, la); // "Lib" - currentState = 595; + currentState = 621; break; } - case 595: { - if (la == null) { currentState = 595; break; } + case 621: { + if (la == null) { currentState = 621; break; } Expect(3, la); // LiteralString - currentState = 596; + currentState = 622; break; } - case 596: { - if (la == null) { currentState = 596; break; } + case 622: { + if (la == null) { currentState = 622; break; } if (la.kind == 59) { - currentState = 604; + currentState = 630; break; } else { - goto case 597; + goto case 623; } } - case 597: { - if (la == null) { currentState = 597; break; } + case 623: { + if (la == null) { currentState = 623; break; } if (la.kind == 37) { - currentState = 601; + currentState = 627; break; } else { - goto case 598; + goto case 624; } } - case 598: { - if (la == null) { currentState = 598; break; } + case 624: { + if (la == null) { currentState = 624; break; } if (la.kind == 63) { - currentState = 599; + currentState = 625; break; } else { - goto case 18; + goto case 23; } } - case 599: { + case 625: { PushContext(Context.Type, la, t); - stateStack.Push(600); - goto case 32; + stateStack.Push(626); + goto case 37; } - case 600: { + case 626: { PopContext(); - goto case 18; + goto case 23; } - case 601: { + case 627: { SetIdentifierExpected(la); - goto case 602; + goto case 628; } - case 602: { - if (la == null) { currentState = 602; break; } - if (set[72].Get(la.kind)) { - stateStack.Push(603); - goto case 367; + case 628: { + if (la == null) { currentState = 628; break; } + if (set[73].Get(la.kind)) { + stateStack.Push(629); + goto case 372; } else { - goto case 603; + goto case 629; } } - case 603: { - if (la == null) { currentState = 603; break; } + case 629: { + if (la == null) { currentState = 629; break; } Expect(38, la); // ")" - currentState = 598; + currentState = 624; break; } - case 604: { - if (la == null) { currentState = 604; break; } + case 630: { + if (la == null) { currentState = 630; break; } Expect(3, la); // LiteralString - currentState = 597; + currentState = 623; break; } - case 605: { - if (la == null) { currentState = 605; break; } + case 631: { + if (la == null) { currentState = 631; break; } if (la.kind == 210) { - currentState = 606; + currentState = 632; break; } else { if (la.kind == 127) { - currentState = 606; + currentState = 632; break; } else { Error(la); - goto case 606; + goto case 632; } } } - case 606: { + case 632: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 607; + goto case 633; } - case 607: { - if (la == null) { currentState = 607; break; } - currentState = 608; + case 633: { + if (la == null) { currentState = 633; break; } + currentState = 634; break; } - case 608: { + case 634: { PopContext(); - goto case 609; + goto case 635; } - case 609: { - if (la == null) { currentState = 609; break; } + case 635: { + if (la == null) { currentState = 635; break; } if (la.kind == 37) { - currentState = 615; + currentState = 641; break; } else { if (la.kind == 63) { - currentState = 613; + currentState = 639; break; } else { - goto case 610; + goto case 636; } } } - case 610: { - stateStack.Push(611); - goto case 224; + case 636: { + stateStack.Push(637); + goto case 229; } - case 611: { - if (la == null) { currentState = 611; break; } + case 637: { + if (la == null) { currentState = 637; break; } Expect(113, la); // "End" - currentState = 612; + currentState = 638; break; } - case 612: { - if (la == null) { currentState = 612; break; } + case 638: { + if (la == null) { currentState = 638; break; } if (la.kind == 210) { - currentState = 18; + currentState = 23; break; } else { if (la.kind == 127) { - currentState = 18; + currentState = 23; break; } else { - goto case 460; + goto case 471; } } } - case 613: { + case 639: { PushContext(Context.Type, la, t); - stateStack.Push(614); - goto case 32; + stateStack.Push(640); + goto case 37; } - case 614: { + case 640: { PopContext(); - goto case 610; + goto case 636; } - case 615: { + case 641: { SetIdentifierExpected(la); - goto case 616; + goto case 642; } - case 616: { - if (la == null) { currentState = 616; break; } + case 642: { + if (la == null) { currentState = 642; break; } if (set[142].Get(la.kind)) { if (la.kind == 169) { - currentState = 618; + currentState = 644; break; } else { - if (set[72].Get(la.kind)) { - stateStack.Push(617); - goto case 367; + if (set[73].Get(la.kind)) { + stateStack.Push(643); + goto case 372; } else { Error(la); - goto case 617; + goto case 643; } } } else { - goto case 617; + goto case 643; } } - case 617: { - if (la == null) { currentState = 617; break; } + case 643: { + if (la == null) { currentState = 643; break; } Expect(38, la); // ")" - currentState = 609; + currentState = 635; break; } - case 618: { - stateStack.Push(617); - goto case 430; + case 644: { + stateStack.Push(643); + goto case 438; } - case 619: { - stateStack.Push(620); + case 645: { + stateStack.Push(646); SetIdentifierExpected(la); - goto case 621; + goto case 647; } - case 620: { - if (la == null) { currentState = 620; break; } + case 646: { + if (la == null) { currentState = 646; break; } if (la.kind == 22) { - currentState = 619; + currentState = 645; break; } else { - goto case 18; + goto case 23; } } - case 621: { - if (la == null) { currentState = 621; break; } + case 647: { + if (la == null) { currentState = 647; break; } if (la.kind == 88) { - currentState = 622; + currentState = 648; break; } else { - goto case 622; + goto case 648; } } - case 622: { + case 648: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - stateStack.Push(623); - goto case 629; + stateStack.Push(649); + goto case 656; } - case 623: { + case 649: { PopContext(); - goto case 624; + goto case 650; } - case 624: { - if (la == null) { currentState = 624; break; } + case 650: { + if (la == null) { currentState = 650; break; } if (la.kind == 63) { - currentState = 626; + currentState = 652; break; } else { - goto case 625; + goto case 651; } } - case 625: { - if (la == null) { currentState = 625; break; } + case 651: { + if (la == null) { currentState = 651; break; } if (la.kind == 20) { - goto case 182; + goto case 187; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 626: { + case 652: { PushContext(Context.Type, la, t); - goto case 627; + goto case 653; } - case 627: { - if (la == null) { currentState = 627; break; } + case 653: { + if (la == null) { currentState = 653; break; } if (la.kind == 162) { - stateStack.Push(628); - goto case 62; + stateStack.Push(654); + goto case 67; } else { - if (set[15].Get(la.kind)) { - stateStack.Push(628); - goto case 32; + if (set[16].Get(la.kind)) { + PushContext(Context.Type, la, t); + stateStack.Push(655); + goto case 37; } else { Error(la); - goto case 628; + goto case 654; } } } - case 628: { + case 654: { PopContext(); - goto case 625; + goto case 651; } - case 629: { - if (la == null) { currentState = 629; break; } + case 655: { + PopContext(); + goto case 654; + } + case 656: { + if (la == null) { currentState = 656; break; } if (set[128].Get(la.kind)) { currentState = stateStack.Pop(); break; } else { if (la.kind == 58) { - goto case 119; + goto case 124; } else { if (la.kind == 126) { - goto case 103; + goto case 108; } else { goto case 6; } } } } - case 630: { + case 657: { isMissingModifier = false; - goto case 505; + goto case 525; } - case 631: { - if (la == null) { currentState = 631; break; } + case 658: { + if (la == null) { currentState = 658; break; } Expect(136, la); // "Implements" - currentState = 632; + currentState = 659; break; } - case 632: { + case 659: { PushContext(Context.Type, la, t); - stateStack.Push(633); - goto case 32; + stateStack.Push(660); + goto case 37; } - case 633: { + case 660: { PopContext(); - goto case 634; + goto case 661; } - case 634: { - if (la == null) { currentState = 634; break; } + case 661: { + if (la == null) { currentState = 661; break; } if (la.kind == 22) { - currentState = 635; + currentState = 662; break; } else { - stateStack.Push(497); - goto case 18; + stateStack.Push(517); + goto case 23; } } - case 635: { + case 662: { PushContext(Context.Type, la, t); - stateStack.Push(636); - goto case 32; + stateStack.Push(663); + goto case 37; } - case 636: { + case 663: { PopContext(); - goto case 634; + goto case 661; } - case 637: { - if (la == null) { currentState = 637; break; } + case 664: { + if (la == null) { currentState = 664; break; } Expect(140, la); // "Inherits" - currentState = 638; + currentState = 665; break; } - case 638: { + case 665: { PushContext(Context.Type, la, t); - stateStack.Push(639); - goto case 32; + stateStack.Push(666); + goto case 37; } - case 639: { + case 666: { PopContext(); - stateStack.Push(495); - goto case 18; + stateStack.Push(515); + goto case 23; } - case 640: { - if (la == null) { currentState = 640; break; } + case 667: { + if (la == null) { currentState = 667; break; } Expect(169, la); // "Of" - currentState = 641; + currentState = 668; break; } - case 641: { - stateStack.Push(642); - goto case 430; + case 668: { + stateStack.Push(669); + goto case 438; } - case 642: { - if (la == null) { currentState = 642; break; } + case 669: { + if (la == null) { currentState = 669; break; } Expect(38, la); // ")" - currentState = 492; + currentState = 512; break; } - case 643: { + case 670: { isMissingModifier = false; - goto case 23; - } - case 644: { - if (la == null) { currentState = 644; break; } - Expect(140, la); // "Inherits" - currentState = 645; - break; + goto case 28; } - case 645: { - stateStack.Push(646); - goto case 32; + case 671: { + PushContext(Context.Type, la, t); + stateStack.Push(672); + goto case 37; } - case 646: { + case 672: { PopContext(); - goto case 647; + goto case 673; } - case 647: { - if (la == null) { currentState = 647; break; } + case 673: { + if (la == null) { currentState = 673; break; } if (la.kind == 22) { - currentState = 648; + currentState = 674; break; } else { - stateStack.Push(14); - goto case 18; + stateStack.Push(17); + goto case 23; } } - case 648: { + case 674: { PushContext(Context.Type, la, t); - stateStack.Push(649); - goto case 32; + stateStack.Push(675); + goto case 37; } - case 649: { + case 675: { PopContext(); - goto case 647; + goto case 673; } - case 650: { - if (la == null) { currentState = 650; break; } + case 676: { + if (la == null) { currentState = 676; break; } Expect(169, la); // "Of" - currentState = 651; + currentState = 677; break; } - case 651: { - stateStack.Push(652); - goto case 430; + case 677: { + stateStack.Push(678); + goto case 438; } - case 652: { - if (la == null) { currentState = 652; break; } + case 678: { + if (la == null) { currentState = 678; break; } Expect(38, la); // ")" - currentState = 11; + currentState = 14; break; } - case 653: { + case 679: { PushContext(Context.Identifier, la, t); SetIdentifierExpected(la); - goto case 654; + goto case 680; } - case 654: { - if (la == null) { currentState = 654; break; } - if (set[45].Get(la.kind)) { - currentState = 654; + case 680: { + if (la == null) { currentState = 680; break; } + if (set[46].Get(la.kind)) { + currentState = 680; break; } else { PopContext(); - stateStack.Push(655); - goto case 18; + stateStack.Push(681); + goto case 23; } } - case 655: { - if (la == null) { currentState = 655; break; } + case 681: { + if (la == null) { currentState = 681; break; } if (set[3].Get(la.kind)) { - stateStack.Push(655); + stateStack.Push(681); goto case 5; } else { Expect(113, la); // "End" - currentState = 656; + currentState = 682; break; } } - case 656: { - if (la == null) { currentState = 656; break; } + case 682: { + if (la == null) { currentState = 682; break; } Expect(160, la); // "Namespace" - currentState = 18; + currentState = 23; break; } - case 657: { - if (la == null) { currentState = 657; break; } + case 683: { + if (la == null) { currentState = 683; break; } Expect(137, la); // "Imports" - currentState = 658; + currentState = 684; break; } - case 658: { + case 684: { PushContext(Context.Importable, la, t); nextTokenIsStartOfImportsOrAccessExpression = true; - goto case 659; + goto case 685; } - case 659: { - if (la == null) { currentState = 659; break; } + case 685: { + if (la == null) { currentState = 685; break; } if (set[145].Get(la.kind)) { - currentState = 665; + currentState = 691; break; } else { if (la.kind == 10) { - currentState = 661; + currentState = 687; break; } else { Error(la); - goto case 660; + goto case 686; } } } - case 660: { + case 686: { PopContext(); - goto case 18; + goto case 23; } - case 661: { - stateStack.Push(662); - goto case 169; + case 687: { + stateStack.Push(688); + goto case 174; } - case 662: { - if (la == null) { currentState = 662; break; } + case 688: { + if (la == null) { currentState = 688; break; } Expect(20, la); // "=" - currentState = 663; + currentState = 689; break; } - case 663: { - if (la == null) { currentState = 663; break; } + case 689: { + if (la == null) { currentState = 689; break; } Expect(3, la); // LiteralString - currentState = 664; + currentState = 690; break; } - case 664: { - if (la == null) { currentState = 664; break; } + case 690: { + if (la == null) { currentState = 690; break; } Expect(11, la); // XmlCloseTag - currentState = 660; + currentState = 686; break; } - case 665: { - if (la == null) { currentState = 665; break; } + case 691: { + if (la == null) { currentState = 691; break; } if (la.kind == 37) { - stateStack.Push(665); - goto case 37; + stateStack.Push(691); + goto case 42; } else { if (la.kind == 20 || la.kind == 26) { - currentState = 666; + currentState = 692; break; } else { - goto case 660; + goto case 686; } } } - case 666: { - stateStack.Push(660); - goto case 32; + case 692: { + PushContext(Context.Type, la, t); + stateStack.Push(693); + goto case 37; } - case 667: { - if (la == null) { currentState = 667; break; } + case 693: { + PopContext(); + goto case 686; + } + case 694: { + if (la == null) { currentState = 694; break; } Expect(173, la); // "Option" - currentState = 668; + currentState = 695; break; } - case 668: { - if (la == null) { currentState = 668; break; } + case 695: { + if (la == null) { currentState = 695; break; } if (la.kind == 121 || la.kind == 139 || la.kind == 207) { - currentState = 670; + currentState = 697; break; } else { if (la.kind == 87) { - currentState = 669; + currentState = 696; break; } else { - goto case 460; + goto case 471; } } } - case 669: { - if (la == null) { currentState = 669; break; } + case 696: { + if (la == null) { currentState = 696; break; } if (la.kind == 213) { - currentState = 18; + currentState = 23; break; } else { if (la.kind == 67) { - currentState = 18; + currentState = 23; break; } else { - goto case 460; + goto case 471; } } } - case 670: { - if (la == null) { currentState = 670; break; } + case 697: { + if (la == null) { currentState = 697; break; } if (la.kind == 170 || la.kind == 171) { - currentState = 18; + currentState = 23; break; } else { - goto case 18; + goto case 23; } } } @@ -7648,6 +7818,7 @@ partial class ExpressionFinder { new BitArray(new int[] {4, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}), new BitArray(new int[] {0, 256, 1048576, -1601568064, 671109120, 1589117058, 393600, 3328}), new BitArray(new int[] {0, 256, 1048576, -1601568064, 671105024, 1589117058, 393600, 3328}), + new BitArray(new int[] {5, 1140850944, 26214479, -493220892, 671926304, 1606227075, -2143942272, 3393}), new BitArray(new int[] {0, 256, 1048576, -1601699136, 671105024, 1589117058, 393600, 3328}), new BitArray(new int[] {0, 0, 1048576, -1601699136, 671105024, 1589117058, 393600, 3328}), new BitArray(new int[] {0, 0, 1048576, -2138570624, 134234112, 67108864, 393216, 0}), @@ -7733,7 +7904,6 @@ partial class ExpressionFinder { new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671930656, 1606227074, -2143942272, 3393}), new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926560, 1606227074, -2143942272, 3393}), new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926304, 1606227074, -2143942272, 3393}), - new BitArray(new int[] {5, 1140850944, 26214479, -493220892, 671926304, 1606227075, -2143942272, 3393}), new BitArray(new int[] {4, 1140850944, 26214479, -493351964, 671926304, 1606227074, -2143942272, 3393}), new BitArray(new int[] {4, 1140850688, 26214479, -493351964, 671926304, 1606227074, -2143942272, 3393}), new BitArray(new int[] {4, 1140850688, 26214479, -1030223452, 135055392, 84218880, -2143942656, 65}),