diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs index c273a0b367..966859b808 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs @@ -65,21 +65,28 @@ namespace NRefactoryASTGenerator.Ast } [IncludeBoolProperty("IsAlias", "return !alias.IsNull;")] + [IncludeBoolProperty("IsXml", "return xmlPrefix != null;")] class Using : AbstractNode { [QuestionMarkDefault] string name; TypeReference alias; + string xmlPrefix; public Using(string name) {} public Using(string name, TypeReference alias) {} + public Using(string name, string xmlPrefix) {} } - [IncludeMember("public UsingDeclaration(string @namespace) : this(@namespace, null) {}")] + [IncludeMember("public UsingDeclaration(string @namespace) : this(@namespace, TypeReference.Null) {}")] [IncludeMember("public UsingDeclaration(string @namespace, TypeReference alias) {" + " usings = new List(1);" + " usings.Add(new Using(@namespace, alias)); " + "}")] + [IncludeMember("public UsingDeclaration(string xmlNamespace, string prefix) {" + + " usings = new List(1);" + + " usings.Add(new Using(xmlNamespace, prefix)); " + + "}")] class UsingDeclaration : AbstractNode { List usings; diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs index 173dd82dd5..9f20dc4b74 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs @@ -1665,15 +1665,15 @@ namespace ICSharpCode.NRefactory.Ast { initializer = Expression.Null; } - public bool HasAddRegion { + public bool HasRemoveRegion { get { - return !addRegion.IsNull; + return !removeRegion.IsNull; } } - public bool HasRemoveRegion { + public bool HasAddRegion { get { - return !removeRegion.IsNull; + return !addRegion.IsNull; } } @@ -3403,15 +3403,15 @@ public Location ExtendedEndLocation { get; set; } initializer = Expression.Null; } - public bool HasGetRegion { + public bool HasSetRegion { get { - return !getRegion.IsNull; + return !setRegion.IsNull; } } - public bool HasSetRegion { + public bool HasGetRegion { get { - return !setRegion.IsNull; + return !getRegion.IsNull; } } @@ -5195,6 +5195,8 @@ public Location ExtendedEndLocation { get; set; } TypeReference alias; + string xmlPrefix; + public string Name { get { return name; @@ -5214,14 +5216,31 @@ public Location ExtendedEndLocation { get; set; } } } + public string XmlPrefix { + get { + return xmlPrefix; + } + set { + xmlPrefix = value ?? ""; + } + } + public Using(string name) { Name = name; alias = TypeReference.Null; + xmlPrefix = ""; } public Using(string name, TypeReference alias) { Name = name; Alias = alias; + xmlPrefix = ""; + } + + public Using(string name, string xmlPrefix) { + Name = name; + XmlPrefix = xmlPrefix; + alias = TypeReference.Null; } public bool IsAlias { @@ -5230,12 +5249,18 @@ public Location ExtendedEndLocation { get; set; } } } + public bool IsXml { + get { + return xmlPrefix != null; + } + } + public override object AcceptVisitor(IAstVisitor visitor, object data) { return visitor.VisitUsing(this, data); } public override string ToString() { - return string.Format("[Using Name={0} Alias={1}]", Name, Alias); + return string.Format("[Using Name={0} Alias={1} XmlPrefix={2}]", Name, Alias, XmlPrefix); } } @@ -5256,10 +5281,12 @@ public Location ExtendedEndLocation { get; set; } Usings = usings; } -public UsingDeclaration(string @namespace) : this(@namespace, null) {} +public UsingDeclaration(string @namespace) : this(@namespace, TypeReference.Null) {} public UsingDeclaration(string @namespace, TypeReference alias) { usings = new List(1); usings.Add(new Using(@namespace, alias)); } +public UsingDeclaration(string xmlNamespace, string prefix) { usings = new List(1); usings.Add(new Using(xmlNamespace, prefix)); } + public override object AcceptVisitor(IAstVisitor visitor, object data) { return visitor.VisitUsingDeclaration(this, data); } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 0c0a7cf5a7..db74d07184 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -180,7 +180,7 @@ out u); void GlobalAttributeSection() { Expect(28); -#line 2569 "VBNET.ATG" +#line 2573 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 52) { lexer.NextToken(); @@ -188,20 +188,20 @@ out u); lexer.NextToken(); } else SynErr(226); -#line 2571 "VBNET.ATG" +#line 2575 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(11); Attribute( -#line 2575 "VBNET.ATG" +#line 2579 "VBNET.ATG" out attribute); -#line 2575 "VBNET.ATG" +#line 2579 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2576 "VBNET.ATG" +#line 2580 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -213,10 +213,10 @@ NotFinalComma()) { Expect(11); } Attribute( -#line 2576 "VBNET.ATG" +#line 2580 "VBNET.ATG" out attribute); -#line 2576 "VBNET.ATG" +#line 2580 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -225,7 +225,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2581 "VBNET.ATG" +#line 2585 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -238,7 +238,7 @@ out attribute); void NamespaceMemberDecl() { -#line 341 "VBNET.ATG" +#line 345 "VBNET.ATG" ModifierList m = new ModifierList(); AttributeSection section; List attributes = new List(); @@ -247,14 +247,14 @@ out attribute); if (la.kind == 146) { lexer.NextToken(); -#line 348 "VBNET.ATG" +#line 352 "VBNET.ATG" Location startPos = t.Location; Qualident( -#line 350 "VBNET.ATG" +#line 354 "VBNET.ATG" out qualident); -#line 352 "VBNET.ATG" +#line 356 "VBNET.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; compilationUnit.AddChild(node); @@ -263,26 +263,26 @@ out qualident); EndOfStmt(); NamespaceBody(); -#line 360 "VBNET.ATG" +#line 364 "VBNET.ATG" node.EndLocation = t.Location; compilationUnit.BlockEnd(); } else if (StartOf(2)) { while (la.kind == 28) { AttributeSection( -#line 364 "VBNET.ATG" +#line 368 "VBNET.ATG" out section); -#line 364 "VBNET.ATG" +#line 368 "VBNET.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 365 "VBNET.ATG" +#line 369 "VBNET.ATG" m); } NonModuleDeclaration( -#line 365 "VBNET.ATG" +#line 369 "VBNET.ATG" m, attributes); } else SynErr(228); } @@ -312,75 +312,104 @@ out Using u) { TypeReference aliasedType = null; u = null; - Qualident( -#line 325 "VBNET.ATG" -out qualident); - if (la.kind == 10) { - lexer.NextToken(); - TypeName( + if (StartOf(4)) { + Qualident( #line 326 "VBNET.ATG" +out qualident); + if (la.kind == 10) { + lexer.NextToken(); + TypeName( +#line 327 "VBNET.ATG" out aliasedType); - } + } -#line 328 "VBNET.ATG" - if (qualident != null && qualident.Length > 0) { - if (aliasedType != null) { - u = new Using(qualident, aliasedType); - } else { - u = new Using(qualident); - } - } - +#line 329 "VBNET.ATG" + if (qualident != null && qualident.Length > 0) { + if (aliasedType != null) { + u = new Using(qualident, aliasedType); + } else { + u = new Using(qualident); + } + } + + } else if (la.kind == 28) { + +#line 337 "VBNET.ATG" + string prefix = null; + lexer.NextToken(); + Identifier(); + if (la.kind == 11) { + lexer.NextToken(); + Identifier(); + +#line 338 "VBNET.ATG" + prefix = t.val; + } + Expect(10); + Expect(3); + +#line 338 "VBNET.ATG" + u = new Using(t.literalValue as string, prefix); + Expect(27); + } else SynErr(230); } void Qualident( -#line 3327 "VBNET.ATG" +#line 3331 "VBNET.ATG" out string qualident) { -#line 3329 "VBNET.ATG" +#line 3333 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3333 "VBNET.ATG" +#line 3337 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3334 "VBNET.ATG" +#line 3338 "VBNET.ATG" DotAndIdentOrKw()) { Expect(16); IdentifierOrKeyword( -#line 3334 "VBNET.ATG" +#line 3338 "VBNET.ATG" out name); -#line 3334 "VBNET.ATG" +#line 3338 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3336 "VBNET.ATG" +#line 3340 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2442 "VBNET.ATG" +#line 2446 "VBNET.ATG" out TypeReference typeref) { -#line 2443 "VBNET.ATG" +#line 2447 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2445 "VBNET.ATG" +#line 2449 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2449 "VBNET.ATG" +#line 2453 "VBNET.ATG" out rank); -#line 2450 "VBNET.ATG" +#line 2454 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } } + void Identifier() { + if (StartOf(5)) { + IdentifierForFieldDeclaration(); + } else if (la.kind == 85) { + lexer.NextToken(); + } else SynErr(231); + } + void NamespaceBody() { while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -397,35 +426,35 @@ out rank); } void AttributeSection( -#line 2644 "VBNET.ATG" +#line 2648 "VBNET.ATG" out AttributeSection section) { -#line 2646 "VBNET.ATG" +#line 2650 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2650 "VBNET.ATG" +#line 2654 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2651 "VBNET.ATG" +#line 2655 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 106) { lexer.NextToken(); -#line 2652 "VBNET.ATG" +#line 2656 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 180) { lexer.NextToken(); -#line 2653 "VBNET.ATG" +#line 2657 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2656 "VBNET.ATG" +#line 2660 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -438,20 +467,20 @@ IsLocalAttrTarget()) { Expect(11); } Attribute( -#line 2666 "VBNET.ATG" +#line 2670 "VBNET.ATG" out attribute); -#line 2666 "VBNET.ATG" +#line 2670 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2667 "VBNET.ATG" +#line 2671 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2667 "VBNET.ATG" +#line 2671 "VBNET.ATG" out attribute); -#line 2667 "VBNET.ATG" +#line 2671 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -459,7 +488,7 @@ out attribute); } Expect(27); -#line 2671 "VBNET.ATG" +#line 2675 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -470,92 +499,92 @@ out attribute); } void TypeModifier( -#line 3410 "VBNET.ATG" +#line 3414 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 173: { lexer.NextToken(); -#line 3411 "VBNET.ATG" +#line 3415 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 172: { lexer.NextToken(); -#line 3412 "VBNET.ATG" +#line 3416 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 112: { lexer.NextToken(); -#line 3413 "VBNET.ATG" +#line 3417 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 170: { lexer.NextToken(); -#line 3414 "VBNET.ATG" +#line 3418 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 185: { lexer.NextToken(); -#line 3415 "VBNET.ATG" +#line 3419 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 184: { lexer.NextToken(); -#line 3416 "VBNET.ATG" +#line 3420 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 3417 "VBNET.ATG" +#line 3421 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 152: { lexer.NextToken(); -#line 3418 "VBNET.ATG" +#line 3422 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 168: { lexer.NextToken(); -#line 3419 "VBNET.ATG" +#line 3423 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } - default: SynErr(230); break; + default: SynErr(232); break; } } void NonModuleDeclaration( -#line 424 "VBNET.ATG" +#line 428 "VBNET.ATG" ModifierList m, List attributes) { -#line 426 "VBNET.ATG" +#line 430 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 71: { -#line 429 "VBNET.ATG" +#line 433 "VBNET.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 432 "VBNET.ATG" +#line 436 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; compilationUnit.AddChild(newType); @@ -565,42 +594,42 @@ ModifierList m, List attributes) { Identifier(); -#line 439 "VBNET.ATG" +#line 443 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 440 "VBNET.ATG" +#line 444 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 442 "VBNET.ATG" +#line 446 "VBNET.ATG" newType.BodyStartLocation = t.Location; if (la.kind == 127) { ClassBaseType( -#line 443 "VBNET.ATG" +#line 447 "VBNET.ATG" out typeRef); -#line 443 "VBNET.ATG" +#line 447 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } while (la.kind == 123) { TypeImplementsClause( -#line 444 "VBNET.ATG" +#line 448 "VBNET.ATG" out baseInterfaces); -#line 444 "VBNET.ATG" +#line 448 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 445 "VBNET.ATG" +#line 449 "VBNET.ATG" newType); Expect(100); Expect(71); -#line 446 "VBNET.ATG" +#line 450 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 449 "VBNET.ATG" +#line 453 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -608,7 +637,7 @@ newType); case 141: { lexer.NextToken(); -#line 453 "VBNET.ATG" +#line 457 "VBNET.ATG" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -618,17 +647,17 @@ newType); Identifier(); -#line 460 "VBNET.ATG" +#line 464 "VBNET.ATG" newType.Name = t.val; EndOfStmt(); -#line 462 "VBNET.ATG" +#line 466 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 463 "VBNET.ATG" +#line 467 "VBNET.ATG" newType); -#line 465 "VBNET.ATG" +#line 469 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -636,7 +665,7 @@ newType); case 194: { lexer.NextToken(); -#line 469 "VBNET.ATG" +#line 473 "VBNET.ATG" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -646,28 +675,28 @@ newType); Identifier(); -#line 476 "VBNET.ATG" +#line 480 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 477 "VBNET.ATG" +#line 481 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 479 "VBNET.ATG" +#line 483 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 123) { TypeImplementsClause( -#line 480 "VBNET.ATG" +#line 484 "VBNET.ATG" out baseInterfaces); -#line 480 "VBNET.ATG" +#line 484 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 481 "VBNET.ATG" +#line 485 "VBNET.ATG" newType); -#line 483 "VBNET.ATG" +#line 487 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -675,7 +704,7 @@ newType); case 102: { lexer.NextToken(); -#line 488 "VBNET.ATG" +#line 492 "VBNET.ATG" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -686,26 +715,26 @@ newType); Identifier(); -#line 496 "VBNET.ATG" +#line 500 "VBNET.ATG" newType.Name = t.val; if (la.kind == 50) { lexer.NextToken(); NonArrayTypeName( -#line 497 "VBNET.ATG" +#line 501 "VBNET.ATG" out typeRef, false); -#line 497 "VBNET.ATG" +#line 501 "VBNET.ATG" SafeAdd(newType, newType.BaseTypes, typeRef); } EndOfStmt(); -#line 499 "VBNET.ATG" +#line 503 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 500 "VBNET.ATG" +#line 504 "VBNET.ATG" newType); -#line 502 "VBNET.ATG" +#line 506 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -713,7 +742,7 @@ newType); case 129: { lexer.NextToken(); -#line 507 "VBNET.ATG" +#line 511 "VBNET.ATG" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -723,28 +752,28 @@ newType); Identifier(); -#line 514 "VBNET.ATG" +#line 518 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 515 "VBNET.ATG" +#line 519 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 517 "VBNET.ATG" +#line 521 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 127) { InterfaceBase( -#line 518 "VBNET.ATG" +#line 522 "VBNET.ATG" out baseInterfaces); -#line 518 "VBNET.ATG" +#line 522 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 519 "VBNET.ATG" +#line 523 "VBNET.ATG" newType); -#line 521 "VBNET.ATG" +#line 525 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -752,7 +781,7 @@ newType); case 90: { lexer.NextToken(); -#line 526 "VBNET.ATG" +#line 530 "VBNET.ATG" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("System.Void", true); @@ -763,97 +792,97 @@ newType); lexer.NextToken(); Identifier(); -#line 533 "VBNET.ATG" +#line 537 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 534 "VBNET.ATG" +#line 538 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 535 "VBNET.ATG" +#line 539 "VBNET.ATG" p); } Expect(26); -#line 535 "VBNET.ATG" +#line 539 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 114) { lexer.NextToken(); Identifier(); -#line 537 "VBNET.ATG" +#line 541 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 538 "VBNET.ATG" +#line 542 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 539 "VBNET.ATG" +#line 543 "VBNET.ATG" p); } Expect(26); -#line 539 "VBNET.ATG" +#line 543 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 50) { lexer.NextToken(); -#line 540 "VBNET.ATG" +#line 544 "VBNET.ATG" TypeReference type; TypeName( -#line 540 "VBNET.ATG" +#line 544 "VBNET.ATG" out type); -#line 540 "VBNET.ATG" +#line 544 "VBNET.ATG" delegateDeclr.ReturnType = type; } - } else SynErr(231); + } else SynErr(233); -#line 542 "VBNET.ATG" +#line 546 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 545 "VBNET.ATG" +#line 549 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; } - default: SynErr(232); break; + default: SynErr(234); break; } } void TypeParameterList( -#line 369 "VBNET.ATG" +#line 373 "VBNET.ATG" List templates) { -#line 371 "VBNET.ATG" +#line 375 "VBNET.ATG" TemplateDefinition template; if ( -#line 374 "VBNET.ATG" +#line 378 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); TypeParameter( -#line 375 "VBNET.ATG" +#line 379 "VBNET.ATG" out template); -#line 377 "VBNET.ATG" +#line 381 "VBNET.ATG" if (template != null) templates.Add(template); while (la.kind == 12) { lexer.NextToken(); TypeParameter( -#line 380 "VBNET.ATG" +#line 384 "VBNET.ATG" out template); -#line 382 "VBNET.ATG" +#line 386 "VBNET.ATG" if (template != null) templates.Add(template); } @@ -862,163 +891,155 @@ out template); } void TypeParameter( -#line 390 "VBNET.ATG" +#line 394 "VBNET.ATG" out TemplateDefinition template) { Identifier(); -#line 392 "VBNET.ATG" +#line 396 "VBNET.ATG" template = new TemplateDefinition(t.val, null); if (la.kind == 50) { TypeParameterConstraints( -#line 393 "VBNET.ATG" +#line 397 "VBNET.ATG" template); } } - void Identifier() { - if (StartOf(5)) { - IdentifierForFieldDeclaration(); - } else if (la.kind == 85) { - lexer.NextToken(); - } else SynErr(233); - } - void TypeParameterConstraints( -#line 397 "VBNET.ATG" +#line 401 "VBNET.ATG" TemplateDefinition template) { -#line 399 "VBNET.ATG" +#line 403 "VBNET.ATG" TypeReference constraint; Expect(50); if (la.kind == 23) { lexer.NextToken(); TypeParameterConstraint( -#line 405 "VBNET.ATG" +#line 409 "VBNET.ATG" out constraint); -#line 405 "VBNET.ATG" +#line 409 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); TypeParameterConstraint( -#line 408 "VBNET.ATG" +#line 412 "VBNET.ATG" out constraint); -#line 408 "VBNET.ATG" +#line 412 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(24); - } else if (StartOf(6)) { + } else if (StartOf(7)) { TypeParameterConstraint( -#line 411 "VBNET.ATG" +#line 415 "VBNET.ATG" out constraint); -#line 411 "VBNET.ATG" +#line 415 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } - } else SynErr(234); + } else SynErr(235); } void TypeParameterConstraint( -#line 415 "VBNET.ATG" +#line 419 "VBNET.ATG" out TypeReference constraint) { -#line 416 "VBNET.ATG" +#line 420 "VBNET.ATG" constraint = null; if (la.kind == 71) { lexer.NextToken(); -#line 417 "VBNET.ATG" +#line 421 "VBNET.ATG" constraint = TypeReference.ClassConstraint; } else if (la.kind == 194) { lexer.NextToken(); -#line 418 "VBNET.ATG" +#line 422 "VBNET.ATG" constraint = TypeReference.StructConstraint; } else if (la.kind == 148) { lexer.NextToken(); -#line 419 "VBNET.ATG" +#line 423 "VBNET.ATG" constraint = TypeReference.NewConstraint; - } else if (StartOf(7)) { + } else if (StartOf(8)) { TypeName( -#line 420 "VBNET.ATG" +#line 424 "VBNET.ATG" out constraint); - } else SynErr(235); + } else SynErr(236); } void ClassBaseType( -#line 765 "VBNET.ATG" +#line 769 "VBNET.ATG" out TypeReference typeRef) { -#line 767 "VBNET.ATG" +#line 771 "VBNET.ATG" typeRef = null; Expect(127); TypeName( -#line 770 "VBNET.ATG" +#line 774 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1582 "VBNET.ATG" +#line 1586 "VBNET.ATG" out List baseInterfaces) { -#line 1584 "VBNET.ATG" +#line 1588 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(123); TypeName( -#line 1587 "VBNET.ATG" +#line 1591 "VBNET.ATG" out type); -#line 1589 "VBNET.ATG" +#line 1593 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1592 "VBNET.ATG" +#line 1596 "VBNET.ATG" out type); -#line 1593 "VBNET.ATG" +#line 1597 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 559 "VBNET.ATG" +#line 563 "VBNET.ATG" TypeDeclaration newType) { -#line 560 "VBNET.ATG" +#line 564 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(8)) { + while (StartOf(9)) { -#line 563 "VBNET.ATG" +#line 567 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 566 "VBNET.ATG" +#line 570 "VBNET.ATG" out section); -#line 566 "VBNET.ATG" +#line 570 "VBNET.ATG" attributes.Add(section); } - while (StartOf(9)) { + while (StartOf(10)) { MemberModifier( -#line 567 "VBNET.ATG" +#line 571 "VBNET.ATG" m); } ClassMemberDecl( -#line 568 "VBNET.ATG" +#line 572 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -1027,35 +1048,35 @@ m, attributes); } void ModuleBody( -#line 590 "VBNET.ATG" +#line 594 "VBNET.ATG" TypeDeclaration newType) { -#line 591 "VBNET.ATG" +#line 595 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(8)) { + while (StartOf(9)) { -#line 594 "VBNET.ATG" +#line 598 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 597 "VBNET.ATG" +#line 601 "VBNET.ATG" out section); -#line 597 "VBNET.ATG" +#line 601 "VBNET.ATG" attributes.Add(section); } - while (StartOf(9)) { + while (StartOf(10)) { MemberModifier( -#line 598 "VBNET.ATG" +#line 602 "VBNET.ATG" m); } ClassMemberDecl( -#line 599 "VBNET.ATG" +#line 603 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -1064,41 +1085,41 @@ m, attributes); Expect(100); Expect(141); -#line 602 "VBNET.ATG" +#line 606 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 573 "VBNET.ATG" +#line 577 "VBNET.ATG" TypeDeclaration newType) { -#line 574 "VBNET.ATG" +#line 578 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(8)) { + while (StartOf(9)) { -#line 577 "VBNET.ATG" +#line 581 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 580 "VBNET.ATG" +#line 584 "VBNET.ATG" out section); -#line 580 "VBNET.ATG" +#line 584 "VBNET.ATG" attributes.Add(section); } - while (StartOf(9)) { + while (StartOf(10)) { MemberModifier( -#line 581 "VBNET.ATG" +#line 585 "VBNET.ATG" m); } StructureMemberDecl( -#line 582 "VBNET.ATG" +#line 586 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -1107,94 +1128,94 @@ m, attributes); Expect(100); Expect(194); -#line 585 "VBNET.ATG" +#line 589 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 2468 "VBNET.ATG" +#line 2472 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2470 "VBNET.ATG" +#line 2474 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; - if (StartOf(10)) { + if (StartOf(11)) { if (la.kind == 117) { lexer.NextToken(); Expect(16); -#line 2475 "VBNET.ATG" +#line 2479 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2476 "VBNET.ATG" +#line 2480 "VBNET.ATG" out typeref, canBeUnbound); -#line 2477 "VBNET.ATG" +#line 2481 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 16) { lexer.NextToken(); -#line 2478 "VBNET.ATG" +#line 2482 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2479 "VBNET.ATG" +#line 2483 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2480 "VBNET.ATG" +#line 2484 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 154) { lexer.NextToken(); -#line 2483 "VBNET.ATG" +#line 2487 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 21) { lexer.NextToken(); -#line 2487 "VBNET.ATG" +#line 2491 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; } - } else if (StartOf(11)) { + } else if (StartOf(12)) { PrimitiveTypeName( -#line 2493 "VBNET.ATG" +#line 2497 "VBNET.ATG" out name); -#line 2493 "VBNET.ATG" +#line 2497 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 21) { lexer.NextToken(); -#line 2497 "VBNET.ATG" +#line 2501 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; } - } else SynErr(236); + } else SynErr(237); } void EnumBody( -#line 606 "VBNET.ATG" +#line 610 "VBNET.ATG" TypeDeclaration newType) { -#line 607 "VBNET.ATG" +#line 611 "VBNET.ATG" FieldDeclaration f; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(12)) { + while (StartOf(13)) { EnumMemberDecl( -#line 610 "VBNET.ATG" +#line 614 "VBNET.ATG" out f); -#line 612 "VBNET.ATG" +#line 616 "VBNET.ATG" compilationUnit.AddChild(f); while (la.kind == 1 || la.kind == 11) { @@ -1204,45 +1225,45 @@ out f); Expect(100); Expect(102); -#line 616 "VBNET.ATG" +#line 620 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1567 "VBNET.ATG" +#line 1571 "VBNET.ATG" out List bases) { -#line 1569 "VBNET.ATG" +#line 1573 "VBNET.ATG" TypeReference type; bases = new List(); Expect(127); TypeName( -#line 1573 "VBNET.ATG" +#line 1577 "VBNET.ATG" out type); -#line 1573 "VBNET.ATG" +#line 1577 "VBNET.ATG" if (type != null) bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1576 "VBNET.ATG" +#line 1580 "VBNET.ATG" out type); -#line 1576 "VBNET.ATG" +#line 1580 "VBNET.ATG" if (type != null) bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 620 "VBNET.ATG" +#line 624 "VBNET.ATG" TypeDeclaration newType) { while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(13)) { + while (StartOf(14)) { InterfaceMemberDecl(); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -1251,188 +1272,188 @@ TypeDeclaration newType) { Expect(100); Expect(129); -#line 626 "VBNET.ATG" +#line 630 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2681 "VBNET.ATG" +#line 2685 "VBNET.ATG" List parameter) { -#line 2682 "VBNET.ATG" +#line 2686 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2684 "VBNET.ATG" +#line 2688 "VBNET.ATG" out p); -#line 2684 "VBNET.ATG" +#line 2688 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2686 "VBNET.ATG" +#line 2690 "VBNET.ATG" out p); -#line 2686 "VBNET.ATG" +#line 2690 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3422 "VBNET.ATG" +#line 3426 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 142: { lexer.NextToken(); -#line 3423 "VBNET.ATG" +#line 3427 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 89: { lexer.NextToken(); -#line 3424 "VBNET.ATG" +#line 3428 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 112: { lexer.NextToken(); -#line 3425 "VBNET.ATG" +#line 3429 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 184: { lexer.NextToken(); -#line 3426 "VBNET.ATG" +#line 3430 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 166: { lexer.NextToken(); -#line 3427 "VBNET.ATG" +#line 3431 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 143: { lexer.NextToken(); -#line 3428 "VBNET.ATG" +#line 3432 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 170: { lexer.NextToken(); -#line 3429 "VBNET.ATG" +#line 3433 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 172: { lexer.NextToken(); -#line 3430 "VBNET.ATG" +#line 3434 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 173: { lexer.NextToken(); -#line 3431 "VBNET.ATG" +#line 3435 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 152: { lexer.NextToken(); -#line 3432 "VBNET.ATG" +#line 3436 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 153: { lexer.NextToken(); -#line 3433 "VBNET.ATG" +#line 3437 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 185: { lexer.NextToken(); -#line 3434 "VBNET.ATG" +#line 3438 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 165: { lexer.NextToken(); -#line 3435 "VBNET.ATG" +#line 3439 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 164: { lexer.NextToken(); -#line 3436 "VBNET.ATG" +#line 3440 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 175: { lexer.NextToken(); -#line 3437 "VBNET.ATG" +#line 3441 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 220: { lexer.NextToken(); -#line 3438 "VBNET.ATG" +#line 3442 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 219: { lexer.NextToken(); -#line 3439 "VBNET.ATG" +#line 3443 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 92: { lexer.NextToken(); -#line 3440 "VBNET.ATG" +#line 3444 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 168: { lexer.NextToken(); -#line 3441 "VBNET.ATG" +#line 3445 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } - default: SynErr(237); break; + default: SynErr(238); break; } } void ClassMemberDecl( -#line 761 "VBNET.ATG" +#line 765 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 762 "VBNET.ATG" +#line 766 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 775 "VBNET.ATG" +#line 779 "VBNET.ATG" ModifierList m, List attributes) { -#line 777 "VBNET.ATG" +#line 781 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1442,37 +1463,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 71: case 90: case 102: case 129: case 141: case 194: { NonModuleDeclaration( -#line 784 "VBNET.ATG" +#line 788 "VBNET.ATG" m, attributes); break; } case 195: { lexer.NextToken(); -#line 788 "VBNET.ATG" +#line 792 "VBNET.ATG" Location startPos = t.Location; - if (StartOf(14)) { + if (StartOf(4)) { -#line 792 "VBNET.ATG" +#line 796 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 798 "VBNET.ATG" +#line 802 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 801 "VBNET.ATG" +#line 805 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 802 "VBNET.ATG" +#line 806 "VBNET.ATG" p); } Expect(26); @@ -1480,23 +1501,23 @@ p); if (la.kind == 121 || la.kind == 123) { if (la.kind == 123) { ImplementsClause( -#line 805 "VBNET.ATG" +#line 809 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 807 "VBNET.ATG" +#line 811 "VBNET.ATG" out handlesClause); } } -#line 810 "VBNET.ATG" +#line 814 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 813 "VBNET.ATG" +#line 817 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 816 "VBNET.ATG" +#line 820 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1510,7 +1531,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 829 "VBNET.ATG" +#line 833 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1522,67 +1543,67 @@ IsMustOverride(m)) { compilationUnit.AddChild(methodDeclaration); -#line 840 "VBNET.ATG" +#line 844 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 841 "VBNET.ATG" +#line 845 "VBNET.ATG" out stmt); Expect(100); Expect(195); -#line 843 "VBNET.ATG" +#line 847 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 849 "VBNET.ATG" +#line 853 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 850 "VBNET.ATG" +#line 854 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); - } else SynErr(238); + } else SynErr(239); } else if (la.kind == 148) { lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 854 "VBNET.ATG" +#line 858 "VBNET.ATG" p); } Expect(26); } -#line 855 "VBNET.ATG" +#line 859 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 856 "VBNET.ATG" +#line 860 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 859 "VBNET.ATG" +#line 863 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 860 "VBNET.ATG" +#line 864 "VBNET.ATG" out stmt); Expect(100); Expect(195); -#line 862 "VBNET.ATG" +#line 866 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 868 "VBNET.ATG" +#line 872 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 871 "VBNET.ATG" +#line 875 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1590,13 +1611,13 @@ out stmt); cd.Body.EndLocation = endLocation; compilationUnit.AddChild(cd); - } else SynErr(239); + } else SynErr(240); break; } case 114: { lexer.NextToken(); -#line 883 "VBNET.ATG" +#line 887 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1606,16 +1627,16 @@ out stmt); Identifier(); -#line 890 "VBNET.ATG" +#line 894 "VBNET.ATG" name = t.val; TypeParameterList( -#line 891 "VBNET.ATG" +#line 895 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 892 "VBNET.ATG" +#line 896 "VBNET.ATG" p); } Expect(26); @@ -1624,10 +1645,10 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 894 "VBNET.ATG" +#line 898 "VBNET.ATG" out returnTypeAttributeSection); -#line 896 "VBNET.ATG" +#line 900 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1635,11 +1656,11 @@ out returnTypeAttributeSection); } TypeName( -#line 902 "VBNET.ATG" +#line 906 "VBNET.ATG" out type); } -#line 904 "VBNET.ATG" +#line 908 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1647,23 +1668,23 @@ out type); if (la.kind == 121 || la.kind == 123) { if (la.kind == 123) { ImplementsClause( -#line 910 "VBNET.ATG" +#line 914 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 912 "VBNET.ATG" +#line 916 "VBNET.ATG" out handlesClause); } } -#line 915 "VBNET.ATG" +#line 919 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 918 "VBNET.ATG" +#line 922 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 921 "VBNET.ATG" +#line 925 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1679,7 +1700,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 936 "VBNET.ATG" +#line 940 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1694,12 +1715,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 949 "VBNET.ATG" +#line 953 "VBNET.ATG" out stmt); Expect(100); Expect(114); -#line 951 "VBNET.ATG" +#line 955 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1709,13 +1730,13 @@ out stmt); methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); - } else SynErr(240); + } else SynErr(241); break; } case 88: { lexer.NextToken(); -#line 965 "VBNET.ATG" +#line 969 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1725,39 +1746,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 972 "VBNET.ATG" +#line 976 "VBNET.ATG" out charsetModifer); } if (la.kind == 195) { lexer.NextToken(); Identifier(); -#line 975 "VBNET.ATG" +#line 979 "VBNET.ATG" name = t.val; Expect(135); Expect(3); -#line 976 "VBNET.ATG" +#line 980 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 977 "VBNET.ATG" +#line 981 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 978 "VBNET.ATG" +#line 982 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 981 "VBNET.ATG" +#line 985 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1767,25 +1788,25 @@ p); lexer.NextToken(); Identifier(); -#line 988 "VBNET.ATG" +#line 992 "VBNET.ATG" name = t.val; Expect(135); Expect(3); -#line 989 "VBNET.ATG" +#line 993 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 990 "VBNET.ATG" +#line 994 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 991 "VBNET.ATG" +#line 995 "VBNET.ATG" p); } Expect(26); @@ -1793,24 +1814,24 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 992 "VBNET.ATG" +#line 996 "VBNET.ATG" out type); } EndOfStmt(); -#line 995 "VBNET.ATG" +#line 999 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; compilationUnit.AddChild(declareDeclaration); - } else SynErr(241); + } else SynErr(242); break; } case 106: { lexer.NextToken(); -#line 1005 "VBNET.ATG" +#line 1009 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1819,31 +1840,31 @@ out type); Identifier(); -#line 1011 "VBNET.ATG" +#line 1015 "VBNET.ATG" name= t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1013 "VBNET.ATG" +#line 1017 "VBNET.ATG" out type); } else if (StartOf(16)) { if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1015 "VBNET.ATG" +#line 1019 "VBNET.ATG" p); } Expect(26); } - } else SynErr(242); + } else SynErr(243); if (la.kind == 123) { ImplementsClause( -#line 1017 "VBNET.ATG" +#line 1021 "VBNET.ATG" out implementsClause); } -#line 1019 "VBNET.ATG" +#line 1023 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1857,29 +1878,29 @@ out implementsClause); } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { -#line 1030 "VBNET.ATG" +#line 1034 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); IdentifierForFieldDeclaration(); -#line 1033 "VBNET.ATG" +#line 1037 "VBNET.ATG" string name = t.val; -#line 1034 "VBNET.ATG" +#line 1038 "VBNET.ATG" fd.StartLocation = m.GetDeclarationLocation(t.Location); VariableDeclaratorPartAfterIdentifier( -#line 1036 "VBNET.ATG" +#line 1040 "VBNET.ATG" variableDeclarators, name); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1037 "VBNET.ATG" +#line 1041 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1040 "VBNET.ATG" +#line 1044 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -1888,35 +1909,35 @@ variableDeclarators); } case 75: { -#line 1045 "VBNET.ATG" +#line 1049 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1046 "VBNET.ATG" +#line 1050 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1048 "VBNET.ATG" +#line 1052 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1052 "VBNET.ATG" +#line 1056 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1053 "VBNET.ATG" +#line 1057 "VBNET.ATG" constantDeclarators); } -#line 1055 "VBNET.ATG" +#line 1059 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1060 "VBNET.ATG" +#line 1064 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -1925,7 +1946,7 @@ constantDeclarators); case 171: { lexer.NextToken(); -#line 1066 "VBNET.ATG" +#line 1070 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; @@ -1934,13 +1955,13 @@ constantDeclarators); Identifier(); -#line 1072 "VBNET.ATG" +#line 1076 "VBNET.ATG" string propertyName = t.val; if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1073 "VBNET.ATG" +#line 1077 "VBNET.ATG" p); } Expect(26); @@ -1949,10 +1970,10 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 1076 "VBNET.ATG" +#line 1080 "VBNET.ATG" out returnTypeAttributeSection); -#line 1078 "VBNET.ATG" +#line 1082 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1960,42 +1981,42 @@ out returnTypeAttributeSection); } if ( -#line 1085 "VBNET.ATG" +#line 1089 "VBNET.ATG" IsNewExpression()) { ObjectCreateExpression( -#line 1085 "VBNET.ATG" +#line 1089 "VBNET.ATG" out initializer); -#line 1087 "VBNET.ATG" +#line 1091 "VBNET.ATG" if (initializer is ObjectCreateExpression) { type = ((ObjectCreateExpression)initializer).CreateType.Clone(); } else { type = ((ArrayCreateExpression)initializer).CreateType.Clone(); } - } else if (StartOf(7)) { + } else if (StartOf(8)) { TypeName( -#line 1094 "VBNET.ATG" +#line 1098 "VBNET.ATG" out type); - } else SynErr(243); + } else SynErr(244); } if (la.kind == 10) { lexer.NextToken(); Expr( -#line 1097 "VBNET.ATG" +#line 1101 "VBNET.ATG" out initializer); } if (la.kind == 123) { ImplementsClause( -#line 1098 "VBNET.ATG" +#line 1102 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1102 "VBNET.ATG" +#line 1106 "VBNET.ATG" IsMustOverride(m) || IsAutomaticProperty()) { -#line 1104 "VBNET.ATG" +#line 1108 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2008,7 +2029,7 @@ IsMustOverride(m) || IsAutomaticProperty()) { } else if (StartOf(17)) { -#line 1116 "VBNET.ATG" +#line 1120 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2020,29 +2041,29 @@ IsMustOverride(m) || IsAutomaticProperty()) { PropertySetRegion setRegion; AccessorDecls( -#line 1126 "VBNET.ATG" +#line 1130 "VBNET.ATG" out getRegion, out setRegion); Expect(100); Expect(171); EndOfStmt(); -#line 1130 "VBNET.ATG" +#line 1134 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.Location; // t = EndOfStmt; not "Property" compilationUnit.AddChild(pDecl); - } else SynErr(244); + } else SynErr(245); break; } case 85: { lexer.NextToken(); -#line 1137 "VBNET.ATG" +#line 1141 "VBNET.ATG" Location startPos = t.Location; Expect(106); -#line 1139 "VBNET.ATG" +#line 1143 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2052,24 +2073,24 @@ out getRegion, out setRegion); Identifier(); -#line 1146 "VBNET.ATG" +#line 1150 "VBNET.ATG" string customEventName = t.val; Expect(50); TypeName( -#line 1147 "VBNET.ATG" +#line 1151 "VBNET.ATG" out type); if (la.kind == 123) { ImplementsClause( -#line 1148 "VBNET.ATG" +#line 1152 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1151 "VBNET.ATG" +#line 1155 "VBNET.ATG" out eventAccessorDeclaration); -#line 1153 "VBNET.ATG" +#line 1157 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2088,7 +2109,7 @@ out eventAccessorDeclaration); Expect(106); EndOfStmt(); -#line 1169 "VBNET.ATG" +#line 1173 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2119,24 +2140,24 @@ out eventAccessorDeclaration); } case 147: case 158: case 217: { -#line 1195 "VBNET.ATG" +#line 1199 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 147 || la.kind == 217) { if (la.kind == 217) { lexer.NextToken(); -#line 1196 "VBNET.ATG" +#line 1200 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1197 "VBNET.ATG" +#line 1201 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(158); -#line 1200 "VBNET.ATG" +#line 1204 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2147,7 +2168,7 @@ out eventAccessorDeclaration); List parameters = new List(); OverloadableOperator( -#line 1209 "VBNET.ATG" +#line 1213 "VBNET.ATG" out operatorType); Expect(25); if (la.kind == 59) { @@ -2155,16 +2176,16 @@ out operatorType); } Identifier(); -#line 1210 "VBNET.ATG" +#line 1214 "VBNET.ATG" operandName = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1211 "VBNET.ATG" +#line 1215 "VBNET.ATG" out operandType); } -#line 1212 "VBNET.ATG" +#line 1216 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2173,51 +2194,51 @@ out operandType); } Identifier(); -#line 1216 "VBNET.ATG" +#line 1220 "VBNET.ATG" operandName = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1217 "VBNET.ATG" +#line 1221 "VBNET.ATG" out operandType); } -#line 1218 "VBNET.ATG" +#line 1222 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); } Expect(26); -#line 1221 "VBNET.ATG" +#line 1225 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 50) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 1222 "VBNET.ATG" +#line 1226 "VBNET.ATG" out section); -#line 1223 "VBNET.ATG" +#line 1227 "VBNET.ATG" if (section != null) { section.AttributeTarget = "return"; attributes.Add(section); } } TypeName( -#line 1227 "VBNET.ATG" +#line 1231 "VBNET.ATG" out returnType); -#line 1227 "VBNET.ATG" +#line 1231 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1229 "VBNET.ATG" +#line 1233 "VBNET.ATG" out stmt); Expect(100); Expect(158); EndOfStmt(); -#line 1231 "VBNET.ATG" +#line 1235 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2235,30 +2256,30 @@ out stmt); break; } - default: SynErr(245); break; + default: SynErr(246); break; } } void EnumMemberDecl( -#line 743 "VBNET.ATG" +#line 747 "VBNET.ATG" out FieldDeclaration f) { -#line 745 "VBNET.ATG" +#line 749 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 28) { AttributeSection( -#line 749 "VBNET.ATG" +#line 753 "VBNET.ATG" out section); -#line 749 "VBNET.ATG" +#line 753 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 752 "VBNET.ATG" +#line 756 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2267,10 +2288,10 @@ out section); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 757 "VBNET.ATG" +#line 761 "VBNET.ATG" out expr); -#line 757 "VBNET.ATG" +#line 761 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2278,7 +2299,7 @@ out expr); void InterfaceMemberDecl() { -#line 634 "VBNET.ATG" +#line 638 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2290,33 +2311,33 @@ out expr); if (StartOf(19)) { while (la.kind == 28) { AttributeSection( -#line 642 "VBNET.ATG" +#line 646 "VBNET.ATG" out section); -#line 642 "VBNET.ATG" +#line 646 "VBNET.ATG" attributes.Add(section); } - while (StartOf(9)) { + while (StartOf(10)) { MemberModifier( -#line 645 "VBNET.ATG" +#line 649 "VBNET.ATG" mod); } if (la.kind == 106) { lexer.NextToken(); -#line 649 "VBNET.ATG" +#line 653 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 652 "VBNET.ATG" +#line 656 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 653 "VBNET.ATG" +#line 657 "VBNET.ATG" p); } Expect(26); @@ -2324,12 +2345,12 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 654 "VBNET.ATG" +#line 658 "VBNET.ATG" out type); } EndOfStmt(); -#line 657 "VBNET.ATG" +#line 661 "VBNET.ATG" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2340,29 +2361,29 @@ out type); } else if (la.kind == 195) { lexer.NextToken(); -#line 667 "VBNET.ATG" +#line 671 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 670 "VBNET.ATG" +#line 674 "VBNET.ATG" name = t.val; TypeParameterList( -#line 671 "VBNET.ATG" +#line 675 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 672 "VBNET.ATG" +#line 676 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 675 "VBNET.ATG" +#line 679 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2378,22 +2399,22 @@ p); } else if (la.kind == 114) { lexer.NextToken(); -#line 690 "VBNET.ATG" +#line 694 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 693 "VBNET.ATG" +#line 697 "VBNET.ATG" name = t.val; TypeParameterList( -#line 694 "VBNET.ATG" +#line 698 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 695 "VBNET.ATG" +#line 699 "VBNET.ATG" p); } Expect(26); @@ -2402,15 +2423,15 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 696 "VBNET.ATG" +#line 700 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 696 "VBNET.ATG" +#line 700 "VBNET.ATG" out type); } -#line 698 "VBNET.ATG" +#line 702 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -2431,19 +2452,19 @@ out type); } else if (la.kind == 171) { lexer.NextToken(); -#line 718 "VBNET.ATG" +#line 722 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 721 "VBNET.ATG" +#line 725 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 722 "VBNET.ATG" +#line 726 "VBNET.ATG" p); } Expect(26); @@ -2451,134 +2472,134 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 723 "VBNET.ATG" +#line 727 "VBNET.ATG" out type); } -#line 725 "VBNET.ATG" +#line 729 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } EndOfStmt(); -#line 731 "VBNET.ATG" +#line 735 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; pd.StartLocation = startLocation; compilationUnit.AddChild(pd); - } else SynErr(246); + } else SynErr(247); } else if (StartOf(20)) { NonModuleDeclaration( -#line 739 "VBNET.ATG" +#line 743 "VBNET.ATG" mod, attributes); - } else SynErr(247); + } else SynErr(248); } void Expr( -#line 1626 "VBNET.ATG" +#line 1630 "VBNET.ATG" out Expression expr) { -#line 1627 "VBNET.ATG" +#line 1631 "VBNET.ATG" expr = null; if ( -#line 1628 "VBNET.ATG" +#line 1632 "VBNET.ATG" IsQueryExpression() ) { QueryExpr( -#line 1629 "VBNET.ATG" +#line 1633 "VBNET.ATG" out expr); } else if (la.kind == 114) { LambdaExpr( -#line 1630 "VBNET.ATG" +#line 1634 "VBNET.ATG" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1631 "VBNET.ATG" +#line 1635 "VBNET.ATG" out expr); - } else SynErr(248); + } else SynErr(249); } void ImplementsClause( -#line 1599 "VBNET.ATG" +#line 1603 "VBNET.ATG" out List baseInterfaces) { -#line 1601 "VBNET.ATG" +#line 1605 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(123); NonArrayTypeName( -#line 1606 "VBNET.ATG" +#line 1610 "VBNET.ATG" out type, false); -#line 1607 "VBNET.ATG" +#line 1611 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1608 "VBNET.ATG" +#line 1612 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1610 "VBNET.ATG" +#line 1614 "VBNET.ATG" out type, false); -#line 1611 "VBNET.ATG" +#line 1615 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1612 "VBNET.ATG" +#line 1616 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1557 "VBNET.ATG" +#line 1561 "VBNET.ATG" out List handlesClause) { -#line 1559 "VBNET.ATG" +#line 1563 "VBNET.ATG" handlesClause = new List(); string name; Expect(121); EventMemberSpecifier( -#line 1562 "VBNET.ATG" +#line 1566 "VBNET.ATG" out name); -#line 1562 "VBNET.ATG" +#line 1566 "VBNET.ATG" if (name != null) handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1563 "VBNET.ATG" +#line 1567 "VBNET.ATG" out name); -#line 1563 "VBNET.ATG" +#line 1567 "VBNET.ATG" if (name != null) handlesClause.Add(name); } } void Block( -#line 2728 "VBNET.ATG" +#line 2732 "VBNET.ATG" out Statement stmt) { -#line 2731 "VBNET.ATG" +#line 2735 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); while (StartOf(22) || -#line 2737 "VBNET.ATG" +#line 2741 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2737 "VBNET.ATG" +#line 2741 "VBNET.ATG" IsEndStmtAhead()) { Expect(100); EndOfStmt(); -#line 2737 "VBNET.ATG" +#line 2741 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2586,7 +2607,7 @@ IsEndStmtAhead()) { } } -#line 2742 "VBNET.ATG" +#line 2746 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2594,28 +2615,28 @@ IsEndStmtAhead()) { } void Charset( -#line 1549 "VBNET.ATG" +#line 1553 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1550 "VBNET.ATG" +#line 1554 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 114 || la.kind == 195) { } else if (la.kind == 49) { lexer.NextToken(); -#line 1551 "VBNET.ATG" +#line 1555 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 53) { lexer.NextToken(); -#line 1552 "VBNET.ATG" +#line 1556 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 208) { lexer.NextToken(); -#line 1553 "VBNET.ATG" +#line 1557 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; - } else SynErr(249); + } else SynErr(250); } void IdentifierForFieldDeclaration() { @@ -2728,15 +2749,15 @@ out CharsetModifier charsetModifier) { lexer.NextToken(); break; } - default: SynErr(250); break; + default: SynErr(251); break; } } void VariableDeclaratorPartAfterIdentifier( -#line 1434 "VBNET.ATG" +#line 1438 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1436 "VBNET.ATG" +#line 1440 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2744,28 +2765,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1442 "VBNET.ATG" +#line 1446 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1442 "VBNET.ATG" +#line 1446 "VBNET.ATG" out dimension); } if ( -#line 1443 "VBNET.ATG" +#line 1447 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1443 "VBNET.ATG" +#line 1447 "VBNET.ATG" out rank); } if ( -#line 1445 "VBNET.ATG" +#line 1449 "VBNET.ATG" IsObjectCreation()) { Expect(50); ObjectCreateExpression( -#line 1445 "VBNET.ATG" +#line 1449 "VBNET.ATG" out expr); -#line 1447 "VBNET.ATG" +#line 1451 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType.Clone(); } else { @@ -2776,10 +2797,10 @@ out expr); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1454 "VBNET.ATG" +#line 1458 "VBNET.ATG" out type); -#line 1456 "VBNET.ATG" +#line 1460 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2792,7 +2813,7 @@ out type); } -#line 1468 "VBNET.ATG" +#line 1472 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2819,12 +2840,12 @@ out type); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 1491 "VBNET.ATG" +#line 1495 "VBNET.ATG" out expr); } - } else SynErr(251); + } else SynErr(252); -#line 1494 "VBNET.ATG" +#line 1498 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2833,22 +2854,22 @@ out expr); } void VariableDeclarator( -#line 1428 "VBNET.ATG" +#line 1432 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1430 "VBNET.ATG" +#line 1434 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1431 "VBNET.ATG" +#line 1435 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1409 "VBNET.ATG" +#line 1413 "VBNET.ATG" List constantDeclaration) { -#line 1411 "VBNET.ATG" +#line 1415 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2856,20 +2877,20 @@ List constantDeclaration) { Identifier(); -#line 1416 "VBNET.ATG" +#line 1420 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1417 "VBNET.ATG" +#line 1421 "VBNET.ATG" out type); } Expect(10); Expr( -#line 1418 "VBNET.ATG" +#line 1422 "VBNET.ATG" out expr); -#line 1420 "VBNET.ATG" +#line 1424 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2878,10 +2899,10 @@ out expr); } void ObjectCreateExpression( -#line 1956 "VBNET.ATG" +#line 1960 "VBNET.ATG" out Expression oce) { -#line 1958 "VBNET.ATG" +#line 1962 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2890,41 +2911,41 @@ out Expression oce) { bool canBeNormal; bool canBeReDim; Expect(148); - if (StartOf(7)) { + if (StartOf(8)) { NonArrayTypeName( -#line 1966 "VBNET.ATG" +#line 1970 "VBNET.ATG" out type, false); if (la.kind == 25) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1967 "VBNET.ATG" +#line 1971 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(26); if (la.kind == 23 || -#line 1968 "VBNET.ATG" +#line 1972 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1968 "VBNET.ATG" +#line 1972 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1969 "VBNET.ATG" +#line 1973 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1970 "VBNET.ATG" +#line 1974 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1971 "VBNET.ATG" +#line 1975 "VBNET.ATG" out initializer); } } -#line 1973 "VBNET.ATG" +#line 1977 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 1977 "VBNET.ATG" +#line 1981 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2939,34 +2960,34 @@ out initializer); if (la.kind == 113 || la.kind == 218) { if (la.kind == 218) { -#line 1992 "VBNET.ATG" +#line 1996 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; lexer.NextToken(); -#line 1996 "VBNET.ATG" +#line 2000 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(23); MemberInitializer( -#line 2000 "VBNET.ATG" +#line 2004 "VBNET.ATG" out memberInitializer); -#line 2001 "VBNET.ATG" +#line 2005 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 12) { lexer.NextToken(); MemberInitializer( -#line 2003 "VBNET.ATG" +#line 2007 "VBNET.ATG" out memberInitializer); -#line 2004 "VBNET.ATG" +#line 2008 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(24); -#line 2008 "VBNET.ATG" +#line 2012 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -2976,10 +2997,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2018 "VBNET.ATG" +#line 2022 "VBNET.ATG" out initializer); -#line 2020 "VBNET.ATG" +#line 2024 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -2988,10 +3009,10 @@ out initializer); } void AccessorDecls( -#line 1343 "VBNET.ATG" +#line 1347 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1345 "VBNET.ATG" +#line 1349 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2999,60 +3020,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 28) { AttributeSection( -#line 1350 "VBNET.ATG" +#line 1354 "VBNET.ATG" out section); -#line 1350 "VBNET.ATG" +#line 1354 "VBNET.ATG" attributes.Add(section); } if (StartOf(24)) { GetAccessorDecl( -#line 1352 "VBNET.ATG" +#line 1356 "VBNET.ATG" out getBlock, attributes); if (StartOf(25)) { -#line 1354 "VBNET.ATG" +#line 1358 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1355 "VBNET.ATG" +#line 1359 "VBNET.ATG" out section); -#line 1355 "VBNET.ATG" +#line 1359 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1356 "VBNET.ATG" +#line 1360 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(26)) { SetAccessorDecl( -#line 1359 "VBNET.ATG" +#line 1363 "VBNET.ATG" out setBlock, attributes); if (StartOf(27)) { -#line 1361 "VBNET.ATG" +#line 1365 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1362 "VBNET.ATG" +#line 1366 "VBNET.ATG" out section); -#line 1362 "VBNET.ATG" +#line 1366 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1363 "VBNET.ATG" +#line 1367 "VBNET.ATG" out getBlock, attributes); } - } else SynErr(252); + } else SynErr(253); } void EventAccessorDeclaration( -#line 1306 "VBNET.ATG" +#line 1310 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1308 "VBNET.ATG" +#line 1312 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -3061,32 +3082,32 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 28) { AttributeSection( -#line 1314 "VBNET.ATG" +#line 1318 "VBNET.ATG" out section); -#line 1314 "VBNET.ATG" +#line 1318 "VBNET.ATG" attributes.Add(section); } if (la.kind == 43) { lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1316 "VBNET.ATG" +#line 1320 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1317 "VBNET.ATG" +#line 1321 "VBNET.ATG" out stmt); Expect(100); Expect(43); EndOfStmt(); -#line 1319 "VBNET.ATG" +#line 1323 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3095,22 +3116,22 @@ out stmt); lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1324 "VBNET.ATG" +#line 1328 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1325 "VBNET.ATG" +#line 1329 "VBNET.ATG" out stmt); Expect(100); Expect(178); EndOfStmt(); -#line 1327 "VBNET.ATG" +#line 1331 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3119,187 +3140,187 @@ out stmt); lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1332 "VBNET.ATG" +#line 1336 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1333 "VBNET.ATG" +#line 1337 "VBNET.ATG" out stmt); Expect(100); Expect(174); EndOfStmt(); -#line 1335 "VBNET.ATG" +#line 1339 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else SynErr(253); + } else SynErr(254); } void OverloadableOperator( -#line 1248 "VBNET.ATG" +#line 1252 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1249 "VBNET.ATG" +#line 1253 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 19: { lexer.NextToken(); -#line 1251 "VBNET.ATG" +#line 1255 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 18: { lexer.NextToken(); -#line 1253 "VBNET.ATG" +#line 1257 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 22: { lexer.NextToken(); -#line 1255 "VBNET.ATG" +#line 1259 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 14: { lexer.NextToken(); -#line 1257 "VBNET.ATG" +#line 1261 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 15: { lexer.NextToken(); -#line 1259 "VBNET.ATG" +#line 1263 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 13: { lexer.NextToken(); -#line 1261 "VBNET.ATG" +#line 1265 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 136: { lexer.NextToken(); -#line 1263 "VBNET.ATG" +#line 1267 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 140: { lexer.NextToken(); -#line 1265 "VBNET.ATG" +#line 1269 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 47: { lexer.NextToken(); -#line 1267 "VBNET.ATG" +#line 1271 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 161: { lexer.NextToken(); -#line 1269 "VBNET.ATG" +#line 1273 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 221: { lexer.NextToken(); -#line 1271 "VBNET.ATG" +#line 1275 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1273 "VBNET.ATG" +#line 1277 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 32: { lexer.NextToken(); -#line 1275 "VBNET.ATG" +#line 1279 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1277 "VBNET.ATG" +#line 1281 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 10: { lexer.NextToken(); -#line 1279 "VBNET.ATG" +#line 1283 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 1281 "VBNET.ATG" +#line 1285 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 28: { lexer.NextToken(); -#line 1283 "VBNET.ATG" +#line 1287 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 31: { lexer.NextToken(); -#line 1285 "VBNET.ATG" +#line 1289 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 27: { lexer.NextToken(); -#line 1287 "VBNET.ATG" +#line 1291 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1289 "VBNET.ATG" +#line 1293 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 81: { lexer.NextToken(); -#line 1291 "VBNET.ATG" +#line 1295 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1295 "VBNET.ATG" +#line 1299 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3311,72 +3332,72 @@ out OverloadableOperatorType operatorType) { break; } - default: SynErr(254); break; + default: SynErr(255); break; } } void GetAccessorDecl( -#line 1369 "VBNET.ATG" +#line 1373 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1370 "VBNET.ATG" +#line 1374 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1372 "VBNET.ATG" +#line 1376 "VBNET.ATG" out m); Expect(115); -#line 1374 "VBNET.ATG" +#line 1378 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1376 "VBNET.ATG" +#line 1380 "VBNET.ATG" out stmt); -#line 1377 "VBNET.ATG" +#line 1381 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(100); Expect(115); -#line 1379 "VBNET.ATG" +#line 1383 "VBNET.ATG" getBlock.Modifier = m; -#line 1380 "VBNET.ATG" +#line 1384 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1385 "VBNET.ATG" +#line 1389 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1387 "VBNET.ATG" +#line 1391 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1392 "VBNET.ATG" +#line 1396 "VBNET.ATG" out m); Expect(183); -#line 1394 "VBNET.ATG" +#line 1398 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 1395 "VBNET.ATG" +#line 1399 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1397 "VBNET.ATG" +#line 1401 "VBNET.ATG" out stmt); -#line 1399 "VBNET.ATG" +#line 1403 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3384,207 +3405,207 @@ out stmt); Expect(100); Expect(183); -#line 1404 "VBNET.ATG" +#line 1408 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3444 "VBNET.ATG" +#line 3448 "VBNET.ATG" out Modifiers m) { -#line 3445 "VBNET.ATG" +#line 3449 "VBNET.ATG" m = Modifiers.None; while (StartOf(28)) { if (la.kind == 173) { lexer.NextToken(); -#line 3447 "VBNET.ATG" +#line 3451 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 172) { lexer.NextToken(); -#line 3448 "VBNET.ATG" +#line 3452 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 112) { lexer.NextToken(); -#line 3449 "VBNET.ATG" +#line 3453 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3450 "VBNET.ATG" +#line 3454 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1502 "VBNET.ATG" +#line 1506 "VBNET.ATG" out List arrayModifiers) { -#line 1504 "VBNET.ATG" +#line 1508 "VBNET.ATG" arrayModifiers = null; Expect(25); InitializationRankList( -#line 1506 "VBNET.ATG" +#line 1510 "VBNET.ATG" out arrayModifiers); Expect(26); } void ArrayNameModifier( -#line 2521 "VBNET.ATG" +#line 2525 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2523 "VBNET.ATG" +#line 2527 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2525 "VBNET.ATG" +#line 2529 "VBNET.ATG" out arrayModifiers); } void InitializationRankList( -#line 1510 "VBNET.ATG" +#line 1514 "VBNET.ATG" out List rank) { -#line 1512 "VBNET.ATG" +#line 1516 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1515 "VBNET.ATG" +#line 1519 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 1516 "VBNET.ATG" +#line 1520 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1517 "VBNET.ATG" +#line 1521 "VBNET.ATG" out expr); } -#line 1519 "VBNET.ATG" +#line 1523 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1521 "VBNET.ATG" +#line 1525 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 1522 "VBNET.ATG" +#line 1526 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1523 "VBNET.ATG" +#line 1527 "VBNET.ATG" out expr); } -#line 1525 "VBNET.ATG" +#line 1529 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1530 "VBNET.ATG" +#line 1534 "VBNET.ATG" out CollectionInitializerExpression outExpr) { -#line 1532 "VBNET.ATG" +#line 1536 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(23); if (StartOf(29)) { Expr( -#line 1537 "VBNET.ATG" +#line 1541 "VBNET.ATG" out expr); -#line 1539 "VBNET.ATG" +#line 1543 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1542 "VBNET.ATG" +#line 1546 "VBNET.ATG" NotFinalComma()) { Expect(12); Expr( -#line 1542 "VBNET.ATG" +#line 1546 "VBNET.ATG" out expr); -#line 1543 "VBNET.ATG" +#line 1547 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(24); -#line 1546 "VBNET.ATG" +#line 1550 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1616 "VBNET.ATG" +#line 1620 "VBNET.ATG" out string name) { -#line 1617 "VBNET.ATG" +#line 1621 "VBNET.ATG" string eventName; - if (StartOf(14)) { + if (StartOf(4)) { Identifier(); } else if (la.kind == 144) { lexer.NextToken(); } else if (la.kind == 139) { lexer.NextToken(); - } else SynErr(255); + } else SynErr(256); -#line 1620 "VBNET.ATG" +#line 1624 "VBNET.ATG" name = t.val; Expect(16); IdentifierOrKeyword( -#line 1622 "VBNET.ATG" +#line 1626 "VBNET.ATG" out eventName); -#line 1623 "VBNET.ATG" +#line 1627 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3377 "VBNET.ATG" +#line 3381 "VBNET.ATG" out string name) { -#line 3379 "VBNET.ATG" +#line 3383 "VBNET.ATG" lexer.NextToken(); name = t.val; } void QueryExpr( -#line 2045 "VBNET.ATG" +#line 2049 "VBNET.ATG" out Expression expr) { -#line 2047 "VBNET.ATG" +#line 2051 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2051 "VBNET.ATG" +#line 2055 "VBNET.ATG" qexpr.Clauses); while (StartOf(30)) { QueryOperator( -#line 2052 "VBNET.ATG" +#line 2056 "VBNET.ATG" qexpr.Clauses); } -#line 2054 "VBNET.ATG" +#line 2058 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2027 "VBNET.ATG" +#line 2031 "VBNET.ATG" out Expression expr) { -#line 2029 "VBNET.ATG" +#line 2033 "VBNET.ATG" Expression inner = null; LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; @@ -3592,18 +3613,18 @@ out Expression expr) { Expect(114); if (la.kind == 25) { lexer.NextToken(); - if (StartOf(4)) { + if (StartOf(6)) { FormalParameterList( -#line 2035 "VBNET.ATG" +#line 2039 "VBNET.ATG" lambda.Parameters); } Expect(26); } Expr( -#line 2036 "VBNET.ATG" +#line 2040 "VBNET.ATG" out inner); -#line 2038 "VBNET.ATG" +#line 2042 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? @@ -3612,172 +3633,172 @@ out inner); } void DisjunctionExpr( -#line 1800 "VBNET.ATG" +#line 1804 "VBNET.ATG" out Expression outExpr) { -#line 1802 "VBNET.ATG" +#line 1806 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1805 "VBNET.ATG" +#line 1809 "VBNET.ATG" out outExpr); while (la.kind == 161 || la.kind == 163 || la.kind == 221) { if (la.kind == 161) { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1812 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 163) { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1813 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1810 "VBNET.ATG" +#line 1814 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1812 "VBNET.ATG" +#line 1816 "VBNET.ATG" out expr); -#line 1812 "VBNET.ATG" +#line 1816 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1634 "VBNET.ATG" +#line 1638 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1635 "VBNET.ATG" +#line 1639 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 10: { lexer.NextToken(); -#line 1636 "VBNET.ATG" +#line 1640 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 42: { lexer.NextToken(); -#line 1637 "VBNET.ATG" +#line 1641 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 34: { lexer.NextToken(); -#line 1638 "VBNET.ATG" +#line 1642 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 36: { lexer.NextToken(); -#line 1639 "VBNET.ATG" +#line 1643 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 37: { lexer.NextToken(); -#line 1640 "VBNET.ATG" +#line 1644 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 38: { lexer.NextToken(); -#line 1641 "VBNET.ATG" +#line 1645 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 39: { lexer.NextToken(); -#line 1642 "VBNET.ATG" +#line 1646 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 35: { lexer.NextToken(); -#line 1643 "VBNET.ATG" +#line 1647 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 40: { lexer.NextToken(); -#line 1644 "VBNET.ATG" +#line 1648 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 41: { lexer.NextToken(); -#line 1645 "VBNET.ATG" +#line 1649 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(256); break; + default: SynErr(257); break; } } void SimpleExpr( -#line 1649 "VBNET.ATG" +#line 1653 "VBNET.ATG" out Expression pexpr) { -#line 1650 "VBNET.ATG" +#line 1654 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1652 "VBNET.ATG" +#line 1656 "VBNET.ATG" out pexpr); while (la.kind == 16 || la.kind == 17 || la.kind == 25) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1654 "VBNET.ATG" +#line 1658 "VBNET.ATG" out name); -#line 1655 "VBNET.ATG" +#line 1659 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); if ( -#line 1656 "VBNET.ATG" +#line 1660 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); TypeArgumentList( -#line 1657 "VBNET.ATG" +#line 1661 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(26); } } else if (la.kind == 17) { lexer.NextToken(); IdentifierOrKeyword( -#line 1659 "VBNET.ATG" +#line 1663 "VBNET.ATG" out name); -#line 1659 "VBNET.ATG" +#line 1663 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); } else { InvocationExpression( -#line 1660 "VBNET.ATG" +#line 1664 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1664 "VBNET.ATG" +#line 1668 "VBNET.ATG" out Expression pexpr) { -#line 1666 "VBNET.ATG" +#line 1670 "VBNET.ATG" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; @@ -3789,98 +3810,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1675 "VBNET.ATG" +#line 1679 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1676 "VBNET.ATG" +#line 1680 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1677 "VBNET.ATG" +#line 1681 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1678 "VBNET.ATG" +#line 1682 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1679 "VBNET.ATG" +#line 1683 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1680 "VBNET.ATG" +#line 1684 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1681 "VBNET.ATG" +#line 1685 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 202: { lexer.NextToken(); -#line 1683 "VBNET.ATG" +#line 1687 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 109: { lexer.NextToken(); -#line 1684 "VBNET.ATG" +#line 1688 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 151: { lexer.NextToken(); -#line 1685 "VBNET.ATG" +#line 1689 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 25: { lexer.NextToken(); Expr( -#line 1686 "VBNET.ATG" +#line 1690 "VBNET.ATG" out expr); Expect(26); -#line 1686 "VBNET.ATG" +#line 1690 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1688 "VBNET.ATG" +#line 1692 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1691 "VBNET.ATG" +#line 1695 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); TypeArgumentList( -#line 1692 "VBNET.ATG" +#line 1696 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(26); } @@ -3888,51 +3909,51 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 55: case 58: case 69: case 86: case 87: case 96: case 128: case 137: case 154: case 181: case 186: case 187: case 193: case 206: case 207: case 210: { -#line 1694 "VBNET.ATG" +#line 1698 "VBNET.ATG" string val = String.Empty; - if (StartOf(11)) { + if (StartOf(12)) { PrimitiveTypeName( -#line 1695 "VBNET.ATG" +#line 1699 "VBNET.ATG" out val); } else if (la.kind == 154) { lexer.NextToken(); -#line 1695 "VBNET.ATG" +#line 1699 "VBNET.ATG" val = "System.Object"; - } else SynErr(257); + } else SynErr(258); -#line 1696 "VBNET.ATG" +#line 1700 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 139: { lexer.NextToken(); -#line 1697 "VBNET.ATG" +#line 1701 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 144: case 145: { -#line 1698 "VBNET.ATG" +#line 1702 "VBNET.ATG" Expression retExpr = null; if (la.kind == 144) { lexer.NextToken(); -#line 1699 "VBNET.ATG" +#line 1703 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 145) { lexer.NextToken(); -#line 1700 "VBNET.ATG" +#line 1704 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(258); + } else SynErr(259); Expect(16); IdentifierOrKeyword( -#line 1702 "VBNET.ATG" +#line 1706 "VBNET.ATG" out name); -#line 1702 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -3941,86 +3962,86 @@ out name); Expect(16); Identifier(); -#line 1704 "VBNET.ATG" +#line 1708 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1706 "VBNET.ATG" +#line 1710 "VBNET.ATG" type.IsGlobal = true; -#line 1707 "VBNET.ATG" +#line 1711 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 148: { ObjectCreateExpression( -#line 1708 "VBNET.ATG" +#line 1712 "VBNET.ATG" out expr); -#line 1708 "VBNET.ATG" +#line 1712 "VBNET.ATG" pexpr = expr; break; } case 23: { CollectionInitializer( -#line 1709 "VBNET.ATG" +#line 1713 "VBNET.ATG" out cie); -#line 1709 "VBNET.ATG" +#line 1713 "VBNET.ATG" pexpr = cie; break; } case 81: case 93: case 204: { -#line 1711 "VBNET.ATG" +#line 1715 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 93) { lexer.NextToken(); } else if (la.kind == 81) { lexer.NextToken(); -#line 1713 "VBNET.ATG" +#line 1717 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 204) { lexer.NextToken(); -#line 1714 "VBNET.ATG" +#line 1718 "VBNET.ATG" castType = CastType.TryCast; - } else SynErr(259); + } else SynErr(260); Expect(25); Expr( -#line 1716 "VBNET.ATG" +#line 1720 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1716 "VBNET.ATG" +#line 1720 "VBNET.ATG" out type); Expect(26); -#line 1717 "VBNET.ATG" +#line 1721 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 63: case 64: case 65: case 66: case 67: case 68: case 70: case 72: case 73: case 77: case 78: case 79: case 80: case 82: case 83: case 84: { CastTarget( -#line 1718 "VBNET.ATG" +#line 1722 "VBNET.ATG" out type); Expect(25); Expr( -#line 1718 "VBNET.ATG" +#line 1722 "VBNET.ATG" out expr); Expect(26); -#line 1718 "VBNET.ATG" +#line 1722 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 44: { lexer.NextToken(); Expr( -#line 1719 "VBNET.ATG" +#line 1723 "VBNET.ATG" out expr); -#line 1719 "VBNET.ATG" +#line 1723 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4028,31 +4049,31 @@ out expr); lexer.NextToken(); Expect(25); GetTypeTypeName( -#line 1720 "VBNET.ATG" +#line 1724 "VBNET.ATG" out type); Expect(26); -#line 1720 "VBNET.ATG" +#line 1724 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 205: { lexer.NextToken(); SimpleExpr( -#line 1721 "VBNET.ATG" +#line 1725 "VBNET.ATG" out expr); Expect(131); TypeName( -#line 1721 "VBNET.ATG" +#line 1725 "VBNET.ATG" out type); -#line 1721 "VBNET.ATG" +#line 1725 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 122: { ConditionalExpression( -#line 1722 "VBNET.ATG" +#line 1726 "VBNET.ATG" out pexpr); break; } @@ -4060,315 +4081,315 @@ out pexpr); } else if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1726 "VBNET.ATG" +#line 1730 "VBNET.ATG" out name); -#line 1726 "VBNET.ATG" +#line 1730 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); - } else SynErr(260); + } else SynErr(261); } void TypeArgumentList( -#line 2557 "VBNET.ATG" +#line 2561 "VBNET.ATG" List typeArguments) { -#line 2559 "VBNET.ATG" +#line 2563 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2561 "VBNET.ATG" +#line 2565 "VBNET.ATG" out typeref); -#line 2561 "VBNET.ATG" +#line 2565 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2564 "VBNET.ATG" +#line 2568 "VBNET.ATG" out typeref); -#line 2564 "VBNET.ATG" +#line 2568 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1764 "VBNET.ATG" +#line 1768 "VBNET.ATG" ref Expression pexpr) { -#line 1765 "VBNET.ATG" +#line 1769 "VBNET.ATG" List parameters = null; Expect(25); -#line 1767 "VBNET.ATG" +#line 1771 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1768 "VBNET.ATG" +#line 1772 "VBNET.ATG" out parameters); Expect(26); -#line 1771 "VBNET.ATG" +#line 1775 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1773 "VBNET.ATG" +#line 1777 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3384 "VBNET.ATG" +#line 3388 "VBNET.ATG" out string type) { -#line 3385 "VBNET.ATG" +#line 3389 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 55: { lexer.NextToken(); -#line 3386 "VBNET.ATG" +#line 3390 "VBNET.ATG" type = "System.Boolean"; break; } case 86: { lexer.NextToken(); -#line 3387 "VBNET.ATG" +#line 3391 "VBNET.ATG" type = "System.DateTime"; break; } case 69: { lexer.NextToken(); -#line 3388 "VBNET.ATG" +#line 3392 "VBNET.ATG" type = "System.Char"; break; } case 193: { lexer.NextToken(); -#line 3389 "VBNET.ATG" +#line 3393 "VBNET.ATG" type = "System.String"; break; } case 87: { lexer.NextToken(); -#line 3390 "VBNET.ATG" +#line 3394 "VBNET.ATG" type = "System.Decimal"; break; } case 58: { lexer.NextToken(); -#line 3391 "VBNET.ATG" +#line 3395 "VBNET.ATG" type = "System.Byte"; break; } case 186: { lexer.NextToken(); -#line 3392 "VBNET.ATG" +#line 3396 "VBNET.ATG" type = "System.Int16"; break; } case 128: { lexer.NextToken(); -#line 3393 "VBNET.ATG" +#line 3397 "VBNET.ATG" type = "System.Int32"; break; } case 137: { lexer.NextToken(); -#line 3394 "VBNET.ATG" +#line 3398 "VBNET.ATG" type = "System.Int64"; break; } case 187: { lexer.NextToken(); -#line 3395 "VBNET.ATG" +#line 3399 "VBNET.ATG" type = "System.Single"; break; } case 96: { lexer.NextToken(); -#line 3396 "VBNET.ATG" +#line 3400 "VBNET.ATG" type = "System.Double"; break; } case 206: { lexer.NextToken(); -#line 3397 "VBNET.ATG" +#line 3401 "VBNET.ATG" type = "System.UInt32"; break; } case 207: { lexer.NextToken(); -#line 3398 "VBNET.ATG" +#line 3402 "VBNET.ATG" type = "System.UInt64"; break; } case 210: { lexer.NextToken(); -#line 3399 "VBNET.ATG" +#line 3403 "VBNET.ATG" type = "System.UInt16"; break; } case 181: { lexer.NextToken(); -#line 3400 "VBNET.ATG" +#line 3404 "VBNET.ATG" type = "System.SByte"; break; } - default: SynErr(261); break; + default: SynErr(262); break; } } void CastTarget( -#line 1778 "VBNET.ATG" +#line 1782 "VBNET.ATG" out TypeReference type) { -#line 1780 "VBNET.ATG" +#line 1784 "VBNET.ATG" type = null; switch (la.kind) { case 63: { lexer.NextToken(); -#line 1782 "VBNET.ATG" +#line 1786 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 64: { lexer.NextToken(); -#line 1783 "VBNET.ATG" +#line 1787 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 77: { lexer.NextToken(); -#line 1784 "VBNET.ATG" +#line 1788 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 65: { lexer.NextToken(); -#line 1785 "VBNET.ATG" +#line 1789 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 66: { lexer.NextToken(); -#line 1786 "VBNET.ATG" +#line 1790 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 68: { lexer.NextToken(); -#line 1787 "VBNET.ATG" +#line 1791 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 67: { lexer.NextToken(); -#line 1788 "VBNET.ATG" +#line 1792 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 78: { lexer.NextToken(); -#line 1789 "VBNET.ATG" +#line 1793 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 70: { lexer.NextToken(); -#line 1790 "VBNET.ATG" +#line 1794 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 72: { lexer.NextToken(); -#line 1791 "VBNET.ATG" +#line 1795 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 84: { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1796 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 82: { lexer.NextToken(); -#line 1793 "VBNET.ATG" +#line 1797 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 83: { lexer.NextToken(); -#line 1794 "VBNET.ATG" +#line 1798 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 73: { lexer.NextToken(); -#line 1795 "VBNET.ATG" +#line 1799 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 79: { lexer.NextToken(); -#line 1796 "VBNET.ATG" +#line 1800 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 80: { lexer.NextToken(); -#line 1797 "VBNET.ATG" +#line 1801 "VBNET.ATG" type = new TypeReference("System.String", true); break; } - default: SynErr(262); break; + default: SynErr(263); break; } } void GetTypeTypeName( -#line 2456 "VBNET.ATG" +#line 2460 "VBNET.ATG" out TypeReference typeref) { -#line 2457 "VBNET.ATG" +#line 2461 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2459 "VBNET.ATG" +#line 2463 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2460 "VBNET.ATG" +#line 2464 "VBNET.ATG" out rank); -#line 2461 "VBNET.ATG" +#line 2465 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4376,10 +4397,10 @@ out rank); } void ConditionalExpression( -#line 1730 "VBNET.ATG" +#line 1734 "VBNET.ATG" out Expression expr) { -#line 1732 "VBNET.ATG" +#line 1736 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4391,21 +4412,21 @@ out Expression expr) { Expect(122); Expect(25); Expr( -#line 1741 "VBNET.ATG" +#line 1745 "VBNET.ATG" out condition); Expect(12); Expr( -#line 1741 "VBNET.ATG" +#line 1745 "VBNET.ATG" out trueExpr); if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1741 "VBNET.ATG" +#line 1745 "VBNET.ATG" out falseExpr); } Expect(26); -#line 1743 "VBNET.ATG" +#line 1747 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4428,348 +4449,348 @@ out falseExpr); } void ArgumentList( -#line 2388 "VBNET.ATG" +#line 2392 "VBNET.ATG" out List arguments) { -#line 2390 "VBNET.ATG" +#line 2394 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(29)) { Argument( -#line 2393 "VBNET.ATG" +#line 2397 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 2394 "VBNET.ATG" +#line 2398 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(29)) { Argument( -#line 2395 "VBNET.ATG" +#line 2399 "VBNET.ATG" out expr); } -#line 2396 "VBNET.ATG" +#line 2400 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2398 "VBNET.ATG" +#line 2402 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1816 "VBNET.ATG" +#line 1820 "VBNET.ATG" out Expression outExpr) { -#line 1818 "VBNET.ATG" +#line 1822 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1821 "VBNET.ATG" +#line 1825 "VBNET.ATG" out outExpr); while (la.kind == 47 || la.kind == 48) { if (la.kind == 47) { lexer.NextToken(); -#line 1824 "VBNET.ATG" +#line 1828 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1825 "VBNET.ATG" +#line 1829 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1827 "VBNET.ATG" +#line 1831 "VBNET.ATG" out expr); -#line 1827 "VBNET.ATG" +#line 1831 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1831 "VBNET.ATG" +#line 1835 "VBNET.ATG" out Expression outExpr) { -#line 1832 "VBNET.ATG" +#line 1836 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 150) { lexer.NextToken(); -#line 1833 "VBNET.ATG" +#line 1837 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1834 "VBNET.ATG" +#line 1838 "VBNET.ATG" out outExpr); -#line 1835 "VBNET.ATG" +#line 1839 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1840 "VBNET.ATG" +#line 1844 "VBNET.ATG" out Expression outExpr) { -#line 1842 "VBNET.ATG" +#line 1846 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1845 "VBNET.ATG" +#line 1849 "VBNET.ATG" out outExpr); while (StartOf(32)) { switch (la.kind) { case 28: { lexer.NextToken(); -#line 1848 "VBNET.ATG" +#line 1852 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1853 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 1850 "VBNET.ATG" +#line 1854 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 1851 "VBNET.ATG" +#line 1855 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1852 "VBNET.ATG" +#line 1856 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 10: { lexer.NextToken(); -#line 1853 "VBNET.ATG" +#line 1857 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 136: { lexer.NextToken(); -#line 1854 "VBNET.ATG" +#line 1858 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 131: { lexer.NextToken(); -#line 1855 "VBNET.ATG" +#line 1859 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 132: { lexer.NextToken(); -#line 1856 "VBNET.ATG" +#line 1860 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(33)) { ShiftExpr( -#line 1859 "VBNET.ATG" +#line 1863 "VBNET.ATG" out expr); -#line 1859 "VBNET.ATG" +#line 1863 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 150) { lexer.NextToken(); ShiftExpr( -#line 1862 "VBNET.ATG" +#line 1866 "VBNET.ATG" out expr); -#line 1862 "VBNET.ATG" +#line 1866 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(263); + } else SynErr(264); } } void ShiftExpr( -#line 1867 "VBNET.ATG" +#line 1871 "VBNET.ATG" out Expression outExpr) { -#line 1869 "VBNET.ATG" +#line 1873 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1872 "VBNET.ATG" +#line 1876 "VBNET.ATG" out outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 32) { lexer.NextToken(); -#line 1875 "VBNET.ATG" +#line 1879 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1876 "VBNET.ATG" +#line 1880 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1878 "VBNET.ATG" +#line 1882 "VBNET.ATG" out expr); -#line 1878 "VBNET.ATG" +#line 1882 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1882 "VBNET.ATG" +#line 1886 "VBNET.ATG" out Expression outExpr) { -#line 1883 "VBNET.ATG" +#line 1887 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1885 "VBNET.ATG" +#line 1889 "VBNET.ATG" out outExpr); while (la.kind == 13) { lexer.NextToken(); AdditiveExpr( -#line 1885 "VBNET.ATG" +#line 1889 "VBNET.ATG" out expr); -#line 1885 "VBNET.ATG" +#line 1889 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1888 "VBNET.ATG" +#line 1892 "VBNET.ATG" out Expression outExpr) { -#line 1890 "VBNET.ATG" +#line 1894 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1893 "VBNET.ATG" +#line 1897 "VBNET.ATG" out outExpr); while (la.kind == 18 || la.kind == 19) { if (la.kind == 19) { lexer.NextToken(); -#line 1896 "VBNET.ATG" +#line 1900 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1897 "VBNET.ATG" +#line 1901 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1899 "VBNET.ATG" +#line 1903 "VBNET.ATG" out expr); -#line 1899 "VBNET.ATG" +#line 1903 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1903 "VBNET.ATG" +#line 1907 "VBNET.ATG" out Expression outExpr) { -#line 1904 "VBNET.ATG" +#line 1908 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1906 "VBNET.ATG" +#line 1910 "VBNET.ATG" out outExpr); while (la.kind == 140) { lexer.NextToken(); IntegerDivisionExpr( -#line 1906 "VBNET.ATG" +#line 1910 "VBNET.ATG" out expr); -#line 1906 "VBNET.ATG" +#line 1910 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1909 "VBNET.ATG" +#line 1913 "VBNET.ATG" out Expression outExpr) { -#line 1910 "VBNET.ATG" +#line 1914 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1912 "VBNET.ATG" +#line 1916 "VBNET.ATG" out outExpr); while (la.kind == 15) { lexer.NextToken(); MultiplicativeExpr( -#line 1912 "VBNET.ATG" +#line 1916 "VBNET.ATG" out expr); -#line 1912 "VBNET.ATG" +#line 1916 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1915 "VBNET.ATG" +#line 1919 "VBNET.ATG" out Expression outExpr) { -#line 1917 "VBNET.ATG" +#line 1921 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1920 "VBNET.ATG" +#line 1924 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 22) { if (la.kind == 22) { lexer.NextToken(); -#line 1923 "VBNET.ATG" +#line 1927 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1924 "VBNET.ATG" +#line 1928 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1926 "VBNET.ATG" +#line 1930 "VBNET.ATG" out expr); -#line 1926 "VBNET.ATG" +#line 1930 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1930 "VBNET.ATG" +#line 1934 "VBNET.ATG" out Expression uExpr) { -#line 1932 "VBNET.ATG" +#line 1936 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4778,25 +4799,25 @@ out Expression uExpr) { if (la.kind == 19) { lexer.NextToken(); -#line 1936 "VBNET.ATG" +#line 1940 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 18) { lexer.NextToken(); -#line 1937 "VBNET.ATG" +#line 1941 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1938 "VBNET.ATG" +#line 1942 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 1940 "VBNET.ATG" +#line 1944 "VBNET.ATG" out expr); -#line 1942 "VBNET.ATG" +#line 1946 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4806,107 +4827,107 @@ out expr); } void ExponentiationExpr( -#line 1950 "VBNET.ATG" +#line 1954 "VBNET.ATG" out Expression outExpr) { -#line 1951 "VBNET.ATG" +#line 1955 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1953 "VBNET.ATG" +#line 1957 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1953 "VBNET.ATG" +#line 1957 "VBNET.ATG" out expr); -#line 1953 "VBNET.ATG" +#line 1957 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2402 "VBNET.ATG" +#line 2406 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2404 "VBNET.ATG" +#line 2408 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(29)) { Argument( -#line 2409 "VBNET.ATG" +#line 2413 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 2410 "VBNET.ATG" +#line 2414 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2411 "VBNET.ATG" +#line 2415 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 2414 "VBNET.ATG" +#line 2418 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2415 "VBNET.ATG" +#line 2419 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2416 "VBNET.ATG" +#line 2420 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(29)) { Argument( -#line 2417 "VBNET.ATG" +#line 2421 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 2418 "VBNET.ATG" +#line 2422 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2419 "VBNET.ATG" +#line 2423 "VBNET.ATG" out expr); } } -#line 2421 "VBNET.ATG" +#line 2425 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2423 "VBNET.ATG" +#line 2427 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2530 "VBNET.ATG" +#line 2534 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2532 "VBNET.ATG" +#line 2536 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2535 "VBNET.ATG" +#line 2539 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2537 "VBNET.ATG" +#line 2541 "VBNET.ATG" out i); } -#line 2539 "VBNET.ATG" +#line 2543 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2544 "VBNET.ATG" +#line 2548 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4914,10 +4935,10 @@ out i); } void MemberInitializer( -#line 2369 "VBNET.ATG" +#line 2373 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2371 "VBNET.ATG" +#line 2375 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -4926,14 +4947,14 @@ out MemberInitializerExpression memberInitializer) { Expect(16); IdentifierOrKeyword( -#line 2378 "VBNET.ATG" +#line 2382 "VBNET.ATG" out name); Expect(10); Expr( -#line 2378 "VBNET.ATG" +#line 2382 "VBNET.ATG" out initExpr); -#line 2380 "VBNET.ATG" +#line 2384 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -4942,35 +4963,35 @@ out initExpr); } void FromOrAggregateQueryOperator( -#line 2058 "VBNET.ATG" +#line 2062 "VBNET.ATG" List middleClauses) { -#line 2060 "VBNET.ATG" +#line 2064 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 113) { FromQueryOperator( -#line 2063 "VBNET.ATG" +#line 2067 "VBNET.ATG" out fromClause); -#line 2064 "VBNET.ATG" +#line 2068 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 45) { AggregateQueryOperator( -#line 2065 "VBNET.ATG" +#line 2069 "VBNET.ATG" out aggregateClause); -#line 2066 "VBNET.ATG" +#line 2070 "VBNET.ATG" middleClauses.Add(aggregateClause); - } else SynErr(264); + } else SynErr(265); } void QueryOperator( -#line 2069 "VBNET.ATG" +#line 2073 "VBNET.ATG" List middleClauses) { -#line 2071 "VBNET.ATG" +#line 2075 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -4980,94 +5001,94 @@ List middleClauses) { if (la.kind == 113) { FromQueryOperator( -#line 2078 "VBNET.ATG" +#line 2082 "VBNET.ATG" out fromClause); -#line 2079 "VBNET.ATG" +#line 2083 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 45) { AggregateQueryOperator( -#line 2080 "VBNET.ATG" +#line 2084 "VBNET.ATG" out aggregateClause); -#line 2081 "VBNET.ATG" +#line 2085 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 182) { SelectQueryOperator( -#line 2082 "VBNET.ATG" +#line 2086 "VBNET.ATG" middleClauses); } else if (la.kind == 94) { DistinctQueryOperator( -#line 2083 "VBNET.ATG" +#line 2087 "VBNET.ATG" middleClauses); } else if (la.kind == 215) { WhereQueryOperator( -#line 2084 "VBNET.ATG" +#line 2088 "VBNET.ATG" middleClauses); } else if (la.kind == 162) { OrderByQueryOperator( -#line 2085 "VBNET.ATG" +#line 2089 "VBNET.ATG" middleClauses); } else if (la.kind == 188 || la.kind == 197) { PartitionQueryOperator( -#line 2086 "VBNET.ATG" +#line 2090 "VBNET.ATG" out partitionClause); -#line 2087 "VBNET.ATG" +#line 2091 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 134) { LetQueryOperator( -#line 2088 "VBNET.ATG" +#line 2092 "VBNET.ATG" middleClauses); } else if (la.kind == 133) { JoinQueryOperator( -#line 2089 "VBNET.ATG" +#line 2093 "VBNET.ATG" out joinClause); -#line 2090 "VBNET.ATG" +#line 2094 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2091 "VBNET.ATG" +#line 2095 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2091 "VBNET.ATG" +#line 2095 "VBNET.ATG" out groupJoinClause); -#line 2092 "VBNET.ATG" +#line 2096 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 120) { GroupByQueryOperator( -#line 2093 "VBNET.ATG" +#line 2097 "VBNET.ATG" out groupByClause); -#line 2094 "VBNET.ATG" +#line 2098 "VBNET.ATG" middleClauses.Add(groupByClause); - } else SynErr(265); + } else SynErr(266); } void FromQueryOperator( -#line 2169 "VBNET.ATG" +#line 2173 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2171 "VBNET.ATG" +#line 2175 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(113); CollectionRangeVariableDeclarationList( -#line 2174 "VBNET.ATG" +#line 2178 "VBNET.ATG" fromClause.Sources); -#line 2176 "VBNET.ATG" +#line 2180 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2238 "VBNET.ATG" +#line 2242 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2240 "VBNET.ATG" +#line 2244 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -5075,77 +5096,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(45); CollectionRangeVariableDeclaration( -#line 2245 "VBNET.ATG" +#line 2249 "VBNET.ATG" out source); -#line 2247 "VBNET.ATG" +#line 2251 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(30)) { QueryOperator( -#line 2250 "VBNET.ATG" +#line 2254 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(130); ExpressionRangeVariableDeclarationList( -#line 2252 "VBNET.ATG" +#line 2256 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2254 "VBNET.ATG" +#line 2258 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2180 "VBNET.ATG" +#line 2184 "VBNET.ATG" List middleClauses) { -#line 2182 "VBNET.ATG" +#line 2186 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(182); ExpressionRangeVariableDeclarationList( -#line 2185 "VBNET.ATG" +#line 2189 "VBNET.ATG" selectClause.Variables); -#line 2187 "VBNET.ATG" +#line 2191 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2192 "VBNET.ATG" +#line 2196 "VBNET.ATG" List middleClauses) { -#line 2194 "VBNET.ATG" +#line 2198 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(94); -#line 2199 "VBNET.ATG" +#line 2203 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2204 "VBNET.ATG" +#line 2208 "VBNET.ATG" List middleClauses) { -#line 2206 "VBNET.ATG" +#line 2210 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(215); Expr( -#line 2210 "VBNET.ATG" +#line 2214 "VBNET.ATG" out operand); -#line 2212 "VBNET.ATG" +#line 2216 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -5154,10 +5175,10 @@ out operand); } void OrderByQueryOperator( -#line 2097 "VBNET.ATG" +#line 2101 "VBNET.ATG" List middleClauses) { -#line 2099 "VBNET.ATG" +#line 2103 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -5165,10 +5186,10 @@ List middleClauses) { Expect(162); Expect(57); OrderExpressionList( -#line 2103 "VBNET.ATG" +#line 2107 "VBNET.ATG" out orderings); -#line 2105 "VBNET.ATG" +#line 2109 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -5176,10 +5197,10 @@ out orderings); } void PartitionQueryOperator( -#line 2219 "VBNET.ATG" +#line 2223 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2221 "VBNET.ATG" +#line 2225 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -5187,60 +5208,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 197) { lexer.NextToken(); -#line 2226 "VBNET.ATG" +#line 2230 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 216) { lexer.NextToken(); -#line 2227 "VBNET.ATG" +#line 2231 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 188) { lexer.NextToken(); -#line 2228 "VBNET.ATG" +#line 2232 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 216) { lexer.NextToken(); -#line 2229 "VBNET.ATG" +#line 2233 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } - } else SynErr(266); + } else SynErr(267); Expr( -#line 2231 "VBNET.ATG" +#line 2235 "VBNET.ATG" out expr); -#line 2233 "VBNET.ATG" +#line 2237 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2258 "VBNET.ATG" +#line 2262 "VBNET.ATG" List middleClauses) { -#line 2260 "VBNET.ATG" +#line 2264 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(134); ExpressionRangeVariableDeclarationList( -#line 2263 "VBNET.ATG" +#line 2267 "VBNET.ATG" letClause.Variables); -#line 2265 "VBNET.ATG" +#line 2269 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2302 "VBNET.ATG" +#line 2306 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2304 "VBNET.ATG" +#line 2308 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -5250,203 +5271,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(133); CollectionRangeVariableDeclaration( -#line 2311 "VBNET.ATG" +#line 2315 "VBNET.ATG" out joinVariable); -#line 2312 "VBNET.ATG" +#line 2316 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 133) { JoinQueryOperator( -#line 2314 "VBNET.ATG" +#line 2318 "VBNET.ATG" out subJoin); -#line 2315 "VBNET.ATG" +#line 2319 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(157); JoinCondition( -#line 2318 "VBNET.ATG" +#line 2322 "VBNET.ATG" out condition); -#line 2319 "VBNET.ATG" +#line 2323 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 47) { lexer.NextToken(); JoinCondition( -#line 2321 "VBNET.ATG" +#line 2325 "VBNET.ATG" out condition); -#line 2322 "VBNET.ATG" +#line 2326 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2325 "VBNET.ATG" +#line 2329 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2155 "VBNET.ATG" +#line 2159 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2157 "VBNET.ATG" +#line 2161 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(120); JoinQueryOperator( -#line 2161 "VBNET.ATG" +#line 2165 "VBNET.ATG" out joinClause); Expect(130); ExpressionRangeVariableDeclarationList( -#line 2162 "VBNET.ATG" +#line 2166 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2164 "VBNET.ATG" +#line 2168 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2142 "VBNET.ATG" +#line 2146 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2144 "VBNET.ATG" +#line 2148 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(120); ExpressionRangeVariableDeclarationList( -#line 2147 "VBNET.ATG" +#line 2151 "VBNET.ATG" groupByClause.GroupVariables); Expect(57); ExpressionRangeVariableDeclarationList( -#line 2148 "VBNET.ATG" +#line 2152 "VBNET.ATG" groupByClause.ByVariables); Expect(130); ExpressionRangeVariableDeclarationList( -#line 2149 "VBNET.ATG" +#line 2153 "VBNET.ATG" groupByClause.IntoVariables); -#line 2151 "VBNET.ATG" +#line 2155 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2111 "VBNET.ATG" +#line 2115 "VBNET.ATG" out List orderings) { -#line 2113 "VBNET.ATG" +#line 2117 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2116 "VBNET.ATG" +#line 2120 "VBNET.ATG" out ordering); -#line 2117 "VBNET.ATG" +#line 2121 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 12) { lexer.NextToken(); OrderExpression( -#line 2119 "VBNET.ATG" +#line 2123 "VBNET.ATG" out ordering); -#line 2120 "VBNET.ATG" +#line 2124 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2124 "VBNET.ATG" +#line 2128 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2126 "VBNET.ATG" +#line 2130 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2131 "VBNET.ATG" +#line 2135 "VBNET.ATG" out orderExpr); -#line 2133 "VBNET.ATG" +#line 2137 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 51 || la.kind == 91) { if (la.kind == 51) { lexer.NextToken(); -#line 2136 "VBNET.ATG" +#line 2140 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2137 "VBNET.ATG" +#line 2141 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2139 "VBNET.ATG" +#line 2143 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2270 "VBNET.ATG" +#line 2274 "VBNET.ATG" List variables) { -#line 2272 "VBNET.ATG" +#line 2276 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2274 "VBNET.ATG" +#line 2278 "VBNET.ATG" out variable); -#line 2275 "VBNET.ATG" +#line 2279 "VBNET.ATG" variables.Add(variable); while (la.kind == 12) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2276 "VBNET.ATG" +#line 2280 "VBNET.ATG" out variable); -#line 2276 "VBNET.ATG" +#line 2280 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2329 "VBNET.ATG" +#line 2333 "VBNET.ATG" List rangeVariables) { -#line 2330 "VBNET.ATG" +#line 2334 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2332 "VBNET.ATG" +#line 2336 "VBNET.ATG" out variableDeclaration); -#line 2333 "VBNET.ATG" +#line 2337 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 12) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2334 "VBNET.ATG" +#line 2338 "VBNET.ATG" out variableDeclaration); -#line 2334 "VBNET.ATG" +#line 2338 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2337 "VBNET.ATG" +#line 2341 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2339 "VBNET.ATG" +#line 2343 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -5454,71 +5475,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2344 "VBNET.ATG" +#line 2348 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2345 "VBNET.ATG" +#line 2349 "VBNET.ATG" out typeName); -#line 2345 "VBNET.ATG" +#line 2349 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(125); Expr( -#line 2346 "VBNET.ATG" +#line 2350 "VBNET.ATG" out inExpr); -#line 2348 "VBNET.ATG" +#line 2352 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2279 "VBNET.ATG" +#line 2283 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2281 "VBNET.ATG" +#line 2285 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2287 "VBNET.ATG" +#line 2291 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2288 "VBNET.ATG" +#line 2292 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2290 "VBNET.ATG" +#line 2294 "VBNET.ATG" out typeName); -#line 2291 "VBNET.ATG" +#line 2295 "VBNET.ATG" variable.Type = typeName; } Expect(10); } Expr( -#line 2295 "VBNET.ATG" +#line 2299 "VBNET.ATG" out rhs); -#line 2297 "VBNET.ATG" +#line 2301 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2353 "VBNET.ATG" +#line 2357 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2355 "VBNET.ATG" +#line 2359 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -5526,14 +5547,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2361 "VBNET.ATG" +#line 2365 "VBNET.ATG" out lhs); Expect(103); Expr( -#line 2361 "VBNET.ATG" +#line 2365 "VBNET.ATG" out rhs); -#line 2363 "VBNET.ATG" +#line 2367 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -5541,94 +5562,94 @@ out rhs); } void Argument( -#line 2427 "VBNET.ATG" +#line 2431 "VBNET.ATG" out Expression argumentexpr) { -#line 2429 "VBNET.ATG" +#line 2433 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2433 "VBNET.ATG" +#line 2437 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2433 "VBNET.ATG" +#line 2437 "VBNET.ATG" name = t.val; Expect(11); Expect(10); Expr( -#line 2433 "VBNET.ATG" +#line 2437 "VBNET.ATG" out expr); -#line 2435 "VBNET.ATG" +#line 2439 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(29)) { Expr( -#line 2438 "VBNET.ATG" +#line 2442 "VBNET.ATG" out argumentexpr); - } else SynErr(267); + } else SynErr(268); } void QualIdentAndTypeArguments( -#line 2504 "VBNET.ATG" +#line 2508 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2505 "VBNET.ATG" +#line 2509 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2507 "VBNET.ATG" +#line 2511 "VBNET.ATG" out name); -#line 2508 "VBNET.ATG" +#line 2512 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2509 "VBNET.ATG" +#line 2513 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); if ( -#line 2511 "VBNET.ATG" +#line 2515 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2512 "VBNET.ATG" +#line 2516 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2513 "VBNET.ATG" +#line 2517 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } - } else if (StartOf(7)) { + } else if (StartOf(8)) { TypeArgumentList( -#line 2514 "VBNET.ATG" +#line 2518 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(268); + } else SynErr(269); Expect(26); } } void RankList( -#line 2551 "VBNET.ATG" +#line 2555 "VBNET.ATG" out int i) { -#line 2552 "VBNET.ATG" +#line 2556 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2553 "VBNET.ATG" +#line 2557 "VBNET.ATG" ++i; } } void Attribute( -#line 2592 "VBNET.ATG" +#line 2596 "VBNET.ATG" out ASTAttribute attribute) { -#line 2593 "VBNET.ATG" +#line 2597 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -5638,40 +5659,40 @@ out ASTAttribute attribute) { Expect(16); } Qualident( -#line 2598 "VBNET.ATG" +#line 2602 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2599 "VBNET.ATG" +#line 2603 "VBNET.ATG" positional, named); } -#line 2601 "VBNET.ATG" +#line 2605 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2606 "VBNET.ATG" +#line 2610 "VBNET.ATG" List positional, List named) { -#line 2608 "VBNET.ATG" +#line 2612 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2614 "VBNET.ATG" +#line 2618 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2616 "VBNET.ATG" +#line 2620 "VBNET.ATG" IsNamedAssign()) { -#line 2616 "VBNET.ATG" +#line 2620 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2617 "VBNET.ATG" +#line 2621 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); @@ -5679,10 +5700,10 @@ out name); Expect(10); } Expr( -#line 2619 "VBNET.ATG" +#line 2623 "VBNET.ATG" out expr); -#line 2621 "VBNET.ATG" +#line 2625 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -5691,13 +5712,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2629 "VBNET.ATG" +#line 2633 "VBNET.ATG" IsNamedAssign()) { -#line 2629 "VBNET.ATG" +#line 2633 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2630 "VBNET.ATG" +#line 2634 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); @@ -5705,14 +5726,14 @@ out name); Expect(10); } else if (StartOf(29)) { -#line 2632 "VBNET.ATG" +#line 2636 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(269); + } else SynErr(270); Expr( -#line 2633 "VBNET.ATG" +#line 2637 "VBNET.ATG" out expr); -#line 2633 "VBNET.ATG" +#line 2637 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5723,10 +5744,10 @@ out expr); } void FormalParameter( -#line 2690 "VBNET.ATG" +#line 2694 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2692 "VBNET.ATG" +#line 2696 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -5737,36 +5758,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2701 "VBNET.ATG" +#line 2705 "VBNET.ATG" out section); -#line 2701 "VBNET.ATG" +#line 2705 "VBNET.ATG" attributes.Add(section); } while (StartOf(34)) { ParameterModifier( -#line 2702 "VBNET.ATG" +#line 2706 "VBNET.ATG" mod); } Identifier(); -#line 2703 "VBNET.ATG" +#line 2707 "VBNET.ATG" string parameterName = t.val; if ( -#line 2704 "VBNET.ATG" +#line 2708 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2704 "VBNET.ATG" +#line 2708 "VBNET.ATG" out arrayModifiers); } if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2705 "VBNET.ATG" +#line 2709 "VBNET.ATG" out type); } -#line 2707 "VBNET.ATG" +#line 2711 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5782,11 +5803,11 @@ out type); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 2719 "VBNET.ATG" +#line 2723 "VBNET.ATG" out expr); } -#line 2721 "VBNET.ATG" +#line 2725 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -5794,34 +5815,34 @@ out expr); } void ParameterModifier( -#line 3403 "VBNET.ATG" +#line 3407 "VBNET.ATG" ParamModifierList m) { if (la.kind == 59) { lexer.NextToken(); -#line 3404 "VBNET.ATG" +#line 3408 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 56) { lexer.NextToken(); -#line 3405 "VBNET.ATG" +#line 3409 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 160) { lexer.NextToken(); -#line 3406 "VBNET.ATG" +#line 3410 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 167) { lexer.NextToken(); -#line 3407 "VBNET.ATG" +#line 3411 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(270); + } else SynErr(271); } void Statement() { -#line 2750 "VBNET.ATG" +#line 2754 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -5829,27 +5850,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 11) { } else if ( -#line 2756 "VBNET.ATG" +#line 2760 "VBNET.ATG" IsLabel()) { LabelName( -#line 2756 "VBNET.ATG" +#line 2760 "VBNET.ATG" out label); -#line 2758 "VBNET.ATG" +#line 2762 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(11); Statement(); } else if (StartOf(35)) { EmbeddedStatement( -#line 2761 "VBNET.ATG" +#line 2765 "VBNET.ATG" out stmt); -#line 2761 "VBNET.ATG" +#line 2765 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else SynErr(271); + } else SynErr(272); -#line 2764 "VBNET.ATG" +#line 2768 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5858,30 +5879,30 @@ out stmt); } void LabelName( -#line 3179 "VBNET.ATG" +#line 3183 "VBNET.ATG" out string name) { -#line 3181 "VBNET.ATG" +#line 3185 "VBNET.ATG" name = String.Empty; - if (StartOf(14)) { + if (StartOf(4)) { Identifier(); -#line 3183 "VBNET.ATG" +#line 3187 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3184 "VBNET.ATG" +#line 3188 "VBNET.ATG" name = t.val; - } else SynErr(272); + } else SynErr(273); } void EmbeddedStatement( -#line 2803 "VBNET.ATG" +#line 2807 "VBNET.ATG" out Statement statement) { -#line 2805 "VBNET.ATG" +#line 2809 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5891,224 +5912,224 @@ out Statement statement) { if (la.kind == 107) { lexer.NextToken(); -#line 2811 "VBNET.ATG" +#line 2815 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 195: { lexer.NextToken(); -#line 2813 "VBNET.ATG" +#line 2817 "VBNET.ATG" exitType = ExitType.Sub; break; } case 114: { lexer.NextToken(); -#line 2815 "VBNET.ATG" +#line 2819 "VBNET.ATG" exitType = ExitType.Function; break; } case 171: { lexer.NextToken(); -#line 2817 "VBNET.ATG" +#line 2821 "VBNET.ATG" exitType = ExitType.Property; break; } case 95: { lexer.NextToken(); -#line 2819 "VBNET.ATG" +#line 2823 "VBNET.ATG" exitType = ExitType.Do; break; } case 111: { lexer.NextToken(); -#line 2821 "VBNET.ATG" +#line 2825 "VBNET.ATG" exitType = ExitType.For; break; } case 203: { lexer.NextToken(); -#line 2823 "VBNET.ATG" +#line 2827 "VBNET.ATG" exitType = ExitType.Try; break; } case 216: { lexer.NextToken(); -#line 2825 "VBNET.ATG" +#line 2829 "VBNET.ATG" exitType = ExitType.While; break; } case 182: { lexer.NextToken(); -#line 2827 "VBNET.ATG" +#line 2831 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(273); break; + default: SynErr(274); break; } -#line 2829 "VBNET.ATG" +#line 2833 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 203) { TryStatement( -#line 2830 "VBNET.ATG" +#line 2834 "VBNET.ATG" out statement); } else if (la.kind == 76) { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2835 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 95 || la.kind == 111 || la.kind == 216) { if (la.kind == 95) { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2835 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 111) { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2835 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2835 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2831 "VBNET.ATG" +#line 2835 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 200) { lexer.NextToken(); if (StartOf(29)) { Expr( -#line 2833 "VBNET.ATG" +#line 2837 "VBNET.ATG" out expr); } -#line 2833 "VBNET.ATG" +#line 2837 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 180) { lexer.NextToken(); if (StartOf(29)) { Expr( -#line 2835 "VBNET.ATG" +#line 2839 "VBNET.ATG" out expr); } -#line 2835 "VBNET.ATG" +#line 2839 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 196) { lexer.NextToken(); Expr( -#line 2837 "VBNET.ATG" +#line 2841 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2837 "VBNET.ATG" +#line 2841 "VBNET.ATG" out embeddedStatement); Expect(100); Expect(196); -#line 2838 "VBNET.ATG" +#line 2842 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 174) { lexer.NextToken(); Identifier(); -#line 2840 "VBNET.ATG" +#line 2844 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(36)) { ArgumentList( -#line 2841 "VBNET.ATG" +#line 2845 "VBNET.ATG" out p); } Expect(26); } -#line 2843 "VBNET.ATG" +#line 2847 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 218) { WithStatement( -#line 2846 "VBNET.ATG" +#line 2850 "VBNET.ATG" out statement); } else if (la.kind == 43) { lexer.NextToken(); -#line 2848 "VBNET.ATG" +#line 2852 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2849 "VBNET.ATG" +#line 2853 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2849 "VBNET.ATG" +#line 2853 "VBNET.ATG" out handlerExpr); -#line 2851 "VBNET.ATG" +#line 2855 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 178) { lexer.NextToken(); -#line 2854 "VBNET.ATG" +#line 2858 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2855 "VBNET.ATG" +#line 2859 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2855 "VBNET.ATG" +#line 2859 "VBNET.ATG" out handlerExpr); -#line 2857 "VBNET.ATG" +#line 2861 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 216) { lexer.NextToken(); Expr( -#line 2860 "VBNET.ATG" +#line 2864 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2861 "VBNET.ATG" +#line 2865 "VBNET.ATG" out embeddedStatement); Expect(100); Expect(216); -#line 2863 "VBNET.ATG" +#line 2867 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 95) { lexer.NextToken(); -#line 2868 "VBNET.ATG" +#line 2872 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2871 "VBNET.ATG" +#line 2875 "VBNET.ATG" out conditionType); Expr( -#line 2871 "VBNET.ATG" +#line 2875 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2872 "VBNET.ATG" +#line 2876 "VBNET.ATG" out embeddedStatement); Expect(138); -#line 2875 "VBNET.ATG" +#line 2879 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -6117,26 +6138,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2882 "VBNET.ATG" +#line 2886 "VBNET.ATG" out embeddedStatement); Expect(138); if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2883 "VBNET.ATG" +#line 2887 "VBNET.ATG" out conditionType); Expr( -#line 2883 "VBNET.ATG" +#line 2887 "VBNET.ATG" out expr); } -#line 2885 "VBNET.ATG" +#line 2889 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(274); + } else SynErr(275); } else if (la.kind == 111) { lexer.NextToken(); -#line 2890 "VBNET.ATG" +#line 2894 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -6145,24 +6166,24 @@ out expr); if (la.kind == 97) { lexer.NextToken(); LoopControlVariable( -#line 2897 "VBNET.ATG" +#line 2901 "VBNET.ATG" out typeReference, out typeName); Expect(125); Expr( -#line 2898 "VBNET.ATG" +#line 2902 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2899 "VBNET.ATG" +#line 2903 "VBNET.ATG" out embeddedStatement); Expect(149); if (StartOf(29)) { Expr( -#line 2900 "VBNET.ATG" +#line 2904 "VBNET.ATG" out expr); } -#line 2902 "VBNET.ATG" +#line 2906 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -6174,7 +6195,7 @@ out expr); } else if (StartOf(37)) { -#line 2913 "VBNET.ATG" +#line 2917 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -6183,59 +6204,59 @@ out expr); List nextExpressions = null; if ( -#line 2920 "VBNET.ATG" +#line 2924 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 2921 "VBNET.ATG" +#line 2925 "VBNET.ATG" out typeReference, out typeName); } else { -#line 2923 "VBNET.ATG" +#line 2927 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 2924 "VBNET.ATG" +#line 2928 "VBNET.ATG" out variableExpr); } Expect(10); Expr( -#line 2926 "VBNET.ATG" +#line 2930 "VBNET.ATG" out start); Expect(201); Expr( -#line 2926 "VBNET.ATG" +#line 2930 "VBNET.ATG" out end); if (la.kind == 190) { lexer.NextToken(); Expr( -#line 2926 "VBNET.ATG" +#line 2930 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2927 "VBNET.ATG" +#line 2931 "VBNET.ATG" out embeddedStatement); Expect(149); if (StartOf(29)) { Expr( -#line 2930 "VBNET.ATG" +#line 2934 "VBNET.ATG" out nextExpr); -#line 2932 "VBNET.ATG" +#line 2936 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2935 "VBNET.ATG" +#line 2939 "VBNET.ATG" out nextExpr); -#line 2935 "VBNET.ATG" +#line 2939 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2938 "VBNET.ATG" +#line 2942 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -6247,31 +6268,31 @@ out nextExpr); NextExpressions = nextExpressions }; - } else SynErr(275); + } else SynErr(276); } else if (la.kind == 105) { lexer.NextToken(); Expr( -#line 2951 "VBNET.ATG" +#line 2955 "VBNET.ATG" out expr); -#line 2951 "VBNET.ATG" +#line 2955 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 176) { lexer.NextToken(); -#line 2953 "VBNET.ATG" +#line 2957 "VBNET.ATG" bool isPreserve = false; if (la.kind == 169) { lexer.NextToken(); -#line 2953 "VBNET.ATG" +#line 2957 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2954 "VBNET.ATG" +#line 2958 "VBNET.ATG" out expr); -#line 2956 "VBNET.ATG" +#line 2960 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -6279,48 +6300,48 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2960 "VBNET.ATG" +#line 2964 "VBNET.ATG" out expr); -#line 2961 "VBNET.ATG" +#line 2965 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 104) { lexer.NextToken(); Expr( -#line 2965 "VBNET.ATG" +#line 2969 "VBNET.ATG" out expr); -#line 2967 "VBNET.ATG" +#line 2971 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2970 "VBNET.ATG" +#line 2974 "VBNET.ATG" out expr); -#line 2970 "VBNET.ATG" +#line 2974 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 2971 "VBNET.ATG" +#line 2975 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 191) { lexer.NextToken(); -#line 2973 "VBNET.ATG" +#line 2977 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 2975 "VBNET.ATG" +#line 2979 "VBNET.ATG" la.kind == Tokens.If) { Expect(122); -#line 2976 "VBNET.ATG" +#line 2980 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2976 "VBNET.ATG" +#line 2980 "VBNET.ATG" out expr); if (la.kind == 199) { lexer.NextToken(); @@ -6328,46 +6349,46 @@ out expr); if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2979 "VBNET.ATG" +#line 2983 "VBNET.ATG" out embeddedStatement); -#line 2981 "VBNET.ATG" +#line 2985 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 99 || -#line 2987 "VBNET.ATG" +#line 2991 "VBNET.ATG" IsElseIf()) { if ( -#line 2987 "VBNET.ATG" +#line 2991 "VBNET.ATG" IsElseIf()) { Expect(98); -#line 2987 "VBNET.ATG" +#line 2991 "VBNET.ATG" elseIfStart = t.Location; Expect(122); } else { lexer.NextToken(); -#line 2988 "VBNET.ATG" +#line 2992 "VBNET.ATG" elseIfStart = t.Location; } -#line 2990 "VBNET.ATG" +#line 2994 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2991 "VBNET.ATG" +#line 2995 "VBNET.ATG" out condition); if (la.kind == 199) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2992 "VBNET.ATG" +#line 2996 "VBNET.ATG" out block); -#line 2994 "VBNET.ATG" +#line 2998 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -6381,123 +6402,123 @@ out block); EndOfStmt(); } Block( -#line 3003 "VBNET.ATG" +#line 3007 "VBNET.ATG" out embeddedStatement); -#line 3005 "VBNET.ATG" +#line 3009 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(100); Expect(122); -#line 3009 "VBNET.ATG" +#line 3013 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(38)) { -#line 3014 "VBNET.ATG" +#line 3018 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3017 "VBNET.ATG" +#line 3021 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 98) { lexer.NextToken(); if (StartOf(38)) { SingleLineStatementList( -#line 3020 "VBNET.ATG" +#line 3024 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3022 "VBNET.ATG" +#line 3026 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else SynErr(276); + } else SynErr(277); } else if (la.kind == 182) { lexer.NextToken(); if (la.kind == 61) { lexer.NextToken(); } Expr( -#line 3025 "VBNET.ATG" +#line 3029 "VBNET.ATG" out expr); EndOfStmt(); -#line 3026 "VBNET.ATG" +#line 3030 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 61) { -#line 3030 "VBNET.ATG" +#line 3034 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3031 "VBNET.ATG" +#line 3035 "VBNET.ATG" out caseClauses); if ( -#line 3031 "VBNET.ATG" +#line 3035 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3033 "VBNET.ATG" +#line 3037 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3036 "VBNET.ATG" +#line 3040 "VBNET.ATG" out block); -#line 3038 "VBNET.ATG" +#line 3042 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3044 "VBNET.ATG" +#line 3048 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(100); Expect(182); } else if (la.kind == 157) { -#line 3047 "VBNET.ATG" +#line 3051 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3048 "VBNET.ATG" +#line 3052 "VBNET.ATG" out onErrorStatement); -#line 3048 "VBNET.ATG" +#line 3052 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 119) { -#line 3049 "VBNET.ATG" +#line 3053 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3050 "VBNET.ATG" +#line 3054 "VBNET.ATG" out goToStatement); -#line 3050 "VBNET.ATG" +#line 3054 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 179) { -#line 3051 "VBNET.ATG" +#line 3055 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3052 "VBNET.ATG" +#line 3056 "VBNET.ATG" out resumeStatement); -#line 3052 "VBNET.ATG" +#line 3056 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(37)) { -#line 3055 "VBNET.ATG" +#line 3059 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6505,25 +6526,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3061 "VBNET.ATG" +#line 3065 "VBNET.ATG" out expr); if (StartOf(39)) { AssignmentOperator( -#line 3063 "VBNET.ATG" +#line 3067 "VBNET.ATG" out op); Expr( -#line 3063 "VBNET.ATG" +#line 3067 "VBNET.ATG" out val); -#line 3063 "VBNET.ATG" +#line 3067 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 11 || la.kind == 98) { -#line 3064 "VBNET.ATG" +#line 3068 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(277); + } else SynErr(278); -#line 3067 "VBNET.ATG" +#line 3071 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6534,63 +6555,63 @@ out val); } else if (la.kind == 60) { lexer.NextToken(); SimpleExpr( -#line 3074 "VBNET.ATG" +#line 3078 "VBNET.ATG" out expr); -#line 3074 "VBNET.ATG" +#line 3078 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); -#line 3076 "VBNET.ATG" +#line 3080 "VBNET.ATG" Statement block; if ( -#line 3077 "VBNET.ATG" +#line 3081 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3078 "VBNET.ATG" +#line 3082 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3079 "VBNET.ATG" +#line 3083 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 3081 "VBNET.ATG" +#line 3085 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3083 "VBNET.ATG" +#line 3087 "VBNET.ATG" out block); -#line 3085 "VBNET.ATG" +#line 3089 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(29)) { Expr( -#line 3087 "VBNET.ATG" +#line 3091 "VBNET.ATG" out expr); Block( -#line 3088 "VBNET.ATG" +#line 3092 "VBNET.ATG" out block); -#line 3089 "VBNET.ATG" +#line 3093 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(278); + } else SynErr(279); Expect(100); Expect(211); } else if (StartOf(40)) { LocalDeclarationStatement( -#line 3092 "VBNET.ATG" +#line 3096 "VBNET.ATG" out statement); - } else SynErr(279); + } else SynErr(280); } void LocalDeclarationStatement( -#line 2772 "VBNET.ATG" +#line 2776 "VBNET.ATG" out Statement statement) { -#line 2774 "VBNET.ATG" +#line 2778 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6599,22 +6620,22 @@ out Statement statement) { if (la.kind == 75) { lexer.NextToken(); -#line 2780 "VBNET.ATG" +#line 2784 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 189) { lexer.NextToken(); -#line 2781 "VBNET.ATG" +#line 2785 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2782 "VBNET.ATG" +#line 2786 "VBNET.ATG" dimfound = true; } } -#line 2785 "VBNET.ATG" +#line 2789 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6627,135 +6648,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2796 "VBNET.ATG" +#line 2800 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2797 "VBNET.ATG" +#line 2801 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2799 "VBNET.ATG" +#line 2803 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3293 "VBNET.ATG" +#line 3297 "VBNET.ATG" out Statement tryStatement) { -#line 3295 "VBNET.ATG" +#line 3299 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(203); EndOfStmt(); Block( -#line 3298 "VBNET.ATG" +#line 3302 "VBNET.ATG" out blockStmt); if (la.kind == 62 || la.kind == 100 || la.kind == 110) { CatchClauses( -#line 3299 "VBNET.ATG" +#line 3303 "VBNET.ATG" out catchClauses); } if (la.kind == 110) { lexer.NextToken(); EndOfStmt(); Block( -#line 3300 "VBNET.ATG" +#line 3304 "VBNET.ATG" out finallyStmt); } Expect(100); Expect(203); -#line 3303 "VBNET.ATG" +#line 3307 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3273 "VBNET.ATG" +#line 3277 "VBNET.ATG" out Statement withStatement) { -#line 3275 "VBNET.ATG" +#line 3279 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(218); -#line 3278 "VBNET.ATG" +#line 3282 "VBNET.ATG" Location start = t.Location; Expr( -#line 3279 "VBNET.ATG" +#line 3283 "VBNET.ATG" out expr); EndOfStmt(); -#line 3281 "VBNET.ATG" +#line 3285 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3284 "VBNET.ATG" +#line 3288 "VBNET.ATG" out blockStmt); -#line 3286 "VBNET.ATG" +#line 3290 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(100); Expect(218); -#line 3289 "VBNET.ATG" +#line 3293 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3266 "VBNET.ATG" +#line 3270 "VBNET.ATG" out ConditionType conditionType) { -#line 3267 "VBNET.ATG" +#line 3271 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 216) { lexer.NextToken(); -#line 3268 "VBNET.ATG" +#line 3272 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 209) { lexer.NextToken(); -#line 3269 "VBNET.ATG" +#line 3273 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(280); + } else SynErr(281); } void LoopControlVariable( -#line 3109 "VBNET.ATG" +#line 3113 "VBNET.ATG" out TypeReference type, out string name) { -#line 3110 "VBNET.ATG" +#line 3114 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3114 "VBNET.ATG" +#line 3118 "VBNET.ATG" out name); if ( -#line 3115 "VBNET.ATG" +#line 3119 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3115 "VBNET.ATG" +#line 3119 "VBNET.ATG" out arrayModifiers); } if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 3116 "VBNET.ATG" +#line 3120 "VBNET.ATG" out type); -#line 3116 "VBNET.ATG" +#line 3120 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3118 "VBNET.ATG" +#line 3122 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6767,34 +6788,34 @@ out type); } void ReDimClause( -#line 3188 "VBNET.ATG" +#line 3192 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3190 "VBNET.ATG" +#line 3194 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3191 "VBNET.ATG" +#line 3195 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3095 "VBNET.ATG" +#line 3099 "VBNET.ATG" List list) { -#line 3096 "VBNET.ATG" +#line 3100 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 100) { lexer.NextToken(); -#line 3098 "VBNET.ATG" +#line 3102 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(35)) { EmbeddedStatement( -#line 3099 "VBNET.ATG" +#line 3103 "VBNET.ATG" out embeddedStatement); - } else SynErr(281); + } else SynErr(282); -#line 3100 "VBNET.ATG" +#line 3104 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 11) { lexer.NextToken(); @@ -6804,62 +6825,62 @@ out embeddedStatement); if (la.kind == 100) { lexer.NextToken(); -#line 3102 "VBNET.ATG" +#line 3106 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(35)) { EmbeddedStatement( -#line 3103 "VBNET.ATG" +#line 3107 "VBNET.ATG" out embeddedStatement); - } else SynErr(282); + } else SynErr(283); -#line 3104 "VBNET.ATG" +#line 3108 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3226 "VBNET.ATG" +#line 3230 "VBNET.ATG" out List caseClauses) { -#line 3228 "VBNET.ATG" +#line 3232 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3231 "VBNET.ATG" +#line 3235 "VBNET.ATG" out caseClause); -#line 3231 "VBNET.ATG" +#line 3235 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 3232 "VBNET.ATG" +#line 3236 "VBNET.ATG" out caseClause); -#line 3232 "VBNET.ATG" +#line 3236 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3129 "VBNET.ATG" +#line 3133 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3131 "VBNET.ATG" +#line 3135 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(157); Expect(105); if ( -#line 3137 "VBNET.ATG" +#line 3141 "VBNET.ATG" IsNegativeLabelName()) { Expect(119); Expect(18); Expect(5); -#line 3139 "VBNET.ATG" +#line 3143 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6868,10 +6889,10 @@ IsNegativeLabelName()) { } else if (la.kind == 119) { GotoStatement( -#line 3145 "VBNET.ATG" +#line 3149 "VBNET.ATG" out goToStatement); -#line 3147 "VBNET.ATG" +#line 3151 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6888,88 +6909,88 @@ out goToStatement); lexer.NextToken(); Expect(149); -#line 3161 "VBNET.ATG" +#line 3165 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(283); + } else SynErr(284); } void GotoStatement( -#line 3167 "VBNET.ATG" +#line 3171 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3169 "VBNET.ATG" +#line 3173 "VBNET.ATG" string label = String.Empty; Expect(119); LabelName( -#line 3172 "VBNET.ATG" +#line 3176 "VBNET.ATG" out label); -#line 3174 "VBNET.ATG" +#line 3178 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3215 "VBNET.ATG" +#line 3219 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3217 "VBNET.ATG" +#line 3221 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3220 "VBNET.ATG" +#line 3224 "VBNET.ATG" IsResumeNext()) { Expect(179); Expect(149); -#line 3221 "VBNET.ATG" +#line 3225 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 179) { lexer.NextToken(); if (StartOf(41)) { LabelName( -#line 3222 "VBNET.ATG" +#line 3226 "VBNET.ATG" out label); } -#line 3222 "VBNET.ATG" +#line 3226 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(284); + } else SynErr(285); } void ReDimClauseInternal( -#line 3194 "VBNET.ATG" +#line 3198 "VBNET.ATG" ref Expression expr) { -#line 3195 "VBNET.ATG" +#line 3199 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 16 || -#line 3198 "VBNET.ATG" +#line 3202 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 3197 "VBNET.ATG" +#line 3201 "VBNET.ATG" out name); -#line 3197 "VBNET.ATG" +#line 3201 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3199 "VBNET.ATG" +#line 3203 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 3202 "VBNET.ATG" +#line 3206 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 3204 "VBNET.ATG" +#line 3208 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -6981,10 +7002,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3236 "VBNET.ATG" +#line 3240 "VBNET.ATG" out CaseLabel caseClause) { -#line 3238 "VBNET.ATG" +#line 3242 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6993,7 +7014,7 @@ out CaseLabel caseClause) { if (la.kind == 98) { lexer.NextToken(); -#line 3244 "VBNET.ATG" +#line 3248 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(42)) { if (la.kind == 131) { @@ -7003,76 +7024,76 @@ out CaseLabel caseClause) { case 28: { lexer.NextToken(); -#line 3248 "VBNET.ATG" +#line 3252 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 3249 "VBNET.ATG" +#line 3253 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 3250 "VBNET.ATG" +#line 3254 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 3251 "VBNET.ATG" +#line 3255 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 10: { lexer.NextToken(); -#line 3252 "VBNET.ATG" +#line 3256 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 3253 "VBNET.ATG" +#line 3257 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(285); break; + default: SynErr(286); break; } Expr( -#line 3255 "VBNET.ATG" +#line 3259 "VBNET.ATG" out expr); -#line 3257 "VBNET.ATG" +#line 3261 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(29)) { Expr( -#line 3259 "VBNET.ATG" +#line 3263 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); Expr( -#line 3259 "VBNET.ATG" +#line 3263 "VBNET.ATG" out sexpr); } -#line 3261 "VBNET.ATG" +#line 3265 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(286); + } else SynErr(287); } void CatchClauses( -#line 3308 "VBNET.ATG" +#line 3312 "VBNET.ATG" out List catchClauses) { -#line 3310 "VBNET.ATG" +#line 3314 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7081,30 +7102,30 @@ out List catchClauses) { while (la.kind == 62) { lexer.NextToken(); - if (StartOf(14)) { + if (StartOf(4)) { Identifier(); -#line 3318 "VBNET.ATG" +#line 3322 "VBNET.ATG" name = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 3318 "VBNET.ATG" +#line 3322 "VBNET.ATG" out type); } } if (la.kind == 214) { lexer.NextToken(); Expr( -#line 3319 "VBNET.ATG" +#line 3323 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3321 "VBNET.ATG" +#line 3325 "VBNET.ATG" out blockStmt); -#line 3322 "VBNET.ATG" +#line 3326 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -7351,15 +7372,15 @@ out blockStmt); case 227: s = "invalid GlobalAttributeSection"; break; case 228: s = "invalid NamespaceMemberDecl"; break; case 229: s = "invalid OptionValue"; break; - case 230: s = "invalid TypeModifier"; break; - case 231: s = "invalid NonModuleDeclaration"; break; - case 232: s = "invalid NonModuleDeclaration"; break; - case 233: s = "invalid Identifier"; break; - case 234: s = "invalid TypeParameterConstraints"; break; - case 235: s = "invalid TypeParameterConstraint"; break; - case 236: s = "invalid NonArrayTypeName"; break; - case 237: s = "invalid MemberModifier"; break; - case 238: s = "invalid StructureMemberDecl"; break; + case 230: s = "invalid ImportClause"; break; + case 231: s = "invalid Identifier"; break; + case 232: s = "invalid TypeModifier"; break; + case 233: s = "invalid NonModuleDeclaration"; break; + case 234: s = "invalid NonModuleDeclaration"; break; + case 235: s = "invalid TypeParameterConstraints"; break; + case 236: s = "invalid TypeParameterConstraint"; break; + case 237: s = "invalid NonArrayTypeName"; break; + case 238: s = "invalid MemberModifier"; break; case 239: s = "invalid StructureMemberDecl"; break; case 240: s = "invalid StructureMemberDecl"; break; case 241: s = "invalid StructureMemberDecl"; break; @@ -7367,47 +7388,48 @@ out blockStmt); case 243: s = "invalid StructureMemberDecl"; break; case 244: s = "invalid StructureMemberDecl"; break; case 245: s = "invalid StructureMemberDecl"; break; - case 246: s = "invalid InterfaceMemberDecl"; break; + case 246: s = "invalid StructureMemberDecl"; break; case 247: s = "invalid InterfaceMemberDecl"; break; - case 248: s = "invalid Expr"; break; - case 249: s = "invalid Charset"; break; - case 250: s = "invalid IdentifierForFieldDeclaration"; break; - case 251: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; - case 252: s = "invalid AccessorDecls"; break; - case 253: s = "invalid EventAccessorDeclaration"; break; - case 254: s = "invalid OverloadableOperator"; break; - case 255: s = "invalid EventMemberSpecifier"; break; - case 256: s = "invalid AssignmentOperator"; break; - case 257: s = "invalid SimpleNonInvocationExpression"; break; + case 248: s = "invalid InterfaceMemberDecl"; break; + case 249: s = "invalid Expr"; break; + case 250: s = "invalid Charset"; break; + case 251: s = "invalid IdentifierForFieldDeclaration"; break; + case 252: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; + case 253: s = "invalid AccessorDecls"; break; + case 254: s = "invalid EventAccessorDeclaration"; break; + case 255: s = "invalid OverloadableOperator"; break; + case 256: s = "invalid EventMemberSpecifier"; break; + case 257: s = "invalid AssignmentOperator"; break; case 258: s = "invalid SimpleNonInvocationExpression"; break; case 259: s = "invalid SimpleNonInvocationExpression"; break; case 260: s = "invalid SimpleNonInvocationExpression"; break; - case 261: s = "invalid PrimitiveTypeName"; break; - case 262: s = "invalid CastTarget"; break; - case 263: s = "invalid ComparisonExpr"; break; - case 264: s = "invalid FromOrAggregateQueryOperator"; break; - case 265: s = "invalid QueryOperator"; break; - case 266: s = "invalid PartitionQueryOperator"; break; - case 267: s = "invalid Argument"; break; - case 268: s = "invalid QualIdentAndTypeArguments"; break; - case 269: s = "invalid AttributeArguments"; break; - case 270: s = "invalid ParameterModifier"; break; - case 271: s = "invalid Statement"; break; - case 272: s = "invalid LabelName"; break; - case 273: s = "invalid EmbeddedStatement"; break; + case 261: s = "invalid SimpleNonInvocationExpression"; break; + case 262: s = "invalid PrimitiveTypeName"; break; + case 263: s = "invalid CastTarget"; break; + case 264: s = "invalid ComparisonExpr"; break; + case 265: s = "invalid FromOrAggregateQueryOperator"; break; + case 266: s = "invalid QueryOperator"; break; + case 267: s = "invalid PartitionQueryOperator"; break; + case 268: s = "invalid Argument"; break; + case 269: s = "invalid QualIdentAndTypeArguments"; break; + case 270: s = "invalid AttributeArguments"; break; + case 271: s = "invalid ParameterModifier"; break; + case 272: s = "invalid Statement"; break; + case 273: s = "invalid LabelName"; break; case 274: s = "invalid EmbeddedStatement"; break; case 275: s = "invalid EmbeddedStatement"; break; case 276: s = "invalid EmbeddedStatement"; break; case 277: s = "invalid EmbeddedStatement"; break; case 278: s = "invalid EmbeddedStatement"; break; case 279: s = "invalid EmbeddedStatement"; break; - case 280: s = "invalid WhileOrUntil"; break; - case 281: s = "invalid SingleLineStatementList"; break; + case 280: s = "invalid EmbeddedStatement"; break; + case 281: s = "invalid WhileOrUntil"; break; case 282: s = "invalid SingleLineStatementList"; break; - case 283: s = "invalid OnErrorStatement"; break; - case 284: s = "invalid ResumeStatement"; break; - case 285: s = "invalid CaseClause"; break; + case 283: s = "invalid SingleLineStatementList"; break; + case 284: s = "invalid OnErrorStatement"; break; + case 285: s = "invalid ResumeStatement"; break; case 286: s = "invalid CaseClause"; break; + case 287: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -7424,8 +7446,9 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, T,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, T,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,T,x, x,T,T,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,T,x,x, T,T,T,T, T,x,T,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,T,T,x, x,x,x,x, T,x,x,x, x,x,T,x, x,T,T,x, x,T,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,T,T,x, T,T,T,T, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,T,T, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,T,x,T, T,x,x,x}, @@ -7434,7 +7457,6 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 9c6ef936da..32f13fc824 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -322,17 +322,21 @@ ImportClause TypeReference aliasedType = null; u = null; .) = - Qualident - [ "=" TypeName ] - (. - if (qualident != null && qualident.Length > 0) { - if (aliasedType != null) { - u = new Using(qualident, aliasedType); - } else { - u = new Using(qualident); + ( + Qualident + [ "=" TypeName ] + (. + if (qualident != null && qualident.Length > 0) { + if (aliasedType != null) { + u = new Using(qualident, aliasedType); + } else { + u = new Using(qualident); + } } - } - .) + .) + ) | ( (. string prefix = null; .) + "<" Identifier /* TODO this is "xmlns" */ [ ":" Identifier (. prefix = t.val; .) ] "=" LiteralString /* TODO support single-quote xml strings */ (. u = new Using(t.literalValue as string, prefix); .) ">" + ) . /* 6.4.2 */ @@ -1902,7 +1906,7 @@ AdditiveExpr ModuloExpr (. Expression expr; .) -= += IntegerDivisionExpr { "Mod" IntegerDivisionExpr (. outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); .) } . diff --git a/src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs b/src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs index 3593d1f66f..1a4ae70a95 100644 --- a/src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs @@ -158,6 +158,48 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.AreEqual("", parser.Errors.ErrorOutput); // TODO : Extend test ... } + + [Test] + public void VBNetXmlNamespaceUsingTest() + { + string program = "Imports "; + IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + parser.Parse(); + + Assert.AreEqual("", parser.Errors.ErrorOutput); + CompilationUnit unit = parser.CompilationUnit; + + Assert.AreEqual(1, unit.Children.Count); + Assert.IsTrue(unit.Children[0] is UsingDeclaration); + UsingDeclaration ud = (UsingDeclaration)unit.Children[0]; + Assert.AreEqual(1, ud.Usings.Count); + Assert.IsFalse(ud.Usings[0].IsAlias); + Assert.IsTrue(ud.Usings[0].IsXml); + + Assert.AreEqual("", ud.Usings[0].XmlPrefix); + Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.Usings[0].Name); + } + + [Test] + public void VBNetXmlNamespaceWithPrefixUsingTest() + { + string program = "Imports "; + IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + parser.Parse(); + + Assert.AreEqual("", parser.Errors.ErrorOutput); + CompilationUnit unit = parser.CompilationUnit; + + Assert.AreEqual(1, unit.Children.Count); + Assert.IsTrue(unit.Children[0] is UsingDeclaration); + UsingDeclaration ud = (UsingDeclaration)unit.Children[0]; + Assert.AreEqual(1, ud.Usings.Count); + Assert.IsFalse(ud.Usings[0].IsAlias); + Assert.IsTrue(ud.Usings[0].IsXml); + + Assert.AreEqual("avalonedit", ud.Usings[0].XmlPrefix); + Assert.AreEqual("http://icsharpcode.net/sharpdevelop/avalonedit", ud.Usings[0].Name); + } #endregion } }