diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 32f0b9d735..0d5003448a 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -181,7 +181,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2748 "VBNET.ATG" +#line 2749 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -189,20 +189,20 @@ out u); lexer.NextToken(); } else SynErr(242); -#line 2750 "VBNET.ATG" +#line 2751 "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 2754 "VBNET.ATG" +#line 2755 "VBNET.ATG" out attribute); -#line 2754 "VBNET.ATG" +#line 2755 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2755 "VBNET.ATG" +#line 2756 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -214,10 +214,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2755 "VBNET.ATG" +#line 2756 "VBNET.ATG" out attribute); -#line 2755 "VBNET.ATG" +#line 2756 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -226,7 +226,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2760 "VBNET.ATG" +#line 2761 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -352,47 +352,47 @@ out aliasedType); } void Qualident( -#line 3504 "VBNET.ATG" +#line 3505 "VBNET.ATG" out string qualident) { -#line 3506 "VBNET.ATG" +#line 3507 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3510 "VBNET.ATG" +#line 3511 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3511 "VBNET.ATG" +#line 3512 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3511 "VBNET.ATG" +#line 3512 "VBNET.ATG" out name); -#line 3511 "VBNET.ATG" +#line 3512 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3513 "VBNET.ATG" +#line 3514 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2621 "VBNET.ATG" +#line 2622 "VBNET.ATG" out TypeReference typeref) { -#line 2622 "VBNET.ATG" +#line 2623 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2624 "VBNET.ATG" +#line 2625 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2628 "VBNET.ATG" +#line 2629 "VBNET.ATG" out rank); -#line 2629 "VBNET.ATG" +#line 2630 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -423,35 +423,35 @@ out rank); } void AttributeSection( -#line 2823 "VBNET.ATG" +#line 2824 "VBNET.ATG" out AttributeSection section) { -#line 2825 "VBNET.ATG" +#line 2826 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(40); -#line 2829 "VBNET.ATG" +#line 2830 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2830 "VBNET.ATG" +#line 2831 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2832 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2832 "VBNET.ATG" +#line 2833 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2835 "VBNET.ATG" +#line 2836 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -464,20 +464,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2845 "VBNET.ATG" +#line 2846 "VBNET.ATG" out attribute); -#line 2845 "VBNET.ATG" +#line 2846 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2846 "VBNET.ATG" +#line 2847 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2846 "VBNET.ATG" +#line 2847 "VBNET.ATG" out attribute); -#line 2846 "VBNET.ATG" +#line 2847 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -485,7 +485,7 @@ out attribute); } Expect(39); -#line 2850 "VBNET.ATG" +#line 2851 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -496,69 +496,69 @@ out attribute); } void TypeModifier( -#line 3589 "VBNET.ATG" +#line 3590 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3590 "VBNET.ATG" +#line 3591 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3591 "VBNET.ATG" +#line 3592 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3592 "VBNET.ATG" +#line 3593 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3593 "VBNET.ATG" +#line 3594 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3594 "VBNET.ATG" +#line 3595 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3595 "VBNET.ATG" +#line 3596 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3596 "VBNET.ATG" +#line 3597 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3597 "VBNET.ATG" +#line 3598 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3598 "VBNET.ATG" +#line 3599 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -567,21 +567,21 @@ ModifierList m) { } void NonModuleDeclaration( -#line 446 "VBNET.ATG" +#line 447 "VBNET.ATG" ModifierList m, List attributes) { -#line 448 "VBNET.ATG" +#line 449 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 84: { -#line 451 "VBNET.ATG" +#line 452 "VBNET.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 454 "VBNET.ATG" +#line 455 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; AddChild(newType); @@ -591,42 +591,42 @@ ModifierList m, List attributes) { Identifier(); -#line 461 "VBNET.ATG" +#line 462 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 462 "VBNET.ATG" +#line 463 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 464 "VBNET.ATG" +#line 465 "VBNET.ATG" newType.BodyStartLocation = t.Location; if (la.kind == 140) { ClassBaseType( -#line 465 "VBNET.ATG" +#line 466 "VBNET.ATG" out typeRef); -#line 465 "VBNET.ATG" +#line 466 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } while (la.kind == 136) { TypeImplementsClause( -#line 466 "VBNET.ATG" +#line 467 "VBNET.ATG" out baseInterfaces); -#line 466 "VBNET.ATG" +#line 467 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 467 "VBNET.ATG" +#line 468 "VBNET.ATG" newType); Expect(113); Expect(84); -#line 468 "VBNET.ATG" +#line 469 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 471 "VBNET.ATG" +#line 472 "VBNET.ATG" BlockEnd(); break; @@ -634,7 +634,7 @@ newType); case 155: { lexer.NextToken(); -#line 475 "VBNET.ATG" +#line 476 "VBNET.ATG" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -644,17 +644,17 @@ newType); Identifier(); -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" newType.Name = t.val; EndOfStmt(); -#line 484 "VBNET.ATG" +#line 485 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 485 "VBNET.ATG" +#line 486 "VBNET.ATG" newType); -#line 487 "VBNET.ATG" +#line 488 "VBNET.ATG" BlockEnd(); break; @@ -662,7 +662,7 @@ newType); case 209: { lexer.NextToken(); -#line 491 "VBNET.ATG" +#line 492 "VBNET.ATG" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -672,28 +672,28 @@ newType); Identifier(); -#line 498 "VBNET.ATG" +#line 499 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 499 "VBNET.ATG" +#line 500 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 501 "VBNET.ATG" +#line 502 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 136) { TypeImplementsClause( -#line 502 "VBNET.ATG" +#line 503 "VBNET.ATG" out baseInterfaces); -#line 502 "VBNET.ATG" +#line 503 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 503 "VBNET.ATG" +#line 504 "VBNET.ATG" newType); -#line 505 "VBNET.ATG" +#line 506 "VBNET.ATG" BlockEnd(); break; @@ -701,7 +701,7 @@ newType); case 115: { lexer.NextToken(); -#line 510 "VBNET.ATG" +#line 511 "VBNET.ATG" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -712,26 +712,26 @@ newType); Identifier(); -#line 518 "VBNET.ATG" +#line 519 "VBNET.ATG" newType.Name = t.val; if (la.kind == 63) { lexer.NextToken(); NonArrayTypeName( -#line 519 "VBNET.ATG" +#line 520 "VBNET.ATG" out typeRef, false); -#line 519 "VBNET.ATG" +#line 520 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } EndOfStmt(); -#line 521 "VBNET.ATG" +#line 522 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 522 "VBNET.ATG" +#line 523 "VBNET.ATG" newType); -#line 524 "VBNET.ATG" +#line 525 "VBNET.ATG" BlockEnd(); break; @@ -739,7 +739,7 @@ newType); case 142: { lexer.NextToken(); -#line 529 "VBNET.ATG" +#line 530 "VBNET.ATG" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -749,28 +749,28 @@ newType); Identifier(); -#line 536 "VBNET.ATG" +#line 537 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 537 "VBNET.ATG" +#line 538 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 539 "VBNET.ATG" +#line 540 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 140) { InterfaceBase( -#line 540 "VBNET.ATG" +#line 541 "VBNET.ATG" out baseInterfaces); -#line 540 "VBNET.ATG" +#line 541 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 541 "VBNET.ATG" +#line 542 "VBNET.ATG" newType); -#line 543 "VBNET.ATG" +#line 544 "VBNET.ATG" BlockEnd(); break; @@ -778,7 +778,7 @@ newType); case 103: { lexer.NextToken(); -#line 548 "VBNET.ATG" +#line 549 "VBNET.ATG" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("System.Void", true); @@ -789,63 +789,63 @@ newType); lexer.NextToken(); Identifier(); -#line 555 "VBNET.ATG" +#line 556 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 556 "VBNET.ATG" +#line 557 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 557 "VBNET.ATG" +#line 558 "VBNET.ATG" p); } Expect(38); -#line 557 "VBNET.ATG" +#line 558 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 127) { lexer.NextToken(); Identifier(); -#line 559 "VBNET.ATG" +#line 560 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 560 "VBNET.ATG" +#line 561 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 561 "VBNET.ATG" +#line 562 "VBNET.ATG" p); } Expect(38); -#line 561 "VBNET.ATG" +#line 562 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 63) { lexer.NextToken(); -#line 562 "VBNET.ATG" +#line 563 "VBNET.ATG" TypeReference type; TypeName( -#line 562 "VBNET.ATG" +#line 563 "VBNET.ATG" out type); -#line 562 "VBNET.ATG" +#line 563 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(249); -#line 564 "VBNET.ATG" +#line 565 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 567 "VBNET.ATG" +#line 568 "VBNET.ATG" AddChild(delegateDeclr); break; @@ -890,153 +890,169 @@ out template); void TypeParameter( #line 412 "VBNET.ATG" out TemplateDefinition template) { + +#line 413 "VBNET.ATG" + VarianceModifier modifier = VarianceModifier.Invariant; + if (la.kind == 138 || la.kind == 178) { + if (la.kind == 138) { + lexer.NextToken(); + +#line 415 "VBNET.ATG" + modifier = VarianceModifier.Contravariant; + } else { + lexer.NextToken(); + +#line 415 "VBNET.ATG" + modifier = VarianceModifier.Covariant; + } + } Identifier(); -#line 414 "VBNET.ATG" - template = new TemplateDefinition(t.val, null); +#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); } } void TypeParameterConstraints( -#line 419 "VBNET.ATG" +#line 420 "VBNET.ATG" TemplateDefinition template) { -#line 421 "VBNET.ATG" +#line 422 "VBNET.ATG" TypeReference constraint; Expect(63); if (la.kind == 35) { lexer.NextToken(); TypeParameterConstraint( -#line 427 "VBNET.ATG" +#line 428 "VBNET.ATG" out constraint); -#line 427 "VBNET.ATG" +#line 428 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 22) { lexer.NextToken(); TypeParameterConstraint( -#line 430 "VBNET.ATG" +#line 431 "VBNET.ATG" out constraint); -#line 430 "VBNET.ATG" +#line 431 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(36); } else if (StartOf(7)) { TypeParameterConstraint( -#line 433 "VBNET.ATG" +#line 434 "VBNET.ATG" out constraint); -#line 433 "VBNET.ATG" +#line 434 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } else SynErr(251); } void TypeParameterConstraint( -#line 437 "VBNET.ATG" +#line 438 "VBNET.ATG" out TypeReference constraint) { -#line 438 "VBNET.ATG" +#line 439 "VBNET.ATG" constraint = null; if (la.kind == 84) { lexer.NextToken(); -#line 439 "VBNET.ATG" +#line 440 "VBNET.ATG" constraint = TypeReference.ClassConstraint; } else if (la.kind == 209) { lexer.NextToken(); -#line 440 "VBNET.ATG" +#line 441 "VBNET.ATG" constraint = TypeReference.StructConstraint; } else if (la.kind == 162) { lexer.NextToken(); -#line 441 "VBNET.ATG" +#line 442 "VBNET.ATG" constraint = TypeReference.NewConstraint; } else if (StartOf(8)) { TypeName( -#line 442 "VBNET.ATG" +#line 443 "VBNET.ATG" out constraint); } else SynErr(252); } void ClassBaseType( -#line 787 "VBNET.ATG" +#line 788 "VBNET.ATG" out TypeReference typeRef) { -#line 789 "VBNET.ATG" +#line 790 "VBNET.ATG" typeRef = null; Expect(140); TypeName( -#line 792 "VBNET.ATG" +#line 793 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1604 "VBNET.ATG" +#line 1605 "VBNET.ATG" out List baseInterfaces) { -#line 1606 "VBNET.ATG" +#line 1607 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(136); TypeName( -#line 1609 "VBNET.ATG" +#line 1610 "VBNET.ATG" out type); -#line 1611 "VBNET.ATG" +#line 1612 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1614 "VBNET.ATG" +#line 1615 "VBNET.ATG" out type); -#line 1615 "VBNET.ATG" +#line 1616 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 581 "VBNET.ATG" +#line 582 "VBNET.ATG" TypeDeclaration newType) { -#line 582 "VBNET.ATG" +#line 583 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 585 "VBNET.ATG" +#line 586 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 588 "VBNET.ATG" +#line 589 "VBNET.ATG" out section); -#line 588 "VBNET.ATG" +#line 589 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 589 "VBNET.ATG" +#line 590 "VBNET.ATG" m); } ClassMemberDecl( -#line 590 "VBNET.ATG" +#line 591 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1045,35 +1061,35 @@ m, attributes); } void ModuleBody( -#line 612 "VBNET.ATG" +#line 613 "VBNET.ATG" TypeDeclaration newType) { -#line 613 "VBNET.ATG" +#line 614 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 616 "VBNET.ATG" +#line 617 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 619 "VBNET.ATG" +#line 620 "VBNET.ATG" out section); -#line 619 "VBNET.ATG" +#line 620 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 620 "VBNET.ATG" +#line 621 "VBNET.ATG" m); } ClassMemberDecl( -#line 621 "VBNET.ATG" +#line 622 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1082,41 +1098,41 @@ m, attributes); Expect(113); Expect(155); -#line 624 "VBNET.ATG" +#line 625 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 595 "VBNET.ATG" +#line 596 "VBNET.ATG" TypeDeclaration newType) { -#line 596 "VBNET.ATG" +#line 597 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 599 "VBNET.ATG" +#line 600 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 602 "VBNET.ATG" +#line 603 "VBNET.ATG" out section); -#line 602 "VBNET.ATG" +#line 603 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 603 "VBNET.ATG" +#line 604 "VBNET.ATG" m); } StructureMemberDecl( -#line 604 "VBNET.ATG" +#line 605 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1125,16 +1141,16 @@ m, attributes); Expect(113); Expect(209); -#line 607 "VBNET.ATG" +#line 608 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 2647 "VBNET.ATG" +#line 2648 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2649 "VBNET.ATG" +#line 2650 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1144,36 +1160,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2654 "VBNET.ATG" +#line 2655 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2655 "VBNET.ATG" +#line 2656 "VBNET.ATG" out typeref, canBeUnbound); -#line 2656 "VBNET.ATG" +#line 2657 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2658 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2658 "VBNET.ATG" +#line 2659 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2659 "VBNET.ATG" +#line 2660 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2663 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2666 "VBNET.ATG" +#line 2667 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1181,15 +1197,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2672 "VBNET.ATG" +#line 2673 "VBNET.ATG" out name); -#line 2672 "VBNET.ATG" +#line 2673 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2676 "VBNET.ATG" +#line 2677 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1199,20 +1215,20 @@ out name); } void EnumBody( -#line 628 "VBNET.ATG" +#line 629 "VBNET.ATG" TypeDeclaration newType) { -#line 629 "VBNET.ATG" +#line 630 "VBNET.ATG" FieldDeclaration f; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(13)) { EnumMemberDecl( -#line 632 "VBNET.ATG" +#line 633 "VBNET.ATG" out f); -#line 634 "VBNET.ATG" +#line 635 "VBNET.ATG" AddChild(f); while (la.kind == 1 || la.kind == 21) { @@ -1222,40 +1238,40 @@ out f); Expect(113); Expect(115); -#line 638 "VBNET.ATG" +#line 639 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1589 "VBNET.ATG" +#line 1590 "VBNET.ATG" out List bases) { -#line 1591 "VBNET.ATG" +#line 1592 "VBNET.ATG" TypeReference type; bases = new List(); Expect(140); TypeName( -#line 1595 "VBNET.ATG" +#line 1596 "VBNET.ATG" out type); -#line 1595 "VBNET.ATG" +#line 1596 "VBNET.ATG" if (type != null) bases.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1598 "VBNET.ATG" +#line 1599 "VBNET.ATG" out type); -#line 1598 "VBNET.ATG" +#line 1599 "VBNET.ATG" if (type != null) bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 642 "VBNET.ATG" +#line 643 "VBNET.ATG" TypeDeclaration newType) { while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1269,168 +1285,168 @@ TypeDeclaration newType) { Expect(113); Expect(142); -#line 648 "VBNET.ATG" +#line 649 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2860 "VBNET.ATG" +#line 2861 "VBNET.ATG" List parameter) { -#line 2861 "VBNET.ATG" +#line 2862 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2863 "VBNET.ATG" +#line 2864 "VBNET.ATG" out p); -#line 2863 "VBNET.ATG" +#line 2864 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2865 "VBNET.ATG" +#line 2866 "VBNET.ATG" out p); -#line 2865 "VBNET.ATG" +#line 2866 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3601 "VBNET.ATG" +#line 3602 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3602 "VBNET.ATG" +#line 3603 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3603 "VBNET.ATG" +#line 3604 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3604 "VBNET.ATG" +#line 3605 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3605 "VBNET.ATG" +#line 3606 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3606 "VBNET.ATG" +#line 3607 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3607 "VBNET.ATG" +#line 3608 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3608 "VBNET.ATG" +#line 3609 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3609 "VBNET.ATG" +#line 3610 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3610 "VBNET.ATG" +#line 3611 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3611 "VBNET.ATG" +#line 3612 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3612 "VBNET.ATG" +#line 3613 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3613 "VBNET.ATG" +#line 3614 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3614 "VBNET.ATG" +#line 3615 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3615 "VBNET.ATG" +#line 3616 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3616 "VBNET.ATG" +#line 3617 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3617 "VBNET.ATG" +#line 3618 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3618 "VBNET.ATG" +#line 3619 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3619 "VBNET.ATG" +#line 3620 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3620 "VBNET.ATG" +#line 3621 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1439,18 +1455,18 @@ ModifierList m) { } void ClassMemberDecl( -#line 783 "VBNET.ATG" +#line 784 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 784 "VBNET.ATG" +#line 785 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 797 "VBNET.ATG" +#line 798 "VBNET.ATG" ModifierList m, List attributes) { -#line 799 "VBNET.ATG" +#line 800 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1460,37 +1476,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 84: case 103: case 115: case 142: case 155: case 209: { NonModuleDeclaration( -#line 806 "VBNET.ATG" +#line 807 "VBNET.ATG" m, attributes); break; } case 210: { lexer.NextToken(); -#line 810 "VBNET.ATG" +#line 811 "VBNET.ATG" Location startPos = t.Location; if (StartOf(4)) { -#line 814 "VBNET.ATG" +#line 815 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 820 "VBNET.ATG" +#line 821 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 823 "VBNET.ATG" +#line 824 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 824 "VBNET.ATG" +#line 825 "VBNET.ATG" p); } Expect(38); @@ -1498,23 +1514,23 @@ p); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 827 "VBNET.ATG" +#line 828 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 829 "VBNET.ATG" +#line 830 "VBNET.ATG" out handlesClause); } } -#line 832 "VBNET.ATG" +#line 833 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 835 "VBNET.ATG" +#line 836 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 838 "VBNET.ATG" +#line 839 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1528,7 +1544,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 851 "VBNET.ATG" +#line 852 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1540,25 +1556,25 @@ IsMustOverride(m)) { AddChild(methodDeclaration); -#line 862 "VBNET.ATG" +#line 863 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 863 "VBNET.ATG" +#line 864 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 865 "VBNET.ATG" +#line 866 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 871 "VBNET.ATG" +#line 872 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 872 "VBNET.ATG" +#line 873 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(255); @@ -1568,39 +1584,39 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 876 "VBNET.ATG" +#line 877 "VBNET.ATG" p); } Expect(38); } -#line 877 "VBNET.ATG" +#line 878 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 878 "VBNET.ATG" +#line 879 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 881 "VBNET.ATG" +#line 882 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 882 "VBNET.ATG" +#line 883 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 884 "VBNET.ATG" +#line 885 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 890 "VBNET.ATG" +#line 891 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 893 "VBNET.ATG" +#line 894 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1614,7 +1630,7 @@ out stmt); case 127: { lexer.NextToken(); -#line 905 "VBNET.ATG" +#line 906 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1624,16 +1640,16 @@ out stmt); Identifier(); -#line 912 "VBNET.ATG" +#line 913 "VBNET.ATG" name = t.val; TypeParameterList( -#line 913 "VBNET.ATG" +#line 914 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 914 "VBNET.ATG" +#line 915 "VBNET.ATG" p); } Expect(38); @@ -1642,10 +1658,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 916 "VBNET.ATG" +#line 917 "VBNET.ATG" out returnTypeAttributeSection); -#line 918 "VBNET.ATG" +#line 919 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1653,11 +1669,11 @@ out returnTypeAttributeSection); } TypeName( -#line 924 "VBNET.ATG" +#line 925 "VBNET.ATG" out type); } -#line 926 "VBNET.ATG" +#line 927 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1665,23 +1681,23 @@ out type); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 932 "VBNET.ATG" +#line 933 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 934 "VBNET.ATG" +#line 935 "VBNET.ATG" out handlesClause); } } -#line 937 "VBNET.ATG" +#line 938 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 940 "VBNET.ATG" +#line 941 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 943 "VBNET.ATG" +#line 944 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1697,7 +1713,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 958 "VBNET.ATG" +#line 959 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1712,12 +1728,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 971 "VBNET.ATG" +#line 972 "VBNET.ATG" out stmt); Expect(113); Expect(127); -#line 973 "VBNET.ATG" +#line 974 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1733,7 +1749,7 @@ out stmt); case 101: { lexer.NextToken(); -#line 987 "VBNET.ATG" +#line 988 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1743,39 +1759,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 994 "VBNET.ATG" +#line 995 "VBNET.ATG" out charsetModifer); } if (la.kind == 210) { lexer.NextToken(); Identifier(); -#line 997 "VBNET.ATG" +#line 998 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 998 "VBNET.ATG" +#line 999 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 999 "VBNET.ATG" +#line 1000 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1000 "VBNET.ATG" +#line 1001 "VBNET.ATG" p); } Expect(38); } EndOfStmt(); -#line 1003 "VBNET.ATG" +#line 1004 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1785,25 +1801,25 @@ p); lexer.NextToken(); Identifier(); -#line 1010 "VBNET.ATG" +#line 1011 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 1011 "VBNET.ATG" +#line 1012 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1012 "VBNET.ATG" +#line 1013 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1013 "VBNET.ATG" +#line 1014 "VBNET.ATG" p); } Expect(38); @@ -1811,12 +1827,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1014 "VBNET.ATG" +#line 1015 "VBNET.ATG" out type); } EndOfStmt(); -#line 1017 "VBNET.ATG" +#line 1018 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1828,7 +1844,7 @@ out type); case 119: { lexer.NextToken(); -#line 1027 "VBNET.ATG" +#line 1028 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1837,19 +1853,19 @@ out type); Identifier(); -#line 1033 "VBNET.ATG" +#line 1034 "VBNET.ATG" name= t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1035 "VBNET.ATG" +#line 1036 "VBNET.ATG" out type); } else if (StartOf(16)) { if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1037 "VBNET.ATG" +#line 1038 "VBNET.ATG" p); } Expect(38); @@ -1857,11 +1873,11 @@ p); } else SynErr(259); if (la.kind == 136) { ImplementsClause( -#line 1039 "VBNET.ATG" +#line 1040 "VBNET.ATG" out implementsClause); } -#line 1041 "VBNET.ATG" +#line 1042 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1875,29 +1891,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 1052 "VBNET.ATG" +#line 1053 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); IdentifierForFieldDeclaration(); -#line 1055 "VBNET.ATG" +#line 1056 "VBNET.ATG" string name = t.val; -#line 1056 "VBNET.ATG" +#line 1057 "VBNET.ATG" fd.StartLocation = m.GetDeclarationLocation(t.Location); VariableDeclaratorPartAfterIdentifier( -#line 1058 "VBNET.ATG" +#line 1059 "VBNET.ATG" variableDeclarators, name); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 1059 "VBNET.ATG" +#line 1060 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1062 "VBNET.ATG" +#line 1063 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; AddChild(fd); @@ -1906,35 +1922,35 @@ variableDeclarators); } case 88: { -#line 1067 "VBNET.ATG" +#line 1068 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1068 "VBNET.ATG" +#line 1069 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1070 "VBNET.ATG" +#line 1071 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1074 "VBNET.ATG" +#line 1075 "VBNET.ATG" constantDeclarators); while (la.kind == 22) { lexer.NextToken(); ConstantDeclarator( -#line 1075 "VBNET.ATG" +#line 1076 "VBNET.ATG" constantDeclarators); } -#line 1077 "VBNET.ATG" +#line 1078 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1082 "VBNET.ATG" +#line 1083 "VBNET.ATG" fd.EndLocation = t.EndLocation; AddChild(fd); @@ -1943,7 +1959,7 @@ constantDeclarators); case 186: { lexer.NextToken(); -#line 1088 "VBNET.ATG" +#line 1089 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; @@ -1952,13 +1968,13 @@ constantDeclarators); Identifier(); -#line 1094 "VBNET.ATG" +#line 1095 "VBNET.ATG" string propertyName = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1095 "VBNET.ATG" +#line 1096 "VBNET.ATG" p); } Expect(38); @@ -1967,10 +1983,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1098 "VBNET.ATG" +#line 1099 "VBNET.ATG" out returnTypeAttributeSection); -#line 1100 "VBNET.ATG" +#line 1101 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1978,13 +1994,13 @@ out returnTypeAttributeSection); } if ( -#line 1107 "VBNET.ATG" +#line 1108 "VBNET.ATG" IsNewExpression()) { ObjectCreateExpression( -#line 1107 "VBNET.ATG" +#line 1108 "VBNET.ATG" out initializer); -#line 1109 "VBNET.ATG" +#line 1110 "VBNET.ATG" if (initializer is ObjectCreateExpression) { type = ((ObjectCreateExpression)initializer).CreateType.Clone(); } else { @@ -1993,27 +2009,27 @@ out initializer); } else if (StartOf(8)) { TypeName( -#line 1116 "VBNET.ATG" +#line 1117 "VBNET.ATG" out type); } else SynErr(260); } if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1119 "VBNET.ATG" +#line 1120 "VBNET.ATG" out initializer); } if (la.kind == 136) { ImplementsClause( -#line 1120 "VBNET.ATG" +#line 1121 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1124 "VBNET.ATG" +#line 1125 "VBNET.ATG" IsMustOverride(m) || IsAutomaticProperty()) { -#line 1126 "VBNET.ATG" +#line 1127 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2026,7 +2042,7 @@ IsMustOverride(m) || IsAutomaticProperty()) { } else if (StartOf(17)) { -#line 1138 "VBNET.ATG" +#line 1139 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2038,13 +2054,13 @@ IsMustOverride(m) || IsAutomaticProperty()) { PropertySetRegion setRegion; AccessorDecls( -#line 1148 "VBNET.ATG" +#line 1149 "VBNET.ATG" out getRegion, out setRegion); Expect(113); Expect(186); EndOfStmt(); -#line 1152 "VBNET.ATG" +#line 1153 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.Location; // t = EndOfStmt; not "Property" @@ -2056,11 +2072,11 @@ out getRegion, out setRegion); case 98: { lexer.NextToken(); -#line 1159 "VBNET.ATG" +#line 1160 "VBNET.ATG" Location startPos = t.Location; Expect(119); -#line 1161 "VBNET.ATG" +#line 1162 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2070,24 +2086,24 @@ out getRegion, out setRegion); Identifier(); -#line 1168 "VBNET.ATG" +#line 1169 "VBNET.ATG" string customEventName = t.val; Expect(63); TypeName( -#line 1169 "VBNET.ATG" +#line 1170 "VBNET.ATG" out type); if (la.kind == 136) { ImplementsClause( -#line 1170 "VBNET.ATG" +#line 1171 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1173 "VBNET.ATG" +#line 1174 "VBNET.ATG" out eventAccessorDeclaration); -#line 1175 "VBNET.ATG" +#line 1176 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2106,7 +2122,7 @@ out eventAccessorDeclaration); Expect(119); EndOfStmt(); -#line 1191 "VBNET.ATG" +#line 1192 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2137,24 +2153,24 @@ out eventAccessorDeclaration); } case 161: case 172: case 232: { -#line 1217 "VBNET.ATG" +#line 1218 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 161 || la.kind == 232) { if (la.kind == 232) { lexer.NextToken(); -#line 1218 "VBNET.ATG" +#line 1219 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1219 "VBNET.ATG" +#line 1220 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(172); -#line 1222 "VBNET.ATG" +#line 1223 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2165,7 +2181,7 @@ out eventAccessorDeclaration); List parameters = new List(); OverloadableOperator( -#line 1231 "VBNET.ATG" +#line 1232 "VBNET.ATG" out operatorType); Expect(37); if (la.kind == 72) { @@ -2173,16 +2189,16 @@ out operatorType); } Identifier(); -#line 1232 "VBNET.ATG" +#line 1233 "VBNET.ATG" operandName = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1233 "VBNET.ATG" +#line 1234 "VBNET.ATG" out operandType); } -#line 1234 "VBNET.ATG" +#line 1235 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); while (la.kind == 22) { lexer.NextToken(); @@ -2191,51 +2207,51 @@ out operandType); } Identifier(); -#line 1238 "VBNET.ATG" +#line 1239 "VBNET.ATG" operandName = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1239 "VBNET.ATG" +#line 1240 "VBNET.ATG" out operandType); } -#line 1240 "VBNET.ATG" +#line 1241 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); } Expect(38); -#line 1243 "VBNET.ATG" +#line 1244 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 63) { lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1244 "VBNET.ATG" +#line 1245 "VBNET.ATG" out section); -#line 1245 "VBNET.ATG" +#line 1246 "VBNET.ATG" if (section != null) { section.AttributeTarget = "return"; attributes.Add(section); } } TypeName( -#line 1249 "VBNET.ATG" +#line 1250 "VBNET.ATG" out returnType); -#line 1249 "VBNET.ATG" +#line 1250 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1251 "VBNET.ATG" +#line 1252 "VBNET.ATG" out stmt); Expect(113); Expect(172); EndOfStmt(); -#line 1253 "VBNET.ATG" +#line 1254 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2258,25 +2274,25 @@ out stmt); } void EnumMemberDecl( -#line 765 "VBNET.ATG" +#line 766 "VBNET.ATG" out FieldDeclaration f) { -#line 767 "VBNET.ATG" +#line 768 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 40) { AttributeSection( -#line 771 "VBNET.ATG" +#line 772 "VBNET.ATG" out section); -#line 771 "VBNET.ATG" +#line 772 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 774 "VBNET.ATG" +#line 775 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2285,10 +2301,10 @@ out section); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 779 "VBNET.ATG" +#line 780 "VBNET.ATG" out expr); -#line 779 "VBNET.ATG" +#line 780 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2296,7 +2312,7 @@ out expr); void InterfaceMemberDecl() { -#line 656 "VBNET.ATG" +#line 657 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2308,33 +2324,33 @@ out expr); if (StartOf(19)) { while (la.kind == 40) { AttributeSection( -#line 664 "VBNET.ATG" +#line 665 "VBNET.ATG" out section); -#line 664 "VBNET.ATG" +#line 665 "VBNET.ATG" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 667 "VBNET.ATG" +#line 668 "VBNET.ATG" mod); } if (la.kind == 119) { lexer.NextToken(); -#line 671 "VBNET.ATG" +#line 672 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 674 "VBNET.ATG" +#line 675 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 675 "VBNET.ATG" +#line 676 "VBNET.ATG" p); } Expect(38); @@ -2342,12 +2358,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 676 "VBNET.ATG" +#line 677 "VBNET.ATG" out type); } EndOfStmt(); -#line 679 "VBNET.ATG" +#line 680 "VBNET.ATG" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2358,29 +2374,29 @@ out type); } else if (la.kind == 210) { lexer.NextToken(); -#line 689 "VBNET.ATG" +#line 690 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 692 "VBNET.ATG" +#line 693 "VBNET.ATG" name = t.val; TypeParameterList( -#line 693 "VBNET.ATG" +#line 694 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 694 "VBNET.ATG" +#line 695 "VBNET.ATG" p); } Expect(38); } EndOfStmt(); -#line 697 "VBNET.ATG" +#line 698 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2396,22 +2412,22 @@ p); } else if (la.kind == 127) { lexer.NextToken(); -#line 712 "VBNET.ATG" +#line 713 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 715 "VBNET.ATG" +#line 716 "VBNET.ATG" name = t.val; TypeParameterList( -#line 716 "VBNET.ATG" +#line 717 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 717 "VBNET.ATG" +#line 718 "VBNET.ATG" p); } Expect(38); @@ -2420,15 +2436,15 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 718 "VBNET.ATG" +#line 719 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 718 "VBNET.ATG" +#line 719 "VBNET.ATG" out type); } -#line 720 "VBNET.ATG" +#line 721 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -2449,19 +2465,19 @@ out type); } else if (la.kind == 186) { lexer.NextToken(); -#line 740 "VBNET.ATG" +#line 741 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 743 "VBNET.ATG" +#line 744 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 744 "VBNET.ATG" +#line 745 "VBNET.ATG" p); } Expect(38); @@ -2469,18 +2485,18 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 745 "VBNET.ATG" +#line 746 "VBNET.ATG" out type); } -#line 747 "VBNET.ATG" +#line 748 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } EndOfStmt(); -#line 753 "VBNET.ATG" +#line 754 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2490,117 +2506,117 @@ out type); } else SynErr(263); } else if (StartOf(20)) { NonModuleDeclaration( -#line 761 "VBNET.ATG" +#line 762 "VBNET.ATG" mod, attributes); } else SynErr(264); } void Expr( -#line 1648 "VBNET.ATG" +#line 1649 "VBNET.ATG" out Expression expr) { -#line 1649 "VBNET.ATG" +#line 1650 "VBNET.ATG" expr = null; if ( -#line 1650 "VBNET.ATG" +#line 1651 "VBNET.ATG" IsQueryExpression() ) { QueryExpr( -#line 1651 "VBNET.ATG" +#line 1652 "VBNET.ATG" out expr); } else if (la.kind == 127 || la.kind == 210) { LambdaExpr( -#line 1652 "VBNET.ATG" +#line 1653 "VBNET.ATG" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1653 "VBNET.ATG" +#line 1654 "VBNET.ATG" out expr); } else if (StartOf(22)) { XmlLiteralExpression( -#line 1654 "VBNET.ATG" +#line 1655 "VBNET.ATG" out expr); } else SynErr(265); } void ImplementsClause( -#line 1621 "VBNET.ATG" +#line 1622 "VBNET.ATG" out List baseInterfaces) { -#line 1623 "VBNET.ATG" +#line 1624 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(136); NonArrayTypeName( -#line 1628 "VBNET.ATG" +#line 1629 "VBNET.ATG" out type, false); -#line 1629 "VBNET.ATG" +#line 1630 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1630 "VBNET.ATG" +#line 1631 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 22) { lexer.NextToken(); NonArrayTypeName( -#line 1632 "VBNET.ATG" +#line 1633 "VBNET.ATG" out type, false); -#line 1633 "VBNET.ATG" +#line 1634 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1634 "VBNET.ATG" +#line 1635 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1579 "VBNET.ATG" +#line 1580 "VBNET.ATG" out List handlesClause) { -#line 1581 "VBNET.ATG" +#line 1582 "VBNET.ATG" handlesClause = new List(); string name; Expect(134); EventMemberSpecifier( -#line 1584 "VBNET.ATG" +#line 1585 "VBNET.ATG" out name); -#line 1584 "VBNET.ATG" +#line 1585 "VBNET.ATG" if (name != null) handlesClause.Add(name); while (la.kind == 22) { lexer.NextToken(); EventMemberSpecifier( -#line 1585 "VBNET.ATG" +#line 1586 "VBNET.ATG" out name); -#line 1585 "VBNET.ATG" +#line 1586 "VBNET.ATG" if (name != null) handlesClause.Add(name); } } void Block( -#line 2905 "VBNET.ATG" +#line 2906 "VBNET.ATG" out Statement stmt) { -#line 2908 "VBNET.ATG" +#line 2909 "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(23) || -#line 2914 "VBNET.ATG" +#line 2915 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2914 "VBNET.ATG" +#line 2915 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2914 "VBNET.ATG" +#line 2915 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2608,7 +2624,7 @@ IsEndStmtAhead()) { } } -#line 2919 "VBNET.ATG" +#line 2920 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2616,26 +2632,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1571 "VBNET.ATG" +#line 1572 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1572 "VBNET.ATG" +#line 1573 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 127 || la.kind == 210) { } else if (la.kind == 62) { lexer.NextToken(); -#line 1573 "VBNET.ATG" +#line 1574 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 66) { lexer.NextToken(); -#line 1574 "VBNET.ATG" +#line 1575 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 223) { lexer.NextToken(); -#line 1575 "VBNET.ATG" +#line 1576 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(266); } @@ -2763,10 +2779,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1456 "VBNET.ATG" +#line 1457 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1458 "VBNET.ATG" +#line 1459 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2774,28 +2790,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1464 "VBNET.ATG" +#line 1465 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1464 "VBNET.ATG" +#line 1465 "VBNET.ATG" out dimension); } if ( -#line 1465 "VBNET.ATG" +#line 1466 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1465 "VBNET.ATG" +#line 1466 "VBNET.ATG" out rank); } if ( -#line 1467 "VBNET.ATG" +#line 1468 "VBNET.ATG" IsObjectCreation()) { Expect(63); ObjectCreateExpression( -#line 1467 "VBNET.ATG" +#line 1468 "VBNET.ATG" out expr); -#line 1469 "VBNET.ATG" +#line 1470 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType.Clone(); } else { @@ -2806,10 +2822,10 @@ out expr); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1476 "VBNET.ATG" +#line 1477 "VBNET.ATG" out type); -#line 1478 "VBNET.ATG" +#line 1479 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2822,7 +2838,7 @@ out type); } -#line 1490 "VBNET.ATG" +#line 1491 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2849,12 +2865,12 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1513 "VBNET.ATG" +#line 1514 "VBNET.ATG" out expr); } } else SynErr(268); -#line 1516 "VBNET.ATG" +#line 1517 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2863,22 +2879,22 @@ out expr); } void VariableDeclarator( -#line 1450 "VBNET.ATG" +#line 1451 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1452 "VBNET.ATG" +#line 1453 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1453 "VBNET.ATG" +#line 1454 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1431 "VBNET.ATG" +#line 1432 "VBNET.ATG" List constantDeclaration) { -#line 1433 "VBNET.ATG" +#line 1434 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2886,20 +2902,20 @@ List constantDeclaration) { Identifier(); -#line 1438 "VBNET.ATG" +#line 1439 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1439 "VBNET.ATG" +#line 1440 "VBNET.ATG" out type); } Expect(20); Expr( -#line 1440 "VBNET.ATG" +#line 1441 "VBNET.ATG" out expr); -#line 1442 "VBNET.ATG" +#line 1443 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2908,10 +2924,10 @@ out expr); } void ObjectCreateExpression( -#line 2073 "VBNET.ATG" +#line 2074 "VBNET.ATG" out Expression oce) { -#line 2075 "VBNET.ATG" +#line 2076 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2922,39 +2938,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2083 "VBNET.ATG" +#line 2084 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2084 "VBNET.ATG" +#line 2085 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2085 "VBNET.ATG" +#line 2086 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2085 "VBNET.ATG" +#line 2086 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2086 "VBNET.ATG" +#line 2087 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 2087 "VBNET.ATG" +#line 2088 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 2088 "VBNET.ATG" +#line 2089 "VBNET.ATG" out initializer); } } -#line 2090 "VBNET.ATG" +#line 2091 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2094 "VBNET.ATG" +#line 2095 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2969,34 +2985,34 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2109 "VBNET.ATG" +#line 2110 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; lexer.NextToken(); -#line 2113 "VBNET.ATG" +#line 2114 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); MemberInitializer( -#line 2117 "VBNET.ATG" +#line 2118 "VBNET.ATG" out memberInitializer); -#line 2118 "VBNET.ATG" +#line 2119 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 22) { lexer.NextToken(); MemberInitializer( -#line 2120 "VBNET.ATG" +#line 2121 "VBNET.ATG" out memberInitializer); -#line 2121 "VBNET.ATG" +#line 2122 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(36); -#line 2125 "VBNET.ATG" +#line 2126 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3006,10 +3022,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2135 "VBNET.ATG" +#line 2136 "VBNET.ATG" out initializer); -#line 2137 "VBNET.ATG" +#line 2138 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3018,10 +3034,10 @@ out initializer); } void AccessorDecls( -#line 1365 "VBNET.ATG" +#line 1366 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1367 "VBNET.ATG" +#line 1368 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3029,60 +3045,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 40) { AttributeSection( -#line 1372 "VBNET.ATG" +#line 1373 "VBNET.ATG" out section); -#line 1372 "VBNET.ATG" +#line 1373 "VBNET.ATG" attributes.Add(section); } if (StartOf(25)) { GetAccessorDecl( -#line 1374 "VBNET.ATG" +#line 1375 "VBNET.ATG" out getBlock, attributes); if (StartOf(26)) { -#line 1376 "VBNET.ATG" +#line 1377 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1377 "VBNET.ATG" +#line 1378 "VBNET.ATG" out section); -#line 1377 "VBNET.ATG" +#line 1378 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1378 "VBNET.ATG" +#line 1379 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(27)) { SetAccessorDecl( -#line 1381 "VBNET.ATG" +#line 1382 "VBNET.ATG" out setBlock, attributes); if (StartOf(28)) { -#line 1383 "VBNET.ATG" +#line 1384 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1384 "VBNET.ATG" +#line 1385 "VBNET.ATG" out section); -#line 1384 "VBNET.ATG" +#line 1385 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1385 "VBNET.ATG" +#line 1386 "VBNET.ATG" out getBlock, attributes); } } else SynErr(269); } void EventAccessorDeclaration( -#line 1328 "VBNET.ATG" +#line 1329 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1330 "VBNET.ATG" +#line 1331 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -3091,10 +3107,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 40) { AttributeSection( -#line 1336 "VBNET.ATG" +#line 1337 "VBNET.ATG" out section); -#line 1336 "VBNET.ATG" +#line 1337 "VBNET.ATG" attributes.Add(section); } if (la.kind == 56) { @@ -3103,20 +3119,20 @@ out section); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1338 "VBNET.ATG" +#line 1339 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1339 "VBNET.ATG" +#line 1340 "VBNET.ATG" out stmt); Expect(113); Expect(56); EndOfStmt(); -#line 1341 "VBNET.ATG" +#line 1342 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3127,20 +3143,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1346 "VBNET.ATG" +#line 1347 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1347 "VBNET.ATG" +#line 1348 "VBNET.ATG" out stmt); Expect(113); Expect(193); EndOfStmt(); -#line 1349 "VBNET.ATG" +#line 1350 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3151,20 +3167,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1354 "VBNET.ATG" +#line 1355 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1355 "VBNET.ATG" +#line 1356 "VBNET.ATG" out stmt); Expect(113); Expect(189); EndOfStmt(); -#line 1357 "VBNET.ATG" +#line 1358 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3173,163 +3189,163 @@ out stmt); } void OverloadableOperator( -#line 1270 "VBNET.ATG" +#line 1271 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1271 "VBNET.ATG" +#line 1272 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1273 "VBNET.ATG" +#line 1274 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 30: { lexer.NextToken(); -#line 1275 "VBNET.ATG" +#line 1276 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 34: { lexer.NextToken(); -#line 1277 "VBNET.ATG" +#line 1278 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 24: { lexer.NextToken(); -#line 1279 "VBNET.ATG" +#line 1280 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 25: { lexer.NextToken(); -#line 1281 "VBNET.ATG" +#line 1282 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 23: { lexer.NextToken(); -#line 1283 "VBNET.ATG" +#line 1284 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 150: { lexer.NextToken(); -#line 1285 "VBNET.ATG" +#line 1286 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 154: { lexer.NextToken(); -#line 1287 "VBNET.ATG" +#line 1288 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 60: { lexer.NextToken(); -#line 1289 "VBNET.ATG" +#line 1290 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 175: { lexer.NextToken(); -#line 1291 "VBNET.ATG" +#line 1292 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 236: { lexer.NextToken(); -#line 1293 "VBNET.ATG" +#line 1294 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 32: { lexer.NextToken(); -#line 1295 "VBNET.ATG" +#line 1296 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 44: { lexer.NextToken(); -#line 1297 "VBNET.ATG" +#line 1298 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 45: { lexer.NextToken(); -#line 1299 "VBNET.ATG" +#line 1300 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 20: { lexer.NextToken(); -#line 1301 "VBNET.ATG" +#line 1302 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 1303 "VBNET.ATG" +#line 1304 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 40: { lexer.NextToken(); -#line 1305 "VBNET.ATG" +#line 1306 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 43: { lexer.NextToken(); -#line 1307 "VBNET.ATG" +#line 1308 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 39: { lexer.NextToken(); -#line 1309 "VBNET.ATG" +#line 1310 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 42: { lexer.NextToken(); -#line 1311 "VBNET.ATG" +#line 1312 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 94: { lexer.NextToken(); -#line 1313 "VBNET.ATG" +#line 1314 "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 1317 "VBNET.ATG" +#line 1318 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3346,67 +3362,67 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1391 "VBNET.ATG" +#line 1392 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1392 "VBNET.ATG" +#line 1393 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1394 "VBNET.ATG" +#line 1395 "VBNET.ATG" out m); Expect(128); -#line 1396 "VBNET.ATG" +#line 1397 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1398 "VBNET.ATG" +#line 1399 "VBNET.ATG" out stmt); -#line 1399 "VBNET.ATG" +#line 1400 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(113); Expect(128); -#line 1401 "VBNET.ATG" +#line 1402 "VBNET.ATG" getBlock.Modifier = m; -#line 1402 "VBNET.ATG" +#line 1403 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1407 "VBNET.ATG" +#line 1408 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1409 "VBNET.ATG" +#line 1410 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1414 "VBNET.ATG" +#line 1415 "VBNET.ATG" out m); Expect(198); -#line 1416 "VBNET.ATG" +#line 1417 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1417 "VBNET.ATG" +#line 1418 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1419 "VBNET.ATG" +#line 1420 "VBNET.ATG" out stmt); -#line 1421 "VBNET.ATG" +#line 1422 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3414,151 +3430,151 @@ out stmt); Expect(113); Expect(198); -#line 1426 "VBNET.ATG" +#line 1427 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3623 "VBNET.ATG" +#line 3624 "VBNET.ATG" out Modifiers m) { -#line 3624 "VBNET.ATG" +#line 3625 "VBNET.ATG" m = Modifiers.None; while (StartOf(29)) { if (la.kind == 188) { lexer.NextToken(); -#line 3626 "VBNET.ATG" +#line 3627 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3627 "VBNET.ATG" +#line 3628 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3628 "VBNET.ATG" +#line 3629 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3629 "VBNET.ATG" +#line 3630 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1524 "VBNET.ATG" +#line 1525 "VBNET.ATG" out List arrayModifiers) { -#line 1526 "VBNET.ATG" +#line 1527 "VBNET.ATG" arrayModifiers = null; Expect(37); InitializationRankList( -#line 1528 "VBNET.ATG" +#line 1529 "VBNET.ATG" out arrayModifiers); Expect(38); } void ArrayNameModifier( -#line 2700 "VBNET.ATG" +#line 2701 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2702 "VBNET.ATG" +#line 2703 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2704 "VBNET.ATG" +#line 2705 "VBNET.ATG" out arrayModifiers); } void InitializationRankList( -#line 1532 "VBNET.ATG" +#line 1533 "VBNET.ATG" out List rank) { -#line 1534 "VBNET.ATG" +#line 1535 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1537 "VBNET.ATG" +#line 1538 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1538 "VBNET.ATG" +#line 1539 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1539 "VBNET.ATG" +#line 1540 "VBNET.ATG" out expr); } -#line 1541 "VBNET.ATG" +#line 1542 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 22) { lexer.NextToken(); Expr( -#line 1543 "VBNET.ATG" +#line 1544 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1544 "VBNET.ATG" +#line 1545 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1545 "VBNET.ATG" +#line 1546 "VBNET.ATG" out expr); } -#line 1547 "VBNET.ATG" +#line 1548 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1552 "VBNET.ATG" +#line 1553 "VBNET.ATG" out CollectionInitializerExpression outExpr) { -#line 1554 "VBNET.ATG" +#line 1555 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(35); if (StartOf(30)) { Expr( -#line 1559 "VBNET.ATG" +#line 1560 "VBNET.ATG" out expr); -#line 1561 "VBNET.ATG" +#line 1562 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1564 "VBNET.ATG" +#line 1565 "VBNET.ATG" NotFinalComma()) { Expect(22); Expr( -#line 1564 "VBNET.ATG" +#line 1565 "VBNET.ATG" out expr); -#line 1565 "VBNET.ATG" +#line 1566 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(36); -#line 1568 "VBNET.ATG" +#line 1569 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1638 "VBNET.ATG" +#line 1639 "VBNET.ATG" out string name) { -#line 1639 "VBNET.ATG" +#line 1640 "VBNET.ATG" string eventName; if (StartOf(4)) { Identifier(); @@ -3568,112 +3584,112 @@ out string name) { lexer.NextToken(); } else SynErr(272); -#line 1642 "VBNET.ATG" +#line 1643 "VBNET.ATG" name = t.val; Expect(26); IdentifierOrKeyword( -#line 1644 "VBNET.ATG" +#line 1645 "VBNET.ATG" out eventName); -#line 1645 "VBNET.ATG" +#line 1646 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3556 "VBNET.ATG" +#line 3557 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3558 "VBNET.ATG" +#line 3559 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2224 "VBNET.ATG" +#line 2225 "VBNET.ATG" out Expression expr) { -#line 2226 "VBNET.ATG" +#line 2227 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2230 "VBNET.ATG" +#line 2231 "VBNET.ATG" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2231 "VBNET.ATG" +#line 2232 "VBNET.ATG" qexpr.Clauses); } -#line 2233 "VBNET.ATG" +#line 2234 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2144 "VBNET.ATG" +#line 2145 "VBNET.ATG" out Expression expr) { -#line 2146 "VBNET.ATG" +#line 2147 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2148 "VBNET.ATG" +#line 2149 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2149 "VBNET.ATG" +#line 2150 "VBNET.ATG" out lambda); } else SynErr(273); -#line 2150 "VBNET.ATG" +#line 2151 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1917 "VBNET.ATG" +#line 1918 "VBNET.ATG" out Expression outExpr) { -#line 1919 "VBNET.ATG" +#line 1920 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1922 "VBNET.ATG" +#line 1923 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1925 "VBNET.ATG" +#line 1926 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1926 "VBNET.ATG" +#line 1927 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1927 "VBNET.ATG" +#line 1928 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1929 "VBNET.ATG" +#line 1930 "VBNET.ATG" out expr); -#line 1929 "VBNET.ATG" +#line 1930 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void XmlLiteralExpression( -#line 1772 "VBNET.ATG" +#line 1773 "VBNET.ATG" out Expression pexpr) { -#line 1774 "VBNET.ATG" +#line 1775 "VBNET.ATG" XmlLiteralExpression expr = new XmlLiteralExpression(); List exprs = expr.Expressions; XmlExpression currentExpression = null; @@ -3681,115 +3697,115 @@ out Expression pexpr) { if (StartOf(32)) { XmlContentExpression( -#line 1781 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs); while (StartOf(32)) { XmlContentExpression( -#line 1781 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs); } if (la.kind == 10) { XmlElement( -#line 1781 "VBNET.ATG" +#line 1782 "VBNET.ATG" out currentExpression); -#line 1781 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(32)) { XmlContentExpression( -#line 1781 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs); } } } else if (la.kind == 10) { XmlElement( -#line 1783 "VBNET.ATG" +#line 1784 "VBNET.ATG" out currentExpression); -#line 1783 "VBNET.ATG" +#line 1784 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(32)) { XmlContentExpression( -#line 1783 "VBNET.ATG" +#line 1784 "VBNET.ATG" exprs); } } else SynErr(274); } void AssignmentOperator( -#line 1657 "VBNET.ATG" +#line 1658 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1658 "VBNET.ATG" +#line 1659 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 20: { lexer.NextToken(); -#line 1659 "VBNET.ATG" +#line 1660 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 54: { lexer.NextToken(); -#line 1660 "VBNET.ATG" +#line 1661 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 46: { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1662 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 48: { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1663 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 49: { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1664 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 50: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1665 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 51: { lexer.NextToken(); -#line 1665 "VBNET.ATG" +#line 1666 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 47: { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1667 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 52: { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1668 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 53: { lexer.NextToken(); -#line 1668 "VBNET.ATG" +#line 1669 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3798,13 +3814,13 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1672 "VBNET.ATG" +#line 1673 "VBNET.ATG" out Expression pexpr) { -#line 1673 "VBNET.ATG" +#line 1674 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1675 "VBNET.ATG" +#line 1676 "VBNET.ATG" out pexpr); while (StartOf(33)) { if (la.kind == 26) { @@ -3812,78 +3828,78 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1678 "VBNET.ATG" +#line 1679 "VBNET.ATG" out name); Expect(11); -#line 1679 "VBNET.ATG" +#line 1680 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); } else if (StartOf(34)) { IdentifierOrKeyword( -#line 1680 "VBNET.ATG" +#line 1681 "VBNET.ATG" out name); -#line 1681 "VBNET.ATG" +#line 1682 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); } else SynErr(276); if ( -#line 1683 "VBNET.ATG" +#line 1684 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1684 "VBNET.ATG" +#line 1685 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(38); } } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1686 "VBNET.ATG" +#line 1687 "VBNET.ATG" out name); -#line 1686 "VBNET.ATG" +#line 1687 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); } else if (la.kind == 27 || la.kind == 28) { -#line 1687 "VBNET.ATG" +#line 1688 "VBNET.ATG" XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; if (la.kind == 28) { lexer.NextToken(); } else if (la.kind == 27) { lexer.NextToken(); -#line 1688 "VBNET.ATG" +#line 1689 "VBNET.ATG" type = XmlAxisType.Descendents; } else SynErr(277); if (la.kind == 10) { lexer.NextToken(); -#line 1688 "VBNET.ATG" +#line 1689 "VBNET.ATG" isXmlName = true; } IdentifierOrKeyword( -#line 1688 "VBNET.ATG" +#line 1689 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1689 "VBNET.ATG" +#line 1690 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); } else { InvocationExpression( -#line 1690 "VBNET.ATG" +#line 1691 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1694 "VBNET.ATG" +#line 1695 "VBNET.ATG" out Expression pexpr) { -#line 1696 "VBNET.ATG" +#line 1697 "VBNET.ATG" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; @@ -3895,98 +3911,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1705 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1706 "VBNET.ATG" +#line 1707 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1707 "VBNET.ATG" +#line 1708 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1708 "VBNET.ATG" +#line 1709 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1709 "VBNET.ATG" +#line 1710 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1710 "VBNET.ATG" +#line 1711 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1711 "VBNET.ATG" +#line 1712 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 217: { lexer.NextToken(); -#line 1713 "VBNET.ATG" +#line 1714 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 122: { lexer.NextToken(); -#line 1714 "VBNET.ATG" +#line 1715 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 165: { lexer.NextToken(); -#line 1715 "VBNET.ATG" +#line 1716 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 37: { lexer.NextToken(); Expr( -#line 1716 "VBNET.ATG" +#line 1717 "VBNET.ATG" out expr); Expect(38); -#line 1716 "VBNET.ATG" +#line 1717 "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 1718 "VBNET.ATG" +#line 1719 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1721 "VBNET.ATG" +#line 1722 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1722 "VBNET.ATG" +#line 1723 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(38); } @@ -3994,51 +4010,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 1724 "VBNET.ATG" +#line 1725 "VBNET.ATG" string val = String.Empty; if (StartOf(12)) { PrimitiveTypeName( -#line 1725 "VBNET.ATG" +#line 1726 "VBNET.ATG" out val); } else if (la.kind == 168) { lexer.NextToken(); -#line 1725 "VBNET.ATG" +#line 1726 "VBNET.ATG" val = "System.Object"; } else SynErr(278); -#line 1726 "VBNET.ATG" +#line 1727 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 153: { lexer.NextToken(); -#line 1727 "VBNET.ATG" +#line 1728 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 158: case 159: { -#line 1728 "VBNET.ATG" +#line 1729 "VBNET.ATG" Expression retExpr = null; if (la.kind == 158) { lexer.NextToken(); -#line 1729 "VBNET.ATG" +#line 1730 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 159) { lexer.NextToken(); -#line 1730 "VBNET.ATG" +#line 1731 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(279); Expect(26); IdentifierOrKeyword( -#line 1732 "VBNET.ATG" +#line 1733 "VBNET.ATG" out name); -#line 1732 "VBNET.ATG" +#line 1733 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -4047,86 +4063,86 @@ out name); Expect(26); Identifier(); -#line 1734 "VBNET.ATG" +#line 1735 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1736 "VBNET.ATG" +#line 1737 "VBNET.ATG" type.IsGlobal = true; -#line 1737 "VBNET.ATG" +#line 1738 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 162: { ObjectCreateExpression( -#line 1738 "VBNET.ATG" +#line 1739 "VBNET.ATG" out expr); -#line 1738 "VBNET.ATG" +#line 1739 "VBNET.ATG" pexpr = expr; break; } case 35: { CollectionInitializer( -#line 1739 "VBNET.ATG" +#line 1740 "VBNET.ATG" out cie); -#line 1739 "VBNET.ATG" +#line 1740 "VBNET.ATG" pexpr = cie; break; } case 94: case 106: case 219: { -#line 1741 "VBNET.ATG" +#line 1742 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 106) { lexer.NextToken(); } else if (la.kind == 94) { lexer.NextToken(); -#line 1743 "VBNET.ATG" +#line 1744 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 219) { lexer.NextToken(); -#line 1744 "VBNET.ATG" +#line 1745 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(280); Expect(37); Expr( -#line 1746 "VBNET.ATG" +#line 1747 "VBNET.ATG" out expr); Expect(22); TypeName( -#line 1746 "VBNET.ATG" +#line 1747 "VBNET.ATG" out type); Expect(38); -#line 1747 "VBNET.ATG" +#line 1748 "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 1748 "VBNET.ATG" +#line 1749 "VBNET.ATG" out type); Expect(37); Expr( -#line 1748 "VBNET.ATG" +#line 1749 "VBNET.ATG" out expr); Expect(38); -#line 1748 "VBNET.ATG" +#line 1749 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 57: { lexer.NextToken(); Expr( -#line 1749 "VBNET.ATG" +#line 1750 "VBNET.ATG" out expr); -#line 1749 "VBNET.ATG" +#line 1750 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4134,31 +4150,31 @@ out expr); lexer.NextToken(); Expect(37); GetTypeTypeName( -#line 1750 "VBNET.ATG" +#line 1751 "VBNET.ATG" out type); Expect(38); -#line 1750 "VBNET.ATG" +#line 1751 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 220: { lexer.NextToken(); SimpleExpr( -#line 1751 "VBNET.ATG" +#line 1752 "VBNET.ATG" out expr); Expect(144); TypeName( -#line 1751 "VBNET.ATG" +#line 1752 "VBNET.ATG" out type); -#line 1751 "VBNET.ATG" +#line 1752 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 135: { ConditionalExpression( -#line 1752 "VBNET.ATG" +#line 1753 "VBNET.ATG" out pexpr); break; } @@ -4169,210 +4185,210 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1758 "VBNET.ATG" +#line 1759 "VBNET.ATG" out name); Expect(11); -#line 1759 "VBNET.ATG" +#line 1760 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); } else if (StartOf(34)) { IdentifierOrKeyword( -#line 1760 "VBNET.ATG" +#line 1761 "VBNET.ATG" out name); -#line 1761 "VBNET.ATG" +#line 1762 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); } else SynErr(281); } else { -#line 1763 "VBNET.ATG" +#line 1764 "VBNET.ATG" XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; if (la.kind == 27) { lexer.NextToken(); -#line 1764 "VBNET.ATG" +#line 1765 "VBNET.ATG" axisType = XmlAxisType.Descendents; } else if (la.kind == 28) { lexer.NextToken(); -#line 1764 "VBNET.ATG" +#line 1765 "VBNET.ATG" axisType = XmlAxisType.Attribute; } else SynErr(282); if (la.kind == 10) { lexer.NextToken(); -#line 1765 "VBNET.ATG" +#line 1766 "VBNET.ATG" isXmlIdentifier = true; } IdentifierOrKeyword( -#line 1765 "VBNET.ATG" +#line 1766 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1766 "VBNET.ATG" +#line 1767 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); } } else SynErr(283); } void TypeArgumentList( -#line 2736 "VBNET.ATG" +#line 2737 "VBNET.ATG" List typeArguments) { -#line 2738 "VBNET.ATG" +#line 2739 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2740 "VBNET.ATG" +#line 2741 "VBNET.ATG" out typeref); -#line 2740 "VBNET.ATG" +#line 2741 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2743 "VBNET.ATG" +#line 2744 "VBNET.ATG" out typeref); -#line 2743 "VBNET.ATG" +#line 2744 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1881 "VBNET.ATG" +#line 1882 "VBNET.ATG" ref Expression pexpr) { -#line 1882 "VBNET.ATG" +#line 1883 "VBNET.ATG" List parameters = null; Expect(37); -#line 1884 "VBNET.ATG" +#line 1885 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1885 "VBNET.ATG" +#line 1886 "VBNET.ATG" out parameters); Expect(38); -#line 1888 "VBNET.ATG" +#line 1889 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1890 "VBNET.ATG" +#line 1891 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3563 "VBNET.ATG" +#line 3564 "VBNET.ATG" out string type) { -#line 3564 "VBNET.ATG" +#line 3565 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3565 "VBNET.ATG" +#line 3566 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3566 "VBNET.ATG" +#line 3567 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3567 "VBNET.ATG" +#line 3568 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3568 "VBNET.ATG" +#line 3569 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3569 "VBNET.ATG" +#line 3570 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3570 "VBNET.ATG" +#line 3571 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3571 "VBNET.ATG" +#line 3572 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3572 "VBNET.ATG" +#line 3573 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3573 "VBNET.ATG" +#line 3574 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3574 "VBNET.ATG" +#line 3575 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3575 "VBNET.ATG" +#line 3576 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3576 "VBNET.ATG" +#line 3577 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3577 "VBNET.ATG" +#line 3578 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3578 "VBNET.ATG" +#line 3579 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3579 "VBNET.ATG" +#line 3580 "VBNET.ATG" type = "System.SByte"; break; } @@ -4381,122 +4397,122 @@ out string type) { } void CastTarget( -#line 1895 "VBNET.ATG" +#line 1896 "VBNET.ATG" out TypeReference type) { -#line 1897 "VBNET.ATG" +#line 1898 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1899 "VBNET.ATG" +#line 1900 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1900 "VBNET.ATG" +#line 1901 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1901 "VBNET.ATG" +#line 1902 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1902 "VBNET.ATG" +#line 1903 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1903 "VBNET.ATG" +#line 1904 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1904 "VBNET.ATG" +#line 1905 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1905 "VBNET.ATG" +#line 1906 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1906 "VBNET.ATG" +#line 1907 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1907 "VBNET.ATG" +#line 1908 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1908 "VBNET.ATG" +#line 1909 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1909 "VBNET.ATG" +#line 1910 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1910 "VBNET.ATG" +#line 1911 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1911 "VBNET.ATG" +#line 1912 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1912 "VBNET.ATG" +#line 1913 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1913 "VBNET.ATG" +#line 1914 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1914 "VBNET.ATG" +#line 1915 "VBNET.ATG" type = new TypeReference("System.String", true); break; } @@ -4505,19 +4521,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2635 "VBNET.ATG" +#line 2636 "VBNET.ATG" out TypeReference typeref) { -#line 2636 "VBNET.ATG" +#line 2637 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2638 "VBNET.ATG" +#line 2639 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2639 "VBNET.ATG" +#line 2640 "VBNET.ATG" out rank); -#line 2640 "VBNET.ATG" +#line 2641 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4525,10 +4541,10 @@ out rank); } void ConditionalExpression( -#line 1847 "VBNET.ATG" +#line 1848 "VBNET.ATG" out Expression expr) { -#line 1849 "VBNET.ATG" +#line 1850 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4540,21 +4556,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1858 "VBNET.ATG" +#line 1859 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1858 "VBNET.ATG" +#line 1859 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1858 "VBNET.ATG" +#line 1859 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1860 "VBNET.ATG" +#line 1861 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4577,34 +4593,34 @@ out falseExpr); } void XmlContentExpression( -#line 1787 "VBNET.ATG" +#line 1788 "VBNET.ATG" List exprs) { -#line 1788 "VBNET.ATG" +#line 1789 "VBNET.ATG" XmlContentExpression expr = null; if (la.kind == 16) { lexer.NextToken(); -#line 1790 "VBNET.ATG" +#line 1791 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Text); } else if (la.kind == 18) { lexer.NextToken(); -#line 1791 "VBNET.ATG" +#line 1792 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.CData); } else if (la.kind == 17) { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1793 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Comment); } else if (la.kind == 19) { lexer.NextToken(); -#line 1793 "VBNET.ATG" +#line 1794 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); } else SynErr(286); -#line 1796 "VBNET.ATG" +#line 1797 "VBNET.ATG" expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; exprs.Add(expr); @@ -4612,54 +4628,54 @@ List exprs) { } void XmlElement( -#line 1822 "VBNET.ATG" +#line 1823 "VBNET.ATG" out XmlExpression expr) { -#line 1823 "VBNET.ATG" +#line 1824 "VBNET.ATG" XmlElementExpression el = new XmlElementExpression(); Expect(10); -#line 1826 "VBNET.ATG" +#line 1827 "VBNET.ATG" el.StartLocation = t.Location; if (la.kind == 12) { lexer.NextToken(); -#line 1827 "VBNET.ATG" +#line 1828 "VBNET.ATG" Expression innerExpression; Expr( -#line 1827 "VBNET.ATG" +#line 1828 "VBNET.ATG" out innerExpression); Expect(13); -#line 1828 "VBNET.ATG" +#line 1829 "VBNET.ATG" el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; } else if (StartOf(4)) { Identifier(); -#line 1829 "VBNET.ATG" +#line 1830 "VBNET.ATG" el.XmlName = t.val; } else SynErr(287); while (StartOf(36)) { XmlAttribute( -#line 1829 "VBNET.ATG" +#line 1830 "VBNET.ATG" el.Attributes); } if (la.kind == 14) { lexer.NextToken(); -#line 1830 "VBNET.ATG" +#line 1831 "VBNET.ATG" el.EndLocation = t.EndLocation; } else if (la.kind == 11) { lexer.NextToken(); while (StartOf(37)) { -#line 1830 "VBNET.ATG" +#line 1831 "VBNET.ATG" XmlExpression child; XmlNestedContent( -#line 1830 "VBNET.ATG" +#line 1831 "VBNET.ATG" out child); -#line 1830 "VBNET.ATG" +#line 1831 "VBNET.ATG" el.Children.Add(child); } Expect(15); @@ -4668,73 +4684,73 @@ out child); } Expect(11); -#line 1830 "VBNET.ATG" +#line 1831 "VBNET.ATG" el.EndLocation = t.EndLocation; } else SynErr(288); -#line 1832 "VBNET.ATG" +#line 1833 "VBNET.ATG" expr = el; } void XmlNestedContent( -#line 1802 "VBNET.ATG" +#line 1803 "VBNET.ATG" out XmlExpression expr) { -#line 1803 "VBNET.ATG" +#line 1804 "VBNET.ATG" XmlExpression tmpExpr = null; Location start = la.Location; switch (la.kind) { case 16: { lexer.NextToken(); -#line 1806 "VBNET.ATG" +#line 1807 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); break; } case 18: { lexer.NextToken(); -#line 1807 "VBNET.ATG" +#line 1808 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); break; } case 17: { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1809 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); break; } case 19: { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1810 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); break; } case 12: { lexer.NextToken(); -#line 1810 "VBNET.ATG" +#line 1811 "VBNET.ATG" Expression innerExpression; Expr( -#line 1810 "VBNET.ATG" +#line 1811 "VBNET.ATG" out innerExpression); Expect(13); -#line 1810 "VBNET.ATG" +#line 1811 "VBNET.ATG" tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; break; } case 10: { XmlElement( -#line 1811 "VBNET.ATG" +#line 1812 "VBNET.ATG" out tmpExpr); break; } default: SynErr(289); break; } -#line 1814 "VBNET.ATG" +#line 1815 "VBNET.ATG" if (tmpExpr.StartLocation.IsEmpty) tmpExpr.StartLocation = start; if (tmpExpr.EndLocation.IsEmpty) @@ -4744,393 +4760,393 @@ out tmpExpr); } void XmlAttribute( -#line 1835 "VBNET.ATG" +#line 1836 "VBNET.ATG" List attrs) { -#line 1836 "VBNET.ATG" +#line 1837 "VBNET.ATG" Location start = la.Location; if (StartOf(4)) { Identifier(); -#line 1838 "VBNET.ATG" +#line 1839 "VBNET.ATG" string name = t.val; Expect(20); -#line 1839 "VBNET.ATG" +#line 1840 "VBNET.ATG" string literalValue = null; Expression expressionValue = null; bool useDoubleQuotes = false; if (la.kind == 3) { lexer.NextToken(); -#line 1840 "VBNET.ATG" +#line 1841 "VBNET.ATG" literalValue = t.literalValue.ToString(); useDoubleQuotes = t.val[0] == '"'; } else if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1840 "VBNET.ATG" +#line 1841 "VBNET.ATG" out expressionValue); Expect(13); } else SynErr(290); -#line 1841 "VBNET.ATG" +#line 1842 "VBNET.ATG" attrs.Add(new XmlAttribute() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); } else if (la.kind == 12) { lexer.NextToken(); -#line 1843 "VBNET.ATG" +#line 1844 "VBNET.ATG" Expression innerExpression; Expr( -#line 1843 "VBNET.ATG" +#line 1844 "VBNET.ATG" out innerExpression); Expect(13); -#line 1844 "VBNET.ATG" +#line 1845 "VBNET.ATG" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); } else SynErr(291); } void ArgumentList( -#line 2567 "VBNET.ATG" +#line 2568 "VBNET.ATG" out List arguments) { -#line 2569 "VBNET.ATG" +#line 2570 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(30)) { Argument( -#line 2572 "VBNET.ATG" +#line 2573 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2573 "VBNET.ATG" +#line 2574 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(30)) { Argument( -#line 2574 "VBNET.ATG" +#line 2575 "VBNET.ATG" out expr); } -#line 2575 "VBNET.ATG" +#line 2576 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2577 "VBNET.ATG" +#line 2578 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1933 "VBNET.ATG" +#line 1934 "VBNET.ATG" out Expression outExpr) { -#line 1935 "VBNET.ATG" +#line 1936 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1938 "VBNET.ATG" +#line 1939 "VBNET.ATG" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1941 "VBNET.ATG" +#line 1942 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1942 "VBNET.ATG" +#line 1943 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1944 "VBNET.ATG" +#line 1945 "VBNET.ATG" out expr); -#line 1944 "VBNET.ATG" +#line 1945 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1948 "VBNET.ATG" +#line 1949 "VBNET.ATG" out Expression outExpr) { -#line 1949 "VBNET.ATG" +#line 1950 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 1950 "VBNET.ATG" +#line 1951 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1951 "VBNET.ATG" +#line 1952 "VBNET.ATG" out outExpr); -#line 1952 "VBNET.ATG" +#line 1953 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1957 "VBNET.ATG" +#line 1958 "VBNET.ATG" out Expression outExpr) { -#line 1959 "VBNET.ATG" +#line 1960 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1962 "VBNET.ATG" +#line 1963 "VBNET.ATG" out outExpr); while (StartOf(39)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 1965 "VBNET.ATG" +#line 1966 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 1966 "VBNET.ATG" +#line 1967 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 1967 "VBNET.ATG" +#line 1968 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 1968 "VBNET.ATG" +#line 1969 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 1969 "VBNET.ATG" +#line 1970 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 1970 "VBNET.ATG" +#line 1971 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 1971 "VBNET.ATG" +#line 1972 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 1972 "VBNET.ATG" +#line 1973 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 1973 "VBNET.ATG" +#line 1974 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(40)) { ShiftExpr( -#line 1976 "VBNET.ATG" +#line 1977 "VBNET.ATG" out expr); -#line 1976 "VBNET.ATG" +#line 1977 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 164) { lexer.NextToken(); ShiftExpr( -#line 1979 "VBNET.ATG" +#line 1980 "VBNET.ATG" out expr); -#line 1979 "VBNET.ATG" +#line 1980 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); } else SynErr(292); } } void ShiftExpr( -#line 1984 "VBNET.ATG" +#line 1985 "VBNET.ATG" out Expression outExpr) { -#line 1986 "VBNET.ATG" +#line 1987 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1989 "VBNET.ATG" +#line 1990 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 1992 "VBNET.ATG" +#line 1993 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1993 "VBNET.ATG" +#line 1994 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1995 "VBNET.ATG" +#line 1996 "VBNET.ATG" out expr); -#line 1995 "VBNET.ATG" +#line 1996 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1999 "VBNET.ATG" +#line 2000 "VBNET.ATG" out Expression outExpr) { -#line 2000 "VBNET.ATG" +#line 2001 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 2002 "VBNET.ATG" +#line 2003 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 2002 "VBNET.ATG" +#line 2003 "VBNET.ATG" out expr); -#line 2002 "VBNET.ATG" +#line 2003 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 2005 "VBNET.ATG" +#line 2006 "VBNET.ATG" out Expression outExpr) { -#line 2007 "VBNET.ATG" +#line 2008 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 2010 "VBNET.ATG" +#line 2011 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 2013 "VBNET.ATG" +#line 2014 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2014 "VBNET.ATG" +#line 2015 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 2016 "VBNET.ATG" +#line 2017 "VBNET.ATG" out expr); -#line 2016 "VBNET.ATG" +#line 2017 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 2020 "VBNET.ATG" +#line 2021 "VBNET.ATG" out Expression outExpr) { -#line 2021 "VBNET.ATG" +#line 2022 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 2023 "VBNET.ATG" +#line 2024 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 2023 "VBNET.ATG" +#line 2024 "VBNET.ATG" out expr); -#line 2023 "VBNET.ATG" +#line 2024 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 2026 "VBNET.ATG" +#line 2027 "VBNET.ATG" out Expression outExpr) { -#line 2027 "VBNET.ATG" +#line 2028 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 2029 "VBNET.ATG" +#line 2030 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 2029 "VBNET.ATG" +#line 2030 "VBNET.ATG" out expr); -#line 2029 "VBNET.ATG" +#line 2030 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 2032 "VBNET.ATG" +#line 2033 "VBNET.ATG" out Expression outExpr) { -#line 2034 "VBNET.ATG" +#line 2035 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 2037 "VBNET.ATG" +#line 2038 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2040 "VBNET.ATG" +#line 2041 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 2041 "VBNET.ATG" +#line 2042 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 2043 "VBNET.ATG" +#line 2044 "VBNET.ATG" out expr); -#line 2043 "VBNET.ATG" +#line 2044 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 2047 "VBNET.ATG" +#line 2048 "VBNET.ATG" out Expression uExpr) { -#line 2049 "VBNET.ATG" +#line 2050 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -5139,25 +5155,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 2053 "VBNET.ATG" +#line 2054 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 2054 "VBNET.ATG" +#line 2055 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2055 "VBNET.ATG" +#line 2056 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2057 "VBNET.ATG" +#line 2058 "VBNET.ATG" out expr); -#line 2059 "VBNET.ATG" +#line 2060 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -5167,107 +5183,107 @@ out expr); } void ExponentiationExpr( -#line 2067 "VBNET.ATG" +#line 2068 "VBNET.ATG" out Expression outExpr) { -#line 2068 "VBNET.ATG" +#line 2069 "VBNET.ATG" Expression expr; SimpleExpr( -#line 2070 "VBNET.ATG" +#line 2071 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2070 "VBNET.ATG" +#line 2071 "VBNET.ATG" out expr); -#line 2070 "VBNET.ATG" +#line 2071 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2581 "VBNET.ATG" +#line 2582 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2583 "VBNET.ATG" +#line 2584 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(30)) { Argument( -#line 2588 "VBNET.ATG" +#line 2589 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2589 "VBNET.ATG" +#line 2590 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2590 "VBNET.ATG" +#line 2591 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2593 "VBNET.ATG" +#line 2594 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2594 "VBNET.ATG" +#line 2595 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2595 "VBNET.ATG" +#line 2596 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(30)) { Argument( -#line 2596 "VBNET.ATG" +#line 2597 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2597 "VBNET.ATG" +#line 2598 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2598 "VBNET.ATG" +#line 2599 "VBNET.ATG" out expr); } } -#line 2600 "VBNET.ATG" +#line 2601 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2602 "VBNET.ATG" +#line 2603 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2709 "VBNET.ATG" +#line 2710 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2711 "VBNET.ATG" +#line 2712 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2714 "VBNET.ATG" +#line 2715 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2716 "VBNET.ATG" +#line 2717 "VBNET.ATG" out i); } -#line 2718 "VBNET.ATG" +#line 2719 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2723 "VBNET.ATG" +#line 2724 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5275,10 +5291,10 @@ out i); } void MemberInitializer( -#line 2548 "VBNET.ATG" +#line 2549 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2550 "VBNET.ATG" +#line 2551 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5288,19 +5304,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2556 "VBNET.ATG" +#line 2557 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2557 "VBNET.ATG" +#line 2558 "VBNET.ATG" out name); Expect(20); Expr( -#line 2557 "VBNET.ATG" +#line 2558 "VBNET.ATG" out initExpr); -#line 2559 "VBNET.ATG" +#line 2560 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5309,10 +5325,10 @@ out initExpr); } void SubLambdaExpression( -#line 2153 "VBNET.ATG" +#line 2154 "VBNET.ATG" out LambdaExpression lambda) { -#line 2155 "VBNET.ATG" +#line 2156 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5324,7 +5340,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2162 "VBNET.ATG" +#line 2163 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5332,19 +5348,19 @@ lambda.Parameters); if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2165 "VBNET.ATG" +#line 2166 "VBNET.ATG" out inner); -#line 2167 "VBNET.ATG" +#line 2168 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2171 "VBNET.ATG" +#line 2172 "VBNET.ATG" out statement); -#line 2173 "VBNET.ATG" +#line 2174 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5352,12 +5368,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2179 "VBNET.ATG" +#line 2180 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2182 "VBNET.ATG" +#line 2183 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5365,10 +5381,10 @@ out statement); } void FunctionLambdaExpression( -#line 2188 "VBNET.ATG" +#line 2189 "VBNET.ATG" out LambdaExpression lambda) { -#line 2190 "VBNET.ATG" +#line 2191 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5380,7 +5396,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2197 "VBNET.ATG" +#line 2198 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5388,28 +5404,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2198 "VBNET.ATG" +#line 2199 "VBNET.ATG" out typeRef); -#line 2198 "VBNET.ATG" +#line 2199 "VBNET.ATG" lambda.ReturnType = typeRef; } if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2201 "VBNET.ATG" +#line 2202 "VBNET.ATG" out inner); -#line 2203 "VBNET.ATG" +#line 2204 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2207 "VBNET.ATG" +#line 2208 "VBNET.ATG" out statement); -#line 2209 "VBNET.ATG" +#line 2210 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5417,12 +5433,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2215 "VBNET.ATG" +#line 2216 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2218 "VBNET.ATG" +#line 2219 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5430,10 +5446,10 @@ out statement); } void EmbeddedStatement( -#line 2980 "VBNET.ATG" +#line 2981 "VBNET.ATG" out Statement statement) { -#line 2982 "VBNET.ATG" +#line 2983 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5443,224 +5459,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 2988 "VBNET.ATG" +#line 2989 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 2990 "VBNET.ATG" +#line 2991 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 2992 "VBNET.ATG" +#line 2993 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 2994 "VBNET.ATG" +#line 2995 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 2996 "VBNET.ATG" +#line 2997 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 2998 "VBNET.ATG" +#line 2999 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3000 "VBNET.ATG" +#line 3001 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3002 "VBNET.ATG" +#line 3003 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3004 "VBNET.ATG" +#line 3005 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(295); break; } -#line 3006 "VBNET.ATG" +#line 3007 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3007 "VBNET.ATG" +#line 3008 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" continueType = ContinueType.While; } } -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 3010 "VBNET.ATG" +#line 3011 "VBNET.ATG" out expr); } -#line 3010 "VBNET.ATG" +#line 3011 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 3012 "VBNET.ATG" +#line 3013 "VBNET.ATG" out expr); } -#line 3012 "VBNET.ATG" +#line 3013 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3014 "VBNET.ATG" +#line 3015 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3014 "VBNET.ATG" +#line 3015 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 3015 "VBNET.ATG" +#line 3016 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3017 "VBNET.ATG" +#line 3018 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(42)) { ArgumentList( -#line 3018 "VBNET.ATG" +#line 3019 "VBNET.ATG" out p); } Expect(38); } -#line 3020 "VBNET.ATG" +#line 3021 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3023 "VBNET.ATG" +#line 3024 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3025 "VBNET.ATG" +#line 3026 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3026 "VBNET.ATG" +#line 3027 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3026 "VBNET.ATG" +#line 3027 "VBNET.ATG" out handlerExpr); -#line 3028 "VBNET.ATG" +#line 3029 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3031 "VBNET.ATG" +#line 3032 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3032 "VBNET.ATG" +#line 3033 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3032 "VBNET.ATG" +#line 3033 "VBNET.ATG" out handlerExpr); -#line 3034 "VBNET.ATG" +#line 3035 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3037 "VBNET.ATG" +#line 3038 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3038 "VBNET.ATG" +#line 3039 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 3040 "VBNET.ATG" +#line 3041 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3045 "VBNET.ATG" +#line 3046 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3048 "VBNET.ATG" +#line 3049 "VBNET.ATG" out conditionType); Expr( -#line 3048 "VBNET.ATG" +#line 3049 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3049 "VBNET.ATG" +#line 3050 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 3052 "VBNET.ATG" +#line 3053 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5669,26 +5685,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3059 "VBNET.ATG" +#line 3060 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3060 "VBNET.ATG" +#line 3061 "VBNET.ATG" out conditionType); Expr( -#line 3060 "VBNET.ATG" +#line 3061 "VBNET.ATG" out expr); } -#line 3062 "VBNET.ATG" +#line 3063 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(296); } else if (la.kind == 124) { lexer.NextToken(); -#line 3067 "VBNET.ATG" +#line 3068 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5697,24 +5713,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3074 "VBNET.ATG" +#line 3075 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3075 "VBNET.ATG" +#line 3076 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3076 "VBNET.ATG" +#line 3077 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3077 "VBNET.ATG" +#line 3078 "VBNET.ATG" out expr); } -#line 3079 "VBNET.ATG" +#line 3080 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5726,7 +5742,7 @@ out expr); } else if (StartOf(43)) { -#line 3090 "VBNET.ATG" +#line 3091 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5735,59 +5751,59 @@ out expr); List nextExpressions = null; if ( -#line 3097 "VBNET.ATG" +#line 3098 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3098 "VBNET.ATG" +#line 3099 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3100 "VBNET.ATG" +#line 3101 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3101 "VBNET.ATG" +#line 3102 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3103 "VBNET.ATG" +#line 3104 "VBNET.ATG" out start); Expect(216); Expr( -#line 3103 "VBNET.ATG" +#line 3104 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3103 "VBNET.ATG" +#line 3104 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3104 "VBNET.ATG" +#line 3105 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3107 "VBNET.ATG" +#line 3108 "VBNET.ATG" out nextExpr); -#line 3109 "VBNET.ATG" +#line 3110 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3112 "VBNET.ATG" +#line 3113 "VBNET.ATG" out nextExpr); -#line 3112 "VBNET.ATG" +#line 3113 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3115 "VBNET.ATG" +#line 3116 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5803,27 +5819,27 @@ out nextExpr); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3128 "VBNET.ATG" +#line 3129 "VBNET.ATG" out expr); -#line 3128 "VBNET.ATG" +#line 3129 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3130 "VBNET.ATG" +#line 3131 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3130 "VBNET.ATG" +#line 3131 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3131 "VBNET.ATG" +#line 3132 "VBNET.ATG" out expr); -#line 3133 "VBNET.ATG" +#line 3134 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5831,48 +5847,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3137 "VBNET.ATG" +#line 3138 "VBNET.ATG" out expr); -#line 3138 "VBNET.ATG" +#line 3139 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3142 "VBNET.ATG" +#line 3143 "VBNET.ATG" out expr); -#line 3144 "VBNET.ATG" +#line 3145 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3147 "VBNET.ATG" +#line 3148 "VBNET.ATG" out expr); -#line 3147 "VBNET.ATG" +#line 3148 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3148 "VBNET.ATG" +#line 3149 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3150 "VBNET.ATG" +#line 3151 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3152 "VBNET.ATG" +#line 3153 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3153 "VBNET.ATG" +#line 3154 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3153 "VBNET.ATG" +#line 3154 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -5880,46 +5896,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3156 "VBNET.ATG" +#line 3157 "VBNET.ATG" out embeddedStatement); -#line 3158 "VBNET.ATG" +#line 3159 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3164 "VBNET.ATG" +#line 3165 "VBNET.ATG" IsElseIf()) { if ( -#line 3164 "VBNET.ATG" +#line 3165 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3164 "VBNET.ATG" +#line 3165 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3165 "VBNET.ATG" +#line 3166 "VBNET.ATG" elseIfStart = t.Location; } -#line 3167 "VBNET.ATG" +#line 3168 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3168 "VBNET.ATG" +#line 3169 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3169 "VBNET.ATG" +#line 3170 "VBNET.ATG" out block); -#line 3171 "VBNET.ATG" +#line 3172 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5933,39 +5949,39 @@ out block); EndOfStmt(); } Block( -#line 3180 "VBNET.ATG" +#line 3181 "VBNET.ATG" out embeddedStatement); -#line 3182 "VBNET.ATG" +#line 3183 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3186 "VBNET.ATG" +#line 3187 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(44)) { -#line 3191 "VBNET.ATG" +#line 3192 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3194 "VBNET.ATG" +#line 3195 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(44)) { SingleLineStatementList( -#line 3197 "VBNET.ATG" +#line 3198 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3199 "VBNET.ATG" +#line 3200 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(298); } else if (la.kind == 197) { @@ -5974,82 +5990,82 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 3202 "VBNET.ATG" +#line 3203 "VBNET.ATG" out expr); EndOfStmt(); -#line 3203 "VBNET.ATG" +#line 3204 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3207 "VBNET.ATG" +#line 3208 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3208 "VBNET.ATG" +#line 3209 "VBNET.ATG" out caseClauses); if ( -#line 3208 "VBNET.ATG" +#line 3209 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3210 "VBNET.ATG" +#line 3211 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3213 "VBNET.ATG" +#line 3214 "VBNET.ATG" out block); -#line 3215 "VBNET.ATG" +#line 3216 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3221 "VBNET.ATG" +#line 3222 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3224 "VBNET.ATG" +#line 3225 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3225 "VBNET.ATG" +#line 3226 "VBNET.ATG" out onErrorStatement); -#line 3225 "VBNET.ATG" +#line 3226 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3226 "VBNET.ATG" +#line 3227 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3227 "VBNET.ATG" +#line 3228 "VBNET.ATG" out goToStatement); -#line 3227 "VBNET.ATG" +#line 3228 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3228 "VBNET.ATG" +#line 3229 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3229 "VBNET.ATG" +#line 3230 "VBNET.ATG" out resumeStatement); -#line 3229 "VBNET.ATG" +#line 3230 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(43)) { -#line 3232 "VBNET.ATG" +#line 3233 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6057,25 +6073,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3238 "VBNET.ATG" +#line 3239 "VBNET.ATG" out expr); if (StartOf(45)) { AssignmentOperator( -#line 3240 "VBNET.ATG" +#line 3241 "VBNET.ATG" out op); Expr( -#line 3240 "VBNET.ATG" +#line 3241 "VBNET.ATG" out val); -#line 3240 "VBNET.ATG" +#line 3241 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (StartOf(46)) { -#line 3241 "VBNET.ATG" +#line 3242 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(299); -#line 3244 "VBNET.ATG" +#line 3245 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6086,88 +6102,88 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3251 "VBNET.ATG" +#line 3252 "VBNET.ATG" out expr); -#line 3251 "VBNET.ATG" +#line 3252 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3253 "VBNET.ATG" +#line 3254 "VBNET.ATG" Statement block; if ( -#line 3254 "VBNET.ATG" +#line 3255 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3255 "VBNET.ATG" +#line 3256 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3256 "VBNET.ATG" +#line 3257 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3258 "VBNET.ATG" +#line 3259 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3260 "VBNET.ATG" +#line 3261 "VBNET.ATG" out block); -#line 3262 "VBNET.ATG" +#line 3263 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(30)) { Expr( -#line 3264 "VBNET.ATG" +#line 3265 "VBNET.ATG" out expr); Block( -#line 3265 "VBNET.ATG" +#line 3266 "VBNET.ATG" out block); -#line 3266 "VBNET.ATG" +#line 3267 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(300); Expect(113); Expect(226); } else if (StartOf(47)) { LocalDeclarationStatement( -#line 3269 "VBNET.ATG" +#line 3270 "VBNET.ATG" out statement); } else SynErr(301); } void FromOrAggregateQueryOperator( -#line 2237 "VBNET.ATG" +#line 2238 "VBNET.ATG" List middleClauses) { -#line 2239 "VBNET.ATG" +#line 2240 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2242 "VBNET.ATG" +#line 2243 "VBNET.ATG" out fromClause); -#line 2243 "VBNET.ATG" +#line 2244 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2244 "VBNET.ATG" +#line 2245 "VBNET.ATG" out aggregateClause); -#line 2245 "VBNET.ATG" +#line 2246 "VBNET.ATG" middleClauses.Add(aggregateClause); } else SynErr(302); } void QueryOperator( -#line 2248 "VBNET.ATG" +#line 2249 "VBNET.ATG" List middleClauses) { -#line 2250 "VBNET.ATG" +#line 2251 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6177,94 +6193,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2257 "VBNET.ATG" +#line 2258 "VBNET.ATG" out fromClause); -#line 2258 "VBNET.ATG" +#line 2259 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2259 "VBNET.ATG" +#line 2260 "VBNET.ATG" out aggregateClause); -#line 2260 "VBNET.ATG" +#line 2261 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2261 "VBNET.ATG" +#line 2262 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2262 "VBNET.ATG" +#line 2263 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2263 "VBNET.ATG" +#line 2264 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2264 "VBNET.ATG" +#line 2265 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2265 "VBNET.ATG" +#line 2266 "VBNET.ATG" out partitionClause); -#line 2266 "VBNET.ATG" +#line 2267 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2267 "VBNET.ATG" +#line 2268 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2268 "VBNET.ATG" +#line 2269 "VBNET.ATG" out joinClause); -#line 2269 "VBNET.ATG" +#line 2270 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2270 "VBNET.ATG" +#line 2271 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2270 "VBNET.ATG" +#line 2271 "VBNET.ATG" out groupJoinClause); -#line 2271 "VBNET.ATG" +#line 2272 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2272 "VBNET.ATG" +#line 2273 "VBNET.ATG" out groupByClause); -#line 2273 "VBNET.ATG" +#line 2274 "VBNET.ATG" middleClauses.Add(groupByClause); } else SynErr(303); } void FromQueryOperator( -#line 2348 "VBNET.ATG" +#line 2349 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2350 "VBNET.ATG" +#line 2351 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2353 "VBNET.ATG" +#line 2354 "VBNET.ATG" fromClause.Sources); -#line 2355 "VBNET.ATG" +#line 2356 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2417 "VBNET.ATG" +#line 2418 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2419 "VBNET.ATG" +#line 2420 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6272,77 +6288,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2424 "VBNET.ATG" +#line 2425 "VBNET.ATG" out source); -#line 2426 "VBNET.ATG" +#line 2427 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2429 "VBNET.ATG" +#line 2430 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2431 "VBNET.ATG" +#line 2432 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2433 "VBNET.ATG" +#line 2434 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2359 "VBNET.ATG" +#line 2360 "VBNET.ATG" List middleClauses) { -#line 2361 "VBNET.ATG" +#line 2362 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2364 "VBNET.ATG" +#line 2365 "VBNET.ATG" selectClause.Variables); -#line 2366 "VBNET.ATG" +#line 2367 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2371 "VBNET.ATG" +#line 2372 "VBNET.ATG" List middleClauses) { -#line 2373 "VBNET.ATG" +#line 2374 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2378 "VBNET.ATG" +#line 2379 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2383 "VBNET.ATG" +#line 2384 "VBNET.ATG" List middleClauses) { -#line 2385 "VBNET.ATG" +#line 2386 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2389 "VBNET.ATG" +#line 2390 "VBNET.ATG" out operand); -#line 2391 "VBNET.ATG" +#line 2392 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6351,10 +6367,10 @@ out operand); } void OrderByQueryOperator( -#line 2276 "VBNET.ATG" +#line 2277 "VBNET.ATG" List middleClauses) { -#line 2278 "VBNET.ATG" +#line 2279 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6362,10 +6378,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2282 "VBNET.ATG" +#line 2283 "VBNET.ATG" out orderings); -#line 2284 "VBNET.ATG" +#line 2285 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6373,10 +6389,10 @@ out orderings); } void PartitionQueryOperator( -#line 2398 "VBNET.ATG" +#line 2399 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2400 "VBNET.ATG" +#line 2401 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6384,60 +6400,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2405 "VBNET.ATG" +#line 2406 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2407 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2407 "VBNET.ATG" +#line 2408 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2408 "VBNET.ATG" +#line 2409 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } } else SynErr(304); Expr( -#line 2410 "VBNET.ATG" +#line 2411 "VBNET.ATG" out expr); -#line 2412 "VBNET.ATG" +#line 2413 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2437 "VBNET.ATG" +#line 2438 "VBNET.ATG" List middleClauses) { -#line 2439 "VBNET.ATG" +#line 2440 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2442 "VBNET.ATG" +#line 2443 "VBNET.ATG" letClause.Variables); -#line 2444 "VBNET.ATG" +#line 2445 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2481 "VBNET.ATG" +#line 2482 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2483 "VBNET.ATG" +#line 2484 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6447,203 +6463,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2490 "VBNET.ATG" +#line 2491 "VBNET.ATG" out joinVariable); -#line 2491 "VBNET.ATG" +#line 2492 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2493 "VBNET.ATG" +#line 2494 "VBNET.ATG" out subJoin); -#line 2494 "VBNET.ATG" +#line 2495 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2497 "VBNET.ATG" +#line 2498 "VBNET.ATG" out condition); -#line 2498 "VBNET.ATG" +#line 2499 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2500 "VBNET.ATG" +#line 2501 "VBNET.ATG" out condition); -#line 2501 "VBNET.ATG" +#line 2502 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2504 "VBNET.ATG" +#line 2505 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2334 "VBNET.ATG" +#line 2335 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2336 "VBNET.ATG" +#line 2337 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2340 "VBNET.ATG" +#line 2341 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2341 "VBNET.ATG" +#line 2342 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2343 "VBNET.ATG" +#line 2344 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2321 "VBNET.ATG" +#line 2322 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2323 "VBNET.ATG" +#line 2324 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2326 "VBNET.ATG" +#line 2327 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2327 "VBNET.ATG" +#line 2328 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2328 "VBNET.ATG" +#line 2329 "VBNET.ATG" groupByClause.IntoVariables); -#line 2330 "VBNET.ATG" +#line 2331 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2290 "VBNET.ATG" +#line 2291 "VBNET.ATG" out List orderings) { -#line 2292 "VBNET.ATG" +#line 2293 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2295 "VBNET.ATG" +#line 2296 "VBNET.ATG" out ordering); -#line 2296 "VBNET.ATG" +#line 2297 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2298 "VBNET.ATG" +#line 2299 "VBNET.ATG" out ordering); -#line 2299 "VBNET.ATG" +#line 2300 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2303 "VBNET.ATG" +#line 2304 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2305 "VBNET.ATG" +#line 2306 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2310 "VBNET.ATG" +#line 2311 "VBNET.ATG" out orderExpr); -#line 2312 "VBNET.ATG" +#line 2313 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2315 "VBNET.ATG" +#line 2316 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2316 "VBNET.ATG" +#line 2317 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2318 "VBNET.ATG" +#line 2319 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2449 "VBNET.ATG" +#line 2450 "VBNET.ATG" List variables) { -#line 2451 "VBNET.ATG" +#line 2452 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2453 "VBNET.ATG" +#line 2454 "VBNET.ATG" out variable); -#line 2454 "VBNET.ATG" +#line 2455 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2455 "VBNET.ATG" +#line 2456 "VBNET.ATG" out variable); -#line 2455 "VBNET.ATG" +#line 2456 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2508 "VBNET.ATG" +#line 2509 "VBNET.ATG" List rangeVariables) { -#line 2509 "VBNET.ATG" +#line 2510 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2511 "VBNET.ATG" +#line 2512 "VBNET.ATG" out variableDeclaration); -#line 2512 "VBNET.ATG" +#line 2513 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2513 "VBNET.ATG" +#line 2514 "VBNET.ATG" out variableDeclaration); -#line 2513 "VBNET.ATG" +#line 2514 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2516 "VBNET.ATG" +#line 2517 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2518 "VBNET.ATG" +#line 2519 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6651,71 +6667,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2523 "VBNET.ATG" +#line 2524 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2524 "VBNET.ATG" +#line 2525 "VBNET.ATG" out typeName); -#line 2524 "VBNET.ATG" +#line 2525 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2525 "VBNET.ATG" +#line 2526 "VBNET.ATG" out inExpr); -#line 2527 "VBNET.ATG" +#line 2528 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2458 "VBNET.ATG" +#line 2459 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2460 "VBNET.ATG" +#line 2461 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2466 "VBNET.ATG" +#line 2467 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2467 "VBNET.ATG" +#line 2468 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2469 "VBNET.ATG" +#line 2470 "VBNET.ATG" out typeName); -#line 2470 "VBNET.ATG" +#line 2471 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2474 "VBNET.ATG" +#line 2475 "VBNET.ATG" out rhs); -#line 2476 "VBNET.ATG" +#line 2477 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2532 "VBNET.ATG" +#line 2533 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2534 "VBNET.ATG" +#line 2535 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6723,14 +6739,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2540 "VBNET.ATG" +#line 2541 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2540 "VBNET.ATG" +#line 2541 "VBNET.ATG" out rhs); -#line 2542 "VBNET.ATG" +#line 2543 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6738,68 +6754,68 @@ out rhs); } void Argument( -#line 2606 "VBNET.ATG" +#line 2607 "VBNET.ATG" out Expression argumentexpr) { -#line 2608 "VBNET.ATG" +#line 2609 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2612 "VBNET.ATG" +#line 2613 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2612 "VBNET.ATG" +#line 2613 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2612 "VBNET.ATG" +#line 2613 "VBNET.ATG" out expr); -#line 2614 "VBNET.ATG" +#line 2615 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(30)) { Expr( -#line 2617 "VBNET.ATG" +#line 2618 "VBNET.ATG" out argumentexpr); } else SynErr(305); } void QualIdentAndTypeArguments( -#line 2683 "VBNET.ATG" +#line 2684 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2684 "VBNET.ATG" +#line 2685 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2686 "VBNET.ATG" +#line 2687 "VBNET.ATG" out name); -#line 2687 "VBNET.ATG" +#line 2688 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2688 "VBNET.ATG" +#line 2689 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2690 "VBNET.ATG" +#line 2691 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2691 "VBNET.ATG" +#line 2692 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2692 "VBNET.ATG" +#line 2693 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2693 "VBNET.ATG" +#line 2694 "VBNET.ATG" typeref.GenericTypes); } else SynErr(306); Expect(38); @@ -6807,24 +6823,24 @@ typeref.GenericTypes); } void RankList( -#line 2730 "VBNET.ATG" +#line 2731 "VBNET.ATG" out int i) { -#line 2731 "VBNET.ATG" +#line 2732 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2732 "VBNET.ATG" +#line 2733 "VBNET.ATG" ++i; } } void Attribute( -#line 2771 "VBNET.ATG" +#line 2772 "VBNET.ATG" out ASTAttribute attribute) { -#line 2772 "VBNET.ATG" +#line 2773 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6834,40 +6850,40 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2777 "VBNET.ATG" +#line 2778 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2778 "VBNET.ATG" +#line 2779 "VBNET.ATG" positional, named); } -#line 2780 "VBNET.ATG" +#line 2781 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2785 "VBNET.ATG" +#line 2786 "VBNET.ATG" List positional, List named) { -#line 2787 "VBNET.ATG" +#line 2788 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2793 "VBNET.ATG" +#line 2794 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2795 "VBNET.ATG" +#line 2796 "VBNET.ATG" IsNamedAssign()) { -#line 2795 "VBNET.ATG" +#line 2796 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2796 "VBNET.ATG" +#line 2797 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -6876,10 +6892,10 @@ out name); } else SynErr(307); } Expr( -#line 2798 "VBNET.ATG" +#line 2799 "VBNET.ATG" out expr); -#line 2800 "VBNET.ATG" +#line 2801 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -6888,13 +6904,13 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2808 "VBNET.ATG" +#line 2809 "VBNET.ATG" IsNamedAssign()) { -#line 2808 "VBNET.ATG" +#line 2809 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2809 "VBNET.ATG" +#line 2810 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -6903,14 +6919,14 @@ out name); } else SynErr(308); } else if (StartOf(30)) { -#line 2811 "VBNET.ATG" +#line 2812 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(309); Expr( -#line 2812 "VBNET.ATG" +#line 2813 "VBNET.ATG" out expr); -#line 2812 "VBNET.ATG" +#line 2813 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -6921,10 +6937,10 @@ out expr); } void FormalParameter( -#line 2869 "VBNET.ATG" +#line 2870 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2871 "VBNET.ATG" +#line 2872 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -6935,36 +6951,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2880 "VBNET.ATG" +#line 2881 "VBNET.ATG" out section); -#line 2880 "VBNET.ATG" +#line 2881 "VBNET.ATG" attributes.Add(section); } while (StartOf(48)) { ParameterModifier( -#line 2881 "VBNET.ATG" +#line 2882 "VBNET.ATG" mod); } Identifier(); -#line 2882 "VBNET.ATG" +#line 2883 "VBNET.ATG" string parameterName = t.val; if ( -#line 2883 "VBNET.ATG" +#line 2884 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2883 "VBNET.ATG" +#line 2884 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2884 "VBNET.ATG" +#line 2885 "VBNET.ATG" out type); } -#line 2886 "VBNET.ATG" +#line 2887 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -6978,11 +6994,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2896 "VBNET.ATG" +#line 2897 "VBNET.ATG" out expr); } -#line 2898 "VBNET.ATG" +#line 2899 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -6990,34 +7006,34 @@ out expr); } void ParameterModifier( -#line 3582 "VBNET.ATG" +#line 3583 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3583 "VBNET.ATG" +#line 3584 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3584 "VBNET.ATG" +#line 3585 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3585 "VBNET.ATG" +#line 3586 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3586 "VBNET.ATG" +#line 3587 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(310); } void Statement() { -#line 2927 "VBNET.ATG" +#line 2928 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7025,27 +7041,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 2933 "VBNET.ATG" +#line 2934 "VBNET.ATG" IsLabel()) { LabelName( -#line 2933 "VBNET.ATG" +#line 2934 "VBNET.ATG" out label); -#line 2935 "VBNET.ATG" +#line 2936 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 2938 "VBNET.ATG" +#line 2939 "VBNET.ATG" out stmt); -#line 2938 "VBNET.ATG" +#line 2939 "VBNET.ATG" AddChild(stmt); } else SynErr(311); -#line 2941 "VBNET.ATG" +#line 2942 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7054,30 +7070,30 @@ out stmt); } void LabelName( -#line 3356 "VBNET.ATG" +#line 3357 "VBNET.ATG" out string name) { -#line 3358 "VBNET.ATG" +#line 3359 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3360 "VBNET.ATG" +#line 3361 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3361 "VBNET.ATG" +#line 3362 "VBNET.ATG" name = t.val; } else SynErr(312); } void LocalDeclarationStatement( -#line 2949 "VBNET.ATG" +#line 2950 "VBNET.ATG" out Statement statement) { -#line 2951 "VBNET.ATG" +#line 2952 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7086,22 +7102,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 2957 "VBNET.ATG" +#line 2958 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 2958 "VBNET.ATG" +#line 2959 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2959 "VBNET.ATG" +#line 2960 "VBNET.ATG" dimfound = true; } } -#line 2962 "VBNET.ATG" +#line 2963 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7114,135 +7130,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2973 "VBNET.ATG" +#line 2974 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 2974 "VBNET.ATG" +#line 2975 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2976 "VBNET.ATG" +#line 2977 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3470 "VBNET.ATG" +#line 3471 "VBNET.ATG" out Statement tryStatement) { -#line 3472 "VBNET.ATG" +#line 3473 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3475 "VBNET.ATG" +#line 3476 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3476 "VBNET.ATG" +#line 3477 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3477 "VBNET.ATG" +#line 3478 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3480 "VBNET.ATG" +#line 3481 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3450 "VBNET.ATG" +#line 3451 "VBNET.ATG" out Statement withStatement) { -#line 3452 "VBNET.ATG" +#line 3453 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3455 "VBNET.ATG" +#line 3456 "VBNET.ATG" Location start = t.Location; Expr( -#line 3456 "VBNET.ATG" +#line 3457 "VBNET.ATG" out expr); EndOfStmt(); -#line 3458 "VBNET.ATG" +#line 3459 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3461 "VBNET.ATG" +#line 3462 "VBNET.ATG" out blockStmt); -#line 3463 "VBNET.ATG" +#line 3464 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3466 "VBNET.ATG" +#line 3467 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3443 "VBNET.ATG" +#line 3444 "VBNET.ATG" out ConditionType conditionType) { -#line 3444 "VBNET.ATG" +#line 3445 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3445 "VBNET.ATG" +#line 3446 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3446 "VBNET.ATG" +#line 3447 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(313); } void LoopControlVariable( -#line 3286 "VBNET.ATG" +#line 3287 "VBNET.ATG" out TypeReference type, out string name) { -#line 3287 "VBNET.ATG" +#line 3288 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3291 "VBNET.ATG" +#line 3292 "VBNET.ATG" out name); if ( -#line 3292 "VBNET.ATG" +#line 3293 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3292 "VBNET.ATG" +#line 3293 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3293 "VBNET.ATG" +#line 3294 "VBNET.ATG" out type); -#line 3293 "VBNET.ATG" +#line 3294 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3295 "VBNET.ATG" +#line 3296 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7254,34 +7270,34 @@ out type); } void ReDimClause( -#line 3365 "VBNET.ATG" +#line 3366 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3367 "VBNET.ATG" +#line 3368 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3368 "VBNET.ATG" +#line 3369 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3272 "VBNET.ATG" +#line 3273 "VBNET.ATG" List list) { -#line 3273 "VBNET.ATG" +#line 3274 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3275 "VBNET.ATG" +#line 3276 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3276 "VBNET.ATG" +#line 3277 "VBNET.ATG" out embeddedStatement); } else SynErr(314); -#line 3277 "VBNET.ATG" +#line 3278 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7291,62 +7307,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3279 "VBNET.ATG" +#line 3280 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3280 "VBNET.ATG" +#line 3281 "VBNET.ATG" out embeddedStatement); } else SynErr(315); -#line 3281 "VBNET.ATG" +#line 3282 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3403 "VBNET.ATG" +#line 3404 "VBNET.ATG" out List caseClauses) { -#line 3405 "VBNET.ATG" +#line 3406 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3408 "VBNET.ATG" +#line 3409 "VBNET.ATG" out caseClause); -#line 3408 "VBNET.ATG" +#line 3409 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3409 "VBNET.ATG" +#line 3410 "VBNET.ATG" out caseClause); -#line 3409 "VBNET.ATG" +#line 3410 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3306 "VBNET.ATG" +#line 3307 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3308 "VBNET.ATG" +#line 3309 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3314 "VBNET.ATG" +#line 3315 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3316 "VBNET.ATG" +#line 3317 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7355,10 +7371,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3322 "VBNET.ATG" +#line 3323 "VBNET.ATG" out goToStatement); -#line 3324 "VBNET.ATG" +#line 3325 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7375,88 +7391,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3338 "VBNET.ATG" +#line 3339 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(316); } void GotoStatement( -#line 3344 "VBNET.ATG" +#line 3345 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3346 "VBNET.ATG" +#line 3347 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3349 "VBNET.ATG" +#line 3350 "VBNET.ATG" out label); -#line 3351 "VBNET.ATG" +#line 3352 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3392 "VBNET.ATG" +#line 3393 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3394 "VBNET.ATG" +#line 3395 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3397 "VBNET.ATG" +#line 3398 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3398 "VBNET.ATG" +#line 3399 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3399 "VBNET.ATG" +#line 3400 "VBNET.ATG" out label); } -#line 3399 "VBNET.ATG" +#line 3400 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(317); } void ReDimClauseInternal( -#line 3371 "VBNET.ATG" +#line 3372 "VBNET.ATG" ref Expression expr) { -#line 3372 "VBNET.ATG" +#line 3373 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3375 "VBNET.ATG" +#line 3376 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3374 "VBNET.ATG" +#line 3375 "VBNET.ATG" out name); -#line 3374 "VBNET.ATG" +#line 3375 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3376 "VBNET.ATG" +#line 3377 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3379 "VBNET.ATG" +#line 3380 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3381 "VBNET.ATG" +#line 3382 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7468,10 +7484,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3413 "VBNET.ATG" +#line 3414 "VBNET.ATG" out CaseLabel caseClause) { -#line 3415 "VBNET.ATG" +#line 3416 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7480,7 +7496,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3421 "VBNET.ATG" +#line 3422 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7490,76 +7506,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3425 "VBNET.ATG" +#line 3426 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3426 "VBNET.ATG" +#line 3427 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3427 "VBNET.ATG" +#line 3428 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3428 "VBNET.ATG" +#line 3429 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3429 "VBNET.ATG" +#line 3430 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3430 "VBNET.ATG" +#line 3431 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(318); break; } Expr( -#line 3432 "VBNET.ATG" +#line 3433 "VBNET.ATG" out expr); -#line 3434 "VBNET.ATG" +#line 3435 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(30)) { Expr( -#line 3436 "VBNET.ATG" +#line 3437 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3436 "VBNET.ATG" +#line 3437 "VBNET.ATG" out sexpr); } -#line 3438 "VBNET.ATG" +#line 3439 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(319); } void CatchClauses( -#line 3485 "VBNET.ATG" +#line 3486 "VBNET.ATG" out List catchClauses) { -#line 3487 "VBNET.ATG" +#line 3488 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7571,27 +7587,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3495 "VBNET.ATG" +#line 3496 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3495 "VBNET.ATG" +#line 3496 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3496 "VBNET.ATG" +#line 3497 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3498 "VBNET.ATG" +#line 3499 "VBNET.ATG" out blockStmt); -#line 3499 "VBNET.ATG" +#line 3500 "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 19bd777cba..deaf6ddc35 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -410,8 +410,9 @@ TypeParameterList templates> /* 4.9.1 */ TypeParameter + (. VarianceModifier modifier = VarianceModifier.Invariant; .) = - Identifier (. template = new TemplateDefinition(t.val, null); .) + [ "In" (. modifier = VarianceModifier.Contravariant; .) | "Out" (. modifier = VarianceModifier.Covariant; .) ] Identifier (. template = new TemplateDefinition(t.val, null) { VarianceModifier = modifier }; .) [TypeParameterConstraints