From 98ca2b1265d424580adb4a5d3d26046a8207c6f2 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 15 Oct 2010 07:10:00 +0200 Subject: [PATCH] - fixed positions in TypeReferences - set IsExtensionMethod to true, if Extension-Attribute is on the Sub/Function Note: this can only be guessed, because we cannot reliably resolve the type of the attribute on parser level. --- .../Project/Src/Parser/VBNet/Parser.cs | 2771 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 21 +- 2 files changed, 1402 insertions(+), 1390 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index cf6504ca76..b7b00759e1 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; +using System.Linq; using System.Text; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.Parser.VB; @@ -25,7 +26,7 @@ partial class Parser : AbstractParser const bool x = false; -#line 12 "VBNET.ATG" +#line 13 "VBNET.ATG" /* @@ -34,7 +35,7 @@ partial class Parser : AbstractParser void VBNET() { -#line 262 "VBNET.ATG" +#line 263 "VBNET.ATG" lexer.NextToken(); // get the first token compilationUnit = new CompilationUnit(); BlockStart(compilationUnit); @@ -55,7 +56,7 @@ partial class Parser : AbstractParser } } while ( -#line 270 "VBNET.ATG" +#line 271 "VBNET.ATG" IsGlobalAttrTarget()) { GlobalAttributeSection(); while (la.kind == 1 || la.kind == 21) { @@ -82,59 +83,59 @@ IsGlobalAttrTarget()) { void OptionStmt() { -#line 275 "VBNET.ATG" +#line 276 "VBNET.ATG" INode node = null; bool val = true; Expect(173); -#line 276 "VBNET.ATG" +#line 277 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 121) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 278 "VBNET.ATG" +#line 279 "VBNET.ATG" ref val); } -#line 279 "VBNET.ATG" +#line 280 "VBNET.ATG" node = new OptionDeclaration(OptionType.Explicit, val); } else if (la.kind == 207) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 281 "VBNET.ATG" +#line 282 "VBNET.ATG" ref val); } -#line 282 "VBNET.ATG" +#line 283 "VBNET.ATG" node = new OptionDeclaration(OptionType.Strict, val); } else if (la.kind == 87) { lexer.NextToken(); if (la.kind == 67) { lexer.NextToken(); -#line 284 "VBNET.ATG" +#line 285 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareBinary, val); } else if (la.kind == 213) { lexer.NextToken(); -#line 285 "VBNET.ATG" +#line 286 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareText, val); } else SynErr(241); } else if (la.kind == 139) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 288 "VBNET.ATG" +#line 289 "VBNET.ATG" ref val); } -#line 289 "VBNET.ATG" +#line 290 "VBNET.ATG" node = new OptionDeclaration(OptionType.Infer, val); } else SynErr(242); EndOfStmt(); -#line 293 "VBNET.ATG" +#line 294 "VBNET.ATG" if (node != null) { node.StartLocation = startPos; node.EndLocation = t.Location; @@ -145,33 +146,33 @@ ref val); void ImportsStmt() { -#line 314 "VBNET.ATG" +#line 315 "VBNET.ATG" List usings = new List(); Expect(137); -#line 318 "VBNET.ATG" +#line 319 "VBNET.ATG" Location startPos = t.Location; Using u; ImportClause( -#line 321 "VBNET.ATG" +#line 322 "VBNET.ATG" out u); -#line 321 "VBNET.ATG" +#line 322 "VBNET.ATG" if (u != null) { usings.Add(u); } while (la.kind == 22) { lexer.NextToken(); ImportClause( -#line 323 "VBNET.ATG" +#line 324 "VBNET.ATG" out u); -#line 323 "VBNET.ATG" +#line 324 "VBNET.ATG" if (u != null) { usings.Add(u); } } EndOfStmt(); -#line 327 "VBNET.ATG" +#line 328 "VBNET.ATG" UsingDeclaration usingDeclaration = new UsingDeclaration(usings); usingDeclaration.StartLocation = startPos; usingDeclaration.EndLocation = t.Location; @@ -182,7 +183,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2814 "VBNET.ATG" +#line 2819 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -190,20 +191,20 @@ out u); lexer.NextToken(); } else SynErr(243); -#line 2816 "VBNET.ATG" +#line 2821 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(21); Attribute( -#line 2820 "VBNET.ATG" +#line 2825 "VBNET.ATG" out attribute); -#line 2820 "VBNET.ATG" +#line 2825 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2821 "VBNET.ATG" +#line 2826 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -215,10 +216,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2821 "VBNET.ATG" +#line 2826 "VBNET.ATG" out attribute); -#line 2821 "VBNET.ATG" +#line 2826 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -227,7 +228,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2826 "VBNET.ATG" +#line 2831 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -240,7 +241,7 @@ out attribute); void NamespaceMemberDecl() { -#line 360 "VBNET.ATG" +#line 361 "VBNET.ATG" ModifierList m = new ModifierList(); AttributeSection section; List attributes = new List(); @@ -249,14 +250,14 @@ out attribute); if (la.kind == 160) { lexer.NextToken(); -#line 367 "VBNET.ATG" +#line 368 "VBNET.ATG" Location startPos = t.Location; Qualident( -#line 369 "VBNET.ATG" +#line 370 "VBNET.ATG" out qualident); -#line 371 "VBNET.ATG" +#line 372 "VBNET.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; AddChild(node); @@ -265,67 +266,67 @@ out qualident); EndOfStmt(); NamespaceBody(); -#line 379 "VBNET.ATG" +#line 380 "VBNET.ATG" node.EndLocation = t.Location; BlockEnd(); } else if (StartOf(2)) { while (la.kind == 40) { AttributeSection( -#line 383 "VBNET.ATG" +#line 384 "VBNET.ATG" out section); -#line 383 "VBNET.ATG" +#line 384 "VBNET.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 384 "VBNET.ATG" +#line 385 "VBNET.ATG" m); } NonModuleDeclaration( -#line 384 "VBNET.ATG" +#line 385 "VBNET.ATG" m, attributes); } else SynErr(245); } void OptionValue( -#line 301 "VBNET.ATG" +#line 302 "VBNET.ATG" ref bool val) { if (la.kind == 171) { lexer.NextToken(); -#line 303 "VBNET.ATG" +#line 304 "VBNET.ATG" val = true; } else if (la.kind == 170) { lexer.NextToken(); -#line 305 "VBNET.ATG" +#line 306 "VBNET.ATG" val = false; } else SynErr(246); } void ImportClause( -#line 334 "VBNET.ATG" +#line 335 "VBNET.ATG" out Using u) { -#line 336 "VBNET.ATG" +#line 337 "VBNET.ATG" string qualident = null; TypeReference aliasedType = null; u = null; if (StartOf(4)) { Qualident( -#line 341 "VBNET.ATG" +#line 342 "VBNET.ATG" out qualident); if (la.kind == 20) { lexer.NextToken(); TypeName( -#line 342 "VBNET.ATG" +#line 343 "VBNET.ATG" out aliasedType); } -#line 344 "VBNET.ATG" +#line 345 "VBNET.ATG" if (qualident != null && qualident.Length > 0) { if (aliasedType != null) { u = new Using(qualident, aliasedType); @@ -336,66 +337,70 @@ out aliasedType); } else if (la.kind == 10) { -#line 352 "VBNET.ATG" +#line 353 "VBNET.ATG" string prefix = null; lexer.NextToken(); Identifier(); -#line 353 "VBNET.ATG" +#line 354 "VBNET.ATG" prefix = t.val; Expect(20); Expect(3); -#line 353 "VBNET.ATG" +#line 354 "VBNET.ATG" u = new Using(t.literalValue as string, prefix); Expect(11); } else SynErr(247); } void Qualident( -#line 3591 "VBNET.ATG" +#line 3596 "VBNET.ATG" out string qualident) { -#line 3593 "VBNET.ATG" +#line 3598 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3597 "VBNET.ATG" +#line 3602 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3598 "VBNET.ATG" +#line 3603 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3598 "VBNET.ATG" +#line 3603 "VBNET.ATG" out name); -#line 3598 "VBNET.ATG" +#line 3603 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3600 "VBNET.ATG" +#line 3605 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2687 "VBNET.ATG" +#line 2690 "VBNET.ATG" out TypeReference typeref) { -#line 2688 "VBNET.ATG" - ArrayList rank = null; +#line 2691 "VBNET.ATG" + ArrayList rank = null; Location startLocation = la.Location; NonArrayTypeName( -#line 2690 "VBNET.ATG" +#line 2693 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( #line 2694 "VBNET.ATG" out rank); -#line 2695 "VBNET.ATG" - if (rank != null && typeref != null) { - typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); +#line 2696 "VBNET.ATG" + if (typeref != null) { + if (rank != null) { + typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); + } + typeref.StartLocation = startLocation; + typeref.EndLocation = t.EndLocation; } } @@ -424,10 +429,10 @@ out rank); } void AttributeSection( -#line 2892 "VBNET.ATG" +#line 2897 "VBNET.ATG" out AttributeSection section) { -#line 2894 "VBNET.ATG" +#line 2899 "VBNET.ATG" string attributeTarget = ""; List attributes = new List(); ASTAttribute attribute; @@ -435,22 +440,22 @@ out AttributeSection section) { Expect(40); if ( -#line 2900 "VBNET.ATG" +#line 2905 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2906 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2902 "VBNET.ATG" +#line 2907 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2905 "VBNET.ATG" +#line 2910 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -463,20 +468,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2915 "VBNET.ATG" +#line 2920 "VBNET.ATG" out attribute); -#line 2915 "VBNET.ATG" +#line 2920 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2916 "VBNET.ATG" +#line 2921 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2916 "VBNET.ATG" +#line 2921 "VBNET.ATG" out attribute); -#line 2916 "VBNET.ATG" +#line 2921 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -484,7 +489,7 @@ out attribute); } Expect(39); -#line 2920 "VBNET.ATG" +#line 2925 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -495,69 +500,69 @@ out attribute); } void TypeModifier( -#line 3676 "VBNET.ATG" +#line 3681 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3677 "VBNET.ATG" +#line 3682 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3678 "VBNET.ATG" +#line 3683 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3679 "VBNET.ATG" +#line 3684 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3680 "VBNET.ATG" +#line 3685 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3681 "VBNET.ATG" +#line 3686 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3682 "VBNET.ATG" +#line 3687 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3683 "VBNET.ATG" +#line 3688 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3684 "VBNET.ATG" +#line 3689 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3685 "VBNET.ATG" +#line 3690 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -566,21 +571,21 @@ ModifierList m) { } void NonModuleDeclaration( -#line 462 "VBNET.ATG" +#line 463 "VBNET.ATG" ModifierList m, List attributes) { -#line 464 "VBNET.ATG" +#line 465 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 84: { -#line 467 "VBNET.ATG" +#line 468 "VBNET.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 470 "VBNET.ATG" +#line 471 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; AddChild(newType); @@ -590,42 +595,42 @@ ModifierList m, List attributes) { Identifier(); -#line 477 "VBNET.ATG" +#line 478 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 478 "VBNET.ATG" +#line 479 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 480 "VBNET.ATG" +#line 481 "VBNET.ATG" newType.BodyStartLocation = t.Location; if (la.kind == 140) { ClassBaseType( -#line 481 "VBNET.ATG" +#line 482 "VBNET.ATG" out typeRef); -#line 481 "VBNET.ATG" +#line 482 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } while (la.kind == 136) { TypeImplementsClause( -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" out baseInterfaces); -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 483 "VBNET.ATG" +#line 484 "VBNET.ATG" newType); Expect(113); Expect(84); -#line 484 "VBNET.ATG" +#line 485 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 487 "VBNET.ATG" +#line 488 "VBNET.ATG" BlockEnd(); break; @@ -633,7 +638,7 @@ newType); case 155: { lexer.NextToken(); -#line 491 "VBNET.ATG" +#line 492 "VBNET.ATG" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -643,17 +648,17 @@ newType); Identifier(); -#line 498 "VBNET.ATG" +#line 499 "VBNET.ATG" newType.Name = t.val; EndOfStmt(); -#line 500 "VBNET.ATG" +#line 501 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 501 "VBNET.ATG" +#line 502 "VBNET.ATG" newType); -#line 503 "VBNET.ATG" +#line 504 "VBNET.ATG" BlockEnd(); break; @@ -661,7 +666,7 @@ newType); case 209: { lexer.NextToken(); -#line 507 "VBNET.ATG" +#line 508 "VBNET.ATG" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -671,28 +676,28 @@ newType); Identifier(); -#line 514 "VBNET.ATG" +#line 515 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 515 "VBNET.ATG" +#line 516 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 517 "VBNET.ATG" +#line 518 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 136) { TypeImplementsClause( -#line 518 "VBNET.ATG" +#line 519 "VBNET.ATG" out baseInterfaces); -#line 518 "VBNET.ATG" +#line 519 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 519 "VBNET.ATG" +#line 520 "VBNET.ATG" newType); -#line 521 "VBNET.ATG" +#line 522 "VBNET.ATG" BlockEnd(); break; @@ -700,7 +705,7 @@ newType); case 115: { lexer.NextToken(); -#line 526 "VBNET.ATG" +#line 527 "VBNET.ATG" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -711,26 +716,26 @@ newType); Identifier(); -#line 534 "VBNET.ATG" +#line 535 "VBNET.ATG" newType.Name = t.val; if (la.kind == 63) { lexer.NextToken(); NonArrayTypeName( -#line 535 "VBNET.ATG" +#line 536 "VBNET.ATG" out typeRef, false); -#line 535 "VBNET.ATG" +#line 536 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } EndOfStmt(); -#line 537 "VBNET.ATG" +#line 538 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 538 "VBNET.ATG" +#line 539 "VBNET.ATG" newType); -#line 540 "VBNET.ATG" +#line 541 "VBNET.ATG" BlockEnd(); break; @@ -738,7 +743,7 @@ newType); case 142: { lexer.NextToken(); -#line 545 "VBNET.ATG" +#line 546 "VBNET.ATG" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -748,28 +753,28 @@ newType); Identifier(); -#line 552 "VBNET.ATG" +#line 553 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 553 "VBNET.ATG" +#line 554 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 555 "VBNET.ATG" +#line 556 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 140) { InterfaceBase( -#line 556 "VBNET.ATG" +#line 557 "VBNET.ATG" out baseInterfaces); -#line 556 "VBNET.ATG" +#line 557 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 557 "VBNET.ATG" +#line 558 "VBNET.ATG" newType); -#line 559 "VBNET.ATG" +#line 560 "VBNET.ATG" BlockEnd(); break; @@ -777,7 +782,7 @@ newType); case 103: { lexer.NextToken(); -#line 564 "VBNET.ATG" +#line 565 "VBNET.ATG" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("System.Void", true); @@ -788,63 +793,63 @@ newType); lexer.NextToken(); Identifier(); -#line 571 "VBNET.ATG" +#line 572 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 572 "VBNET.ATG" +#line 573 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 573 "VBNET.ATG" +#line 574 "VBNET.ATG" p); } Expect(38); -#line 573 "VBNET.ATG" +#line 574 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 127) { lexer.NextToken(); Identifier(); -#line 575 "VBNET.ATG" +#line 576 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 576 "VBNET.ATG" +#line 577 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 577 "VBNET.ATG" +#line 578 "VBNET.ATG" p); } Expect(38); -#line 577 "VBNET.ATG" +#line 578 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 63) { lexer.NextToken(); -#line 578 "VBNET.ATG" +#line 579 "VBNET.ATG" TypeReference type; TypeName( -#line 578 "VBNET.ATG" +#line 579 "VBNET.ATG" out type); -#line 578 "VBNET.ATG" +#line 579 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(250); -#line 580 "VBNET.ATG" +#line 581 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 583 "VBNET.ATG" +#line 584 "VBNET.ATG" AddChild(delegateDeclr); break; @@ -854,31 +859,31 @@ out type); } void TypeParameterList( -#line 388 "VBNET.ATG" +#line 389 "VBNET.ATG" List templates) { -#line 390 "VBNET.ATG" +#line 391 "VBNET.ATG" TemplateDefinition template; if ( -#line 394 "VBNET.ATG" +#line 395 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeParameter( -#line 395 "VBNET.ATG" +#line 396 "VBNET.ATG" out template); -#line 397 "VBNET.ATG" +#line 398 "VBNET.ATG" if (template != null) templates.Add(template); while (la.kind == 22) { lexer.NextToken(); TypeParameter( -#line 400 "VBNET.ATG" +#line 401 "VBNET.ATG" out template); -#line 402 "VBNET.ATG" +#line 403 "VBNET.ATG" if (template != null) templates.Add(template); } @@ -887,35 +892,35 @@ out template); } void TypeParameter( -#line 410 "VBNET.ATG" +#line 411 "VBNET.ATG" out TemplateDefinition template) { -#line 411 "VBNET.ATG" +#line 412 "VBNET.ATG" VarianceModifier modifier = VarianceModifier.Invariant; Location startLocation = la.Location; if (la.kind == 138 || la.kind == 178) { if (la.kind == 138) { lexer.NextToken(); -#line 414 "VBNET.ATG" +#line 415 "VBNET.ATG" modifier = VarianceModifier.Contravariant; } else { lexer.NextToken(); -#line 414 "VBNET.ATG" +#line 415 "VBNET.ATG" modifier = VarianceModifier.Covariant; } } Identifier(); -#line 414 "VBNET.ATG" +#line 415 "VBNET.ATG" template = new TemplateDefinition(t.val, null) { VarianceModifier = modifier }; if (la.kind == 63) { TypeParameterConstraints( -#line 415 "VBNET.ATG" +#line 416 "VBNET.ATG" template); } -#line 418 "VBNET.ATG" +#line 419 "VBNET.ATG" if (template != null) { template.StartLocation = startLocation; template.EndLocation = t.EndLocation; @@ -924,69 +929,69 @@ template); } void TypeParameterConstraints( -#line 426 "VBNET.ATG" +#line 427 "VBNET.ATG" TemplateDefinition template) { -#line 428 "VBNET.ATG" +#line 429 "VBNET.ATG" TypeReference constraint; Expect(63); if (la.kind == 35) { lexer.NextToken(); TypeParameterConstraint( -#line 434 "VBNET.ATG" +#line 435 "VBNET.ATG" out constraint); -#line 434 "VBNET.ATG" +#line 435 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 22) { lexer.NextToken(); TypeParameterConstraint( -#line 437 "VBNET.ATG" +#line 438 "VBNET.ATG" out constraint); -#line 437 "VBNET.ATG" +#line 438 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(36); } else if (StartOf(7)) { TypeParameterConstraint( -#line 440 "VBNET.ATG" +#line 441 "VBNET.ATG" out constraint); -#line 440 "VBNET.ATG" +#line 441 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } else SynErr(252); } void TypeParameterConstraint( -#line 444 "VBNET.ATG" +#line 445 "VBNET.ATG" out TypeReference constraint) { -#line 445 "VBNET.ATG" +#line 446 "VBNET.ATG" constraint = null; Location startLocation = la.Location; if (la.kind == 84) { lexer.NextToken(); -#line 448 "VBNET.ATG" +#line 449 "VBNET.ATG" constraint = TypeReference.ClassConstraint.Clone(); } else if (la.kind == 209) { lexer.NextToken(); -#line 449 "VBNET.ATG" +#line 450 "VBNET.ATG" constraint = TypeReference.StructConstraint.Clone(); } else if (la.kind == 162) { lexer.NextToken(); -#line 450 "VBNET.ATG" +#line 451 "VBNET.ATG" constraint = TypeReference.NewConstraint.Clone(); } else if (StartOf(8)) { TypeName( -#line 451 "VBNET.ATG" +#line 452 "VBNET.ATG" out constraint); } else SynErr(253); -#line 454 "VBNET.ATG" +#line 455 "VBNET.ATG" if (constraint != null) { constraint.StartLocation = startLocation; constraint.EndLocation = t.EndLocation; @@ -995,77 +1000,77 @@ out constraint); } void ClassBaseType( -#line 803 "VBNET.ATG" +#line 804 "VBNET.ATG" out TypeReference typeRef) { -#line 805 "VBNET.ATG" +#line 806 "VBNET.ATG" typeRef = null; Expect(140); TypeName( -#line 808 "VBNET.ATG" +#line 809 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1623 "VBNET.ATG" +#line 1626 "VBNET.ATG" out List baseInterfaces) { -#line 1625 "VBNET.ATG" +#line 1628 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(136); TypeName( -#line 1628 "VBNET.ATG" +#line 1631 "VBNET.ATG" out type); -#line 1630 "VBNET.ATG" +#line 1633 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1633 "VBNET.ATG" +#line 1636 "VBNET.ATG" out type); -#line 1634 "VBNET.ATG" +#line 1637 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 597 "VBNET.ATG" +#line 598 "VBNET.ATG" TypeDeclaration newType) { -#line 598 "VBNET.ATG" +#line 599 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 601 "VBNET.ATG" +#line 602 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 604 "VBNET.ATG" +#line 605 "VBNET.ATG" out section); -#line 604 "VBNET.ATG" +#line 605 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 605 "VBNET.ATG" +#line 606 "VBNET.ATG" m); } ClassMemberDecl( -#line 606 "VBNET.ATG" +#line 607 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1074,35 +1079,35 @@ m, attributes); } void ModuleBody( -#line 628 "VBNET.ATG" +#line 629 "VBNET.ATG" TypeDeclaration newType) { -#line 629 "VBNET.ATG" +#line 630 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 632 "VBNET.ATG" +#line 633 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 635 "VBNET.ATG" +#line 636 "VBNET.ATG" out section); -#line 635 "VBNET.ATG" +#line 636 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 636 "VBNET.ATG" +#line 637 "VBNET.ATG" m); } ClassMemberDecl( -#line 637 "VBNET.ATG" +#line 638 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1111,41 +1116,41 @@ m, attributes); Expect(113); Expect(155); -#line 640 "VBNET.ATG" +#line 641 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 611 "VBNET.ATG" +#line 612 "VBNET.ATG" TypeDeclaration newType) { -#line 612 "VBNET.ATG" +#line 613 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 615 "VBNET.ATG" +#line 616 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 618 "VBNET.ATG" +#line 619 "VBNET.ATG" out section); -#line 618 "VBNET.ATG" +#line 619 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 619 "VBNET.ATG" +#line 620 "VBNET.ATG" m); } StructureMemberDecl( -#line 620 "VBNET.ATG" +#line 621 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1154,16 +1159,16 @@ m, attributes); Expect(113); Expect(209); -#line 623 "VBNET.ATG" +#line 624 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 2713 "VBNET.ATG" +#line 2718 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2715 "VBNET.ATG" +#line 2720 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1173,36 +1178,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2720 "VBNET.ATG" +#line 2725 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2721 "VBNET.ATG" +#line 2726 "VBNET.ATG" out typeref, canBeUnbound); -#line 2722 "VBNET.ATG" +#line 2727 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2723 "VBNET.ATG" +#line 2728 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2724 "VBNET.ATG" +#line 2729 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2725 "VBNET.ATG" +#line 2730 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2728 "VBNET.ATG" +#line 2733 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2732 "VBNET.ATG" +#line 2737 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1210,15 +1215,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2738 "VBNET.ATG" +#line 2743 "VBNET.ATG" out name); -#line 2738 "VBNET.ATG" +#line 2743 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2742 "VBNET.ATG" +#line 2747 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1228,20 +1233,20 @@ out name); } void EnumBody( -#line 644 "VBNET.ATG" +#line 645 "VBNET.ATG" TypeDeclaration newType) { -#line 645 "VBNET.ATG" +#line 646 "VBNET.ATG" FieldDeclaration f; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(13)) { EnumMemberDecl( -#line 648 "VBNET.ATG" +#line 649 "VBNET.ATG" out f); -#line 650 "VBNET.ATG" +#line 651 "VBNET.ATG" AddChild(f); while (la.kind == 1 || la.kind == 21) { @@ -1251,40 +1256,40 @@ out f); Expect(113); Expect(115); -#line 654 "VBNET.ATG" +#line 655 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1608 "VBNET.ATG" +#line 1611 "VBNET.ATG" out List bases) { -#line 1610 "VBNET.ATG" +#line 1613 "VBNET.ATG" TypeReference type; bases = new List(); Expect(140); TypeName( -#line 1614 "VBNET.ATG" +#line 1617 "VBNET.ATG" out type); -#line 1614 "VBNET.ATG" +#line 1617 "VBNET.ATG" if (type != null) bases.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1617 "VBNET.ATG" +#line 1620 "VBNET.ATG" out type); -#line 1617 "VBNET.ATG" +#line 1620 "VBNET.ATG" if (type != null) bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 658 "VBNET.ATG" +#line 659 "VBNET.ATG" TypeDeclaration newType) { while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1298,168 +1303,168 @@ TypeDeclaration newType) { Expect(113); Expect(142); -#line 664 "VBNET.ATG" +#line 665 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2930 "VBNET.ATG" +#line 2935 "VBNET.ATG" List parameter) { -#line 2931 "VBNET.ATG" +#line 2936 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2933 "VBNET.ATG" +#line 2938 "VBNET.ATG" out p); -#line 2933 "VBNET.ATG" +#line 2938 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2935 "VBNET.ATG" +#line 2940 "VBNET.ATG" out p); -#line 2935 "VBNET.ATG" +#line 2940 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3688 "VBNET.ATG" +#line 3693 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3689 "VBNET.ATG" +#line 3694 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3690 "VBNET.ATG" +#line 3695 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3691 "VBNET.ATG" +#line 3696 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3692 "VBNET.ATG" +#line 3697 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3693 "VBNET.ATG" +#line 3698 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3694 "VBNET.ATG" +#line 3699 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3695 "VBNET.ATG" +#line 3700 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3696 "VBNET.ATG" +#line 3701 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3697 "VBNET.ATG" +#line 3702 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3698 "VBNET.ATG" +#line 3703 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3699 "VBNET.ATG" +#line 3704 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3700 "VBNET.ATG" +#line 3705 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3701 "VBNET.ATG" +#line 3706 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3702 "VBNET.ATG" +#line 3707 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3703 "VBNET.ATG" +#line 3708 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3704 "VBNET.ATG" +#line 3709 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3705 "VBNET.ATG" +#line 3710 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3706 "VBNET.ATG" +#line 3711 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3707 "VBNET.ATG" +#line 3712 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1468,18 +1473,18 @@ ModifierList m) { } void ClassMemberDecl( -#line 799 "VBNET.ATG" +#line 800 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 800 "VBNET.ATG" +#line 801 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 813 "VBNET.ATG" +#line 814 "VBNET.ATG" ModifierList m, List attributes) { -#line 815 "VBNET.ATG" +#line 816 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1489,37 +1494,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 84: case 103: case 115: case 142: case 155: case 209: { NonModuleDeclaration( -#line 822 "VBNET.ATG" +#line 823 "VBNET.ATG" m, attributes); break; } case 210: { lexer.NextToken(); -#line 826 "VBNET.ATG" +#line 827 "VBNET.ATG" Location startPos = t.Location; if (StartOf(4)) { -#line 830 "VBNET.ATG" +#line 831 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 836 "VBNET.ATG" +#line 837 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 839 "VBNET.ATG" +#line 840 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 840 "VBNET.ATG" +#line 841 "VBNET.ATG" p); } Expect(38); @@ -1527,23 +1532,23 @@ p); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 843 "VBNET.ATG" +#line 844 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 845 "VBNET.ATG" +#line 846 "VBNET.ATG" out handlesClause); } } -#line 848 "VBNET.ATG" +#line 849 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 851 "VBNET.ATG" +#line 852 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 854 "VBNET.ATG" +#line 855 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1557,37 +1562,38 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 867 "VBNET.ATG" +#line 868 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, TypeReference = new TypeReference("System.Void", true), Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause + InterfaceImplementations = implementsClause, + IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) }; AddChild(methodDeclaration); -#line 878 "VBNET.ATG" +#line 880 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 879 "VBNET.ATG" +#line 881 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 881 "VBNET.ATG" +#line 883 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 887 "VBNET.ATG" +#line 889 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 888 "VBNET.ATG" +#line 890 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(256); @@ -1597,39 +1603,39 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 892 "VBNET.ATG" +#line 894 "VBNET.ATG" p); } Expect(38); } -#line 893 "VBNET.ATG" +#line 895 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 894 "VBNET.ATG" +#line 896 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 897 "VBNET.ATG" +#line 899 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 898 "VBNET.ATG" +#line 900 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 900 "VBNET.ATG" +#line 902 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 906 "VBNET.ATG" +#line 908 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 909 "VBNET.ATG" +#line 911 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1643,7 +1649,7 @@ out stmt); case 127: { lexer.NextToken(); -#line 921 "VBNET.ATG" +#line 923 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1653,16 +1659,16 @@ out stmt); Identifier(); -#line 928 "VBNET.ATG" +#line 930 "VBNET.ATG" name = t.val; TypeParameterList( -#line 929 "VBNET.ATG" +#line 931 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 930 "VBNET.ATG" +#line 932 "VBNET.ATG" p); } Expect(38); @@ -1671,10 +1677,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 932 "VBNET.ATG" +#line 934 "VBNET.ATG" out returnTypeAttributeSection); -#line 934 "VBNET.ATG" +#line 936 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1682,11 +1688,11 @@ out returnTypeAttributeSection); } TypeName( -#line 940 "VBNET.ATG" +#line 942 "VBNET.ATG" out type); } -#line 942 "VBNET.ATG" +#line 944 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1694,23 +1700,23 @@ out type); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 948 "VBNET.ATG" +#line 950 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 950 "VBNET.ATG" +#line 952 "VBNET.ATG" out handlesClause); } } -#line 953 "VBNET.ATG" +#line 955 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 956 "VBNET.ATG" +#line 958 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 959 "VBNET.ATG" +#line 961 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1726,7 +1732,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 974 "VBNET.ATG" +#line 976 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1734,19 +1740,20 @@ IsMustOverride(m)) { EndLocation = endLocation, Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause + InterfaceImplementations = implementsClause, + IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) }; AddChild(methodDeclaration); if (ParseMethodBodies) { Block( -#line 987 "VBNET.ATG" +#line 990 "VBNET.ATG" out stmt); Expect(113); Expect(127); -#line 989 "VBNET.ATG" +#line 992 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1762,7 +1769,7 @@ out stmt); case 101: { lexer.NextToken(); -#line 1003 "VBNET.ATG" +#line 1006 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1772,39 +1779,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 1010 "VBNET.ATG" +#line 1013 "VBNET.ATG" out charsetModifer); } if (la.kind == 210) { lexer.NextToken(); Identifier(); -#line 1013 "VBNET.ATG" +#line 1016 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 1014 "VBNET.ATG" +#line 1017 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1015 "VBNET.ATG" +#line 1018 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1016 "VBNET.ATG" +#line 1019 "VBNET.ATG" p); } Expect(38); } EndOfStmt(); -#line 1019 "VBNET.ATG" +#line 1022 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1814,25 +1821,25 @@ p); lexer.NextToken(); Identifier(); -#line 1026 "VBNET.ATG" +#line 1029 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 1027 "VBNET.ATG" +#line 1030 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1028 "VBNET.ATG" +#line 1031 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1029 "VBNET.ATG" +#line 1032 "VBNET.ATG" p); } Expect(38); @@ -1840,12 +1847,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1030 "VBNET.ATG" +#line 1033 "VBNET.ATG" out type); } EndOfStmt(); -#line 1033 "VBNET.ATG" +#line 1036 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1857,7 +1864,7 @@ out type); case 119: { lexer.NextToken(); -#line 1043 "VBNET.ATG" +#line 1046 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1866,19 +1873,19 @@ out type); Identifier(); -#line 1049 "VBNET.ATG" +#line 1052 "VBNET.ATG" name= t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1051 "VBNET.ATG" +#line 1054 "VBNET.ATG" out type); } else if (StartOf(16)) { if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1053 "VBNET.ATG" +#line 1056 "VBNET.ATG" p); } Expect(38); @@ -1886,11 +1893,11 @@ p); } else SynErr(260); if (la.kind == 136) { ImplementsClause( -#line 1055 "VBNET.ATG" +#line 1058 "VBNET.ATG" out implementsClause); } -#line 1057 "VBNET.ATG" +#line 1060 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1904,29 +1911,29 @@ out implementsClause); } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { -#line 1068 "VBNET.ATG" +#line 1071 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); IdentifierForFieldDeclaration(); -#line 1071 "VBNET.ATG" +#line 1074 "VBNET.ATG" string name = t.val; -#line 1072 "VBNET.ATG" +#line 1075 "VBNET.ATG" fd.StartLocation = m.GetDeclarationLocation(t.Location); VariableDeclaratorPartAfterIdentifier( -#line 1074 "VBNET.ATG" +#line 1077 "VBNET.ATG" variableDeclarators, name); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 1075 "VBNET.ATG" +#line 1078 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1078 "VBNET.ATG" +#line 1081 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; AddChild(fd); @@ -1935,35 +1942,35 @@ variableDeclarators); } case 88: { -#line 1083 "VBNET.ATG" +#line 1086 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1084 "VBNET.ATG" +#line 1087 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1086 "VBNET.ATG" +#line 1089 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1090 "VBNET.ATG" +#line 1093 "VBNET.ATG" constantDeclarators); while (la.kind == 22) { lexer.NextToken(); ConstantDeclarator( -#line 1091 "VBNET.ATG" +#line 1094 "VBNET.ATG" constantDeclarators); } -#line 1093 "VBNET.ATG" +#line 1096 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1098 "VBNET.ATG" +#line 1101 "VBNET.ATG" fd.EndLocation = t.EndLocation; AddChild(fd); @@ -1972,7 +1979,7 @@ constantDeclarators); case 186: { lexer.NextToken(); -#line 1104 "VBNET.ATG" +#line 1107 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; @@ -1981,13 +1988,13 @@ constantDeclarators); Identifier(); -#line 1110 "VBNET.ATG" +#line 1113 "VBNET.ATG" string propertyName = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1111 "VBNET.ATG" +#line 1114 "VBNET.ATG" p); } Expect(38); @@ -1996,10 +2003,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1114 "VBNET.ATG" +#line 1117 "VBNET.ATG" out returnTypeAttributeSection); -#line 1116 "VBNET.ATG" +#line 1119 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -2007,13 +2014,13 @@ out returnTypeAttributeSection); } if ( -#line 1123 "VBNET.ATG" +#line 1126 "VBNET.ATG" IsNewExpression()) { ObjectCreateExpression( -#line 1123 "VBNET.ATG" +#line 1126 "VBNET.ATG" out initializer); -#line 1125 "VBNET.ATG" +#line 1128 "VBNET.ATG" if (initializer is ObjectCreateExpression) { type = ((ObjectCreateExpression)initializer).CreateType.Clone(); } else { @@ -2022,27 +2029,27 @@ out initializer); } else if (StartOf(8)) { TypeName( -#line 1132 "VBNET.ATG" +#line 1135 "VBNET.ATG" out type); } else SynErr(261); } if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1135 "VBNET.ATG" +#line 1138 "VBNET.ATG" out initializer); } if (la.kind == 136) { ImplementsClause( -#line 1136 "VBNET.ATG" +#line 1139 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1140 "VBNET.ATG" +#line 1143 "VBNET.ATG" IsMustOverride(m) || IsAutomaticProperty()) { -#line 1142 "VBNET.ATG" +#line 1145 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2055,7 +2062,7 @@ IsMustOverride(m) || IsAutomaticProperty()) { } else if (StartOf(17)) { -#line 1154 "VBNET.ATG" +#line 1157 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2067,13 +2074,13 @@ IsMustOverride(m) || IsAutomaticProperty()) { PropertySetRegion setRegion; AccessorDecls( -#line 1164 "VBNET.ATG" +#line 1167 "VBNET.ATG" out getRegion, out setRegion); Expect(113); Expect(186); EndOfStmt(); -#line 1168 "VBNET.ATG" +#line 1171 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.Location; // t = EndOfStmt; not "Property" @@ -2085,11 +2092,11 @@ out getRegion, out setRegion); case 98: { lexer.NextToken(); -#line 1175 "VBNET.ATG" +#line 1178 "VBNET.ATG" Location startPos = t.Location; Expect(119); -#line 1177 "VBNET.ATG" +#line 1180 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2099,24 +2106,24 @@ out getRegion, out setRegion); Identifier(); -#line 1184 "VBNET.ATG" +#line 1187 "VBNET.ATG" string customEventName = t.val; Expect(63); TypeName( -#line 1185 "VBNET.ATG" +#line 1188 "VBNET.ATG" out type); if (la.kind == 136) { ImplementsClause( -#line 1186 "VBNET.ATG" +#line 1189 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1189 "VBNET.ATG" +#line 1192 "VBNET.ATG" out eventAccessorDeclaration); -#line 1191 "VBNET.ATG" +#line 1194 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2135,7 +2142,7 @@ out eventAccessorDeclaration); Expect(119); EndOfStmt(); -#line 1207 "VBNET.ATG" +#line 1210 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2166,24 +2173,24 @@ out eventAccessorDeclaration); } case 161: case 172: case 232: { -#line 1233 "VBNET.ATG" +#line 1236 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 161 || la.kind == 232) { if (la.kind == 232) { lexer.NextToken(); -#line 1234 "VBNET.ATG" +#line 1237 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1235 "VBNET.ATG" +#line 1238 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(172); -#line 1238 "VBNET.ATG" +#line 1241 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2194,57 +2201,57 @@ out eventAccessorDeclaration); List parameters = new List(); OverloadableOperator( -#line 1247 "VBNET.ATG" +#line 1250 "VBNET.ATG" out operatorType); Expect(37); FormalParameter( -#line 1249 "VBNET.ATG" +#line 1252 "VBNET.ATG" out param); -#line 1250 "VBNET.ATG" +#line 1253 "VBNET.ATG" if (param != null) parameters.Add(param); if (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 1252 "VBNET.ATG" +#line 1255 "VBNET.ATG" out param); -#line 1253 "VBNET.ATG" +#line 1256 "VBNET.ATG" if (param != null) parameters.Add(param); } Expect(38); -#line 1256 "VBNET.ATG" +#line 1259 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 63) { lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1257 "VBNET.ATG" +#line 1260 "VBNET.ATG" out section); -#line 1258 "VBNET.ATG" +#line 1261 "VBNET.ATG" if (section != null) { section.AttributeTarget = "return"; attributes.Add(section); } } TypeName( -#line 1262 "VBNET.ATG" +#line 1265 "VBNET.ATG" out returnType); -#line 1262 "VBNET.ATG" +#line 1265 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1264 "VBNET.ATG" +#line 1267 "VBNET.ATG" out stmt); Expect(113); Expect(172); EndOfStmt(); -#line 1266 "VBNET.ATG" +#line 1269 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2267,25 +2274,25 @@ out stmt); } void EnumMemberDecl( -#line 781 "VBNET.ATG" +#line 782 "VBNET.ATG" out FieldDeclaration f) { -#line 783 "VBNET.ATG" +#line 784 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 40) { AttributeSection( -#line 787 "VBNET.ATG" +#line 788 "VBNET.ATG" out section); -#line 787 "VBNET.ATG" +#line 788 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 790 "VBNET.ATG" +#line 791 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2294,10 +2301,10 @@ out section); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 795 "VBNET.ATG" +#line 796 "VBNET.ATG" out expr); -#line 795 "VBNET.ATG" +#line 796 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2305,7 +2312,7 @@ out expr); void InterfaceMemberDecl() { -#line 672 "VBNET.ATG" +#line 673 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2317,33 +2324,33 @@ out expr); if (StartOf(19)) { while (la.kind == 40) { AttributeSection( -#line 680 "VBNET.ATG" +#line 681 "VBNET.ATG" out section); -#line 680 "VBNET.ATG" +#line 681 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 683 "VBNET.ATG" +#line 684 "VBNET.ATG" mod); } if (la.kind == 119) { lexer.NextToken(); -#line 687 "VBNET.ATG" +#line 688 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 690 "VBNET.ATG" +#line 691 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 691 "VBNET.ATG" +#line 692 "VBNET.ATG" p); } Expect(38); @@ -2351,12 +2358,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 692 "VBNET.ATG" +#line 693 "VBNET.ATG" out type); } EndOfStmt(); -#line 695 "VBNET.ATG" +#line 696 "VBNET.ATG" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2367,29 +2374,29 @@ out type); } else if (la.kind == 210) { lexer.NextToken(); -#line 705 "VBNET.ATG" +#line 706 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 708 "VBNET.ATG" +#line 709 "VBNET.ATG" name = t.val; TypeParameterList( -#line 709 "VBNET.ATG" +#line 710 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 710 "VBNET.ATG" +#line 711 "VBNET.ATG" p); } Expect(38); } EndOfStmt(); -#line 713 "VBNET.ATG" +#line 714 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2405,22 +2412,22 @@ p); } else if (la.kind == 127) { lexer.NextToken(); -#line 728 "VBNET.ATG" +#line 729 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 731 "VBNET.ATG" +#line 732 "VBNET.ATG" name = t.val; TypeParameterList( -#line 732 "VBNET.ATG" +#line 733 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 733 "VBNET.ATG" +#line 734 "VBNET.ATG" p); } Expect(38); @@ -2429,15 +2436,15 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 734 "VBNET.ATG" +#line 735 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 734 "VBNET.ATG" +#line 735 "VBNET.ATG" out type); } -#line 736 "VBNET.ATG" +#line 737 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -2458,19 +2465,19 @@ out type); } else if (la.kind == 186) { lexer.NextToken(); -#line 756 "VBNET.ATG" +#line 757 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 759 "VBNET.ATG" +#line 760 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 760 "VBNET.ATG" +#line 761 "VBNET.ATG" p); } Expect(38); @@ -2478,18 +2485,18 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 761 "VBNET.ATG" +#line 762 "VBNET.ATG" out type); } -#line 763 "VBNET.ATG" +#line 764 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } EndOfStmt(); -#line 769 "VBNET.ATG" +#line 770 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2499,34 +2506,34 @@ out type); } else SynErr(264); } else if (StartOf(20)) { NonModuleDeclaration( -#line 777 "VBNET.ATG" +#line 778 "VBNET.ATG" mod, attributes); } else SynErr(265); } void Expr( -#line 1667 "VBNET.ATG" +#line 1670 "VBNET.ATG" out Expression expr) { -#line 1668 "VBNET.ATG" +#line 1671 "VBNET.ATG" expr = null; Location startLocation = la.Location; if ( -#line 1671 "VBNET.ATG" +#line 1674 "VBNET.ATG" IsQueryExpression() ) { QueryExpr( -#line 1672 "VBNET.ATG" +#line 1675 "VBNET.ATG" out expr); } else if (la.kind == 127 || la.kind == 210) { LambdaExpr( -#line 1673 "VBNET.ATG" +#line 1676 "VBNET.ATG" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1674 "VBNET.ATG" +#line 1677 "VBNET.ATG" out expr); } else SynErr(266); -#line 1677 "VBNET.ATG" +#line 1680 "VBNET.ATG" if (expr != null) { expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; @@ -2535,84 +2542,84 @@ out expr); } void ImplementsClause( -#line 1640 "VBNET.ATG" +#line 1643 "VBNET.ATG" out List baseInterfaces) { -#line 1642 "VBNET.ATG" +#line 1645 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(136); NonArrayTypeName( -#line 1647 "VBNET.ATG" +#line 1650 "VBNET.ATG" out type, false); -#line 1648 "VBNET.ATG" +#line 1651 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1649 "VBNET.ATG" +#line 1652 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 22) { lexer.NextToken(); NonArrayTypeName( -#line 1651 "VBNET.ATG" +#line 1654 "VBNET.ATG" out type, false); -#line 1652 "VBNET.ATG" +#line 1655 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1653 "VBNET.ATG" +#line 1656 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1598 "VBNET.ATG" +#line 1601 "VBNET.ATG" out List handlesClause) { -#line 1600 "VBNET.ATG" +#line 1603 "VBNET.ATG" handlesClause = new List(); string name; Expect(134); EventMemberSpecifier( -#line 1603 "VBNET.ATG" +#line 1606 "VBNET.ATG" out name); -#line 1603 "VBNET.ATG" +#line 1606 "VBNET.ATG" if (name != null) handlesClause.Add(name); while (la.kind == 22) { lexer.NextToken(); EventMemberSpecifier( -#line 1604 "VBNET.ATG" +#line 1607 "VBNET.ATG" out name); -#line 1604 "VBNET.ATG" +#line 1607 "VBNET.ATG" if (name != null) handlesClause.Add(name); } } void Block( -#line 2978 "VBNET.ATG" +#line 2983 "VBNET.ATG" out Statement stmt) { -#line 2981 "VBNET.ATG" +#line 2986 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; BlockStart(blockStmt); while (StartOf(22) || -#line 2987 "VBNET.ATG" +#line 2992 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2987 "VBNET.ATG" +#line 2992 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2987 "VBNET.ATG" +#line 2992 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2620,7 +2627,7 @@ IsEndStmtAhead()) { } } -#line 2992 "VBNET.ATG" +#line 2997 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2628,26 +2635,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1590 "VBNET.ATG" +#line 1593 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1591 "VBNET.ATG" +#line 1594 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 127 || la.kind == 210) { } else if (la.kind == 62) { lexer.NextToken(); -#line 1592 "VBNET.ATG" +#line 1595 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 66) { lexer.NextToken(); -#line 1593 "VBNET.ATG" +#line 1596 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 223) { lexer.NextToken(); -#line 1594 "VBNET.ATG" +#line 1597 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(267); } @@ -2775,10 +2782,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1469 "VBNET.ATG" +#line 1472 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1471 "VBNET.ATG" +#line 1474 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2786,28 +2793,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1477 "VBNET.ATG" +#line 1480 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1477 "VBNET.ATG" +#line 1480 "VBNET.ATG" out dimension); } if ( -#line 1478 "VBNET.ATG" +#line 1481 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1478 "VBNET.ATG" +#line 1481 "VBNET.ATG" out rank); } if ( -#line 1480 "VBNET.ATG" +#line 1483 "VBNET.ATG" IsObjectCreation()) { Expect(63); ObjectCreateExpression( -#line 1480 "VBNET.ATG" +#line 1483 "VBNET.ATG" out expr); -#line 1482 "VBNET.ATG" +#line 1485 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType.Clone(); } else { @@ -2818,10 +2825,10 @@ out expr); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1489 "VBNET.ATG" +#line 1492 "VBNET.ATG" out type); -#line 1491 "VBNET.ATG" +#line 1494 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2834,7 +2841,7 @@ out type); } -#line 1503 "VBNET.ATG" +#line 1506 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2861,12 +2868,12 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1526 "VBNET.ATG" +#line 1529 "VBNET.ATG" out expr); } } else SynErr(269); -#line 1529 "VBNET.ATG" +#line 1532 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2875,22 +2882,22 @@ out expr); } void VariableDeclarator( -#line 1463 "VBNET.ATG" +#line 1466 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1465 "VBNET.ATG" +#line 1468 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1466 "VBNET.ATG" +#line 1469 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1444 "VBNET.ATG" +#line 1447 "VBNET.ATG" List constantDeclaration) { -#line 1446 "VBNET.ATG" +#line 1449 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2898,20 +2905,20 @@ List constantDeclaration) { Identifier(); -#line 1451 "VBNET.ATG" +#line 1454 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1452 "VBNET.ATG" +#line 1455 "VBNET.ATG" out type); } Expect(20); Expr( -#line 1453 "VBNET.ATG" +#line 1456 "VBNET.ATG" out expr); -#line 1455 "VBNET.ATG" +#line 1458 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2920,10 +2927,10 @@ out expr); } void ObjectCreateExpression( -#line 2129 "VBNET.ATG" +#line 2132 "VBNET.ATG" out Expression oce) { -#line 2131 "VBNET.ATG" +#line 2134 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2934,39 +2941,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2139 "VBNET.ATG" +#line 2142 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2140 "VBNET.ATG" +#line 2143 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2141 "VBNET.ATG" +#line 2144 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2141 "VBNET.ATG" +#line 2144 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2142 "VBNET.ATG" +#line 2145 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 2143 "VBNET.ATG" +#line 2146 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 2144 "VBNET.ATG" +#line 2147 "VBNET.ATG" out initializer); } } -#line 2146 "VBNET.ATG" +#line 2149 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2150 "VBNET.ATG" +#line 2153 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2981,53 +2988,53 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2165 "VBNET.ATG" +#line 2168 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; Expression anonymousMember = null; lexer.NextToken(); -#line 2170 "VBNET.ATG" +#line 2173 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2175 "VBNET.ATG" +#line 2178 "VBNET.ATG" out memberInitializer); -#line 2176 "VBNET.ATG" +#line 2179 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2177 "VBNET.ATG" +#line 2180 "VBNET.ATG" out anonymousMember); -#line 2178 "VBNET.ATG" +#line 2181 "VBNET.ATG" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(270); while (la.kind == 22) { lexer.NextToken(); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2182 "VBNET.ATG" +#line 2185 "VBNET.ATG" out memberInitializer); -#line 2183 "VBNET.ATG" +#line 2186 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2184 "VBNET.ATG" +#line 2187 "VBNET.ATG" out anonymousMember); -#line 2185 "VBNET.ATG" +#line 2188 "VBNET.ATG" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(271); } Expect(36); -#line 2190 "VBNET.ATG" +#line 2193 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3037,10 +3044,10 @@ out anonymousMember); } else { lexer.NextToken(); CollectionInitializer( -#line 2200 "VBNET.ATG" +#line 2203 "VBNET.ATG" out initializer); -#line 2202 "VBNET.ATG" +#line 2205 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3049,10 +3056,10 @@ out initializer); } void AccessorDecls( -#line 1378 "VBNET.ATG" +#line 1381 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1380 "VBNET.ATG" +#line 1383 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3060,60 +3067,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 40) { AttributeSection( -#line 1385 "VBNET.ATG" +#line 1388 "VBNET.ATG" out section); -#line 1385 "VBNET.ATG" +#line 1388 "VBNET.ATG" attributes.Add(section); } if (StartOf(25)) { GetAccessorDecl( -#line 1387 "VBNET.ATG" +#line 1390 "VBNET.ATG" out getBlock, attributes); if (StartOf(26)) { -#line 1389 "VBNET.ATG" +#line 1392 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1390 "VBNET.ATG" +#line 1393 "VBNET.ATG" out section); -#line 1390 "VBNET.ATG" +#line 1393 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1391 "VBNET.ATG" +#line 1394 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(27)) { SetAccessorDecl( -#line 1394 "VBNET.ATG" +#line 1397 "VBNET.ATG" out setBlock, attributes); if (StartOf(28)) { -#line 1396 "VBNET.ATG" +#line 1399 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1397 "VBNET.ATG" +#line 1400 "VBNET.ATG" out section); -#line 1397 "VBNET.ATG" +#line 1400 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1398 "VBNET.ATG" +#line 1401 "VBNET.ATG" out getBlock, attributes); } } else SynErr(272); } void EventAccessorDeclaration( -#line 1341 "VBNET.ATG" +#line 1344 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1343 "VBNET.ATG" +#line 1346 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -3122,10 +3129,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 40) { AttributeSection( -#line 1349 "VBNET.ATG" +#line 1352 "VBNET.ATG" out section); -#line 1349 "VBNET.ATG" +#line 1352 "VBNET.ATG" attributes.Add(section); } if (la.kind == 56) { @@ -3134,20 +3141,20 @@ out section); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1351 "VBNET.ATG" +#line 1354 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1352 "VBNET.ATG" +#line 1355 "VBNET.ATG" out stmt); Expect(113); Expect(56); EndOfStmt(); -#line 1354 "VBNET.ATG" +#line 1357 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3158,20 +3165,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1359 "VBNET.ATG" +#line 1362 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1360 "VBNET.ATG" +#line 1363 "VBNET.ATG" out stmt); Expect(113); Expect(193); EndOfStmt(); -#line 1362 "VBNET.ATG" +#line 1365 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3182,20 +3189,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1367 "VBNET.ATG" +#line 1370 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1368 "VBNET.ATG" +#line 1371 "VBNET.ATG" out stmt); Expect(113); Expect(189); EndOfStmt(); -#line 1370 "VBNET.ATG" +#line 1373 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3204,163 +3211,163 @@ out stmt); } void OverloadableOperator( -#line 1283 "VBNET.ATG" +#line 1286 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1284 "VBNET.ATG" +#line 1287 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1286 "VBNET.ATG" +#line 1289 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 30: { lexer.NextToken(); -#line 1288 "VBNET.ATG" +#line 1291 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 34: { lexer.NextToken(); -#line 1290 "VBNET.ATG" +#line 1293 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 24: { lexer.NextToken(); -#line 1292 "VBNET.ATG" +#line 1295 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 25: { lexer.NextToken(); -#line 1294 "VBNET.ATG" +#line 1297 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 23: { lexer.NextToken(); -#line 1296 "VBNET.ATG" +#line 1299 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 150: { lexer.NextToken(); -#line 1298 "VBNET.ATG" +#line 1301 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 154: { lexer.NextToken(); -#line 1300 "VBNET.ATG" +#line 1303 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 60: { lexer.NextToken(); -#line 1302 "VBNET.ATG" +#line 1305 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 175: { lexer.NextToken(); -#line 1304 "VBNET.ATG" +#line 1307 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 236: { lexer.NextToken(); -#line 1306 "VBNET.ATG" +#line 1309 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 32: { lexer.NextToken(); -#line 1308 "VBNET.ATG" +#line 1311 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 44: { lexer.NextToken(); -#line 1310 "VBNET.ATG" +#line 1313 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 45: { lexer.NextToken(); -#line 1312 "VBNET.ATG" +#line 1315 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 20: { lexer.NextToken(); -#line 1314 "VBNET.ATG" +#line 1317 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 1316 "VBNET.ATG" +#line 1319 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 40: { lexer.NextToken(); -#line 1318 "VBNET.ATG" +#line 1321 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 43: { lexer.NextToken(); -#line 1320 "VBNET.ATG" +#line 1323 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 39: { lexer.NextToken(); -#line 1322 "VBNET.ATG" +#line 1325 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 42: { lexer.NextToken(); -#line 1324 "VBNET.ATG" +#line 1327 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 94: { lexer.NextToken(); -#line 1326 "VBNET.ATG" +#line 1329 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1330 "VBNET.ATG" +#line 1333 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3377,10 +3384,10 @@ out OverloadableOperatorType operatorType) { } void FormalParameter( -#line 2939 "VBNET.ATG" +#line 2944 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2941 "VBNET.ATG" +#line 2946 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -3392,36 +3399,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2951 "VBNET.ATG" +#line 2956 "VBNET.ATG" out section); -#line 2951 "VBNET.ATG" +#line 2956 "VBNET.ATG" attributes.Add(section); } while (StartOf(29)) { ParameterModifier( -#line 2952 "VBNET.ATG" +#line 2957 "VBNET.ATG" mod); } Identifier(); -#line 2953 "VBNET.ATG" +#line 2958 "VBNET.ATG" string parameterName = t.val; if ( -#line 2954 "VBNET.ATG" +#line 2959 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2954 "VBNET.ATG" +#line 2959 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2955 "VBNET.ATG" +#line 2960 "VBNET.ATG" out type); } -#line 2957 "VBNET.ATG" +#line 2962 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -3435,11 +3442,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2967 "VBNET.ATG" +#line 2972 "VBNET.ATG" out expr); } -#line 2969 "VBNET.ATG" +#line 2974 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -3449,67 +3456,67 @@ out expr); } void GetAccessorDecl( -#line 1404 "VBNET.ATG" +#line 1407 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1405 "VBNET.ATG" +#line 1408 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1407 "VBNET.ATG" +#line 1410 "VBNET.ATG" out m); Expect(128); -#line 1409 "VBNET.ATG" +#line 1412 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1411 "VBNET.ATG" +#line 1414 "VBNET.ATG" out stmt); -#line 1412 "VBNET.ATG" +#line 1415 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(113); Expect(128); -#line 1414 "VBNET.ATG" +#line 1417 "VBNET.ATG" getBlock.Modifier = m; -#line 1415 "VBNET.ATG" +#line 1418 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1420 "VBNET.ATG" +#line 1423 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1422 "VBNET.ATG" +#line 1425 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1427 "VBNET.ATG" +#line 1430 "VBNET.ATG" out m); Expect(198); -#line 1429 "VBNET.ATG" +#line 1432 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1430 "VBNET.ATG" +#line 1433 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1432 "VBNET.ATG" +#line 1435 "VBNET.ATG" out stmt); -#line 1434 "VBNET.ATG" +#line 1437 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3517,116 +3524,116 @@ out stmt); Expect(113); Expect(198); -#line 1439 "VBNET.ATG" +#line 1442 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3710 "VBNET.ATG" +#line 3715 "VBNET.ATG" out Modifiers m) { -#line 3711 "VBNET.ATG" +#line 3716 "VBNET.ATG" m = Modifiers.None; while (StartOf(30)) { if (la.kind == 188) { lexer.NextToken(); -#line 3713 "VBNET.ATG" +#line 3718 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3714 "VBNET.ATG" +#line 3719 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3715 "VBNET.ATG" +#line 3720 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3716 "VBNET.ATG" +#line 3721 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1537 "VBNET.ATG" +#line 1540 "VBNET.ATG" out List arrayModifiers) { -#line 1539 "VBNET.ATG" +#line 1542 "VBNET.ATG" arrayModifiers = null; Expect(37); InitializationRankList( -#line 1541 "VBNET.ATG" +#line 1544 "VBNET.ATG" out arrayModifiers); Expect(38); } void ArrayNameModifier( -#line 2766 "VBNET.ATG" +#line 2771 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2768 "VBNET.ATG" +#line 2773 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2770 "VBNET.ATG" +#line 2775 "VBNET.ATG" out arrayModifiers); } void InitializationRankList( -#line 1545 "VBNET.ATG" +#line 1548 "VBNET.ATG" out List rank) { -#line 1547 "VBNET.ATG" +#line 1550 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1550 "VBNET.ATG" +#line 1553 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1551 "VBNET.ATG" +#line 1554 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1552 "VBNET.ATG" +#line 1555 "VBNET.ATG" out expr); } -#line 1554 "VBNET.ATG" +#line 1557 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 22) { lexer.NextToken(); Expr( -#line 1556 "VBNET.ATG" +#line 1559 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1557 "VBNET.ATG" +#line 1560 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1558 "VBNET.ATG" +#line 1561 "VBNET.ATG" out expr); } -#line 1560 "VBNET.ATG" +#line 1563 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1565 "VBNET.ATG" +#line 1568 "VBNET.ATG" out CollectionInitializerExpression outExpr) { -#line 1567 "VBNET.ATG" +#line 1570 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Location startLocation = la.Location; @@ -3634,27 +3641,27 @@ out CollectionInitializerExpression outExpr) { Expect(35); if (StartOf(24)) { Expr( -#line 1573 "VBNET.ATG" +#line 1576 "VBNET.ATG" out expr); -#line 1575 "VBNET.ATG" +#line 1578 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" NotFinalComma()) { Expect(22); Expr( -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" out expr); -#line 1579 "VBNET.ATG" +#line 1582 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(36); -#line 1584 "VBNET.ATG" +#line 1587 "VBNET.ATG" outExpr = initializer; outExpr.StartLocation = startLocation; outExpr.EndLocation = t.EndLocation; @@ -3662,10 +3669,10 @@ out expr); } void EventMemberSpecifier( -#line 1657 "VBNET.ATG" +#line 1660 "VBNET.ATG" out string name) { -#line 1658 "VBNET.ATG" +#line 1661 "VBNET.ATG" string eventName; if (StartOf(4)) { Identifier(); @@ -3675,182 +3682,182 @@ out string name) { lexer.NextToken(); } else SynErr(275); -#line 1661 "VBNET.ATG" +#line 1664 "VBNET.ATG" name = t.val; Expect(26); IdentifierOrKeyword( -#line 1663 "VBNET.ATG" +#line 1666 "VBNET.ATG" out eventName); -#line 1664 "VBNET.ATG" +#line 1667 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3643 "VBNET.ATG" +#line 3648 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3645 "VBNET.ATG" +#line 3650 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2289 "VBNET.ATG" +#line 2292 "VBNET.ATG" out Expression expr) { -#line 2291 "VBNET.ATG" +#line 2294 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2295 "VBNET.ATG" +#line 2298 "VBNET.ATG" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2296 "VBNET.ATG" +#line 2299 "VBNET.ATG" qexpr.Clauses); } -#line 2298 "VBNET.ATG" +#line 2301 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2209 "VBNET.ATG" +#line 2212 "VBNET.ATG" out Expression expr) { -#line 2211 "VBNET.ATG" +#line 2214 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2213 "VBNET.ATG" +#line 2216 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2214 "VBNET.ATG" +#line 2217 "VBNET.ATG" out lambda); } else SynErr(276); -#line 2215 "VBNET.ATG" +#line 2218 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1966 "VBNET.ATG" +#line 1969 "VBNET.ATG" out Expression outExpr) { -#line 1968 "VBNET.ATG" +#line 1971 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConjunctionExpr( -#line 1972 "VBNET.ATG" +#line 1975 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1975 "VBNET.ATG" +#line 1978 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1976 "VBNET.ATG" +#line 1979 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1977 "VBNET.ATG" +#line 1980 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1979 "VBNET.ATG" +#line 1982 "VBNET.ATG" out expr); -#line 1979 "VBNET.ATG" +#line 1982 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AssignmentOperator( -#line 1684 "VBNET.ATG" +#line 1687 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1685 "VBNET.ATG" +#line 1688 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 20: { lexer.NextToken(); -#line 1686 "VBNET.ATG" +#line 1689 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 54: { lexer.NextToken(); -#line 1687 "VBNET.ATG" +#line 1690 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 46: { lexer.NextToken(); -#line 1688 "VBNET.ATG" +#line 1691 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 48: { lexer.NextToken(); -#line 1689 "VBNET.ATG" +#line 1692 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 49: { lexer.NextToken(); -#line 1690 "VBNET.ATG" +#line 1693 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 50: { lexer.NextToken(); -#line 1691 "VBNET.ATG" +#line 1694 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 51: { lexer.NextToken(); -#line 1692 "VBNET.ATG" +#line 1695 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 47: { lexer.NextToken(); -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 52: { lexer.NextToken(); -#line 1694 "VBNET.ATG" +#line 1697 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 53: { lexer.NextToken(); -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3859,13 +3866,13 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1699 "VBNET.ATG" +#line 1702 "VBNET.ATG" out Expression pexpr) { -#line 1700 "VBNET.ATG" +#line 1703 "VBNET.ATG" string name; Location startLocation = la.Location; SimpleNonInvocationExpression( -#line 1703 "VBNET.ATG" +#line 1706 "VBNET.ATG" out pexpr); while (StartOf(32)) { if (la.kind == 26) { @@ -3873,73 +3880,73 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" out name); Expect(11); -#line 1707 "VBNET.ATG" +#line 1710 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1708 "VBNET.ATG" +#line 1711 "VBNET.ATG" out name); -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); } else SynErr(278); if ( -#line 1711 "VBNET.ATG" +#line 1714 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1712 "VBNET.ATG" +#line 1715 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(38); } } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1714 "VBNET.ATG" +#line 1717 "VBNET.ATG" out name); -#line 1714 "VBNET.ATG" +#line 1717 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else if (la.kind == 27 || la.kind == 28) { -#line 1715 "VBNET.ATG" +#line 1718 "VBNET.ATG" XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; if (la.kind == 28) { lexer.NextToken(); } else if (la.kind == 27) { lexer.NextToken(); -#line 1716 "VBNET.ATG" +#line 1719 "VBNET.ATG" type = XmlAxisType.Descendents; } else SynErr(279); if (la.kind == 10) { lexer.NextToken(); -#line 1716 "VBNET.ATG" +#line 1719 "VBNET.ATG" isXmlName = true; } IdentifierOrKeyword( -#line 1716 "VBNET.ATG" +#line 1719 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1717 "VBNET.ATG" +#line 1720 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); } else { InvocationExpression( -#line 1718 "VBNET.ATG" +#line 1721 "VBNET.ATG" ref pexpr); } } -#line 1722 "VBNET.ATG" +#line 1725 "VBNET.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -3948,10 +3955,10 @@ ref pexpr); } void SimpleNonInvocationExpression( -#line 1729 "VBNET.ATG" +#line 1732 "VBNET.ATG" out Expression pexpr) { -#line 1731 "VBNET.ATG" +#line 1734 "VBNET.ATG" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; @@ -3964,98 +3971,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1741 "VBNET.ATG" +#line 1744 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1742 "VBNET.ATG" +#line 1745 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1743 "VBNET.ATG" +#line 1746 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1744 "VBNET.ATG" +#line 1747 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1748 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1746 "VBNET.ATG" +#line 1749 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1747 "VBNET.ATG" +#line 1750 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 217: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1752 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 122: { lexer.NextToken(); -#line 1750 "VBNET.ATG" +#line 1753 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 165: { lexer.NextToken(); -#line 1751 "VBNET.ATG" +#line 1754 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 37: { lexer.NextToken(); Expr( -#line 1752 "VBNET.ATG" +#line 1755 "VBNET.ATG" out expr); Expect(38); -#line 1752 "VBNET.ATG" +#line 1755 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1754 "VBNET.ATG" +#line 1757 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1757 "VBNET.ATG" +#line 1760 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1758 "VBNET.ATG" +#line 1761 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(38); } @@ -4063,51 +4070,51 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 68: case 71: case 82: case 99: case 100: case 109: case 141: case 151: case 168: case 196: case 201: case 202: case 208: case 221: case 222: case 225: { -#line 1760 "VBNET.ATG" +#line 1763 "VBNET.ATG" string val = String.Empty; if (StartOf(12)) { PrimitiveTypeName( -#line 1761 "VBNET.ATG" +#line 1764 "VBNET.ATG" out val); } else if (la.kind == 168) { lexer.NextToken(); -#line 1761 "VBNET.ATG" +#line 1764 "VBNET.ATG" val = "System.Object"; } else SynErr(280); -#line 1762 "VBNET.ATG" +#line 1765 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 153: { lexer.NextToken(); -#line 1763 "VBNET.ATG" +#line 1766 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 158: case 159: { -#line 1764 "VBNET.ATG" +#line 1767 "VBNET.ATG" Expression retExpr = null; if (la.kind == 158) { lexer.NextToken(); -#line 1765 "VBNET.ATG" +#line 1768 "VBNET.ATG" retExpr = new BaseReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (la.kind == 159) { lexer.NextToken(); -#line 1766 "VBNET.ATG" +#line 1769 "VBNET.ATG" retExpr = new ClassReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else SynErr(281); Expect(26); IdentifierOrKeyword( -#line 1768 "VBNET.ATG" +#line 1771 "VBNET.ATG" out name); -#line 1768 "VBNET.ATG" +#line 1771 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -4116,86 +4123,86 @@ out name); Expect(26); Identifier(); -#line 1770 "VBNET.ATG" +#line 1773 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1772 "VBNET.ATG" +#line 1775 "VBNET.ATG" type.IsGlobal = true; -#line 1773 "VBNET.ATG" +#line 1776 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 162: { ObjectCreateExpression( -#line 1774 "VBNET.ATG" +#line 1777 "VBNET.ATG" out expr); -#line 1774 "VBNET.ATG" +#line 1777 "VBNET.ATG" pexpr = expr; break; } case 35: { CollectionInitializer( -#line 1775 "VBNET.ATG" +#line 1778 "VBNET.ATG" out cie); -#line 1775 "VBNET.ATG" +#line 1778 "VBNET.ATG" pexpr = cie; break; } case 94: case 106: case 219: { -#line 1777 "VBNET.ATG" +#line 1780 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 106) { lexer.NextToken(); } else if (la.kind == 94) { lexer.NextToken(); -#line 1779 "VBNET.ATG" +#line 1782 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 219) { lexer.NextToken(); -#line 1780 "VBNET.ATG" +#line 1783 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(282); Expect(37); Expr( -#line 1782 "VBNET.ATG" +#line 1785 "VBNET.ATG" out expr); Expect(22); TypeName( -#line 1782 "VBNET.ATG" +#line 1785 "VBNET.ATG" out type); Expect(38); -#line 1783 "VBNET.ATG" +#line 1786 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 76: case 77: case 78: case 79: case 80: case 81: case 83: case 85: case 86: case 90: case 91: case 92: case 93: case 95: case 96: case 97: { CastTarget( -#line 1784 "VBNET.ATG" +#line 1787 "VBNET.ATG" out type); Expect(37); Expr( -#line 1784 "VBNET.ATG" +#line 1787 "VBNET.ATG" out expr); Expect(38); -#line 1784 "VBNET.ATG" +#line 1787 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 57: { lexer.NextToken(); Expr( -#line 1785 "VBNET.ATG" +#line 1788 "VBNET.ATG" out expr); -#line 1785 "VBNET.ATG" +#line 1788 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4203,37 +4210,37 @@ out expr); lexer.NextToken(); Expect(37); GetTypeTypeName( -#line 1786 "VBNET.ATG" +#line 1789 "VBNET.ATG" out type); Expect(38); -#line 1786 "VBNET.ATG" +#line 1789 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 220: { lexer.NextToken(); SimpleExpr( -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" out expr); Expect(144); TypeName( -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" out type); -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 135: { ConditionalExpression( -#line 1788 "VBNET.ATG" +#line 1791 "VBNET.ATG" out pexpr); break; } case 10: case 16: case 17: case 18: case 19: { XmlLiteralExpression( -#line 1789 "VBNET.ATG" +#line 1792 "VBNET.ATG" out pexpr); break; } @@ -4244,62 +4251,62 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1795 "VBNET.ATG" +#line 1798 "VBNET.ATG" out name); Expect(11); -#line 1796 "VBNET.ATG" +#line 1799 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1797 "VBNET.ATG" +#line 1800 "VBNET.ATG" out name); -#line 1798 "VBNET.ATG" +#line 1801 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); } else SynErr(283); } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1800 "VBNET.ATG" +#line 1803 "VBNET.ATG" out name); -#line 1800 "VBNET.ATG" +#line 1803 "VBNET.ATG" pexpr = new BinaryOperatorExpression(null, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else { -#line 1801 "VBNET.ATG" +#line 1804 "VBNET.ATG" XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; if (la.kind == 27) { lexer.NextToken(); -#line 1802 "VBNET.ATG" +#line 1805 "VBNET.ATG" axisType = XmlAxisType.Descendents; } else if (la.kind == 28) { lexer.NextToken(); -#line 1802 "VBNET.ATG" +#line 1805 "VBNET.ATG" axisType = XmlAxisType.Attribute; } else SynErr(284); if (la.kind == 10) { lexer.NextToken(); -#line 1803 "VBNET.ATG" +#line 1806 "VBNET.ATG" isXmlIdentifier = true; } IdentifierOrKeyword( -#line 1803 "VBNET.ATG" +#line 1806 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1804 "VBNET.ATG" +#line 1807 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); } } else SynErr(285); -#line 1809 "VBNET.ATG" +#line 1812 "VBNET.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -4308,161 +4315,161 @@ out name); } void TypeArgumentList( -#line 2802 "VBNET.ATG" +#line 2807 "VBNET.ATG" List typeArguments) { -#line 2804 "VBNET.ATG" +#line 2809 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2806 "VBNET.ATG" +#line 2811 "VBNET.ATG" out typeref); -#line 2806 "VBNET.ATG" +#line 2811 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2809 "VBNET.ATG" +#line 2814 "VBNET.ATG" out typeref); -#line 2809 "VBNET.ATG" +#line 2814 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1930 "VBNET.ATG" +#line 1933 "VBNET.ATG" ref Expression pexpr) { -#line 1931 "VBNET.ATG" +#line 1934 "VBNET.ATG" List parameters = null; Expect(37); -#line 1933 "VBNET.ATG" +#line 1936 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1934 "VBNET.ATG" +#line 1937 "VBNET.ATG" out parameters); Expect(38); -#line 1937 "VBNET.ATG" +#line 1940 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1939 "VBNET.ATG" +#line 1942 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3650 "VBNET.ATG" +#line 3655 "VBNET.ATG" out string type) { -#line 3651 "VBNET.ATG" +#line 3656 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3652 "VBNET.ATG" +#line 3657 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3653 "VBNET.ATG" +#line 3658 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3654 "VBNET.ATG" +#line 3659 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3655 "VBNET.ATG" +#line 3660 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3656 "VBNET.ATG" +#line 3661 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3657 "VBNET.ATG" +#line 3662 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3658 "VBNET.ATG" +#line 3663 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3659 "VBNET.ATG" +#line 3664 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3660 "VBNET.ATG" +#line 3665 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3661 "VBNET.ATG" +#line 3666 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3662 "VBNET.ATG" +#line 3667 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3663 "VBNET.ATG" +#line 3668 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3664 "VBNET.ATG" +#line 3669 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3665 "VBNET.ATG" +#line 3670 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3666 "VBNET.ATG" +#line 3671 "VBNET.ATG" type = "System.SByte"; break; } @@ -4471,122 +4478,122 @@ out string type) { } void CastTarget( -#line 1944 "VBNET.ATG" +#line 1947 "VBNET.ATG" out TypeReference type) { -#line 1946 "VBNET.ATG" +#line 1949 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1948 "VBNET.ATG" +#line 1951 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1949 "VBNET.ATG" +#line 1952 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1950 "VBNET.ATG" +#line 1953 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1951 "VBNET.ATG" +#line 1954 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1952 "VBNET.ATG" +#line 1955 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1953 "VBNET.ATG" +#line 1956 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1954 "VBNET.ATG" +#line 1957 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1955 "VBNET.ATG" +#line 1958 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1956 "VBNET.ATG" +#line 1959 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1957 "VBNET.ATG" +#line 1960 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1958 "VBNET.ATG" +#line 1961 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1959 "VBNET.ATG" +#line 1962 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1960 "VBNET.ATG" +#line 1963 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1961 "VBNET.ATG" +#line 1964 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1962 "VBNET.ATG" +#line 1965 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1963 "VBNET.ATG" +#line 1966 "VBNET.ATG" type = new TypeReference("System.String", true); break; } @@ -4595,19 +4602,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2701 "VBNET.ATG" +#line 2706 "VBNET.ATG" out TypeReference typeref) { -#line 2702 "VBNET.ATG" +#line 2707 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2704 "VBNET.ATG" +#line 2709 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2705 "VBNET.ATG" +#line 2710 "VBNET.ATG" out rank); -#line 2706 "VBNET.ATG" +#line 2711 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4615,10 +4622,10 @@ out rank); } void ConditionalExpression( -#line 1896 "VBNET.ATG" +#line 1899 "VBNET.ATG" out Expression expr) { -#line 1898 "VBNET.ATG" +#line 1901 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4630,21 +4637,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1907 "VBNET.ATG" +#line 1910 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1907 "VBNET.ATG" +#line 1910 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1907 "VBNET.ATG" +#line 1910 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1909 "VBNET.ATG" +#line 1912 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4667,50 +4674,50 @@ out falseExpr); } void XmlLiteralExpression( -#line 1816 "VBNET.ATG" +#line 1819 "VBNET.ATG" out Expression pexpr) { -#line 1818 "VBNET.ATG" +#line 1821 "VBNET.ATG" List exprs = new List(); XmlExpression currentExpression = null; if (StartOf(36)) { XmlContentExpression( -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs); while (StartOf(36)) { XmlContentExpression( -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs); } if (la.kind == 10) { XmlElement( -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" out currentExpression); -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs); } } } else if (la.kind == 10) { XmlElement( -#line 1825 "VBNET.ATG" +#line 1828 "VBNET.ATG" out currentExpression); -#line 1825 "VBNET.ATG" +#line 1828 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1825 "VBNET.ATG" +#line 1828 "VBNET.ATG" exprs); } } else SynErr(288); -#line 1828 "VBNET.ATG" +#line 1831 "VBNET.ATG" if (exprs.Count > 1) { pexpr = new XmlDocumentExpression() { Expressions = exprs }; } else { @@ -4720,34 +4727,34 @@ exprs); } void XmlContentExpression( -#line 1836 "VBNET.ATG" +#line 1839 "VBNET.ATG" List exprs) { -#line 1837 "VBNET.ATG" +#line 1840 "VBNET.ATG" XmlContentExpression expr = null; if (la.kind == 16) { lexer.NextToken(); -#line 1839 "VBNET.ATG" +#line 1842 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Text); } else if (la.kind == 18) { lexer.NextToken(); -#line 1840 "VBNET.ATG" +#line 1843 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.CData); } else if (la.kind == 17) { lexer.NextToken(); -#line 1841 "VBNET.ATG" +#line 1844 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Comment); } else if (la.kind == 19) { lexer.NextToken(); -#line 1842 "VBNET.ATG" +#line 1845 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); } else SynErr(289); -#line 1845 "VBNET.ATG" +#line 1848 "VBNET.ATG" expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; exprs.Add(expr); @@ -4755,54 +4762,54 @@ List exprs) { } void XmlElement( -#line 1871 "VBNET.ATG" +#line 1874 "VBNET.ATG" out XmlExpression expr) { -#line 1872 "VBNET.ATG" +#line 1875 "VBNET.ATG" XmlElementExpression el = new XmlElementExpression(); Expect(10); -#line 1875 "VBNET.ATG" +#line 1878 "VBNET.ATG" el.StartLocation = t.Location; if (la.kind == 12) { lexer.NextToken(); -#line 1876 "VBNET.ATG" +#line 1879 "VBNET.ATG" Expression innerExpression; Expr( -#line 1876 "VBNET.ATG" +#line 1879 "VBNET.ATG" out innerExpression); Expect(13); -#line 1877 "VBNET.ATG" +#line 1880 "VBNET.ATG" el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; } else if (StartOf(4)) { Identifier(); -#line 1878 "VBNET.ATG" +#line 1881 "VBNET.ATG" el.XmlName = t.val; } else SynErr(290); while (StartOf(37)) { XmlAttribute( -#line 1878 "VBNET.ATG" +#line 1881 "VBNET.ATG" el.Attributes); } if (la.kind == 14) { lexer.NextToken(); -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" el.EndLocation = t.EndLocation; } else if (la.kind == 11) { lexer.NextToken(); while (StartOf(38)) { -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" XmlExpression child; XmlNestedContent( -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" out child); -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" el.Children.Add(child); } Expect(15); @@ -4811,73 +4818,73 @@ out child); } Expect(11); -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" el.EndLocation = t.EndLocation; } else SynErr(291); -#line 1881 "VBNET.ATG" +#line 1884 "VBNET.ATG" expr = el; } void XmlNestedContent( -#line 1851 "VBNET.ATG" +#line 1854 "VBNET.ATG" out XmlExpression expr) { -#line 1852 "VBNET.ATG" +#line 1855 "VBNET.ATG" XmlExpression tmpExpr = null; Location start = la.Location; switch (la.kind) { case 16: { lexer.NextToken(); -#line 1855 "VBNET.ATG" +#line 1858 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); break; } case 18: { lexer.NextToken(); -#line 1856 "VBNET.ATG" +#line 1859 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); break; } case 17: { lexer.NextToken(); -#line 1857 "VBNET.ATG" +#line 1860 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); break; } case 19: { lexer.NextToken(); -#line 1858 "VBNET.ATG" +#line 1861 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); break; } case 12: { lexer.NextToken(); -#line 1859 "VBNET.ATG" +#line 1862 "VBNET.ATG" Expression innerExpression; Expr( -#line 1859 "VBNET.ATG" +#line 1862 "VBNET.ATG" out innerExpression); Expect(13); -#line 1859 "VBNET.ATG" +#line 1862 "VBNET.ATG" tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; break; } case 10: { XmlElement( -#line 1860 "VBNET.ATG" +#line 1863 "VBNET.ATG" out tmpExpr); break; } default: SynErr(292); break; } -#line 1863 "VBNET.ATG" +#line 1866 "VBNET.ATG" if (tmpExpr.StartLocation.IsEmpty) tmpExpr.StartLocation = start; if (tmpExpr.EndLocation.IsEmpty) @@ -4887,401 +4894,401 @@ out tmpExpr); } void XmlAttribute( -#line 1884 "VBNET.ATG" +#line 1887 "VBNET.ATG" List attrs) { -#line 1885 "VBNET.ATG" +#line 1888 "VBNET.ATG" Location start = la.Location; if (StartOf(4)) { Identifier(); -#line 1887 "VBNET.ATG" +#line 1890 "VBNET.ATG" string name = t.val; Expect(20); -#line 1888 "VBNET.ATG" +#line 1891 "VBNET.ATG" string literalValue = null; Expression expressionValue = null; bool useDoubleQuotes = false; if (la.kind == 3) { lexer.NextToken(); -#line 1889 "VBNET.ATG" +#line 1892 "VBNET.ATG" literalValue = t.literalValue.ToString(); useDoubleQuotes = t.val[0] == '"'; } else if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1889 "VBNET.ATG" +#line 1892 "VBNET.ATG" out expressionValue); Expect(13); } else SynErr(293); -#line 1890 "VBNET.ATG" +#line 1893 "VBNET.ATG" attrs.Add(new XmlAttributeExpression() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); } else if (la.kind == 12) { lexer.NextToken(); -#line 1892 "VBNET.ATG" +#line 1895 "VBNET.ATG" Expression innerExpression; Expr( -#line 1892 "VBNET.ATG" +#line 1895 "VBNET.ATG" out innerExpression); Expect(13); -#line 1893 "VBNET.ATG" +#line 1896 "VBNET.ATG" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); } else SynErr(294); } void ArgumentList( -#line 2632 "VBNET.ATG" +#line 2635 "VBNET.ATG" out List arguments) { -#line 2634 "VBNET.ATG" +#line 2637 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2637 "VBNET.ATG" +#line 2640 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2638 "VBNET.ATG" +#line 2641 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(24)) { Argument( -#line 2639 "VBNET.ATG" +#line 2642 "VBNET.ATG" out expr); } -#line 2640 "VBNET.ATG" +#line 2643 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2642 "VBNET.ATG" +#line 2645 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1983 "VBNET.ATG" +#line 1986 "VBNET.ATG" out Expression outExpr) { -#line 1985 "VBNET.ATG" +#line 1988 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; NotExpr( -#line 1989 "VBNET.ATG" +#line 1992 "VBNET.ATG" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1992 "VBNET.ATG" +#line 1995 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1993 "VBNET.ATG" +#line 1996 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1995 "VBNET.ATG" +#line 1998 "VBNET.ATG" out expr); -#line 1995 "VBNET.ATG" +#line 1998 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NotExpr( -#line 1999 "VBNET.ATG" +#line 2002 "VBNET.ATG" out Expression outExpr) { -#line 2000 "VBNET.ATG" +#line 2003 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 2001 "VBNET.ATG" +#line 2004 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 2002 "VBNET.ATG" +#line 2005 "VBNET.ATG" out outExpr); -#line 2003 "VBNET.ATG" +#line 2006 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 2008 "VBNET.ATG" +#line 2011 "VBNET.ATG" out Expression outExpr) { -#line 2010 "VBNET.ATG" +#line 2013 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ShiftExpr( -#line 2014 "VBNET.ATG" +#line 2017 "VBNET.ATG" out outExpr); while (StartOf(40)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 2017 "VBNET.ATG" +#line 2020 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 2018 "VBNET.ATG" +#line 2021 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 2019 "VBNET.ATG" +#line 2022 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 2020 "VBNET.ATG" +#line 2023 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 2021 "VBNET.ATG" +#line 2024 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 2022 "VBNET.ATG" +#line 2025 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 2023 "VBNET.ATG" +#line 2026 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 2024 "VBNET.ATG" +#line 2027 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 2025 "VBNET.ATG" +#line 2028 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(41)) { ShiftExpr( -#line 2028 "VBNET.ATG" +#line 2031 "VBNET.ATG" out expr); -#line 2028 "VBNET.ATG" +#line 2031 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (la.kind == 164) { -#line 2029 "VBNET.ATG" +#line 2032 "VBNET.ATG" Location startLocation2 = la.Location; lexer.NextToken(); ShiftExpr( -#line 2031 "VBNET.ATG" +#line 2034 "VBNET.ATG" out expr); -#line 2031 "VBNET.ATG" +#line 2034 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not) { StartLocation = startLocation2, EndLocation = t.EndLocation }) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else SynErr(295); } } void ShiftExpr( -#line 2036 "VBNET.ATG" +#line 2039 "VBNET.ATG" out Expression outExpr) { -#line 2038 "VBNET.ATG" +#line 2041 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConcatenationExpr( -#line 2042 "VBNET.ATG" +#line 2045 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 2045 "VBNET.ATG" +#line 2048 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 2046 "VBNET.ATG" +#line 2049 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 2048 "VBNET.ATG" +#line 2051 "VBNET.ATG" out expr); -#line 2048 "VBNET.ATG" +#line 2051 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ConcatenationExpr( -#line 2052 "VBNET.ATG" +#line 2055 "VBNET.ATG" out Expression outExpr) { -#line 2053 "VBNET.ATG" +#line 2056 "VBNET.ATG" Expression expr; Location startLocation = la.Location; AdditiveExpr( -#line 2055 "VBNET.ATG" +#line 2058 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 2055 "VBNET.ATG" +#line 2058 "VBNET.ATG" out expr); -#line 2055 "VBNET.ATG" +#line 2058 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AdditiveExpr( -#line 2058 "VBNET.ATG" +#line 2061 "VBNET.ATG" out Expression outExpr) { -#line 2060 "VBNET.ATG" +#line 2063 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ModuloExpr( -#line 2064 "VBNET.ATG" +#line 2067 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 2067 "VBNET.ATG" +#line 2070 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2068 "VBNET.ATG" +#line 2071 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 2070 "VBNET.ATG" +#line 2073 "VBNET.ATG" out expr); -#line 2070 "VBNET.ATG" +#line 2073 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ModuloExpr( -#line 2074 "VBNET.ATG" +#line 2077 "VBNET.ATG" out Expression outExpr) { -#line 2075 "VBNET.ATG" +#line 2078 "VBNET.ATG" Expression expr; Location startLocation = la.Location; IntegerDivisionExpr( -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" out expr); -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void IntegerDivisionExpr( -#line 2080 "VBNET.ATG" +#line 2083 "VBNET.ATG" out Expression outExpr) { -#line 2081 "VBNET.ATG" +#line 2084 "VBNET.ATG" Expression expr; Location startLocation = la.Location; MultiplicativeExpr( -#line 2083 "VBNET.ATG" +#line 2086 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 2083 "VBNET.ATG" +#line 2086 "VBNET.ATG" out expr); -#line 2083 "VBNET.ATG" +#line 2086 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void MultiplicativeExpr( -#line 2086 "VBNET.ATG" +#line 2089 "VBNET.ATG" out Expression outExpr) { -#line 2088 "VBNET.ATG" +#line 2091 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; UnaryExpr( -#line 2092 "VBNET.ATG" +#line 2095 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2095 "VBNET.ATG" +#line 2098 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 2096 "VBNET.ATG" +#line 2099 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" out expr); -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void UnaryExpr( -#line 2102 "VBNET.ATG" +#line 2105 "VBNET.ATG" out Expression uExpr) { -#line 2104 "VBNET.ATG" +#line 2107 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; Location startLocation = la.Location; @@ -5291,25 +5298,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 2109 "VBNET.ATG" +#line 2112 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 2110 "VBNET.ATG" +#line 2113 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2111 "VBNET.ATG" +#line 2114 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2113 "VBNET.ATG" +#line 2116 "VBNET.ATG" out expr); -#line 2115 "VBNET.ATG" +#line 2118 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else { @@ -5319,107 +5326,107 @@ out expr); } void ExponentiationExpr( -#line 2123 "VBNET.ATG" +#line 2126 "VBNET.ATG" out Expression outExpr) { -#line 2124 "VBNET.ATG" +#line 2127 "VBNET.ATG" Expression expr; Location startLocation = la.Location; SimpleExpr( -#line 2126 "VBNET.ATG" +#line 2129 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2126 "VBNET.ATG" +#line 2129 "VBNET.ATG" out expr); -#line 2126 "VBNET.ATG" +#line 2129 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NormalOrReDimArgumentList( -#line 2646 "VBNET.ATG" +#line 2649 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2648 "VBNET.ATG" +#line 2651 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2653 "VBNET.ATG" +#line 2656 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2654 "VBNET.ATG" +#line 2657 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2655 "VBNET.ATG" +#line 2658 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2658 "VBNET.ATG" +#line 2661 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2659 "VBNET.ATG" +#line 2662 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2660 "VBNET.ATG" +#line 2663 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(24)) { Argument( -#line 2661 "VBNET.ATG" +#line 2664 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2665 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2663 "VBNET.ATG" +#line 2666 "VBNET.ATG" out expr); } } -#line 2665 "VBNET.ATG" +#line 2668 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2667 "VBNET.ATG" +#line 2670 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2775 "VBNET.ATG" +#line 2780 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2777 "VBNET.ATG" +#line 2782 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2780 "VBNET.ATG" +#line 2785 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2782 "VBNET.ATG" +#line 2787 "VBNET.ATG" out i); } -#line 2784 "VBNET.ATG" +#line 2789 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2789 "VBNET.ATG" +#line 2794 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5427,10 +5434,10 @@ out i); } void MemberInitializer( -#line 2613 "VBNET.ATG" +#line 2616 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2615 "VBNET.ATG" +#line 2618 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5440,19 +5447,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2621 "VBNET.ATG" +#line 2624 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2622 "VBNET.ATG" +#line 2625 "VBNET.ATG" out name); Expect(20); Expr( -#line 2622 "VBNET.ATG" +#line 2625 "VBNET.ATG" out initExpr); -#line 2624 "VBNET.ATG" +#line 2627 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5461,10 +5468,10 @@ out initExpr); } void SubLambdaExpression( -#line 2218 "VBNET.ATG" +#line 2221 "VBNET.ATG" out LambdaExpression lambda) { -#line 2220 "VBNET.ATG" +#line 2223 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5476,7 +5483,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2227 "VBNET.ATG" +#line 2230 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5484,19 +5491,19 @@ lambda.Parameters); if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2230 "VBNET.ATG" +#line 2233 "VBNET.ATG" out inner); -#line 2232 "VBNET.ATG" +#line 2235 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2236 "VBNET.ATG" +#line 2239 "VBNET.ATG" out statement); -#line 2238 "VBNET.ATG" +#line 2241 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5504,12 +5511,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2244 "VBNET.ATG" +#line 2247 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2247 "VBNET.ATG" +#line 2250 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5517,10 +5524,10 @@ out statement); } void FunctionLambdaExpression( -#line 2253 "VBNET.ATG" +#line 2256 "VBNET.ATG" out LambdaExpression lambda) { -#line 2255 "VBNET.ATG" +#line 2258 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5532,7 +5539,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2262 "VBNET.ATG" +#line 2265 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5540,28 +5547,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2263 "VBNET.ATG" +#line 2266 "VBNET.ATG" out typeRef); -#line 2263 "VBNET.ATG" +#line 2266 "VBNET.ATG" lambda.ReturnType = typeRef; } if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2266 "VBNET.ATG" +#line 2269 "VBNET.ATG" out inner); -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2272 "VBNET.ATG" +#line 2275 "VBNET.ATG" out statement); -#line 2274 "VBNET.ATG" +#line 2277 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5569,12 +5576,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2280 "VBNET.ATG" +#line 2283 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2283 "VBNET.ATG" +#line 2286 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5582,10 +5589,10 @@ out statement); } void EmbeddedStatement( -#line 3053 "VBNET.ATG" +#line 3058 "VBNET.ATG" out Statement statement) { -#line 3055 "VBNET.ATG" +#line 3060 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5596,224 +5603,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 3063 "VBNET.ATG" +#line 3068 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 3065 "VBNET.ATG" +#line 3070 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 3067 "VBNET.ATG" +#line 3072 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 3069 "VBNET.ATG" +#line 3074 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 3071 "VBNET.ATG" +#line 3076 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 3073 "VBNET.ATG" +#line 3078 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3075 "VBNET.ATG" +#line 3080 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3077 "VBNET.ATG" +#line 3082 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3079 "VBNET.ATG" +#line 3084 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(298); break; } -#line 3081 "VBNET.ATG" +#line 3086 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3082 "VBNET.ATG" +#line 3087 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3083 "VBNET.ATG" +#line 3088 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3083 "VBNET.ATG" +#line 3088 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3083 "VBNET.ATG" +#line 3088 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3083 "VBNET.ATG" +#line 3088 "VBNET.ATG" continueType = ContinueType.While; } } -#line 3083 "VBNET.ATG" +#line 3088 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3085 "VBNET.ATG" +#line 3090 "VBNET.ATG" out expr); } -#line 3085 "VBNET.ATG" +#line 3090 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3087 "VBNET.ATG" +#line 3092 "VBNET.ATG" out expr); } -#line 3087 "VBNET.ATG" +#line 3092 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3089 "VBNET.ATG" +#line 3094 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3089 "VBNET.ATG" +#line 3094 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 3090 "VBNET.ATG" +#line 3095 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3092 "VBNET.ATG" +#line 3097 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(43)) { ArgumentList( -#line 3093 "VBNET.ATG" +#line 3098 "VBNET.ATG" out p); } Expect(38); } -#line 3095 "VBNET.ATG" +#line 3100 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3098 "VBNET.ATG" +#line 3103 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3100 "VBNET.ATG" +#line 3105 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3101 "VBNET.ATG" +#line 3106 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3101 "VBNET.ATG" +#line 3106 "VBNET.ATG" out handlerExpr); -#line 3103 "VBNET.ATG" +#line 3108 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3106 "VBNET.ATG" +#line 3111 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3107 "VBNET.ATG" +#line 3112 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3107 "VBNET.ATG" +#line 3112 "VBNET.ATG" out handlerExpr); -#line 3109 "VBNET.ATG" +#line 3114 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3112 "VBNET.ATG" +#line 3117 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3113 "VBNET.ATG" +#line 3118 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 3115 "VBNET.ATG" +#line 3120 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3120 "VBNET.ATG" +#line 3125 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3123 "VBNET.ATG" +#line 3128 "VBNET.ATG" out conditionType); Expr( -#line 3123 "VBNET.ATG" +#line 3128 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3124 "VBNET.ATG" +#line 3129 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 3127 "VBNET.ATG" +#line 3132 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5822,26 +5829,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3134 "VBNET.ATG" +#line 3139 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3135 "VBNET.ATG" +#line 3140 "VBNET.ATG" out conditionType); Expr( -#line 3135 "VBNET.ATG" +#line 3140 "VBNET.ATG" out expr); } -#line 3137 "VBNET.ATG" +#line 3142 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(299); } else if (la.kind == 124) { lexer.NextToken(); -#line 3142 "VBNET.ATG" +#line 3147 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5849,24 +5856,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3148 "VBNET.ATG" +#line 3153 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3149 "VBNET.ATG" +#line 3154 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3150 "VBNET.ATG" +#line 3155 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3151 "VBNET.ATG" +#line 3156 "VBNET.ATG" out expr); } -#line 3153 "VBNET.ATG" +#line 3158 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5878,7 +5885,7 @@ out expr); } else if (StartOf(44)) { -#line 3164 "VBNET.ATG" +#line 3169 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5887,59 +5894,59 @@ out expr); List nextExpressions = null; if ( -#line 3171 "VBNET.ATG" +#line 3176 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3172 "VBNET.ATG" +#line 3177 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3174 "VBNET.ATG" +#line 3179 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3175 "VBNET.ATG" +#line 3180 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3177 "VBNET.ATG" +#line 3182 "VBNET.ATG" out start); Expect(216); Expr( -#line 3177 "VBNET.ATG" +#line 3182 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3177 "VBNET.ATG" +#line 3182 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3178 "VBNET.ATG" +#line 3183 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3181 "VBNET.ATG" +#line 3186 "VBNET.ATG" out nextExpr); -#line 3183 "VBNET.ATG" +#line 3188 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3186 "VBNET.ATG" +#line 3191 "VBNET.ATG" out nextExpr); -#line 3186 "VBNET.ATG" +#line 3191 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3189 "VBNET.ATG" +#line 3194 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5955,27 +5962,27 @@ out nextExpr); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3202 "VBNET.ATG" +#line 3207 "VBNET.ATG" out expr); -#line 3202 "VBNET.ATG" +#line 3207 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3204 "VBNET.ATG" +#line 3209 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3204 "VBNET.ATG" +#line 3209 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3205 "VBNET.ATG" +#line 3210 "VBNET.ATG" out expr); -#line 3207 "VBNET.ATG" +#line 3212 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5983,48 +5990,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3211 "VBNET.ATG" +#line 3216 "VBNET.ATG" out expr); -#line 3212 "VBNET.ATG" +#line 3217 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3216 "VBNET.ATG" +#line 3221 "VBNET.ATG" out expr); -#line 3218 "VBNET.ATG" +#line 3223 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3221 "VBNET.ATG" +#line 3226 "VBNET.ATG" out expr); -#line 3221 "VBNET.ATG" +#line 3226 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3222 "VBNET.ATG" +#line 3227 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3224 "VBNET.ATG" +#line 3229 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3226 "VBNET.ATG" +#line 3231 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3227 "VBNET.ATG" +#line 3232 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3227 "VBNET.ATG" +#line 3232 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -6032,46 +6039,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3230 "VBNET.ATG" +#line 3235 "VBNET.ATG" out embeddedStatement); -#line 3232 "VBNET.ATG" +#line 3237 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3238 "VBNET.ATG" +#line 3243 "VBNET.ATG" IsElseIf()) { if ( -#line 3238 "VBNET.ATG" +#line 3243 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3238 "VBNET.ATG" +#line 3243 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3239 "VBNET.ATG" +#line 3244 "VBNET.ATG" elseIfStart = t.Location; } -#line 3241 "VBNET.ATG" +#line 3246 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3242 "VBNET.ATG" +#line 3247 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3243 "VBNET.ATG" +#line 3248 "VBNET.ATG" out block); -#line 3245 "VBNET.ATG" +#line 3250 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -6085,39 +6092,39 @@ out block); EndOfStmt(); } Block( -#line 3254 "VBNET.ATG" +#line 3259 "VBNET.ATG" out embeddedStatement); -#line 3256 "VBNET.ATG" +#line 3261 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3260 "VBNET.ATG" +#line 3265 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(45)) { -#line 3265 "VBNET.ATG" +#line 3270 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3268 "VBNET.ATG" +#line 3273 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(45)) { SingleLineStatementList( -#line 3271 "VBNET.ATG" +#line 3276 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3273 "VBNET.ATG" +#line 3278 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(301); } else if (la.kind == 197) { @@ -6126,82 +6133,82 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 3276 "VBNET.ATG" +#line 3281 "VBNET.ATG" out expr); EndOfStmt(); -#line 3277 "VBNET.ATG" +#line 3282 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3281 "VBNET.ATG" +#line 3286 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3282 "VBNET.ATG" +#line 3287 "VBNET.ATG" out caseClauses); if ( -#line 3282 "VBNET.ATG" +#line 3287 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3284 "VBNET.ATG" +#line 3289 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3287 "VBNET.ATG" +#line 3292 "VBNET.ATG" out block); -#line 3289 "VBNET.ATG" +#line 3294 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3295 "VBNET.ATG" +#line 3300 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3298 "VBNET.ATG" +#line 3303 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3299 "VBNET.ATG" +#line 3304 "VBNET.ATG" out onErrorStatement); -#line 3299 "VBNET.ATG" +#line 3304 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3300 "VBNET.ATG" +#line 3305 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3301 "VBNET.ATG" +#line 3306 "VBNET.ATG" out goToStatement); -#line 3301 "VBNET.ATG" +#line 3306 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3302 "VBNET.ATG" +#line 3307 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3303 "VBNET.ATG" +#line 3308 "VBNET.ATG" out resumeStatement); -#line 3303 "VBNET.ATG" +#line 3308 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(44)) { -#line 3306 "VBNET.ATG" +#line 3311 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; Location startLoc = la.Location; @@ -6210,28 +6217,28 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3313 "VBNET.ATG" +#line 3318 "VBNET.ATG" out expr); if (StartOf(46)) { AssignmentOperator( -#line 3315 "VBNET.ATG" +#line 3320 "VBNET.ATG" out op); Expr( -#line 3315 "VBNET.ATG" +#line 3320 "VBNET.ATG" out val); -#line 3317 "VBNET.ATG" +#line 3322 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); expr.StartLocation = startLoc; expr.EndLocation = t.EndLocation; } else if (StartOf(47)) { -#line 3321 "VBNET.ATG" +#line 3326 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(302); -#line 3324 "VBNET.ATG" +#line 3329 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6242,58 +6249,58 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3331 "VBNET.ATG" +#line 3336 "VBNET.ATG" out expr); -#line 3331 "VBNET.ATG" +#line 3336 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3333 "VBNET.ATG" +#line 3338 "VBNET.ATG" Statement block; if ( -#line 3334 "VBNET.ATG" +#line 3339 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3335 "VBNET.ATG" +#line 3340 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3336 "VBNET.ATG" +#line 3341 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3338 "VBNET.ATG" +#line 3343 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3340 "VBNET.ATG" +#line 3345 "VBNET.ATG" out block); -#line 3342 "VBNET.ATG" +#line 3347 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(24)) { Expr( -#line 3344 "VBNET.ATG" +#line 3349 "VBNET.ATG" out expr); Block( -#line 3345 "VBNET.ATG" +#line 3350 "VBNET.ATG" out block); -#line 3346 "VBNET.ATG" +#line 3351 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(303); Expect(113); Expect(226); } else if (StartOf(48)) { LocalDeclarationStatement( -#line 3349 "VBNET.ATG" +#line 3354 "VBNET.ATG" out statement); } else SynErr(304); -#line 3352 "VBNET.ATG" +#line 3357 "VBNET.ATG" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -6302,35 +6309,35 @@ out statement); } void FromOrAggregateQueryOperator( -#line 2302 "VBNET.ATG" +#line 2305 "VBNET.ATG" List middleClauses) { -#line 2304 "VBNET.ATG" +#line 2307 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2307 "VBNET.ATG" +#line 2310 "VBNET.ATG" out fromClause); -#line 2308 "VBNET.ATG" +#line 2311 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2309 "VBNET.ATG" +#line 2312 "VBNET.ATG" out aggregateClause); -#line 2310 "VBNET.ATG" +#line 2313 "VBNET.ATG" middleClauses.Add(aggregateClause); } else SynErr(305); } void QueryOperator( -#line 2313 "VBNET.ATG" +#line 2316 "VBNET.ATG" List middleClauses) { -#line 2315 "VBNET.ATG" +#line 2318 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6340,94 +6347,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2322 "VBNET.ATG" +#line 2325 "VBNET.ATG" out fromClause); -#line 2323 "VBNET.ATG" +#line 2326 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2324 "VBNET.ATG" +#line 2327 "VBNET.ATG" out aggregateClause); -#line 2325 "VBNET.ATG" +#line 2328 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2326 "VBNET.ATG" +#line 2329 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2327 "VBNET.ATG" +#line 2330 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2328 "VBNET.ATG" +#line 2331 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2329 "VBNET.ATG" +#line 2332 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2330 "VBNET.ATG" +#line 2333 "VBNET.ATG" out partitionClause); -#line 2331 "VBNET.ATG" +#line 2334 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2332 "VBNET.ATG" +#line 2335 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2333 "VBNET.ATG" +#line 2336 "VBNET.ATG" out joinClause); -#line 2334 "VBNET.ATG" +#line 2337 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2335 "VBNET.ATG" +#line 2338 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2335 "VBNET.ATG" +#line 2338 "VBNET.ATG" out groupJoinClause); -#line 2336 "VBNET.ATG" +#line 2339 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2337 "VBNET.ATG" +#line 2340 "VBNET.ATG" out groupByClause); -#line 2338 "VBNET.ATG" +#line 2341 "VBNET.ATG" middleClauses.Add(groupByClause); } else SynErr(306); } void FromQueryOperator( -#line 2413 "VBNET.ATG" +#line 2416 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2415 "VBNET.ATG" +#line 2418 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2418 "VBNET.ATG" +#line 2421 "VBNET.ATG" fromClause.Sources); -#line 2420 "VBNET.ATG" +#line 2423 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2482 "VBNET.ATG" +#line 2485 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2484 "VBNET.ATG" +#line 2487 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6435,77 +6442,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2489 "VBNET.ATG" +#line 2492 "VBNET.ATG" out source); -#line 2491 "VBNET.ATG" +#line 2494 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2494 "VBNET.ATG" +#line 2497 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2496 "VBNET.ATG" +#line 2499 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2498 "VBNET.ATG" +#line 2501 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2424 "VBNET.ATG" +#line 2427 "VBNET.ATG" List middleClauses) { -#line 2426 "VBNET.ATG" +#line 2429 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2429 "VBNET.ATG" +#line 2432 "VBNET.ATG" selectClause.Variables); -#line 2431 "VBNET.ATG" +#line 2434 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2436 "VBNET.ATG" +#line 2439 "VBNET.ATG" List middleClauses) { -#line 2438 "VBNET.ATG" +#line 2441 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2443 "VBNET.ATG" +#line 2446 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2448 "VBNET.ATG" +#line 2451 "VBNET.ATG" List middleClauses) { -#line 2450 "VBNET.ATG" +#line 2453 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2454 "VBNET.ATG" +#line 2457 "VBNET.ATG" out operand); -#line 2456 "VBNET.ATG" +#line 2459 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6514,10 +6521,10 @@ out operand); } void OrderByQueryOperator( -#line 2341 "VBNET.ATG" +#line 2344 "VBNET.ATG" List middleClauses) { -#line 2343 "VBNET.ATG" +#line 2346 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6525,10 +6532,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2347 "VBNET.ATG" +#line 2350 "VBNET.ATG" out orderings); -#line 2349 "VBNET.ATG" +#line 2352 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6536,10 +6543,10 @@ out orderings); } void PartitionQueryOperator( -#line 2463 "VBNET.ATG" +#line 2466 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2465 "VBNET.ATG" +#line 2468 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6547,60 +6554,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2470 "VBNET.ATG" +#line 2473 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2471 "VBNET.ATG" +#line 2474 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2472 "VBNET.ATG" +#line 2475 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } } else SynErr(307); Expr( -#line 2475 "VBNET.ATG" +#line 2478 "VBNET.ATG" out expr); -#line 2477 "VBNET.ATG" +#line 2480 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2502 "VBNET.ATG" +#line 2505 "VBNET.ATG" List middleClauses) { -#line 2504 "VBNET.ATG" +#line 2507 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2507 "VBNET.ATG" +#line 2510 "VBNET.ATG" letClause.Variables); -#line 2509 "VBNET.ATG" +#line 2512 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2546 "VBNET.ATG" +#line 2549 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2548 "VBNET.ATG" +#line 2551 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6610,203 +6617,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2555 "VBNET.ATG" +#line 2558 "VBNET.ATG" out joinVariable); -#line 2556 "VBNET.ATG" +#line 2559 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2558 "VBNET.ATG" +#line 2561 "VBNET.ATG" out subJoin); -#line 2559 "VBNET.ATG" +#line 2562 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2562 "VBNET.ATG" +#line 2565 "VBNET.ATG" out condition); -#line 2563 "VBNET.ATG" +#line 2566 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2565 "VBNET.ATG" +#line 2568 "VBNET.ATG" out condition); -#line 2566 "VBNET.ATG" +#line 2569 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2569 "VBNET.ATG" +#line 2572 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2399 "VBNET.ATG" +#line 2402 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2401 "VBNET.ATG" +#line 2404 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2405 "VBNET.ATG" +#line 2408 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2406 "VBNET.ATG" +#line 2409 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2408 "VBNET.ATG" +#line 2411 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2386 "VBNET.ATG" +#line 2389 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2388 "VBNET.ATG" +#line 2391 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2391 "VBNET.ATG" +#line 2394 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2392 "VBNET.ATG" +#line 2395 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2393 "VBNET.ATG" +#line 2396 "VBNET.ATG" groupByClause.IntoVariables); -#line 2395 "VBNET.ATG" +#line 2398 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2355 "VBNET.ATG" +#line 2358 "VBNET.ATG" out List orderings) { -#line 2357 "VBNET.ATG" +#line 2360 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2360 "VBNET.ATG" +#line 2363 "VBNET.ATG" out ordering); -#line 2361 "VBNET.ATG" +#line 2364 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2363 "VBNET.ATG" +#line 2366 "VBNET.ATG" out ordering); -#line 2364 "VBNET.ATG" +#line 2367 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2368 "VBNET.ATG" +#line 2371 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2370 "VBNET.ATG" +#line 2373 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2375 "VBNET.ATG" +#line 2378 "VBNET.ATG" out orderExpr); -#line 2377 "VBNET.ATG" +#line 2380 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2380 "VBNET.ATG" +#line 2383 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2381 "VBNET.ATG" +#line 2384 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2383 "VBNET.ATG" +#line 2386 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2514 "VBNET.ATG" +#line 2517 "VBNET.ATG" List variables) { -#line 2516 "VBNET.ATG" +#line 2519 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2518 "VBNET.ATG" +#line 2521 "VBNET.ATG" out variable); -#line 2519 "VBNET.ATG" +#line 2522 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2520 "VBNET.ATG" +#line 2523 "VBNET.ATG" out variable); -#line 2520 "VBNET.ATG" +#line 2523 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2573 "VBNET.ATG" +#line 2576 "VBNET.ATG" List rangeVariables) { -#line 2574 "VBNET.ATG" +#line 2577 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2576 "VBNET.ATG" +#line 2579 "VBNET.ATG" out variableDeclaration); -#line 2577 "VBNET.ATG" +#line 2580 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2578 "VBNET.ATG" +#line 2581 "VBNET.ATG" out variableDeclaration); -#line 2578 "VBNET.ATG" +#line 2581 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2581 "VBNET.ATG" +#line 2584 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2583 "VBNET.ATG" +#line 2586 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6814,71 +6821,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2588 "VBNET.ATG" +#line 2591 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2589 "VBNET.ATG" +#line 2592 "VBNET.ATG" out typeName); -#line 2589 "VBNET.ATG" +#line 2592 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2590 "VBNET.ATG" +#line 2593 "VBNET.ATG" out inExpr); -#line 2592 "VBNET.ATG" +#line 2595 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2523 "VBNET.ATG" +#line 2526 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2525 "VBNET.ATG" +#line 2528 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2531 "VBNET.ATG" +#line 2534 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2532 "VBNET.ATG" +#line 2535 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2534 "VBNET.ATG" +#line 2537 "VBNET.ATG" out typeName); -#line 2535 "VBNET.ATG" +#line 2538 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2539 "VBNET.ATG" +#line 2542 "VBNET.ATG" out rhs); -#line 2541 "VBNET.ATG" +#line 2544 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2597 "VBNET.ATG" +#line 2600 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2599 "VBNET.ATG" +#line 2602 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6886,14 +6893,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2605 "VBNET.ATG" +#line 2608 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2605 "VBNET.ATG" +#line 2608 "VBNET.ATG" out rhs); -#line 2607 "VBNET.ATG" +#line 2610 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6901,69 +6908,69 @@ out rhs); } void Argument( -#line 2671 "VBNET.ATG" +#line 2674 "VBNET.ATG" out Expression argumentexpr) { -#line 2673 "VBNET.ATG" +#line 2676 "VBNET.ATG" Expression expr; argumentexpr = null; string name; Location startLocation = la.Location; if ( -#line 2678 "VBNET.ATG" +#line 2681 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2678 "VBNET.ATG" +#line 2681 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2678 "VBNET.ATG" +#line 2681 "VBNET.ATG" out expr); -#line 2680 "VBNET.ATG" +#line 2683 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (StartOf(24)) { Expr( -#line 2683 "VBNET.ATG" +#line 2686 "VBNET.ATG" out argumentexpr); } else SynErr(308); } void QualIdentAndTypeArguments( -#line 2749 "VBNET.ATG" +#line 2754 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2750 "VBNET.ATG" +#line 2755 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2752 "VBNET.ATG" +#line 2757 "VBNET.ATG" out name); -#line 2753 "VBNET.ATG" +#line 2758 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2754 "VBNET.ATG" +#line 2759 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2756 "VBNET.ATG" +#line 2761 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2757 "VBNET.ATG" +#line 2762 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2758 "VBNET.ATG" +#line 2763 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2759 "VBNET.ATG" +#line 2764 "VBNET.ATG" typeref.GenericTypes); } else SynErr(309); Expect(38); @@ -6971,24 +6978,24 @@ typeref.GenericTypes); } void RankList( -#line 2796 "VBNET.ATG" +#line 2801 "VBNET.ATG" out int i) { -#line 2797 "VBNET.ATG" +#line 2802 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2798 "VBNET.ATG" +#line 2803 "VBNET.ATG" ++i; } } void Attribute( -#line 2837 "VBNET.ATG" +#line 2842 "VBNET.ATG" out ASTAttribute attribute) { -#line 2839 "VBNET.ATG" +#line 2844 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6999,43 +7006,43 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2845 "VBNET.ATG" +#line 2850 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2846 "VBNET.ATG" +#line 2851 "VBNET.ATG" positional, named); } -#line 2848 "VBNET.ATG" +#line 2853 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named) { StartLocation = startLocation, EndLocation = t.EndLocation }; } void AttributeArguments( -#line 2853 "VBNET.ATG" +#line 2858 "VBNET.ATG" List positional, List named) { -#line 2855 "VBNET.ATG" +#line 2860 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2861 "VBNET.ATG" +#line 2866 "VBNET.ATG" IsNotClosingParenthesis()) { -#line 2862 "VBNET.ATG" +#line 2867 "VBNET.ATG" Location startLocation = la.Location; if ( -#line 2864 "VBNET.ATG" +#line 2869 "VBNET.ATG" IsNamedAssign()) { -#line 2864 "VBNET.ATG" +#line 2869 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2865 "VBNET.ATG" +#line 2870 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7044,10 +7051,10 @@ out name); } else SynErr(310); } Expr( -#line 2867 "VBNET.ATG" +#line 2872 "VBNET.ATG" out expr); -#line 2869 "VBNET.ATG" +#line 2874 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } @@ -7056,13 +7063,13 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2877 "VBNET.ATG" +#line 2882 "VBNET.ATG" IsNamedAssign()) { -#line 2877 "VBNET.ATG" +#line 2882 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2878 "VBNET.ATG" +#line 2883 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7071,14 +7078,14 @@ out name); } else SynErr(311); } else if (StartOf(24)) { -#line 2880 "VBNET.ATG" +#line 2885 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(312); Expr( -#line 2881 "VBNET.ATG" +#line 2886 "VBNET.ATG" out expr); -#line 2881 "VBNET.ATG" +#line 2886 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } } @@ -7089,34 +7096,34 @@ out expr); } void ParameterModifier( -#line 3669 "VBNET.ATG" +#line 3674 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3670 "VBNET.ATG" +#line 3675 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3671 "VBNET.ATG" +#line 3676 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3672 "VBNET.ATG" +#line 3677 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3673 "VBNET.ATG" +#line 3678 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(313); } void Statement() { -#line 3000 "VBNET.ATG" +#line 3005 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7124,27 +7131,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 3006 "VBNET.ATG" +#line 3011 "VBNET.ATG" IsLabel()) { LabelName( -#line 3006 "VBNET.ATG" +#line 3011 "VBNET.ATG" out label); -#line 3008 "VBNET.ATG" +#line 3013 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3011 "VBNET.ATG" +#line 3016 "VBNET.ATG" out stmt); -#line 3011 "VBNET.ATG" +#line 3016 "VBNET.ATG" AddChild(stmt); } else SynErr(314); -#line 3014 "VBNET.ATG" +#line 3019 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7153,30 +7160,30 @@ out stmt); } void LabelName( -#line 3443 "VBNET.ATG" +#line 3448 "VBNET.ATG" out string name) { -#line 3445 "VBNET.ATG" +#line 3450 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3447 "VBNET.ATG" +#line 3452 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3448 "VBNET.ATG" +#line 3453 "VBNET.ATG" name = t.val; } else SynErr(315); } void LocalDeclarationStatement( -#line 3022 "VBNET.ATG" +#line 3027 "VBNET.ATG" out Statement statement) { -#line 3024 "VBNET.ATG" +#line 3029 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7185,22 +7192,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 3030 "VBNET.ATG" +#line 3035 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 3031 "VBNET.ATG" +#line 3036 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 3032 "VBNET.ATG" +#line 3037 "VBNET.ATG" dimfound = true; } } -#line 3035 "VBNET.ATG" +#line 3040 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7213,135 +7220,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 3046 "VBNET.ATG" +#line 3051 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3047 "VBNET.ATG" +#line 3052 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 3049 "VBNET.ATG" +#line 3054 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3557 "VBNET.ATG" +#line 3562 "VBNET.ATG" out Statement tryStatement) { -#line 3559 "VBNET.ATG" +#line 3564 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3562 "VBNET.ATG" +#line 3567 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3563 "VBNET.ATG" +#line 3568 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3564 "VBNET.ATG" +#line 3569 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3567 "VBNET.ATG" +#line 3572 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3537 "VBNET.ATG" +#line 3542 "VBNET.ATG" out Statement withStatement) { -#line 3539 "VBNET.ATG" +#line 3544 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3542 "VBNET.ATG" +#line 3547 "VBNET.ATG" Location start = t.Location; Expr( -#line 3543 "VBNET.ATG" +#line 3548 "VBNET.ATG" out expr); EndOfStmt(); -#line 3545 "VBNET.ATG" +#line 3550 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3548 "VBNET.ATG" +#line 3553 "VBNET.ATG" out blockStmt); -#line 3550 "VBNET.ATG" +#line 3555 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3553 "VBNET.ATG" +#line 3558 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3530 "VBNET.ATG" +#line 3535 "VBNET.ATG" out ConditionType conditionType) { -#line 3531 "VBNET.ATG" +#line 3536 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3532 "VBNET.ATG" +#line 3537 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3533 "VBNET.ATG" +#line 3538 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(316); } void LoopControlVariable( -#line 3373 "VBNET.ATG" +#line 3378 "VBNET.ATG" out TypeReference type, out string name) { -#line 3374 "VBNET.ATG" +#line 3379 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3378 "VBNET.ATG" +#line 3383 "VBNET.ATG" out name); if ( -#line 3379 "VBNET.ATG" +#line 3384 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3379 "VBNET.ATG" +#line 3384 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3380 "VBNET.ATG" +#line 3385 "VBNET.ATG" out type); -#line 3380 "VBNET.ATG" +#line 3385 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3382 "VBNET.ATG" +#line 3387 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7353,34 +7360,34 @@ out type); } void ReDimClause( -#line 3452 "VBNET.ATG" +#line 3457 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3454 "VBNET.ATG" +#line 3459 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3455 "VBNET.ATG" +#line 3460 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3359 "VBNET.ATG" +#line 3364 "VBNET.ATG" List list) { -#line 3360 "VBNET.ATG" +#line 3365 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3362 "VBNET.ATG" +#line 3367 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3363 "VBNET.ATG" +#line 3368 "VBNET.ATG" out embeddedStatement); } else SynErr(317); -#line 3364 "VBNET.ATG" +#line 3369 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7390,62 +7397,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3366 "VBNET.ATG" +#line 3371 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3367 "VBNET.ATG" +#line 3372 "VBNET.ATG" out embeddedStatement); } else SynErr(318); -#line 3368 "VBNET.ATG" +#line 3373 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3490 "VBNET.ATG" +#line 3495 "VBNET.ATG" out List caseClauses) { -#line 3492 "VBNET.ATG" +#line 3497 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3495 "VBNET.ATG" +#line 3500 "VBNET.ATG" out caseClause); -#line 3495 "VBNET.ATG" +#line 3500 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3496 "VBNET.ATG" +#line 3501 "VBNET.ATG" out caseClause); -#line 3496 "VBNET.ATG" +#line 3501 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3393 "VBNET.ATG" +#line 3398 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3395 "VBNET.ATG" +#line 3400 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3401 "VBNET.ATG" +#line 3406 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3403 "VBNET.ATG" +#line 3408 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7454,10 +7461,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3409 "VBNET.ATG" +#line 3414 "VBNET.ATG" out goToStatement); -#line 3411 "VBNET.ATG" +#line 3416 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7474,88 +7481,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3425 "VBNET.ATG" +#line 3430 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(319); } void GotoStatement( -#line 3431 "VBNET.ATG" +#line 3436 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3433 "VBNET.ATG" +#line 3438 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3436 "VBNET.ATG" +#line 3441 "VBNET.ATG" out label); -#line 3438 "VBNET.ATG" +#line 3443 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3479 "VBNET.ATG" +#line 3484 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3481 "VBNET.ATG" +#line 3486 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3484 "VBNET.ATG" +#line 3489 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3485 "VBNET.ATG" +#line 3490 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3486 "VBNET.ATG" +#line 3491 "VBNET.ATG" out label); } -#line 3486 "VBNET.ATG" +#line 3491 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(320); } void ReDimClauseInternal( -#line 3458 "VBNET.ATG" +#line 3463 "VBNET.ATG" ref Expression expr) { -#line 3459 "VBNET.ATG" +#line 3464 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3462 "VBNET.ATG" +#line 3467 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3461 "VBNET.ATG" +#line 3466 "VBNET.ATG" out name); -#line 3461 "VBNET.ATG" +#line 3466 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3463 "VBNET.ATG" +#line 3468 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3466 "VBNET.ATG" +#line 3471 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3468 "VBNET.ATG" +#line 3473 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7567,10 +7574,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3500 "VBNET.ATG" +#line 3505 "VBNET.ATG" out CaseLabel caseClause) { -#line 3502 "VBNET.ATG" +#line 3507 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7579,7 +7586,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3508 "VBNET.ATG" +#line 3513 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7589,76 +7596,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3512 "VBNET.ATG" +#line 3517 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3513 "VBNET.ATG" +#line 3518 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3514 "VBNET.ATG" +#line 3519 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3515 "VBNET.ATG" +#line 3520 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3516 "VBNET.ATG" +#line 3521 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3517 "VBNET.ATG" +#line 3522 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(321); break; } Expr( -#line 3519 "VBNET.ATG" +#line 3524 "VBNET.ATG" out expr); -#line 3521 "VBNET.ATG" +#line 3526 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(24)) { Expr( -#line 3523 "VBNET.ATG" +#line 3528 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3523 "VBNET.ATG" +#line 3528 "VBNET.ATG" out sexpr); } -#line 3525 "VBNET.ATG" +#line 3530 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(322); } void CatchClauses( -#line 3572 "VBNET.ATG" +#line 3577 "VBNET.ATG" out List catchClauses) { -#line 3574 "VBNET.ATG" +#line 3579 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7670,27 +7677,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3582 "VBNET.ATG" +#line 3587 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3582 "VBNET.ATG" +#line 3587 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3583 "VBNET.ATG" +#line 3588 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3585 "VBNET.ATG" +#line 3590 "VBNET.ATG" out blockStmt); -#line 3586 "VBNET.ATG" +#line 3591 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index f5e0df13b9..6b5549d594 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; +using System.Linq; using System.Text; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.Parser.VB; @@ -870,7 +871,8 @@ StructureMemberDecl attributes> TypeReference = new TypeReference("System.Void", true), Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause + InterfaceImplementations = implementsClause, + IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) }; AddChild(methodDeclaration); .) @@ -978,7 +980,8 @@ StructureMemberDecl attributes> EndLocation = endLocation, Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause + InterfaceImplementations = implementsClause, + IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) }; AddChild(methodDeclaration); @@ -2685,15 +2688,17 @@ Argument /* 7.1. */ TypeName -(. ArrayList rank = null; .) +(. ArrayList rank = null; Location startLocation = la.Location; .) = NonArrayTypeName - - - ArrayTypeModifiers - (. if (rank != null && typeref != null) { - typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); + (. + if (typeref != null) { + if (rank != null) { + typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); + } + typeref.StartLocation = startLocation; + typeref.EndLocation = t.EndLocation; } .) .