diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/VBNET-Mode.xshd b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/VBNET-Mode.xshd index 7debed7003..9ba16d6210 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/VBNET-Mode.xshd +++ b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/VBNET-Mode.xshd @@ -161,6 +161,9 @@ + + + diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 710297cad7..51137ee3f8 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -188,6 +188,8 @@ + + diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl b/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl index c5600399f0..c274099d03 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl +++ b/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl @@ -10,7 +10,7 @@ $ATGTokensSection = "ATGTokensSection.gen"; #read infile print "\n"; print "Reading keyword definition from '$keyword_file'.\n"; -open(DAT, $keyword_file) || die("Could not open file!"); +open(DAT, $keyword_file) || die("Could not open file '$keyword_file': $!"); @raw_data=; close(DAT); print "done.\n"; diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt index af1528d2d1..1d628cd18a 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt @@ -223,6 +223,7 @@ ConcatStringAssign = "&=" "Narrowing" "Widening" "Partial" +"Custom" #Sets Null("Nothing") diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs index ccb9ae5fa3..3a537970c4 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs @@ -1,10 +1,3 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - // this file was autogenerated by a tool. using System; @@ -171,7 +164,8 @@ namespace ICSharpCode.NRefactory.Parser.VB "OF", "NARROWING", "WIDENING", - "PARTIAL" + "PARTIAL", + "CUSTOM" }; static LookupTable keywords = new LookupTable(false); diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs index efeb64fdf6..f003c15b9b 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs @@ -1,10 +1,3 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - // this file was autogenerated by a tool. using System; using System.Collections; @@ -218,8 +211,9 @@ namespace ICSharpCode.NRefactory.Parser.VB public const int Narrowing = 197; public const int Widening = 198; public const int Partial = 199; + public const int Custom = 200; - public const int maxToken = 200; + public const int maxToken = 201; static BitArray NewSet(params int[] values) { BitArray bitArray = new BitArray(maxToken); @@ -435,6 +429,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "Narrowing", "Widening", "Partial", + "Custom", }; public static string GetTokenString(int token) { diff --git a/src/Libraries/NRefactory/Project/Src/Main.cs b/src/Libraries/NRefactory/Project/Src/Main.cs index f47bde23f2..24964d3d08 100644 --- a/src/Libraries/NRefactory/Project/Src/Main.cs +++ b/src/Libraries/NRefactory/Project/Src/Main.cs @@ -70,13 +70,13 @@ namespace ICSharpCode.NRefactory // //} //"; -// IParser parser = ParserFactory.CreateParser(SupportedLanguages.CSharp, new StringReader(program)); -// parser.Parse(); -// if (parser.Errors.ErrorOutput.Length > 0) { -// Console.WriteLine(parser.Errors.ErrorOutput); -// Console.ReadLine(); -// } - + IParser parser = ParserFactory.CreateParser(@"c:\Dokumente und Einstellungen\Markus\Desktop\CustomEvents.vb"); + parser.Parse(); + if (parser.Errors.ErrorOutput.Length > 0) { + Console.WriteLine(parser.Errors.ErrorOutput); + Console.ReadLine(); + } + /* string searchPath = @"C:\Programme\Microsoft.NET\SDK\v1.1"; //Path.GetFullPath(Application.StartupPath + @"\..\..\..\.."); ArrayList files = SearchDirectory(searchPath, "*.cs", true); ArrayList defs = new ArrayList(); @@ -87,7 +87,8 @@ namespace ICSharpCode.NRefactory IParser parser = ParserFactory.CreateParser(str); parser.Parse(); } - } + */ + } } } @@ -106,6 +107,5 @@ namespace ICSharpCode.NRefactory Properties with Mixed Access Levels Operator Overloading Generic Types - Custom Events */ diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/CustomEventDeclaration.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/CustomEventDeclaration.cs new file mode 100644 index 0000000000..17940b88f9 --- /dev/null +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/CustomEventDeclaration.cs @@ -0,0 +1,99 @@ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision: 230 $ +// + +using System; +using System.Diagnostics; +using System.Collections; +using System.Collections.Generic; + +namespace ICSharpCode.NRefactory.Parser.AST +{ + public class CustomEventDeclaration : AttributedNode + { + string name; + EventAccessorDeclaration addHandlerDeclaration; + EventAccessorDeclaration removeHandlerDeclaration; + EventAccessorDeclaration raiseEventDeclaration; + ArrayList implementsClause = new ArrayList(); + + public CustomEventDeclaration(Modifier modifier, List attributes, string name, EventAccessorDeclaration addHandlerDeclaration, EventAccessorDeclaration removeHandlerDeclaration, EventAccessorDeclaration raiseEventDeclaration, ArrayList implementsClause) : base(modifier, attributes) + { + this.modifier = modifier; + this.attributes = attributes; + this.name = name; + this.addHandlerDeclaration = addHandlerDeclaration; + this.removeHandlerDeclaration = removeHandlerDeclaration; + this.raiseEventDeclaration = raiseEventDeclaration; + this.implementsClause = implementsClause; + } + + public ArrayList ImplementsClause + { + get + { + return implementsClause; + } + set + { + implementsClause = value; + } + } + + public string Name + { + get + { + return name; + } + set + { + name = value; + } + } + + public EventAccessorDeclaration AddHandlerDeclaration + { + get + { + return addHandlerDeclaration; + } + set + { + addHandlerDeclaration = value; + } + } + + public EventAccessorDeclaration RemoveHandlerDeclaration + { + get + { + return removeHandlerDeclaration; + } + set + { + removeHandlerDeclaration = value; + } + } + + public EventAccessorDeclaration RaiseEventDeclaration + { + get + { + return raiseEventDeclaration; + } + set + { + raiseEventDeclaration = value; + } + } + + public override object AcceptVisitor(IASTVisitor visitor, object data) + { + return visitor.Visit(this, data); + } + } +} diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/EventAccessorDeclaration.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/EventAccessorDeclaration.cs new file mode 100644 index 0000000000..4ad634a0c6 --- /dev/null +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/VBNet/TypeLevel/EventAccessorDeclaration.cs @@ -0,0 +1,90 @@ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision: 230 $ +// + +using System; +using System.Diagnostics; +using System.Collections; +using System.Collections.Generic; + +namespace ICSharpCode.NRefactory.Parser.AST +{ + public enum EventAccessorType + { + RemoveHandlerAccessor, + AddHandlerAccessor, + RaiseEventAccessor + } + + public class EventAccessorDeclaration : AbstractNode + { + protected BlockStatement body = BlockStatement.Null; + protected EventAccessorType type; + protected List attributes; + protected List parameters; + + public EventAccessorDeclaration(BlockStatement body, List parameters, EventAccessorType type, List attributes) + { + this.body = body; + this.parameters = parameters; + this.type = type; + this.attributes = attributes; + } + + public List Parameters + { + get + { + return parameters; + } + set + { + parameters = value == null ? new List(1) : value; + } + } + + public List Attributes + { + get + { + return attributes; + } + set + { + attributes = value == null ? new List(1) : value; + } + } + + public EventAccessorType Type + { + get + { + return type; + } + set + { + type = value; + } + } + + public BlockStatement Body + { + get + { + return body; + } + set + { + body = BlockStatement.CheckNull(value); + } + } + + public override object AcceptVisitor(IASTVisitor visitor, object data) + { + return visitor.Visit(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 dbe8169f80..b8bcfc08ba 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -20,7 +20,7 @@ namespace ICSharpCode.NRefactory.Parser.VB { internal class Parser : AbstractParser { - const int maxT = 200; + const int maxT = 201; const bool T = true; const bool x = false; @@ -237,7 +237,7 @@ bool IsLocalAttrTarget() { void VBNET() { -#line 426 "VBNET.ATG" +#line 427 "VBNET.ATG" compilationUnit = new CompilationUnit(); withStatements = new Stack(); @@ -251,7 +251,7 @@ bool IsLocalAttrTarget() { ImportsStmt(); } while ( -#line 432 "VBNET.ATG" +#line 433 "VBNET.ATG" IsGlobalAttrTarget()) { GlobalAttributeSection(); } @@ -263,49 +263,49 @@ IsGlobalAttrTarget()) { void OptionStmt() { -#line 437 "VBNET.ATG" +#line 438 "VBNET.ATG" INode node = null; bool val = true; Expect(135); -#line 438 "VBNET.ATG" +#line 439 "VBNET.ATG" Point startPos = t.Location; if (la.kind == 94) { lexer.NextToken(); if (la.kind == 133 || la.kind == 134) { OptionValue( -#line 440 "VBNET.ATG" +#line 441 "VBNET.ATG" ref val); } -#line 441 "VBNET.ATG" +#line 442 "VBNET.ATG" node = new OptionDeclaration(OptionType.Explicit, val); } else if (la.kind == 164) { lexer.NextToken(); if (la.kind == 133 || la.kind == 134) { OptionValue( -#line 443 "VBNET.ATG" +#line 444 "VBNET.ATG" ref val); } -#line 444 "VBNET.ATG" +#line 445 "VBNET.ATG" node = new OptionDeclaration(OptionType.Strict, val); } else if (la.kind == 69) { lexer.NextToken(); if (la.kind == 50) { lexer.NextToken(); -#line 446 "VBNET.ATG" +#line 447 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareBinary, val); } else if (la.kind == 169) { lexer.NextToken(); -#line 447 "VBNET.ATG" +#line 448 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareText, val); - } else SynErr(201); - } else SynErr(202); + } else SynErr(202); + } else SynErr(203); EndOfStmt(); -#line 452 "VBNET.ATG" +#line 453 "VBNET.ATG" node.StartLocation = startPos; node.EndLocation = t.Location; compilationUnit.AddChild(node); @@ -314,33 +314,33 @@ ref val); void ImportsStmt() { -#line 473 "VBNET.ATG" +#line 474 "VBNET.ATG" ArrayList usings = new ArrayList(); Expect(107); -#line 477 "VBNET.ATG" +#line 478 "VBNET.ATG" Point startPos = t.Location; Using u; ImportClause( -#line 480 "VBNET.ATG" +#line 481 "VBNET.ATG" out u); -#line 480 "VBNET.ATG" +#line 481 "VBNET.ATG" usings.Add(u); while (la.kind == 12) { lexer.NextToken(); ImportClause( -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" out u); -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" usings.Add(u); } EndOfStmt(); -#line 486 "VBNET.ATG" +#line 487 "VBNET.ATG" UsingDeclaration usingDeclaration = new UsingDeclaration(usings); usingDeclaration.StartLocation = startPos; usingDeclaration.EndLocation = t.Location; @@ -350,29 +350,29 @@ out u); void GlobalAttributeSection() { -#line 1811 "VBNET.ATG" +#line 1894 "VBNET.ATG" Point startPos = t.Location; Expect(26); if (la.kind == 48) { lexer.NextToken(); } else if (la.kind == 120) { lexer.NextToken(); - } else SynErr(203); + } else SynErr(204); -#line 1813 "VBNET.ATG" +#line 1896 "VBNET.ATG" string attributeTarget = t.val.ToLower(); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 1817 "VBNET.ATG" +#line 1900 "VBNET.ATG" out attribute); -#line 1817 "VBNET.ATG" +#line 1900 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1818 "VBNET.ATG" +#line 1901 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -380,14 +380,14 @@ NotFinalComma()) { lexer.NextToken(); } else if (la.kind == 120) { lexer.NextToken(); - } else SynErr(204); + } else SynErr(205); Expect(13); } Attribute( -#line 1818 "VBNET.ATG" +#line 1901 "VBNET.ATG" out attribute); -#line 1818 "VBNET.ATG" +#line 1901 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -396,7 +396,7 @@ out attribute); Expect(25); EndOfStmt(); -#line 1823 "VBNET.ATG" +#line 1906 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -406,7 +406,7 @@ out attribute); void NamespaceMemberDecl() { -#line 515 "VBNET.ATG" +#line 516 "VBNET.ATG" Modifiers m = new Modifiers(); AttributeSection section;List attributes = new List(); string qualident; @@ -414,14 +414,14 @@ out attribute); if (la.kind == 125) { lexer.NextToken(); -#line 521 "VBNET.ATG" +#line 522 "VBNET.ATG" Point startPos = t.Location; Qualident( -#line 523 "VBNET.ATG" +#line 524 "VBNET.ATG" out qualident); -#line 525 "VBNET.ATG" +#line 526 "VBNET.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; compilationUnit.AddChild(node); @@ -430,44 +430,44 @@ out qualident); Expect(1); NamespaceBody(); -#line 533 "VBNET.ATG" +#line 534 "VBNET.ATG" node.EndLocation = t.Location; compilationUnit.BlockEnd(); } else if (StartOf(2)) { while (la.kind == 26) { AttributeSection( -#line 537 "VBNET.ATG" +#line 538 "VBNET.ATG" out section); -#line 537 "VBNET.ATG" +#line 538 "VBNET.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 538 "VBNET.ATG" +#line 539 "VBNET.ATG" m); } NonModuleDeclaration( -#line 538 "VBNET.ATG" +#line 539 "VBNET.ATG" m, attributes); - } else SynErr(205); + } else SynErr(206); } void OptionValue( -#line 458 "VBNET.ATG" +#line 459 "VBNET.ATG" ref bool val) { if (la.kind == 134) { lexer.NextToken(); -#line 460 "VBNET.ATG" +#line 461 "VBNET.ATG" val = true; } else if (la.kind == 133) { lexer.NextToken(); -#line 462 "VBNET.ATG" +#line 463 "VBNET.ATG" val = false; - } else SynErr(206); + } else SynErr(207); } void EndOfStmt() { @@ -478,32 +478,32 @@ ref bool val) { if (la.kind == 1) { lexer.NextToken(); } - } else SynErr(207); + } else SynErr(208); } void ImportClause( -#line 493 "VBNET.ATG" +#line 494 "VBNET.ATG" out Using u) { -#line 495 "VBNET.ATG" +#line 496 "VBNET.ATG" string qualident = null; string aliasident = null; u = null; if ( -#line 499 "VBNET.ATG" +#line 500 "VBNET.ATG" IsAssignment()) { Identifier(); -#line 499 "VBNET.ATG" +#line 500 "VBNET.ATG" aliasident = t.val; Expect(11); } Qualident( -#line 500 "VBNET.ATG" +#line 501 "VBNET.ATG" out qualident); -#line 502 "VBNET.ATG" +#line 503 "VBNET.ATG" if (qualident != null && qualident.Length > 0) { if (aliasident != null) { u = new Using(aliasident, qualident); @@ -523,34 +523,34 @@ out qualident); lexer.NextToken(); } else if (la.kind == 69) { lexer.NextToken(); - } else SynErr(208); + } else SynErr(209); } void Qualident( -#line 2535 "VBNET.ATG" +#line 2618 "VBNET.ATG" out string qualident) { -#line 2537 "VBNET.ATG" +#line 2620 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2541 "VBNET.ATG" +#line 2624 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2542 "VBNET.ATG" +#line 2625 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2542 "VBNET.ATG" +#line 2625 "VBNET.ATG" out name); -#line 2542 "VBNET.ATG" +#line 2625 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2544 "VBNET.ATG" +#line 2627 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } @@ -564,35 +564,35 @@ out name); } void AttributeSection( -#line 1881 "VBNET.ATG" +#line 1964 "VBNET.ATG" out AttributeSection section) { -#line 1883 "VBNET.ATG" +#line 1966 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(26); -#line 1887 "VBNET.ATG" +#line 1970 "VBNET.ATG" Point startPos = t.Location; if ( -#line 1888 "VBNET.ATG" +#line 1971 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 92) { lexer.NextToken(); -#line 1889 "VBNET.ATG" +#line 1972 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 1890 "VBNET.ATG" +#line 1973 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 1893 "VBNET.ATG" +#line 1976 "VBNET.ATG" string val = t.val.ToLower(); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -605,20 +605,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 1903 "VBNET.ATG" +#line 1986 "VBNET.ATG" out attribute); -#line 1903 "VBNET.ATG" +#line 1986 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1904 "VBNET.ATG" +#line 1987 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 1904 "VBNET.ATG" +#line 1987 "VBNET.ATG" out attribute); -#line 1904 "VBNET.ATG" +#line 1987 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -626,7 +626,7 @@ out attribute); } Expect(25); -#line 1908 "VBNET.ATG" +#line 1991 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -634,74 +634,74 @@ out attribute); } void TypeModifier( -#line 2744 "VBNET.ATG" +#line 2827 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2745 "VBNET.ATG" +#line 2828 "VBNET.ATG" m.Add(Modifier.Public); break; } case 147: { lexer.NextToken(); -#line 2746 "VBNET.ATG" +#line 2829 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 98: { lexer.NextToken(); -#line 2747 "VBNET.ATG" +#line 2830 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 145: { lexer.NextToken(); -#line 2748 "VBNET.ATG" +#line 2831 "VBNET.ATG" m.Add(Modifier.Private); break; } case 158: { lexer.NextToken(); -#line 2749 "VBNET.ATG" +#line 2832 "VBNET.ATG" m.Add(Modifier.Static); break; } case 157: { lexer.NextToken(); -#line 2750 "VBNET.ATG" +#line 2833 "VBNET.ATG" m.Add(Modifier.New); break; } case 121: { lexer.NextToken(); -#line 2751 "VBNET.ATG" +#line 2834 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 130: { lexer.NextToken(); -#line 2752 "VBNET.ATG" +#line 2835 "VBNET.ATG" m.Add(Modifier.Sealed); break; } - default: SynErr(209); break; + default: SynErr(210); break; } } void NonModuleDeclaration( -#line 589 "VBNET.ATG" +#line 590 "VBNET.ATG" Modifiers m, List attributes) { -#line 591 "VBNET.ATG" +#line 592 "VBNET.ATG" string name = null; TypeReference typeRef = null; List baseInterfaces = null; @@ -709,17 +709,17 @@ Modifiers m, List attributes) { switch (la.kind) { case 66: case 199: { -#line 595 "VBNET.ATG" +#line 596 "VBNET.ATG" m.Check(Modifier.Classes); if (la.kind == 199) { lexer.NextToken(); -#line 597 "VBNET.ATG" +#line 598 "VBNET.ATG" m.Add(Modifier.Partial); } Expect(66); -#line 599 "VBNET.ATG" +#line 600 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; compilationUnit.AddChild(newType); @@ -729,33 +729,33 @@ Modifiers m, List attributes) { Identifier(); -#line 606 "VBNET.ATG" +#line 607 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 607 "VBNET.ATG" +#line 608 "VBNET.ATG" newType.Templates); EndOfStmt(); if (la.kind == 109) { ClassBaseType( -#line 609 "VBNET.ATG" +#line 610 "VBNET.ATG" out typeRef); -#line 609 "VBNET.ATG" +#line 610 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } while (la.kind == 106) { TypeImplementsClause( -#line 610 "VBNET.ATG" +#line 611 "VBNET.ATG" out baseInterfaces); -#line 610 "VBNET.ATG" +#line 611 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 611 "VBNET.ATG" +#line 612 "VBNET.ATG" newType); -#line 613 "VBNET.ATG" +#line 614 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -763,7 +763,7 @@ newType); case 120: { lexer.NextToken(); -#line 617 "VBNET.ATG" +#line 618 "VBNET.ATG" m.Check(Modifier.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -773,14 +773,14 @@ newType); Identifier(); -#line 624 "VBNET.ATG" +#line 625 "VBNET.ATG" newType.Name = t.val; Expect(1); ModuleBody( -#line 626 "VBNET.ATG" +#line 627 "VBNET.ATG" newType); -#line 628 "VBNET.ATG" +#line 629 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -788,7 +788,7 @@ newType); case 166: { lexer.NextToken(); -#line 632 "VBNET.ATG" +#line 633 "VBNET.ATG" m.Check(Modifier.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -798,25 +798,25 @@ newType); Identifier(); -#line 639 "VBNET.ATG" +#line 640 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 640 "VBNET.ATG" +#line 641 "VBNET.ATG" newType.Templates); Expect(1); while (la.kind == 106) { TypeImplementsClause( -#line 641 "VBNET.ATG" +#line 642 "VBNET.ATG" out baseInterfaces); -#line 641 "VBNET.ATG" +#line 642 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 642 "VBNET.ATG" +#line 643 "VBNET.ATG" newType); -#line 644 "VBNET.ATG" +#line 645 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -824,7 +824,7 @@ newType); case 89: { lexer.NextToken(); -#line 649 "VBNET.ATG" +#line 650 "VBNET.ATG" m.Check(Modifier.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; @@ -836,23 +836,23 @@ newType); Identifier(); -#line 658 "VBNET.ATG" +#line 659 "VBNET.ATG" newType.Name = t.val; if (la.kind == 47) { lexer.NextToken(); PrimitiveTypeName( -#line 659 "VBNET.ATG" +#line 660 "VBNET.ATG" out name); -#line 659 "VBNET.ATG" +#line 660 "VBNET.ATG" newType.BaseTypes.Add(new TypeReference(name)); } Expect(1); EnumBody( -#line 661 "VBNET.ATG" +#line 662 "VBNET.ATG" newType); -#line 663 "VBNET.ATG" +#line 664 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -860,7 +860,7 @@ newType); case 111: { lexer.NextToken(); -#line 668 "VBNET.ATG" +#line 669 "VBNET.ATG" m.Check(Modifier.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; @@ -870,25 +870,25 @@ newType); Identifier(); -#line 675 "VBNET.ATG" +#line 676 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 676 "VBNET.ATG" +#line 677 "VBNET.ATG" newType.Templates); EndOfStmt(); while (la.kind == 109) { InterfaceBase( -#line 677 "VBNET.ATG" +#line 678 "VBNET.ATG" out baseInterfaces); -#line 677 "VBNET.ATG" +#line 678 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 678 "VBNET.ATG" +#line 679 "VBNET.ATG" newType); -#line 680 "VBNET.ATG" +#line 681 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -896,7 +896,7 @@ newType); case 79: { lexer.NextToken(); -#line 685 "VBNET.ATG" +#line 686 "VBNET.ATG" m.Check(Modifier.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); @@ -907,97 +907,97 @@ newType); lexer.NextToken(); Identifier(); -#line 692 "VBNET.ATG" +#line 693 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 693 "VBNET.ATG" +#line 694 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 694 "VBNET.ATG" +#line 695 "VBNET.ATG" p); } Expect(24); -#line 694 "VBNET.ATG" +#line 695 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 99) { lexer.NextToken(); Identifier(); -#line 696 "VBNET.ATG" +#line 697 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 697 "VBNET.ATG" +#line 698 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 698 "VBNET.ATG" +#line 699 "VBNET.ATG" p); } Expect(24); -#line 698 "VBNET.ATG" +#line 699 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 47) { lexer.NextToken(); -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" TypeReference type; TypeName( -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" out type); -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" delegateDeclr.ReturnType = type; } - } else SynErr(210); + } else SynErr(211); -#line 701 "VBNET.ATG" +#line 702 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; Expect(1); -#line 704 "VBNET.ATG" +#line 705 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; } - default: SynErr(211); break; + default: SynErr(212); break; } } void TypeParameterList( -#line 542 "VBNET.ATG" +#line 543 "VBNET.ATG" List templates) { -#line 544 "VBNET.ATG" +#line 545 "VBNET.ATG" TemplateDefinition template; if ( -#line 547 "VBNET.ATG" +#line 548 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeParameter( -#line 548 "VBNET.ATG" +#line 549 "VBNET.ATG" out template); -#line 550 "VBNET.ATG" +#line 551 "VBNET.ATG" if (template != null) templates.Add(template); while (la.kind == 12) { lexer.NextToken(); TypeParameter( -#line 553 "VBNET.ATG" +#line 554 "VBNET.ATG" out template); -#line 555 "VBNET.ATG" +#line 556 "VBNET.ATG" if (template != null) templates.Add(template); } @@ -1006,69 +1006,69 @@ out template); } void TypeParameter( -#line 563 "VBNET.ATG" +#line 564 "VBNET.ATG" out TemplateDefinition template) { Identifier(); -#line 565 "VBNET.ATG" +#line 566 "VBNET.ATG" template = new TemplateDefinition(t.val, null); if (la.kind == 47) { TypeParameterConstraints( -#line 566 "VBNET.ATG" +#line 567 "VBNET.ATG" template); } } void TypeParameterConstraints( -#line 570 "VBNET.ATG" +#line 571 "VBNET.ATG" TemplateDefinition template) { -#line 572 "VBNET.ATG" +#line 573 "VBNET.ATG" TypeReference constraint; Expect(47); if (la.kind == 21) { lexer.NextToken(); TypeName( -#line 578 "VBNET.ATG" +#line 579 "VBNET.ATG" out constraint); -#line 578 "VBNET.ATG" +#line 579 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 581 "VBNET.ATG" +#line 582 "VBNET.ATG" out constraint); -#line 581 "VBNET.ATG" +#line 582 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(22); } else if (StartOf(5)) { TypeName( -#line 584 "VBNET.ATG" +#line 585 "VBNET.ATG" out constraint); -#line 584 "VBNET.ATG" +#line 585 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } - } else SynErr(212); + } else SynErr(213); } void TypeName( -#line 1731 "VBNET.ATG" +#line 1814 "VBNET.ATG" out TypeReference typeref) { -#line 1732 "VBNET.ATG" +#line 1815 "VBNET.ATG" ArrayList rank = null; typeref = null; NonArrayTypeName( -#line 1734 "VBNET.ATG" +#line 1817 "VBNET.ATG" out typeref); ArrayTypeModifiers( -#line 1735 "VBNET.ATG" +#line 1818 "VBNET.ATG" out rank); -#line 1737 "VBNET.ATG" +#line 1820 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -1076,325 +1076,325 @@ out rank); } void ClassBaseType( -#line 881 "VBNET.ATG" +#line 882 "VBNET.ATG" out TypeReference typeRef) { -#line 883 "VBNET.ATG" +#line 884 "VBNET.ATG" typeRef = null; Expect(109); TypeName( -#line 886 "VBNET.ATG" +#line 887 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1384 "VBNET.ATG" +#line 1467 "VBNET.ATG" out List baseInterfaces) { -#line 1386 "VBNET.ATG" +#line 1469 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(106); TypeName( -#line 1389 "VBNET.ATG" +#line 1472 "VBNET.ATG" out type); -#line 1391 "VBNET.ATG" +#line 1474 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1394 "VBNET.ATG" +#line 1477 "VBNET.ATG" out type); -#line 1395 "VBNET.ATG" +#line 1478 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 714 "VBNET.ATG" +#line 715 "VBNET.ATG" TypeDeclaration newType) { -#line 715 "VBNET.ATG" +#line 716 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 717 "VBNET.ATG" +#line 718 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 720 "VBNET.ATG" +#line 721 "VBNET.ATG" out section); -#line 720 "VBNET.ATG" +#line 721 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 721 "VBNET.ATG" +#line 722 "VBNET.ATG" m); } ClassMemberDecl( -#line 722 "VBNET.ATG" +#line 723 "VBNET.ATG" m, attributes); } Expect(87); Expect(66); -#line 724 "VBNET.ATG" +#line 725 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void ModuleBody( -#line 743 "VBNET.ATG" +#line 744 "VBNET.ATG" TypeDeclaration newType) { -#line 744 "VBNET.ATG" +#line 745 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 746 "VBNET.ATG" +#line 747 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 749 "VBNET.ATG" +#line 750 "VBNET.ATG" out section); -#line 749 "VBNET.ATG" +#line 750 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 750 "VBNET.ATG" +#line 751 "VBNET.ATG" m); } ClassMemberDecl( -#line 751 "VBNET.ATG" +#line 752 "VBNET.ATG" m, attributes); } Expect(87); Expect(120); -#line 753 "VBNET.ATG" +#line 754 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void StructureBody( -#line 728 "VBNET.ATG" +#line 729 "VBNET.ATG" TypeDeclaration newType) { -#line 729 "VBNET.ATG" +#line 730 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 731 "VBNET.ATG" +#line 732 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 734 "VBNET.ATG" +#line 735 "VBNET.ATG" out section); -#line 734 "VBNET.ATG" +#line 735 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 735 "VBNET.ATG" +#line 736 "VBNET.ATG" m); } StructureMemberDecl( -#line 736 "VBNET.ATG" +#line 737 "VBNET.ATG" m, attributes); } Expect(87); Expect(166); -#line 738 "VBNET.ATG" +#line 739 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void PrimitiveTypeName( -#line 2717 "VBNET.ATG" +#line 2800 "VBNET.ATG" out string type) { -#line 2718 "VBNET.ATG" +#line 2801 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2719 "VBNET.ATG" +#line 2802 "VBNET.ATG" type = "Boolean"; break; } case 75: { lexer.NextToken(); -#line 2720 "VBNET.ATG" +#line 2803 "VBNET.ATG" type = "Date"; break; } case 64: { lexer.NextToken(); -#line 2721 "VBNET.ATG" +#line 2804 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2722 "VBNET.ATG" +#line 2805 "VBNET.ATG" type = "String"; break; } case 76: { lexer.NextToken(); -#line 2723 "VBNET.ATG" +#line 2806 "VBNET.ATG" type = "Decimal"; break; } case 53: { lexer.NextToken(); -#line 2724 "VBNET.ATG" +#line 2807 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2725 "VBNET.ATG" +#line 2808 "VBNET.ATG" type = "Short"; break; } case 110: { lexer.NextToken(); -#line 2726 "VBNET.ATG" +#line 2809 "VBNET.ATG" type = "Integer"; break; } case 116: { lexer.NextToken(); -#line 2727 "VBNET.ATG" +#line 2810 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2728 "VBNET.ATG" +#line 2811 "VBNET.ATG" type = "Single"; break; } case 83: { lexer.NextToken(); -#line 2729 "VBNET.ATG" +#line 2812 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2730 "VBNET.ATG" +#line 2813 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2731 "VBNET.ATG" +#line 2814 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2732 "VBNET.ATG" +#line 2815 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2733 "VBNET.ATG" +#line 2816 "VBNET.ATG" type = "SByte"; break; } - default: SynErr(213); break; + default: SynErr(214); break; } } void EnumBody( -#line 757 "VBNET.ATG" +#line 758 "VBNET.ATG" TypeDeclaration newType) { -#line 758 "VBNET.ATG" +#line 759 "VBNET.ATG" FieldDeclaration f; while (StartOf(8)) { EnumMemberDecl( -#line 760 "VBNET.ATG" +#line 761 "VBNET.ATG" out f); -#line 760 "VBNET.ATG" +#line 761 "VBNET.ATG" compilationUnit.AddChild(f); } Expect(87); Expect(89); -#line 762 "VBNET.ATG" +#line 763 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void InterfaceBase( -#line 1369 "VBNET.ATG" +#line 1452 "VBNET.ATG" out List bases) { -#line 1371 "VBNET.ATG" +#line 1454 "VBNET.ATG" TypeReference type; bases = new List(); Expect(109); TypeName( -#line 1375 "VBNET.ATG" +#line 1458 "VBNET.ATG" out type); -#line 1375 "VBNET.ATG" +#line 1458 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1378 "VBNET.ATG" +#line 1461 "VBNET.ATG" out type); -#line 1378 "VBNET.ATG" +#line 1461 "VBNET.ATG" bases.Add(type); } Expect(1); } void InterfaceBody( -#line 766 "VBNET.ATG" +#line 767 "VBNET.ATG" TypeDeclaration newType) { while (StartOf(9)) { InterfaceMemberDecl(); @@ -1402,33 +1402,33 @@ TypeDeclaration newType) { Expect(87); Expect(111); -#line 768 "VBNET.ATG" +#line 769 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void FormalParameterList( -#line 1915 "VBNET.ATG" +#line 1998 "VBNET.ATG" List parameter) { -#line 1917 "VBNET.ATG" +#line 2000 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1921 "VBNET.ATG" +#line 2004 "VBNET.ATG" out section); -#line 1921 "VBNET.ATG" +#line 2004 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1923 "VBNET.ATG" +#line 2006 "VBNET.ATG" out p); -#line 1925 "VBNET.ATG" +#line 2008 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1436,172 +1436,172 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 1930 "VBNET.ATG" +#line 2013 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 26) { AttributeSection( -#line 1931 "VBNET.ATG" +#line 2014 "VBNET.ATG" out section); -#line 1931 "VBNET.ATG" +#line 2014 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1933 "VBNET.ATG" +#line 2016 "VBNET.ATG" out p); -#line 1933 "VBNET.ATG" +#line 2016 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2755 "VBNET.ATG" +#line 2838 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 121: { lexer.NextToken(); -#line 2756 "VBNET.ATG" +#line 2839 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 78: { lexer.NextToken(); -#line 2757 "VBNET.ATG" +#line 2840 "VBNET.ATG" m.Add(Modifier.Default); break; } case 98: { lexer.NextToken(); -#line 2758 "VBNET.ATG" +#line 2841 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 157: { lexer.NextToken(); -#line 2759 "VBNET.ATG" +#line 2842 "VBNET.ATG" m.Add(Modifier.New); break; } case 142: { lexer.NextToken(); -#line 2760 "VBNET.ATG" +#line 2843 "VBNET.ATG" m.Add(Modifier.Override); break; } case 122: { lexer.NextToken(); -#line 2761 "VBNET.ATG" +#line 2844 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 145: { lexer.NextToken(); -#line 2762 "VBNET.ATG" +#line 2845 "VBNET.ATG" m.Add(Modifier.Private); break; } case 147: { lexer.NextToken(); -#line 2763 "VBNET.ATG" +#line 2846 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 148: { lexer.NextToken(); -#line 2764 "VBNET.ATG" +#line 2847 "VBNET.ATG" m.Add(Modifier.Public); break; } case 130: { lexer.NextToken(); -#line 2765 "VBNET.ATG" +#line 2848 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 131: { lexer.NextToken(); -#line 2766 "VBNET.ATG" +#line 2849 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 158: { lexer.NextToken(); -#line 2767 "VBNET.ATG" +#line 2850 "VBNET.ATG" m.Add(Modifier.Static); break; } case 140: { lexer.NextToken(); -#line 2768 "VBNET.ATG" +#line 2851 "VBNET.ATG" m.Add(Modifier.Virtual); break; } case 139: { lexer.NextToken(); -#line 2769 "VBNET.ATG" +#line 2852 "VBNET.ATG" m.Add(Modifier.Overloads); break; } case 150: { lexer.NextToken(); -#line 2770 "VBNET.ATG" +#line 2853 "VBNET.ATG" break; } case 184: { lexer.NextToken(); -#line 2771 "VBNET.ATG" +#line 2854 "VBNET.ATG" break; } case 183: { lexer.NextToken(); -#line 2772 "VBNET.ATG" +#line 2855 "VBNET.ATG" m.Add(Modifier.WithEvents); break; } case 80: { lexer.NextToken(); -#line 2773 "VBNET.ATG" +#line 2856 "VBNET.ATG" m.Add(Modifier.Dim); break; } - default: SynErr(214); break; + default: SynErr(215); break; } } void ClassMemberDecl( -#line 877 "VBNET.ATG" +#line 878 "VBNET.ATG" Modifiers m, List attributes) { StructureMemberDecl( -#line 878 "VBNET.ATG" +#line 879 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 891 "VBNET.ATG" +#line 892 "VBNET.ATG" Modifiers m, List attributes) { -#line 893 "VBNET.ATG" +#line 894 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1611,36 +1611,36 @@ Modifiers m, List attributes) { switch (la.kind) { case 66: case 79: case 89: case 111: case 120: case 166: case 199: { NonModuleDeclaration( -#line 899 "VBNET.ATG" +#line 900 "VBNET.ATG" m, attributes); break; } case 167: { lexer.NextToken(); -#line 903 "VBNET.ATG" +#line 904 "VBNET.ATG" Point startPos = t.Location; if (StartOf(10)) { -#line 907 "VBNET.ATG" +#line 908 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; ArrayList handlesClause = null; ArrayList implementsClause = null; Identifier(); -#line 912 "VBNET.ATG" +#line 913 "VBNET.ATG" name = t.val; m.Check(Modifier.VBMethods); TypeParameterList( -#line 915 "VBNET.ATG" +#line 916 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 916 "VBNET.ATG" +#line 917 "VBNET.ATG" p); } Expect(24); @@ -1648,23 +1648,23 @@ p); if (la.kind == 104 || la.kind == 106) { if (la.kind == 106) { ImplementsClause( -#line 919 "VBNET.ATG" +#line 920 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 921 "VBNET.ATG" +#line 922 "VBNET.ATG" out handlesClause); } } -#line 924 "VBNET.ATG" +#line 925 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); if ( -#line 928 "VBNET.ATG" +#line 929 "VBNET.ATG" IsMustOverride(m)) { -#line 930 "VBNET.ATG" +#line 931 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = endLocation; @@ -1678,7 +1678,7 @@ IsMustOverride(m)) { } else if (StartOf(11)) { -#line 943 "VBNET.ATG" +#line 944 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = endLocation; @@ -1692,49 +1692,49 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 955 "VBNET.ATG" +#line 956 "VBNET.ATG" out stmt); -#line 957 "VBNET.ATG" +#line 958 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(87); Expect(167); -#line 960 "VBNET.ATG" +#line 961 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); - } else SynErr(215); + } else SynErr(216); } else if (la.kind == 126) { lexer.NextToken(); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 963 "VBNET.ATG" +#line 964 "VBNET.ATG" p); } Expect(24); } -#line 964 "VBNET.ATG" +#line 965 "VBNET.ATG" m.Check(Modifier.Constructors); -#line 965 "VBNET.ATG" +#line 966 "VBNET.ATG" Point constructorEndLocation = t.EndLocation; Expect(1); Block( -#line 967 "VBNET.ATG" +#line 968 "VBNET.ATG" out stmt); Expect(87); Expect(167); -#line 968 "VBNET.ATG" +#line 969 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); -#line 970 "VBNET.ATG" +#line 971 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = startPos; cd.EndLocation = constructorEndLocation; @@ -1742,13 +1742,13 @@ out stmt); cd.Body.EndLocation = endLocation; compilationUnit.AddChild(cd); - } else SynErr(216); + } else SynErr(217); break; } case 99: { lexer.NextToken(); -#line 982 "VBNET.ATG" +#line 983 "VBNET.ATG" m.Check(Modifier.VBMethods); string name = String.Empty; Point startPos = t.Location; @@ -1757,16 +1757,16 @@ out stmt); Identifier(); -#line 988 "VBNET.ATG" +#line 989 "VBNET.ATG" name = t.val; TypeParameterList( -#line 989 "VBNET.ATG" +#line 990 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 990 "VBNET.ATG" +#line 991 "VBNET.ATG" p); } Expect(24); @@ -1775,15 +1775,15 @@ p); lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 991 "VBNET.ATG" +#line 992 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 991 "VBNET.ATG" +#line 992 "VBNET.ATG" out type); } -#line 993 "VBNET.ATG" +#line 994 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -1791,20 +1791,20 @@ out type); if (la.kind == 104 || la.kind == 106) { if (la.kind == 106) { ImplementsClause( -#line 999 "VBNET.ATG" +#line 1000 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 1001 "VBNET.ATG" +#line 1002 "VBNET.ATG" out handlesClause); } } Expect(1); if ( -#line 1007 "VBNET.ATG" +#line 1008 "VBNET.ATG" IsMustOverride(m)) { -#line 1009 "VBNET.ATG" +#line 1010 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; @@ -1817,7 +1817,7 @@ IsMustOverride(m)) { } else if (StartOf(11)) { -#line 1021 "VBNET.ATG" +#line 1022 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; @@ -1831,28 +1831,28 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1033 "VBNET.ATG" +#line 1034 "VBNET.ATG" out stmt); -#line 1035 "VBNET.ATG" +#line 1036 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(87); Expect(99); -#line 1040 "VBNET.ATG" +#line 1041 "VBNET.ATG" methodDeclaration.Body.StartLocation = methodDeclaration.EndLocation; methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); - } else SynErr(217); + } else SynErr(218); break; } case 77: { lexer.NextToken(); -#line 1049 "VBNET.ATG" +#line 1050 "VBNET.ATG" m.Check(Modifier.VBExternalMethods); Point startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1862,39 +1862,39 @@ out stmt); if (StartOf(12)) { Charset( -#line 1056 "VBNET.ATG" +#line 1057 "VBNET.ATG" out charsetModifer); } if (la.kind == 167) { lexer.NextToken(); Identifier(); -#line 1059 "VBNET.ATG" +#line 1060 "VBNET.ATG" name = t.val; Expect(114); Expect(3); -#line 1060 "VBNET.ATG" +#line 1061 "VBNET.ATG" library = t.val.ToString(); if (la.kind == 43) { lexer.NextToken(); Expect(3); -#line 1061 "VBNET.ATG" +#line 1062 "VBNET.ATG" alias = t.val.ToString(); } if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1062 "VBNET.ATG" +#line 1063 "VBNET.ATG" p); } Expect(24); } Expect(1); -#line 1065 "VBNET.ATG" +#line 1066 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = startPos; declareDeclaration.EndLocation = t.EndLocation; @@ -1904,25 +1904,25 @@ p); lexer.NextToken(); Identifier(); -#line 1072 "VBNET.ATG" +#line 1073 "VBNET.ATG" name = t.val; Expect(114); Expect(3); -#line 1073 "VBNET.ATG" +#line 1074 "VBNET.ATG" library = t.val; if (la.kind == 43) { lexer.NextToken(); Expect(3); -#line 1074 "VBNET.ATG" +#line 1075 "VBNET.ATG" alias = t.val; } if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1075 "VBNET.ATG" +#line 1076 "VBNET.ATG" p); } Expect(24); @@ -1930,24 +1930,24 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1076 "VBNET.ATG" +#line 1077 "VBNET.ATG" out type); } Expect(1); -#line 1079 "VBNET.ATG" +#line 1080 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = startPos; declareDeclaration.EndLocation = t.EndLocation; compilationUnit.AddChild(declareDeclaration); - } else SynErr(218); + } else SynErr(219); break; } case 92: { lexer.NextToken(); -#line 1089 "VBNET.ATG" +#line 1090 "VBNET.ATG" m.Check(Modifier.VBEvents); Point startPos = t.Location; EventDeclaration eventDeclaration; @@ -1955,31 +1955,31 @@ out type); Identifier(); -#line 1094 "VBNET.ATG" +#line 1095 "VBNET.ATG" name= t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1096 "VBNET.ATG" +#line 1097 "VBNET.ATG" out type); } else if (la.kind == 1 || la.kind == 23 || la.kind == 106) { if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1098 "VBNET.ATG" +#line 1099 "VBNET.ATG" p); } Expect(24); } - } else SynErr(219); + } else SynErr(220); if (la.kind == 106) { ImplementsClause( -#line 1100 "VBNET.ATG" +#line 1101 "VBNET.ATG" out implementsClause); } -#line 1102 "VBNET.ATG" +#line 1103 "VBNET.ATG" eventDeclaration = new EventDeclaration(type, m.Modifier, p, attributes, name, implementsClause); eventDeclaration.StartLocation = startPos; eventDeclaration.EndLocation = t.EndLocation; @@ -1990,26 +1990,26 @@ out implementsClause); } case 2: case 50: case 69: case 169: { -#line 1109 "VBNET.ATG" +#line 1110 "VBNET.ATG" Point startPos = t.Location; -#line 1111 "VBNET.ATG" +#line 1112 "VBNET.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = startPos; VariableDeclarator( -#line 1115 "VBNET.ATG" +#line 1116 "VBNET.ATG" variableDeclarators); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1116 "VBNET.ATG" +#line 1117 "VBNET.ATG" variableDeclarators); } Expect(1); -#line 1119 "VBNET.ATG" +#line 1120 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -2018,35 +2018,35 @@ variableDeclarators); } case 70: { -#line 1124 "VBNET.ATG" +#line 1125 "VBNET.ATG" m.Check(Modifier.Fields); lexer.NextToken(); -#line 1125 "VBNET.ATG" +#line 1126 "VBNET.ATG" m.Add(Modifier.Const); -#line 1127 "VBNET.ATG" +#line 1128 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = t.Location; List constantDeclarators = new List(); ConstantDeclarator( -#line 1131 "VBNET.ATG" +#line 1132 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1132 "VBNET.ATG" +#line 1133 "VBNET.ATG" constantDeclarators); } -#line 1134 "VBNET.ATG" +#line 1135 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; Expect(1); -#line 1139 "VBNET.ATG" +#line 1140 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -2055,20 +2055,20 @@ constantDeclarators); case 146: { lexer.NextToken(); -#line 1145 "VBNET.ATG" +#line 1146 "VBNET.ATG" m.Check(Modifier.VBProperties); Point startPos = t.Location; ArrayList implementsClause = null; Identifier(); -#line 1149 "VBNET.ATG" +#line 1150 "VBNET.ATG" string propertyName = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1150 "VBNET.ATG" +#line 1151 "VBNET.ATG" p); } Expect(24); @@ -2076,26 +2076,26 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1151 "VBNET.ATG" +#line 1152 "VBNET.ATG" out type); } -#line 1153 "VBNET.ATG" +#line 1154 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } if (la.kind == 106) { ImplementsClause( -#line 1157 "VBNET.ATG" +#line 1158 "VBNET.ATG" out implementsClause); } Expect(1); if ( -#line 1161 "VBNET.ATG" +#line 1162 "VBNET.ATG" IsMustOverride(m)) { -#line 1163 "VBNET.ATG" +#line 1164 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = startPos; pDecl.EndLocation = t.Location; @@ -2106,7 +2106,7 @@ IsMustOverride(m)) { } else if (la.kind == 26 || la.kind == 100 || la.kind == 156) { -#line 1173 "VBNET.ATG" +#line 1174 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = startPos; pDecl.EndLocation = t.Location; @@ -2118,57 +2118,132 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1183 "VBNET.ATG" +#line 1184 "VBNET.ATG" out getRegion, out setRegion); Expect(87); Expect(146); Expect(1); -#line 1187 "VBNET.ATG" +#line 1188 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; compilationUnit.AddChild(pDecl); - } else SynErr(220); + } else SynErr(221); break; } - default: SynErr(221); break; - } - } - - void EnumMemberDecl( -#line 859 "VBNET.ATG" -out FieldDeclaration f) { + case 200: { + lexer.NextToken(); -#line 861 "VBNET.ATG" - Expression expr = null;List attributes = new List(); - AttributeSection section = null; - VariableDeclaration varDecl = null; - - while (la.kind == 26) { - AttributeSection( -#line 865 "VBNET.ATG" -out section); +#line 1195 "VBNET.ATG" + Point startPos = t.Location; + Expect(92); -#line 865 "VBNET.ATG" - attributes.Add(section); - } - Identifier(); +#line 1197 "VBNET.ATG" + EventAccessorDeclaration eventAccessorDeclaration; + EventAccessorDeclaration addHandlerAccessorDeclaration = null; + EventAccessorDeclaration removeHandlerAccessorDeclaration = null; + EventAccessorDeclaration raiseEventAccessorDeclaration = null; + ArrayList implementsClause = null; + + Identifier(); -#line 868 "VBNET.ATG" - f = new FieldDeclaration(attributes); - varDecl = new VariableDeclaration(t.val); - f.Fields.Add(varDecl); - f.StartLocation = t.Location; - - if (la.kind == 11) { - lexer.NextToken(); - Expr( -#line 873 "VBNET.ATG" -out expr); +#line 1203 "VBNET.ATG" + string customEventName = t.val; + Expect(47); + TypeName( +#line 1204 "VBNET.ATG" +out type); + if (la.kind == 106) { + ImplementsClause( +#line 1205 "VBNET.ATG" +out implementsClause); + } + Expect(1); + while (StartOf(13)) { + EventAccessorDeclaration( +#line 1208 "VBNET.ATG" +out eventAccessorDeclaration); + +#line 1210 "VBNET.ATG" + if(eventAccessorDeclaration.Type == EventAccessorType.AddHandlerAccessor) + { + addHandlerAccessorDeclaration = eventAccessorDeclaration; + } + else if(eventAccessorDeclaration.Type == EventAccessorType.RemoveHandlerAccessor) + { + removeHandlerAccessorDeclaration = eventAccessorDeclaration; + } + else if(eventAccessorDeclaration.Type == EventAccessorType.RaiseEventAccessor) + { + raiseEventAccessorDeclaration = eventAccessorDeclaration; + } + + } + Expect(87); + Expect(92); + Expect(1); + +#line 1226 "VBNET.ATG" + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide AddHandler accessor."); + } + + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide RemoveHandler accessor."); + } + + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide RaiseEvent accessor."); + } + + CustomEventDeclaration decl = new CustomEventDeclaration(m.Modifier, attributes, customEventName, addHandlerAccessorDeclaration, removeHandlerAccessorDeclaration, raiseEventAccessorDeclaration, implementsClause); + decl.StartLocation = startPos; + decl.StartLocation = t.EndLocation; + compilationUnit.AddChild(decl); + + break; + } + default: SynErr(222); break; + } + } + + void EnumMemberDecl( +#line 860 "VBNET.ATG" +out FieldDeclaration f) { + +#line 862 "VBNET.ATG" + Expression expr = null;List attributes = new List(); + AttributeSection section = null; + VariableDeclaration varDecl = null; + + while (la.kind == 26) { + AttributeSection( +#line 866 "VBNET.ATG" +out section); + +#line 866 "VBNET.ATG" + attributes.Add(section); + } + Identifier(); + +#line 869 "VBNET.ATG" + f = new FieldDeclaration(attributes); + varDecl = new VariableDeclaration(t.val); + f.Fields.Add(varDecl); + f.StartLocation = t.Location; + + if (la.kind == 11) { + lexer.NextToken(); + Expr( +#line 874 "VBNET.ATG" +out expr); -#line 873 "VBNET.ATG" +#line 874 "VBNET.ATG" varDecl.Initializer = expr; } Expect(1); @@ -2176,7 +2251,7 @@ out expr); void InterfaceMemberDecl() { -#line 778 "VBNET.ATG" +#line 779 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2185,34 +2260,34 @@ out expr); List attributes = new List(); string name; - if (StartOf(13)) { + if (StartOf(14)) { while (la.kind == 26) { AttributeSection( -#line 786 "VBNET.ATG" +#line 787 "VBNET.ATG" out section); -#line 786 "VBNET.ATG" +#line 787 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 790 "VBNET.ATG" +#line 791 "VBNET.ATG" mod); } if (la.kind == 92) { lexer.NextToken(); -#line 793 "VBNET.ATG" +#line 794 "VBNET.ATG" mod.Check(Modifier.VBInterfaceEvents); Identifier(); -#line 794 "VBNET.ATG" +#line 795 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 795 "VBNET.ATG" +#line 796 "VBNET.ATG" p); } Expect(24); @@ -2220,12 +2295,12 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 796 "VBNET.ATG" +#line 797 "VBNET.ATG" out type); } Expect(1); -#line 799 "VBNET.ATG" +#line 800 "VBNET.ATG" EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null); compilationUnit.AddChild(ed); ed.EndLocation = t.EndLocation; @@ -2233,27 +2308,27 @@ out type); } else if (la.kind == 167) { lexer.NextToken(); -#line 805 "VBNET.ATG" +#line 806 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 806 "VBNET.ATG" +#line 807 "VBNET.ATG" name = t.val; TypeParameterList( -#line 807 "VBNET.ATG" +#line 808 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 808 "VBNET.ATG" +#line 809 "VBNET.ATG" p); } Expect(24); } Expect(1); -#line 811 "VBNET.ATG" +#line 812 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; @@ -2263,20 +2338,20 @@ p); } else if (la.kind == 99) { lexer.NextToken(); -#line 819 "VBNET.ATG" +#line 820 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 820 "VBNET.ATG" +#line 821 "VBNET.ATG" name = t.val; TypeParameterList( -#line 821 "VBNET.ATG" +#line 822 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 822 "VBNET.ATG" +#line 823 "VBNET.ATG" p); } Expect(24); @@ -2285,15 +2360,15 @@ p); lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 823 "VBNET.ATG" +#line 824 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 823 "VBNET.ATG" +#line 824 "VBNET.ATG" out type); } -#line 825 "VBNET.ATG" +#line 826 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2307,17 +2382,17 @@ out type); } else if (la.kind == 146) { lexer.NextToken(); -#line 837 "VBNET.ATG" +#line 838 "VBNET.ATG" mod.Check(Modifier.VBInterfaceProperties); Identifier(); -#line 838 "VBNET.ATG" +#line 839 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 839 "VBNET.ATG" +#line 840 "VBNET.ATG" p); } Expect(24); @@ -2325,44 +2400,44 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 840 "VBNET.ATG" +#line 841 "VBNET.ATG" out type); } -#line 842 "VBNET.ATG" +#line 843 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } Expect(1); -#line 848 "VBNET.ATG" +#line 849 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; compilationUnit.AddChild(pd); - } else SynErr(222); - } else if (StartOf(14)) { + } else SynErr(223); + } else if (StartOf(15)) { NonModuleDeclaration( -#line 855 "VBNET.ATG" +#line 856 "VBNET.ATG" mod, attributes); - } else SynErr(223); + } else SynErr(224); } void Expr( -#line 1423 "VBNET.ATG" +#line 1506 "VBNET.ATG" out Expression expr) { ConditionalOrExpr( -#line 1425 "VBNET.ATG" +#line 1508 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1401 "VBNET.ATG" +#line 1484 "VBNET.ATG" out ArrayList baseInterfaces) { -#line 1403 "VBNET.ATG" +#line 1486 "VBNET.ATG" baseInterfaces = new ArrayList(); string typename = String.Empty; string first; @@ -2370,76 +2445,76 @@ out ArrayList baseInterfaces) { Expect(106); Identifier(); -#line 1407 "VBNET.ATG" +#line 1490 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1407 "VBNET.ATG" +#line 1490 "VBNET.ATG" out typename); -#line 1407 "VBNET.ATG" +#line 1490 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); while (la.kind == 12) { lexer.NextToken(); Identifier(); -#line 1408 "VBNET.ATG" +#line 1491 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1408 "VBNET.ATG" +#line 1491 "VBNET.ATG" out typename); -#line 1408 "VBNET.ATG" +#line 1491 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); } } void HandlesClause( -#line 1359 "VBNET.ATG" +#line 1442 "VBNET.ATG" out ArrayList handlesClause) { -#line 1361 "VBNET.ATG" +#line 1444 "VBNET.ATG" handlesClause = new ArrayList(); string name; Expect(104); EventMemberSpecifier( -#line 1364 "VBNET.ATG" +#line 1447 "VBNET.ATG" out name); -#line 1364 "VBNET.ATG" +#line 1447 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1365 "VBNET.ATG" +#line 1448 "VBNET.ATG" out name); -#line 1365 "VBNET.ATG" +#line 1448 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 1971 "VBNET.ATG" +#line 2054 "VBNET.ATG" out Statement stmt) { -#line 1974 "VBNET.ATG" +#line 2057 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); - while (StartOf(15) || -#line 1979 "VBNET.ATG" + while (StartOf(16) || +#line 2062 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 1979 "VBNET.ATG" +#line 2062 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); EndOfStmt(); -#line 1979 "VBNET.ATG" +#line 2062 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2447,7 +2522,7 @@ IsEndStmtAhead()) { } } -#line 1985 "VBNET.ATG" +#line 2068 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2455,80 +2530,80 @@ IsEndStmtAhead()) { } void Charset( -#line 1351 "VBNET.ATG" +#line 1434 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1352 "VBNET.ATG" +#line 1435 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 99 || la.kind == 167) { } else if (la.kind == 46) { lexer.NextToken(); -#line 1353 "VBNET.ATG" +#line 1436 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 49) { lexer.NextToken(); -#line 1354 "VBNET.ATG" +#line 1437 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1355 "VBNET.ATG" +#line 1438 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; - } else SynErr(224); + } else SynErr(225); } void VariableDeclarator( -#line 1269 "VBNET.ATG" +#line 1352 "VBNET.ATG" List fieldDeclaration) { -#line 1271 "VBNET.ATG" +#line 1354 "VBNET.ATG" Expression expr = null; TypeReference type = null;ArrayList rank = null;ArrayList dimension = null; Identifier(); -#line 1274 "VBNET.ATG" +#line 1357 "VBNET.ATG" string name = t.val; if ( -#line 1275 "VBNET.ATG" +#line 1358 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1275 "VBNET.ATG" +#line 1358 "VBNET.ATG" out rank); } if ( -#line 1276 "VBNET.ATG" +#line 1359 "VBNET.ATG" IsSize()) { ArrayInitializationModifier( -#line 1276 "VBNET.ATG" +#line 1359 "VBNET.ATG" out dimension); } if ( -#line 1278 "VBNET.ATG" +#line 1361 "VBNET.ATG" IsObjectCreation()) { Expect(47); ObjectCreateExpression( -#line 1278 "VBNET.ATG" +#line 1361 "VBNET.ATG" out expr); -#line 1280 "VBNET.ATG" +#line 1363 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { type = ((ArrayCreateExpression)expr).CreateType; } - } else if (StartOf(16)) { + } else if (StartOf(17)) { if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1287 "VBNET.ATG" +#line 1370 "VBNET.ATG" out type); } -#line 1289 "VBNET.ATG" +#line 1372 "VBNET.ATG" if (type != null && rank != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2540,40 +2615,40 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1297 "VBNET.ATG" +#line 1380 "VBNET.ATG" out expr); } - } else SynErr(225); + } else SynErr(226); -#line 1299 "VBNET.ATG" +#line 1382 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void ConstantDeclarator( -#line 1252 "VBNET.ATG" +#line 1335 "VBNET.ATG" List constantDeclaration) { -#line 1254 "VBNET.ATG" +#line 1337 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1258 "VBNET.ATG" +#line 1341 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1259 "VBNET.ATG" +#line 1342 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1260 "VBNET.ATG" +#line 1343 "VBNET.ATG" out expr); -#line 1262 "VBNET.ATG" +#line 1345 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2581,10 +2656,10 @@ out expr); } void AccessorDecls( -#line 1196 "VBNET.ATG" +#line 1279 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1198 "VBNET.ATG" +#line 1281 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2592,68 +2667,156 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 26) { AttributeSection( -#line 1203 "VBNET.ATG" +#line 1286 "VBNET.ATG" out section); -#line 1203 "VBNET.ATG" +#line 1286 "VBNET.ATG" attributes.Add(section); } if (la.kind == 100) { GetAccessorDecl( -#line 1205 "VBNET.ATG" +#line 1288 "VBNET.ATG" out getBlock, attributes); if (la.kind == 26 || la.kind == 156) { -#line 1207 "VBNET.ATG" +#line 1290 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1208 "VBNET.ATG" +#line 1291 "VBNET.ATG" out section); -#line 1208 "VBNET.ATG" +#line 1291 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1209 "VBNET.ATG" +#line 1292 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1212 "VBNET.ATG" +#line 1295 "VBNET.ATG" out setBlock, attributes); if (la.kind == 26 || la.kind == 100) { -#line 1214 "VBNET.ATG" +#line 1297 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1215 "VBNET.ATG" +#line 1298 "VBNET.ATG" out section); -#line 1215 "VBNET.ATG" +#line 1298 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1216 "VBNET.ATG" +#line 1299 "VBNET.ATG" out getBlock, attributes); } - } else SynErr(226); + } else SynErr(227); + } + + void EventAccessorDeclaration( +#line 1248 "VBNET.ATG" +out EventAccessorDeclaration eventAccessorDeclaration) { + +#line 1250 "VBNET.ATG" + Statement stmt = null; + List p = new List(); + AttributeSection section; + List attributes = new List(); + eventAccessorDeclaration = null; + + while (la.kind == 26) { + AttributeSection( +#line 1256 "VBNET.ATG" +out section); + +#line 1256 "VBNET.ATG" + attributes.Add(section); + } + if (la.kind == 41) { + lexer.NextToken(); + if (la.kind == 23) { + lexer.NextToken(); + if (StartOf(4)) { + FormalParameterList( +#line 1258 "VBNET.ATG" +p); + } + Expect(24); + } + Expect(1); + Block( +#line 1259 "VBNET.ATG" +out stmt); + Expect(87); + Expect(41); + Expect(1); + +#line 1261 "VBNET.ATG" + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.AddHandlerAccessor, attributes); + + } else if (la.kind == 152) { + lexer.NextToken(); + if (la.kind == 23) { + lexer.NextToken(); + if (StartOf(4)) { + FormalParameterList( +#line 1264 "VBNET.ATG" +p); + } + Expect(24); + } + Expect(1); + Block( +#line 1265 "VBNET.ATG" +out stmt); + Expect(87); + Expect(152); + Expect(1); + +#line 1267 "VBNET.ATG" + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.RemoveHandlerAccessor, attributes); + + } else if (la.kind == 149) { + lexer.NextToken(); + if (la.kind == 23) { + lexer.NextToken(); + if (StartOf(4)) { + FormalParameterList( +#line 1270 "VBNET.ATG" +p); + } + Expect(24); + } + Expect(1); + Block( +#line 1271 "VBNET.ATG" +out stmt); + Expect(87); + Expect(149); + Expect(1); + +#line 1273 "VBNET.ATG" + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.RaiseEventAccessor, attributes); + + } else SynErr(228); } void GetAccessorDecl( -#line 1222 "VBNET.ATG" +#line 1305 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1223 "VBNET.ATG" +#line 1306 "VBNET.ATG" Statement stmt = null; Expect(100); Expect(1); Block( -#line 1226 "VBNET.ATG" +#line 1309 "VBNET.ATG" out stmt); -#line 1228 "VBNET.ATG" +#line 1311 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(87); @@ -2662,10 +2825,10 @@ out stmt); } void SetAccessorDecl( -#line 1235 "VBNET.ATG" +#line 1318 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1237 "VBNET.ATG" +#line 1320 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); @@ -2673,17 +2836,17 @@ out PropertySetRegion setBlock, List attributes) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1240 "VBNET.ATG" +#line 1323 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1242 "VBNET.ATG" +#line 1325 "VBNET.ATG" out stmt); -#line 1244 "VBNET.ATG" +#line 1327 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; @@ -2693,36 +2856,36 @@ out stmt); } void ArrayNameModifier( -#line 1763 "VBNET.ATG" +#line 1846 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1765 "VBNET.ATG" +#line 1848 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1767 "VBNET.ATG" +#line 1850 "VBNET.ATG" out arrayModifiers); } void ArrayInitializationModifier( -#line 1303 "VBNET.ATG" +#line 1386 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1305 "VBNET.ATG" +#line 1388 "VBNET.ATG" arrayModifiers = null; Expect(23); InitializationRankList( -#line 1307 "VBNET.ATG" +#line 1390 "VBNET.ATG" out arrayModifiers); Expect(24); } void ObjectCreateExpression( -#line 1679 "VBNET.ATG" +#line 1762 "VBNET.ATG" out Expression oce) { -#line 1681 "VBNET.ATG" +#line 1764 "VBNET.ATG" TypeReference type = null; Expression initializer = null; ArrayList arguments = null; @@ -2730,24 +2893,24 @@ out Expression oce) { Expect(126); NonArrayTypeName( -#line 1686 "VBNET.ATG" +#line 1769 "VBNET.ATG" out type); if (la.kind == 23) { lexer.NextToken(); - if (StartOf(17)) { + if (StartOf(18)) { ArgumentList( -#line 1687 "VBNET.ATG" +#line 1770 "VBNET.ATG" out arguments); } Expect(24); } if (la.kind == 21) { ArrayInitializer( -#line 1688 "VBNET.ATG" +#line 1771 "VBNET.ATG" out initializer); } -#line 1690 "VBNET.ATG" +#line 1773 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2759,98 +2922,98 @@ out initializer); } void VariableInitializer( -#line 1323 "VBNET.ATG" +#line 1406 "VBNET.ATG" out Expression initializerExpression) { -#line 1325 "VBNET.ATG" +#line 1408 "VBNET.ATG" initializerExpression = null; - if (StartOf(18)) { + if (StartOf(19)) { Expr( -#line 1327 "VBNET.ATG" +#line 1410 "VBNET.ATG" out initializerExpression); } else if (la.kind == 21) { ArrayInitializer( -#line 1328 "VBNET.ATG" +#line 1411 "VBNET.ATG" out initializerExpression); - } else SynErr(227); + } else SynErr(229); } void InitializationRankList( -#line 1311 "VBNET.ATG" +#line 1394 "VBNET.ATG" out ArrayList rank) { -#line 1313 "VBNET.ATG" +#line 1396 "VBNET.ATG" rank = null; Expression expr = null; Expr( -#line 1316 "VBNET.ATG" +#line 1399 "VBNET.ATG" out expr); -#line 1316 "VBNET.ATG" +#line 1399 "VBNET.ATG" rank = new ArrayList(); if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1318 "VBNET.ATG" +#line 1401 "VBNET.ATG" out expr); -#line 1318 "VBNET.ATG" +#line 1401 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1332 "VBNET.ATG" +#line 1415 "VBNET.ATG" out Expression outExpr) { -#line 1334 "VBNET.ATG" +#line 1417 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(21); - if (StartOf(19)) { + if (StartOf(20)) { VariableInitializer( -#line 1339 "VBNET.ATG" +#line 1422 "VBNET.ATG" out expr); -#line 1341 "VBNET.ATG" +#line 1424 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1344 "VBNET.ATG" +#line 1427 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1344 "VBNET.ATG" +#line 1427 "VBNET.ATG" out expr); -#line 1345 "VBNET.ATG" +#line 1428 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(22); -#line 1348 "VBNET.ATG" +#line 1431 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1411 "VBNET.ATG" +#line 1494 "VBNET.ATG" out string name) { -#line 1412 "VBNET.ATG" +#line 1495 "VBNET.ATG" string type; name = String.Empty; if (StartOf(10)) { Identifier(); -#line 1413 "VBNET.ATG" +#line 1496 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1415 "VBNET.ATG" +#line 1498 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 123) { lexer.NextToken(); @@ -2858,42 +3021,42 @@ out string name) { if (StartOf(10)) { Identifier(); -#line 1418 "VBNET.ATG" +#line 1501 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 91) { lexer.NextToken(); -#line 1419 "VBNET.ATG" +#line 1502 "VBNET.ATG" name = "MyBase.Error"; - } else SynErr(228); - } else SynErr(229); + } else SynErr(230); + } else SynErr(231); } void ConditionalOrExpr( -#line 1558 "VBNET.ATG" +#line 1641 "VBNET.ATG" out Expression outExpr) { -#line 1559 "VBNET.ATG" +#line 1642 "VBNET.ATG" Expression expr; ConditionalAndExpr( -#line 1560 "VBNET.ATG" +#line 1643 "VBNET.ATG" out outExpr); while (la.kind == 138) { lexer.NextToken(); ConditionalAndExpr( -#line 1560 "VBNET.ATG" +#line 1643 "VBNET.ATG" out expr); -#line 1560 "VBNET.ATG" +#line 1643 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void UnaryExpr( -#line 1432 "VBNET.ATG" +#line 1515 "VBNET.ATG" out Expression uExpr) { -#line 1434 "VBNET.ATG" +#line 1517 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -2902,25 +3065,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1438 "VBNET.ATG" +#line 1521 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1439 "VBNET.ATG" +#line 1522 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1441 "VBNET.ATG" +#line 1524 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } SimpleExpr( -#line 1443 "VBNET.ATG" +#line 1526 "VBNET.ATG" out expr); -#line 1445 "VBNET.ATG" +#line 1528 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -2930,2027 +3093,2027 @@ out expr); } void SimpleExpr( -#line 1468 "VBNET.ATG" +#line 1551 "VBNET.ATG" out Expression pexpr) { -#line 1470 "VBNET.ATG" +#line 1553 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; pexpr = null; - if (StartOf(20) || -#line 1499 "VBNET.ATG" + if (StartOf(21) || +#line 1582 "VBNET.ATG" la.kind == Tokens.Global) { if (la.kind == 3) { lexer.NextToken(); -#line 1478 "VBNET.ATG" +#line 1561 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 4) { lexer.NextToken(); -#line 1479 "VBNET.ATG" +#line 1562 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 7) { lexer.NextToken(); -#line 1480 "VBNET.ATG" +#line 1563 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 6) { lexer.NextToken(); -#line 1481 "VBNET.ATG" +#line 1564 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 5) { lexer.NextToken(); -#line 1482 "VBNET.ATG" +#line 1565 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 9) { lexer.NextToken(); -#line 1483 "VBNET.ATG" +#line 1566 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 8) { lexer.NextToken(); -#line 1484 "VBNET.ATG" +#line 1567 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 173) { lexer.NextToken(); -#line 1486 "VBNET.ATG" +#line 1569 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 95) { lexer.NextToken(); -#line 1487 "VBNET.ATG" +#line 1570 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 129) { lexer.NextToken(); -#line 1488 "VBNET.ATG" +#line 1571 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 23) { lexer.NextToken(); Expr( -#line 1489 "VBNET.ATG" +#line 1572 "VBNET.ATG" out expr); Expect(24); -#line 1489 "VBNET.ATG" +#line 1572 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(10)) { Identifier(); -#line 1490 "VBNET.ATG" +#line 1573 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); - } else if (StartOf(21)) { + } else if (StartOf(22)) { -#line 1491 "VBNET.ATG" +#line 1574 "VBNET.ATG" string val = String.Empty; PrimitiveTypeName( -#line 1491 "VBNET.ATG" +#line 1574 "VBNET.ATG" out val); Expect(10); -#line 1492 "VBNET.ATG" +#line 1575 "VBNET.ATG" t.val = ""; Identifier(); -#line 1492 "VBNET.ATG" +#line 1575 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 118) { lexer.NextToken(); -#line 1493 "VBNET.ATG" +#line 1576 "VBNET.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 123 || la.kind == 124) { -#line 1494 "VBNET.ATG" +#line 1577 "VBNET.ATG" Expression retExpr = null; if (la.kind == 123) { lexer.NextToken(); -#line 1495 "VBNET.ATG" +#line 1578 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 124) { lexer.NextToken(); -#line 1496 "VBNET.ATG" +#line 1579 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(230); + } else SynErr(232); Expect(10); IdentifierOrKeyword( -#line 1498 "VBNET.ATG" +#line 1581 "VBNET.ATG" out name); -#line 1498 "VBNET.ATG" +#line 1581 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); } else if ( -#line 1499 "VBNET.ATG" +#line 1582 "VBNET.ATG" la.kind == Tokens.Global) { TypeName( -#line 1499 "VBNET.ATG" +#line 1582 "VBNET.ATG" out type); -#line 1499 "VBNET.ATG" +#line 1582 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); } else if (la.kind == 126) { ObjectCreateExpression( -#line 1500 "VBNET.ATG" +#line 1583 "VBNET.ATG" out expr); -#line 1500 "VBNET.ATG" +#line 1583 "VBNET.ATG" pexpr = expr; } else if (la.kind == 74 || la.kind == 81) { if (la.kind == 81) { lexer.NextToken(); } else if (la.kind == 74) { lexer.NextToken(); - } else SynErr(231); + } else SynErr(233); Expect(23); Expr( -#line 1501 "VBNET.ATG" +#line 1584 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1501 "VBNET.ATG" +#line 1584 "VBNET.ATG" out type); Expect(24); -#line 1501 "VBNET.ATG" +#line 1584 "VBNET.ATG" pexpr = new CastExpression(type, expr); } else if (la.kind == 195) { lexer.NextToken(); Expect(23); Expr( -#line 1502 "VBNET.ATG" +#line 1585 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1502 "VBNET.ATG" +#line 1585 "VBNET.ATG" out type); Expect(24); -#line 1502 "VBNET.ATG" +#line 1585 "VBNET.ATG" pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); - } else if (StartOf(22)) { + } else if (StartOf(23)) { CastTarget( -#line 1503 "VBNET.ATG" +#line 1586 "VBNET.ATG" out type); Expect(23); Expr( -#line 1503 "VBNET.ATG" +#line 1586 "VBNET.ATG" out expr); Expect(24); -#line 1503 "VBNET.ATG" +#line 1586 "VBNET.ATG" pexpr = new CastExpression(type, expr, true); } else if (la.kind == 42) { lexer.NextToken(); Expr( -#line 1504 "VBNET.ATG" +#line 1587 "VBNET.ATG" out expr); -#line 1504 "VBNET.ATG" +#line 1587 "VBNET.ATG" pexpr = new AddressOfExpression(expr); } else if (la.kind == 101) { lexer.NextToken(); Expect(23); TypeName( -#line 1505 "VBNET.ATG" +#line 1588 "VBNET.ATG" out type); Expect(24); -#line 1505 "VBNET.ATG" +#line 1588 "VBNET.ATG" pexpr = new TypeOfExpression(type); } else { lexer.NextToken(); SimpleExpr( -#line 1506 "VBNET.ATG" +#line 1589 "VBNET.ATG" out expr); Expect(112); TypeName( -#line 1506 "VBNET.ATG" +#line 1589 "VBNET.ATG" out type); -#line 1506 "VBNET.ATG" +#line 1589 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); } while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1509 "VBNET.ATG" +#line 1592 "VBNET.ATG" out name); -#line 1509 "VBNET.ATG" +#line 1592 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1510 "VBNET.ATG" +#line 1593 "VBNET.ATG" ArrayList parameters = new ArrayList(); - if (StartOf(23)) { - if (StartOf(18)) { + if (StartOf(24)) { + if (StartOf(19)) { Argument( -#line 1512 "VBNET.ATG" +#line 1595 "VBNET.ATG" out expr); -#line 1512 "VBNET.ATG" +#line 1595 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } while (la.kind == 12) { lexer.NextToken(); - if (StartOf(18)) { + if (StartOf(19)) { Argument( -#line 1515 "VBNET.ATG" +#line 1598 "VBNET.ATG" out expr); -#line 1515 "VBNET.ATG" +#line 1598 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } } Expect(24); -#line 1518 "VBNET.ATG" +#line 1601 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1522 "VBNET.ATG" +#line 1605 "VBNET.ATG" out name); -#line 1522 "VBNET.ATG" +#line 1605 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1524 "VBNET.ATG" +#line 1607 "VBNET.ATG" out name); -#line 1524 "VBNET.ATG" +#line 1607 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1525 "VBNET.ATG" +#line 1608 "VBNET.ATG" ArrayList parameters = new ArrayList(); - if (StartOf(23)) { + if (StartOf(24)) { -#line 1527 "VBNET.ATG" +#line 1610 "VBNET.ATG" expr = null; - if (StartOf(18)) { + if (StartOf(19)) { Argument( -#line 1527 "VBNET.ATG" +#line 1610 "VBNET.ATG" out expr); } -#line 1527 "VBNET.ATG" +#line 1610 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1529 "VBNET.ATG" +#line 1612 "VBNET.ATG" expr = null; - if (StartOf(18)) { + if (StartOf(19)) { Argument( -#line 1530 "VBNET.ATG" +#line 1613 "VBNET.ATG" out expr); } -#line 1530 "VBNET.ATG" +#line 1613 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(24); -#line 1533 "VBNET.ATG" +#line 1616 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } - } else SynErr(232); + } else SynErr(234); } void AssignmentOperator( -#line 1453 "VBNET.ATG" +#line 1536 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1454 "VBNET.ATG" +#line 1537 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1455 "VBNET.ATG" +#line 1538 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 40: { lexer.NextToken(); -#line 1456 "VBNET.ATG" +#line 1539 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 32: { lexer.NextToken(); -#line 1457 "VBNET.ATG" +#line 1540 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 34: { lexer.NextToken(); -#line 1458 "VBNET.ATG" +#line 1541 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 35: { lexer.NextToken(); -#line 1459 "VBNET.ATG" +#line 1542 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 36: { lexer.NextToken(); -#line 1460 "VBNET.ATG" +#line 1543 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 37: { lexer.NextToken(); -#line 1461 "VBNET.ATG" +#line 1544 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 33: { lexer.NextToken(); -#line 1462 "VBNET.ATG" +#line 1545 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 38: { lexer.NextToken(); -#line 1463 "VBNET.ATG" +#line 1546 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 39: { lexer.NextToken(); -#line 1464 "VBNET.ATG" +#line 1547 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(233); break; + default: SynErr(235); break; } } void IdentifierOrKeyword( -#line 2556 "VBNET.ATG" +#line 2639 "VBNET.ATG" out string name) { -#line 2558 "VBNET.ATG" +#line 2641 "VBNET.ATG" name = String.Empty; switch (la.kind) { case 2: case 50: case 69: case 169: { Identifier(); -#line 2561 "VBNET.ATG" +#line 2644 "VBNET.ATG" name = t.val; break; } case 41: { lexer.NextToken(); -#line 2562 "VBNET.ATG" +#line 2645 "VBNET.ATG" name = t.val; break; } case 42: { lexer.NextToken(); -#line 2563 "VBNET.ATG" +#line 2646 "VBNET.ATG" name = t.val; break; } case 43: { lexer.NextToken(); -#line 2564 "VBNET.ATG" +#line 2647 "VBNET.ATG" name = t.val; break; } case 44: { lexer.NextToken(); -#line 2565 "VBNET.ATG" +#line 2648 "VBNET.ATG" name = t.val; break; } case 45: { lexer.NextToken(); -#line 2566 "VBNET.ATG" +#line 2649 "VBNET.ATG" name = t.val; break; } case 46: { lexer.NextToken(); -#line 2567 "VBNET.ATG" +#line 2650 "VBNET.ATG" name = t.val; break; } case 47: { lexer.NextToken(); -#line 2568 "VBNET.ATG" +#line 2651 "VBNET.ATG" name = t.val; break; } case 48: { lexer.NextToken(); -#line 2569 "VBNET.ATG" +#line 2652 "VBNET.ATG" name = t.val; break; } case 49: { lexer.NextToken(); -#line 2570 "VBNET.ATG" +#line 2653 "VBNET.ATG" name = t.val; break; } case 51: { lexer.NextToken(); -#line 2571 "VBNET.ATG" +#line 2654 "VBNET.ATG" name = t.val; break; } case 52: { lexer.NextToken(); -#line 2572 "VBNET.ATG" +#line 2655 "VBNET.ATG" name = t.val; break; } case 53: { lexer.NextToken(); -#line 2573 "VBNET.ATG" +#line 2656 "VBNET.ATG" name = t.val; break; } case 54: { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2657 "VBNET.ATG" name = t.val; break; } case 55: { lexer.NextToken(); -#line 2575 "VBNET.ATG" +#line 2658 "VBNET.ATG" name = t.val; break; } case 56: { lexer.NextToken(); -#line 2576 "VBNET.ATG" +#line 2659 "VBNET.ATG" name = t.val; break; } case 57: { lexer.NextToken(); -#line 2577 "VBNET.ATG" +#line 2660 "VBNET.ATG" name = t.val; break; } case 58: { lexer.NextToken(); -#line 2578 "VBNET.ATG" +#line 2661 "VBNET.ATG" name = t.val; break; } case 59: { lexer.NextToken(); -#line 2579 "VBNET.ATG" +#line 2662 "VBNET.ATG" name = t.val; break; } case 60: { lexer.NextToken(); -#line 2580 "VBNET.ATG" +#line 2663 "VBNET.ATG" name = t.val; break; } case 61: { lexer.NextToken(); -#line 2581 "VBNET.ATG" +#line 2664 "VBNET.ATG" name = t.val; break; } case 62: { lexer.NextToken(); -#line 2582 "VBNET.ATG" +#line 2665 "VBNET.ATG" name = t.val; break; } case 63: { lexer.NextToken(); -#line 2583 "VBNET.ATG" +#line 2666 "VBNET.ATG" name = t.val; break; } case 64: { lexer.NextToken(); -#line 2584 "VBNET.ATG" +#line 2667 "VBNET.ATG" name = t.val; break; } case 65: { lexer.NextToken(); -#line 2585 "VBNET.ATG" +#line 2668 "VBNET.ATG" name = t.val; break; } case 66: { lexer.NextToken(); -#line 2586 "VBNET.ATG" +#line 2669 "VBNET.ATG" name = t.val; break; } case 67: { lexer.NextToken(); -#line 2587 "VBNET.ATG" +#line 2670 "VBNET.ATG" name = t.val; break; } case 68: { lexer.NextToken(); -#line 2588 "VBNET.ATG" +#line 2671 "VBNET.ATG" name = t.val; break; } case 70: { lexer.NextToken(); -#line 2589 "VBNET.ATG" +#line 2672 "VBNET.ATG" name = t.val; break; } case 71: { lexer.NextToken(); -#line 2590 "VBNET.ATG" +#line 2673 "VBNET.ATG" name = t.val; break; } case 72: { lexer.NextToken(); -#line 2591 "VBNET.ATG" +#line 2674 "VBNET.ATG" name = t.val; break; } case 73: { lexer.NextToken(); -#line 2592 "VBNET.ATG" +#line 2675 "VBNET.ATG" name = t.val; break; } case 74: { lexer.NextToken(); -#line 2593 "VBNET.ATG" +#line 2676 "VBNET.ATG" name = t.val; break; } case 75: { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2677 "VBNET.ATG" name = t.val; break; } case 76: { lexer.NextToken(); -#line 2595 "VBNET.ATG" +#line 2678 "VBNET.ATG" name = t.val; break; } case 77: { lexer.NextToken(); -#line 2596 "VBNET.ATG" +#line 2679 "VBNET.ATG" name = t.val; break; } case 78: { lexer.NextToken(); -#line 2597 "VBNET.ATG" +#line 2680 "VBNET.ATG" name = t.val; break; } case 79: { lexer.NextToken(); -#line 2598 "VBNET.ATG" +#line 2681 "VBNET.ATG" name = t.val; break; } case 80: { lexer.NextToken(); -#line 2599 "VBNET.ATG" +#line 2682 "VBNET.ATG" name = t.val; break; } case 81: { lexer.NextToken(); -#line 2600 "VBNET.ATG" +#line 2683 "VBNET.ATG" name = t.val; break; } case 82: { lexer.NextToken(); -#line 2601 "VBNET.ATG" +#line 2684 "VBNET.ATG" name = t.val; break; } case 83: { lexer.NextToken(); -#line 2602 "VBNET.ATG" +#line 2685 "VBNET.ATG" name = t.val; break; } case 84: { lexer.NextToken(); -#line 2603 "VBNET.ATG" +#line 2686 "VBNET.ATG" name = t.val; break; } case 85: { lexer.NextToken(); -#line 2604 "VBNET.ATG" +#line 2687 "VBNET.ATG" name = t.val; break; } case 86: { lexer.NextToken(); -#line 2605 "VBNET.ATG" +#line 2688 "VBNET.ATG" name = t.val; break; } case 87: { lexer.NextToken(); -#line 2606 "VBNET.ATG" +#line 2689 "VBNET.ATG" name = t.val; break; } case 88: { lexer.NextToken(); -#line 2607 "VBNET.ATG" +#line 2690 "VBNET.ATG" name = t.val; break; } case 89: { lexer.NextToken(); -#line 2608 "VBNET.ATG" +#line 2691 "VBNET.ATG" name = t.val; break; } case 90: { lexer.NextToken(); -#line 2609 "VBNET.ATG" +#line 2692 "VBNET.ATG" name = t.val; break; } case 91: { lexer.NextToken(); -#line 2610 "VBNET.ATG" +#line 2693 "VBNET.ATG" name = t.val; break; } case 92: { lexer.NextToken(); -#line 2611 "VBNET.ATG" +#line 2694 "VBNET.ATG" name = t.val; break; } case 93: { lexer.NextToken(); -#line 2612 "VBNET.ATG" +#line 2695 "VBNET.ATG" name = t.val; break; } case 94: { lexer.NextToken(); -#line 2613 "VBNET.ATG" +#line 2696 "VBNET.ATG" name = t.val; break; } case 95: { lexer.NextToken(); -#line 2614 "VBNET.ATG" +#line 2697 "VBNET.ATG" name = t.val; break; } case 96: { lexer.NextToken(); -#line 2615 "VBNET.ATG" +#line 2698 "VBNET.ATG" name = t.val; break; } case 97: { lexer.NextToken(); -#line 2616 "VBNET.ATG" +#line 2699 "VBNET.ATG" name = t.val; break; } case 98: { lexer.NextToken(); -#line 2617 "VBNET.ATG" +#line 2700 "VBNET.ATG" name = t.val; break; } case 99: { lexer.NextToken(); -#line 2618 "VBNET.ATG" +#line 2701 "VBNET.ATG" name = t.val; break; } case 100: { lexer.NextToken(); -#line 2619 "VBNET.ATG" +#line 2702 "VBNET.ATG" name = t.val; break; } case 101: { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2703 "VBNET.ATG" name = t.val; break; } case 102: { lexer.NextToken(); -#line 2621 "VBNET.ATG" +#line 2704 "VBNET.ATG" name = t.val; break; } case 103: { lexer.NextToken(); -#line 2622 "VBNET.ATG" +#line 2705 "VBNET.ATG" name = t.val; break; } case 104: { lexer.NextToken(); -#line 2623 "VBNET.ATG" +#line 2706 "VBNET.ATG" name = t.val; break; } case 105: { lexer.NextToken(); -#line 2624 "VBNET.ATG" +#line 2707 "VBNET.ATG" name = t.val; break; } case 106: { lexer.NextToken(); -#line 2625 "VBNET.ATG" +#line 2708 "VBNET.ATG" name = t.val; break; } case 107: { lexer.NextToken(); -#line 2626 "VBNET.ATG" +#line 2709 "VBNET.ATG" name = t.val; break; } case 108: { lexer.NextToken(); -#line 2627 "VBNET.ATG" +#line 2710 "VBNET.ATG" name = t.val; break; } case 109: { lexer.NextToken(); -#line 2628 "VBNET.ATG" +#line 2711 "VBNET.ATG" name = t.val; break; } case 110: { lexer.NextToken(); -#line 2629 "VBNET.ATG" +#line 2712 "VBNET.ATG" name = t.val; break; } case 111: { lexer.NextToken(); -#line 2630 "VBNET.ATG" +#line 2713 "VBNET.ATG" name = t.val; break; } case 112: { lexer.NextToken(); -#line 2631 "VBNET.ATG" +#line 2714 "VBNET.ATG" name = t.val; break; } case 113: { lexer.NextToken(); -#line 2632 "VBNET.ATG" +#line 2715 "VBNET.ATG" name = t.val; break; } case 114: { lexer.NextToken(); -#line 2633 "VBNET.ATG" +#line 2716 "VBNET.ATG" name = t.val; break; } case 115: { lexer.NextToken(); -#line 2634 "VBNET.ATG" +#line 2717 "VBNET.ATG" name = t.val; break; } case 116: { lexer.NextToken(); -#line 2635 "VBNET.ATG" +#line 2718 "VBNET.ATG" name = t.val; break; } case 117: { lexer.NextToken(); -#line 2636 "VBNET.ATG" +#line 2719 "VBNET.ATG" name = t.val; break; } case 118: { lexer.NextToken(); -#line 2637 "VBNET.ATG" +#line 2720 "VBNET.ATG" name = t.val; break; } case 119: { lexer.NextToken(); -#line 2638 "VBNET.ATG" +#line 2721 "VBNET.ATG" name = t.val; break; } case 120: { lexer.NextToken(); -#line 2639 "VBNET.ATG" +#line 2722 "VBNET.ATG" name = t.val; break; } case 121: { lexer.NextToken(); -#line 2640 "VBNET.ATG" +#line 2723 "VBNET.ATG" name = t.val; break; } case 122: { lexer.NextToken(); -#line 2641 "VBNET.ATG" +#line 2724 "VBNET.ATG" name = t.val; break; } case 123: { lexer.NextToken(); -#line 2642 "VBNET.ATG" +#line 2725 "VBNET.ATG" name = t.val; break; } case 124: { lexer.NextToken(); -#line 2643 "VBNET.ATG" +#line 2726 "VBNET.ATG" name = t.val; break; } case 125: { lexer.NextToken(); -#line 2644 "VBNET.ATG" +#line 2727 "VBNET.ATG" name = t.val; break; } case 126: { lexer.NextToken(); -#line 2645 "VBNET.ATG" +#line 2728 "VBNET.ATG" name = t.val; break; } case 127: { lexer.NextToken(); -#line 2646 "VBNET.ATG" +#line 2729 "VBNET.ATG" name = t.val; break; } case 128: { lexer.NextToken(); -#line 2647 "VBNET.ATG" +#line 2730 "VBNET.ATG" name = t.val; break; } case 129: { lexer.NextToken(); -#line 2648 "VBNET.ATG" +#line 2731 "VBNET.ATG" name = t.val; break; } case 130: { lexer.NextToken(); -#line 2649 "VBNET.ATG" +#line 2732 "VBNET.ATG" name = t.val; break; } case 131: { lexer.NextToken(); -#line 2650 "VBNET.ATG" +#line 2733 "VBNET.ATG" name = t.val; break; } case 132: { lexer.NextToken(); -#line 2651 "VBNET.ATG" +#line 2734 "VBNET.ATG" name = t.val; break; } case 134: { lexer.NextToken(); -#line 2652 "VBNET.ATG" +#line 2735 "VBNET.ATG" name = t.val; break; } case 135: { lexer.NextToken(); -#line 2653 "VBNET.ATG" +#line 2736 "VBNET.ATG" name = t.val; break; } case 136: { lexer.NextToken(); -#line 2654 "VBNET.ATG" +#line 2737 "VBNET.ATG" name = t.val; break; } case 137: { lexer.NextToken(); -#line 2655 "VBNET.ATG" +#line 2738 "VBNET.ATG" name = t.val; break; } case 138: { lexer.NextToken(); -#line 2656 "VBNET.ATG" +#line 2739 "VBNET.ATG" name = t.val; break; } case 139: { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2740 "VBNET.ATG" name = t.val; break; } case 140: { lexer.NextToken(); -#line 2658 "VBNET.ATG" +#line 2741 "VBNET.ATG" name = t.val; break; } case 142: { lexer.NextToken(); -#line 2659 "VBNET.ATG" +#line 2742 "VBNET.ATG" name = t.val; break; } case 143: { lexer.NextToken(); -#line 2660 "VBNET.ATG" +#line 2743 "VBNET.ATG" name = t.val; break; } case 144: { lexer.NextToken(); -#line 2661 "VBNET.ATG" +#line 2744 "VBNET.ATG" name = t.val; break; } case 145: { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2745 "VBNET.ATG" name = t.val; break; } case 146: { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2746 "VBNET.ATG" name = t.val; break; } case 147: { lexer.NextToken(); -#line 2664 "VBNET.ATG" +#line 2747 "VBNET.ATG" name = t.val; break; } case 148: { lexer.NextToken(); -#line 2665 "VBNET.ATG" +#line 2748 "VBNET.ATG" name = t.val; break; } case 149: { lexer.NextToken(); -#line 2666 "VBNET.ATG" +#line 2749 "VBNET.ATG" name = t.val; break; } case 150: { lexer.NextToken(); -#line 2667 "VBNET.ATG" +#line 2750 "VBNET.ATG" name = t.val; break; } case 151: { lexer.NextToken(); -#line 2668 "VBNET.ATG" +#line 2751 "VBNET.ATG" name = t.val; break; } case 152: { lexer.NextToken(); -#line 2669 "VBNET.ATG" +#line 2752 "VBNET.ATG" name = t.val; break; } case 153: { lexer.NextToken(); -#line 2670 "VBNET.ATG" +#line 2753 "VBNET.ATG" name = t.val; break; } case 154: { lexer.NextToken(); -#line 2671 "VBNET.ATG" +#line 2754 "VBNET.ATG" name = t.val; break; } case 155: { lexer.NextToken(); -#line 2672 "VBNET.ATG" +#line 2755 "VBNET.ATG" name = t.val; break; } case 156: { lexer.NextToken(); -#line 2673 "VBNET.ATG" +#line 2756 "VBNET.ATG" name = t.val; break; } case 157: { lexer.NextToken(); -#line 2674 "VBNET.ATG" +#line 2757 "VBNET.ATG" name = t.val; break; } case 158: { lexer.NextToken(); -#line 2675 "VBNET.ATG" +#line 2758 "VBNET.ATG" name = t.val; break; } case 159: { lexer.NextToken(); -#line 2676 "VBNET.ATG" +#line 2759 "VBNET.ATG" name = t.val; break; } case 160: { lexer.NextToken(); -#line 2677 "VBNET.ATG" +#line 2760 "VBNET.ATG" name = t.val; break; } case 161: { lexer.NextToken(); -#line 2678 "VBNET.ATG" +#line 2761 "VBNET.ATG" name = t.val; break; } case 162: { lexer.NextToken(); -#line 2679 "VBNET.ATG" +#line 2762 "VBNET.ATG" name = t.val; break; } case 163: { lexer.NextToken(); -#line 2680 "VBNET.ATG" +#line 2763 "VBNET.ATG" name = t.val; break; } case 165: { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2764 "VBNET.ATG" name = t.val; break; } case 166: { lexer.NextToken(); -#line 2682 "VBNET.ATG" +#line 2765 "VBNET.ATG" name = t.val; break; } case 167: { lexer.NextToken(); -#line 2683 "VBNET.ATG" +#line 2766 "VBNET.ATG" name = t.val; break; } case 168: { lexer.NextToken(); -#line 2684 "VBNET.ATG" +#line 2767 "VBNET.ATG" name = t.val; break; } case 170: { lexer.NextToken(); -#line 2685 "VBNET.ATG" +#line 2768 "VBNET.ATG" name = t.val; break; } case 171: { lexer.NextToken(); -#line 2686 "VBNET.ATG" +#line 2769 "VBNET.ATG" name = t.val; break; } case 172: { lexer.NextToken(); -#line 2687 "VBNET.ATG" +#line 2770 "VBNET.ATG" name = t.val; break; } case 173: { lexer.NextToken(); -#line 2688 "VBNET.ATG" +#line 2771 "VBNET.ATG" name = t.val; break; } case 174: { lexer.NextToken(); -#line 2689 "VBNET.ATG" +#line 2772 "VBNET.ATG" name = t.val; break; } case 175: { lexer.NextToken(); -#line 2690 "VBNET.ATG" +#line 2773 "VBNET.ATG" name = t.val; break; } case 176: { lexer.NextToken(); -#line 2691 "VBNET.ATG" +#line 2774 "VBNET.ATG" name = t.val; break; } case 177: { lexer.NextToken(); -#line 2692 "VBNET.ATG" +#line 2775 "VBNET.ATG" name = t.val; break; } case 178: { lexer.NextToken(); -#line 2693 "VBNET.ATG" +#line 2776 "VBNET.ATG" name = t.val; break; } case 179: { lexer.NextToken(); -#line 2694 "VBNET.ATG" +#line 2777 "VBNET.ATG" name = t.val; break; } case 180: { lexer.NextToken(); -#line 2695 "VBNET.ATG" +#line 2778 "VBNET.ATG" name = t.val; break; } case 181: { lexer.NextToken(); -#line 2696 "VBNET.ATG" +#line 2779 "VBNET.ATG" name = t.val; break; } case 182: { lexer.NextToken(); -#line 2697 "VBNET.ATG" +#line 2780 "VBNET.ATG" name = t.val; break; } case 183: { lexer.NextToken(); -#line 2698 "VBNET.ATG" +#line 2781 "VBNET.ATG" name = t.val; break; } case 184: { lexer.NextToken(); -#line 2699 "VBNET.ATG" +#line 2782 "VBNET.ATG" name = t.val; break; } case 185: { lexer.NextToken(); -#line 2700 "VBNET.ATG" +#line 2783 "VBNET.ATG" name = t.val; break; } case 186: { lexer.NextToken(); -#line 2701 "VBNET.ATG" +#line 2784 "VBNET.ATG" name = t.val; break; } case 187: { lexer.NextToken(); -#line 2702 "VBNET.ATG" +#line 2785 "VBNET.ATG" name = t.val; break; } case 188: { lexer.NextToken(); -#line 2703 "VBNET.ATG" +#line 2786 "VBNET.ATG" name = t.val; break; } case 189: { lexer.NextToken(); -#line 2704 "VBNET.ATG" +#line 2787 "VBNET.ATG" name = t.val; break; } case 190: { lexer.NextToken(); -#line 2705 "VBNET.ATG" +#line 2788 "VBNET.ATG" name = t.val; break; } case 191: { lexer.NextToken(); -#line 2706 "VBNET.ATG" +#line 2789 "VBNET.ATG" name = t.val; break; } case 192: { lexer.NextToken(); -#line 2707 "VBNET.ATG" +#line 2790 "VBNET.ATG" name = t.val; break; } case 193: { lexer.NextToken(); -#line 2708 "VBNET.ATG" +#line 2791 "VBNET.ATG" name = t.val; break; } case 196: { lexer.NextToken(); -#line 2709 "VBNET.ATG" +#line 2792 "VBNET.ATG" name = t.val; break; } case 197: { lexer.NextToken(); -#line 2710 "VBNET.ATG" +#line 2793 "VBNET.ATG" name = t.val; break; } case 198: { lexer.NextToken(); -#line 2711 "VBNET.ATG" +#line 2794 "VBNET.ATG" name = t.val; break; } case 199: { lexer.NextToken(); -#line 2712 "VBNET.ATG" +#line 2795 "VBNET.ATG" name = t.val; break; } - default: SynErr(234); break; + default: SynErr(236); break; } } void CastTarget( -#line 1540 "VBNET.ATG" +#line 1623 "VBNET.ATG" out TypeReference type) { -#line 1542 "VBNET.ATG" +#line 1625 "VBNET.ATG" type = null; switch (la.kind) { case 58: { lexer.NextToken(); -#line 1544 "VBNET.ATG" +#line 1627 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 59: { lexer.NextToken(); -#line 1545 "VBNET.ATG" +#line 1628 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 60: { lexer.NextToken(); -#line 1546 "VBNET.ATG" +#line 1629 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 61: { lexer.NextToken(); -#line 1547 "VBNET.ATG" +#line 1630 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 63: { lexer.NextToken(); -#line 1548 "VBNET.ATG" +#line 1631 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 62: { lexer.NextToken(); -#line 1549 "VBNET.ATG" +#line 1632 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 65: { lexer.NextToken(); -#line 1550 "VBNET.ATG" +#line 1633 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 67: { lexer.NextToken(); -#line 1551 "VBNET.ATG" +#line 1634 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 68: { lexer.NextToken(); -#line 1552 "VBNET.ATG" +#line 1635 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 71: { lexer.NextToken(); -#line 1553 "VBNET.ATG" +#line 1636 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 72: { lexer.NextToken(); -#line 1554 "VBNET.ATG" +#line 1637 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 73: { lexer.NextToken(); -#line 1555 "VBNET.ATG" +#line 1638 "VBNET.ATG" type = new TypeReference("System.String"); break; } - default: SynErr(235); break; + default: SynErr(237); break; } } void Argument( -#line 1716 "VBNET.ATG" +#line 1799 "VBNET.ATG" out Expression argumentexpr) { -#line 1718 "VBNET.ATG" +#line 1801 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1722 "VBNET.ATG" +#line 1805 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1722 "VBNET.ATG" +#line 1805 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1722 "VBNET.ATG" +#line 1805 "VBNET.ATG" out expr); -#line 1724 "VBNET.ATG" +#line 1807 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); - } else if (StartOf(18)) { + } else if (StartOf(19)) { Expr( -#line 1727 "VBNET.ATG" +#line 1810 "VBNET.ATG" out argumentexpr); - } else SynErr(236); + } else SynErr(238); } void ConditionalAndExpr( -#line 1563 "VBNET.ATG" +#line 1646 "VBNET.ATG" out Expression outExpr) { -#line 1564 "VBNET.ATG" +#line 1647 "VBNET.ATG" Expression expr; InclusiveOrExpr( -#line 1565 "VBNET.ATG" +#line 1648 "VBNET.ATG" out outExpr); while (la.kind == 45) { lexer.NextToken(); InclusiveOrExpr( -#line 1565 "VBNET.ATG" +#line 1648 "VBNET.ATG" out expr); -#line 1565 "VBNET.ATG" +#line 1648 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 1568 "VBNET.ATG" +#line 1651 "VBNET.ATG" out Expression outExpr) { -#line 1569 "VBNET.ATG" +#line 1652 "VBNET.ATG" Expression expr; ExclusiveOrExpr( -#line 1570 "VBNET.ATG" +#line 1653 "VBNET.ATG" out outExpr); while (la.kind == 185) { lexer.NextToken(); ExclusiveOrExpr( -#line 1570 "VBNET.ATG" +#line 1653 "VBNET.ATG" out expr); -#line 1570 "VBNET.ATG" +#line 1653 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void ExclusiveOrExpr( -#line 1573 "VBNET.ATG" +#line 1656 "VBNET.ATG" out Expression outExpr) { -#line 1574 "VBNET.ATG" +#line 1657 "VBNET.ATG" Expression expr; AndExpr( -#line 1575 "VBNET.ATG" +#line 1658 "VBNET.ATG" out outExpr); while (la.kind == 137) { lexer.NextToken(); AndExpr( -#line 1575 "VBNET.ATG" +#line 1658 "VBNET.ATG" out expr); -#line 1575 "VBNET.ATG" +#line 1658 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void AndExpr( -#line 1578 "VBNET.ATG" +#line 1661 "VBNET.ATG" out Expression outExpr) { -#line 1579 "VBNET.ATG" +#line 1662 "VBNET.ATG" Expression expr; NotExpr( -#line 1580 "VBNET.ATG" +#line 1663 "VBNET.ATG" out outExpr); while (la.kind == 44) { lexer.NextToken(); NotExpr( -#line 1580 "VBNET.ATG" +#line 1663 "VBNET.ATG" out expr); -#line 1580 "VBNET.ATG" +#line 1663 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void NotExpr( -#line 1583 "VBNET.ATG" +#line 1666 "VBNET.ATG" out Expression outExpr) { -#line 1584 "VBNET.ATG" +#line 1667 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 128) { lexer.NextToken(); -#line 1585 "VBNET.ATG" +#line 1668 "VBNET.ATG" uop = UnaryOperatorType.Not; } EqualityExpr( -#line 1586 "VBNET.ATG" +#line 1669 "VBNET.ATG" out outExpr); -#line 1587 "VBNET.ATG" +#line 1670 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void EqualityExpr( -#line 1592 "VBNET.ATG" +#line 1675 "VBNET.ATG" out Expression outExpr) { -#line 1594 "VBNET.ATG" +#line 1677 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 1597 "VBNET.ATG" +#line 1680 "VBNET.ATG" out outExpr); while (la.kind == 11 || la.kind == 27 || la.kind == 115) { if (la.kind == 27) { lexer.NextToken(); -#line 1600 "VBNET.ATG" +#line 1683 "VBNET.ATG" op = BinaryOperatorType.InEquality; } else if (la.kind == 11) { lexer.NextToken(); -#line 1601 "VBNET.ATG" +#line 1684 "VBNET.ATG" op = BinaryOperatorType.Equality; } else { lexer.NextToken(); -#line 1602 "VBNET.ATG" +#line 1685 "VBNET.ATG" op = BinaryOperatorType.Like; } RelationalExpr( -#line 1604 "VBNET.ATG" +#line 1687 "VBNET.ATG" out expr); -#line 1604 "VBNET.ATG" +#line 1687 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 1608 "VBNET.ATG" +#line 1691 "VBNET.ATG" out Expression outExpr) { -#line 1610 "VBNET.ATG" +#line 1693 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1613 "VBNET.ATG" +#line 1696 "VBNET.ATG" out outExpr); - while (StartOf(24)) { - if (StartOf(25)) { + while (StartOf(25)) { + if (StartOf(26)) { if (la.kind == 26) { lexer.NextToken(); -#line 1616 "VBNET.ATG" +#line 1699 "VBNET.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 25) { lexer.NextToken(); -#line 1617 "VBNET.ATG" +#line 1700 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 29) { lexer.NextToken(); -#line 1618 "VBNET.ATG" +#line 1701 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 28) { lexer.NextToken(); -#line 1619 "VBNET.ATG" +#line 1702 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; - } else SynErr(237); + } else SynErr(239); ShiftExpr( -#line 1621 "VBNET.ATG" +#line 1704 "VBNET.ATG" out expr); -#line 1621 "VBNET.ATG" +#line 1704 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 112) { lexer.NextToken(); -#line 1624 "VBNET.ATG" +#line 1707 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; } else if (la.kind == 189) { lexer.NextToken(); -#line 1625 "VBNET.ATG" +#line 1708 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; - } else SynErr(238); + } else SynErr(240); Expr( -#line 1626 "VBNET.ATG" +#line 1709 "VBNET.ATG" out expr); -#line 1626 "VBNET.ATG" +#line 1709 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } } void ShiftExpr( -#line 1630 "VBNET.ATG" +#line 1713 "VBNET.ATG" out Expression outExpr) { -#line 1632 "VBNET.ATG" +#line 1715 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 1635 "VBNET.ATG" +#line 1718 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { lexer.NextToken(); -#line 1638 "VBNET.ATG" +#line 1721 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1639 "VBNET.ATG" +#line 1722 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } AdditiveExpr( -#line 1641 "VBNET.ATG" +#line 1724 "VBNET.ATG" out expr); -#line 1641 "VBNET.ATG" +#line 1724 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 1645 "VBNET.ATG" +#line 1728 "VBNET.ATG" out Expression outExpr) { -#line 1647 "VBNET.ATG" +#line 1730 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 1650 "VBNET.ATG" +#line 1733 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15 || la.kind == 19) { if (la.kind == 14) { lexer.NextToken(); -#line 1653 "VBNET.ATG" +#line 1736 "VBNET.ATG" op = BinaryOperatorType.Add; } else if (la.kind == 15) { lexer.NextToken(); -#line 1654 "VBNET.ATG" +#line 1737 "VBNET.ATG" op = BinaryOperatorType.Subtract; } else { lexer.NextToken(); -#line 1655 "VBNET.ATG" +#line 1738 "VBNET.ATG" op = BinaryOperatorType.Concat; } MultiplicativeExpr( -#line 1657 "VBNET.ATG" +#line 1740 "VBNET.ATG" out expr); -#line 1657 "VBNET.ATG" +#line 1740 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 1661 "VBNET.ATG" +#line 1744 "VBNET.ATG" out Expression outExpr) { -#line 1663 "VBNET.ATG" +#line 1746 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1666 "VBNET.ATG" +#line 1749 "VBNET.ATG" out outExpr); - while (StartOf(26)) { + while (StartOf(27)) { if (la.kind == 16) { lexer.NextToken(); -#line 1669 "VBNET.ATG" +#line 1752 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 17) { lexer.NextToken(); -#line 1670 "VBNET.ATG" +#line 1753 "VBNET.ATG" op = BinaryOperatorType.Divide; } else if (la.kind == 18) { lexer.NextToken(); -#line 1671 "VBNET.ATG" +#line 1754 "VBNET.ATG" op = BinaryOperatorType.DivideInteger; } else if (la.kind == 119) { lexer.NextToken(); -#line 1672 "VBNET.ATG" +#line 1755 "VBNET.ATG" op = BinaryOperatorType.Modulus; } else { lexer.NextToken(); -#line 1673 "VBNET.ATG" +#line 1756 "VBNET.ATG" op = BinaryOperatorType.Power; } UnaryExpr( -#line 1675 "VBNET.ATG" +#line 1758 "VBNET.ATG" out expr); -#line 1675 "VBNET.ATG" +#line 1758 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NonArrayTypeName( -#line 1744 "VBNET.ATG" +#line 1827 "VBNET.ATG" out TypeReference typeref) { -#line 1746 "VBNET.ATG" +#line 1829 "VBNET.ATG" string name; typeref = null; if (StartOf(10)) { Qualident( -#line 1749 "VBNET.ATG" +#line 1832 "VBNET.ATG" out name); -#line 1749 "VBNET.ATG" +#line 1832 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1750 "VBNET.ATG" +#line 1833 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeArgumentList( -#line 1751 "VBNET.ATG" +#line 1834 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (la.kind == 132) { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1836 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (la.kind == 194) { lexer.NextToken(); Expect(10); Qualident( -#line 1754 "VBNET.ATG" +#line 1837 "VBNET.ATG" out name); -#line 1755 "VBNET.ATG" +#line 1838 "VBNET.ATG" typeref = new TypeReference(name); typeref.IsGlobal = true; if ( -#line 1756 "VBNET.ATG" +#line 1839 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeArgumentList( -#line 1757 "VBNET.ATG" +#line 1840 "VBNET.ATG" typeref.GenericTypes); Expect(24); } - } else if (StartOf(21)) { + } else if (StartOf(22)) { PrimitiveTypeName( -#line 1759 "VBNET.ATG" +#line 1842 "VBNET.ATG" out name); -#line 1759 "VBNET.ATG" +#line 1842 "VBNET.ATG" typeref = new TypeReference(name); - } else SynErr(239); + } else SynErr(241); } void ArgumentList( -#line 1701 "VBNET.ATG" +#line 1784 "VBNET.ATG" out ArrayList arguments) { -#line 1703 "VBNET.ATG" +#line 1786 "VBNET.ATG" arguments = new ArrayList(); Expression expr = null; - if (StartOf(18)) { + if (StartOf(19)) { Argument( -#line 1707 "VBNET.ATG" +#line 1790 "VBNET.ATG" out expr); -#line 1707 "VBNET.ATG" +#line 1790 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Argument( -#line 1710 "VBNET.ATG" +#line 1793 "VBNET.ATG" out expr); -#line 1710 "VBNET.ATG" +#line 1793 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } } } } void ArrayTypeModifiers( -#line 1772 "VBNET.ATG" +#line 1855 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1774 "VBNET.ATG" +#line 1857 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1777 "VBNET.ATG" +#line 1860 "VBNET.ATG" IsDims()) { Expect(23); if (la.kind == 12 || la.kind == 24) { RankList( -#line 1779 "VBNET.ATG" +#line 1862 "VBNET.ATG" out i); } -#line 1781 "VBNET.ATG" +#line 1864 "VBNET.ATG" arrayModifiers.Add(i); Expect(24); } -#line 1786 "VBNET.ATG" +#line 1869 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4958,89 +5121,89 @@ out i); } void TypeArgumentList( -#line 1799 "VBNET.ATG" +#line 1882 "VBNET.ATG" List typeArguments) { -#line 1801 "VBNET.ATG" +#line 1884 "VBNET.ATG" TypeReference typeref; TypeName( -#line 1803 "VBNET.ATG" +#line 1886 "VBNET.ATG" out typeref); -#line 1803 "VBNET.ATG" +#line 1886 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1806 "VBNET.ATG" +#line 1889 "VBNET.ATG" out typeref); -#line 1806 "VBNET.ATG" +#line 1889 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 1793 "VBNET.ATG" +#line 1876 "VBNET.ATG" out int i) { -#line 1794 "VBNET.ATG" +#line 1877 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 1795 "VBNET.ATG" +#line 1878 "VBNET.ATG" ++i; } } void Attribute( -#line 1831 "VBNET.ATG" +#line 1914 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 1832 "VBNET.ATG" +#line 1915 "VBNET.ATG" string name; Qualident( -#line 1833 "VBNET.ATG" +#line 1916 "VBNET.ATG" out name); -#line 1834 "VBNET.ATG" +#line 1917 "VBNET.ATG" List positional = new List(); List named = new List(); if (la.kind == 23) { AttributeArguments( -#line 1837 "VBNET.ATG" +#line 1920 "VBNET.ATG" positional, named); } -#line 1839 "VBNET.ATG" +#line 1922 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 1844 "VBNET.ATG" +#line 1927 "VBNET.ATG" List positional, List named) { -#line 1846 "VBNET.ATG" +#line 1929 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(23); if ( -#line 1852 "VBNET.ATG" +#line 1935 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 1854 "VBNET.ATG" +#line 1937 "VBNET.ATG" IsNamedAssign()) { -#line 1854 "VBNET.ATG" +#line 1937 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1855 "VBNET.ATG" +#line 1938 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5048,10 +5211,10 @@ out name); Expect(11); } Expr( -#line 1857 "VBNET.ATG" +#line 1940 "VBNET.ATG" out expr); -#line 1859 "VBNET.ATG" +#line 1942 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5059,28 +5222,28 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 1866 "VBNET.ATG" +#line 1949 "VBNET.ATG" IsNamedAssign()) { -#line 1866 "VBNET.ATG" +#line 1949 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1867 "VBNET.ATG" +#line 1950 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); } Expect(11); - } else if (StartOf(18)) { + } else if (StartOf(19)) { -#line 1869 "VBNET.ATG" +#line 1952 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(240); + } else SynErr(242); Expr( -#line 1870 "VBNET.ATG" +#line 1953 "VBNET.ATG" out expr); -#line 1870 "VBNET.ATG" +#line 1953 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5091,39 +5254,39 @@ out expr); } void FormalParameter( -#line 1939 "VBNET.ATG" +#line 2022 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 1941 "VBNET.ATG" +#line 2024 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; p = null;ArrayList arrayModifiers = null; - while (StartOf(27)) { + while (StartOf(28)) { ParameterModifier( -#line 1946 "VBNET.ATG" +#line 2029 "VBNET.ATG" mod); } Identifier(); -#line 1947 "VBNET.ATG" +#line 2030 "VBNET.ATG" string parameterName = t.val; if ( -#line 1948 "VBNET.ATG" +#line 2031 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 1948 "VBNET.ATG" +#line 2031 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1949 "VBNET.ATG" +#line 2032 "VBNET.ATG" out type); } -#line 1951 "VBNET.ATG" +#line 2034 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5139,45 +5302,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 1963 "VBNET.ATG" +#line 2046 "VBNET.ATG" out expr); } -#line 1965 "VBNET.ATG" +#line 2048 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2737 "VBNET.ATG" +#line 2820 "VBNET.ATG" ParamModifiers m) { if (la.kind == 54) { lexer.NextToken(); -#line 2738 "VBNET.ATG" +#line 2821 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 52) { lexer.NextToken(); -#line 2739 "VBNET.ATG" +#line 2822 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 136) { lexer.NextToken(); -#line 2740 "VBNET.ATG" +#line 2823 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2741 "VBNET.ATG" +#line 2824 "VBNET.ATG" m.Add(ParamModifier.Params); - } else SynErr(241); + } else SynErr(243); } void Statement() { -#line 1993 "VBNET.ATG" +#line 2076 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -5185,34 +5348,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 1999 "VBNET.ATG" +#line 2082 "VBNET.ATG" IsLabel()) { LabelName( -#line 1999 "VBNET.ATG" +#line 2082 "VBNET.ATG" out label); -#line 2001 "VBNET.ATG" +#line 2084 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); - } else if (StartOf(28)) { + } else if (StartOf(29)) { EmbeddedStatement( -#line 2004 "VBNET.ATG" +#line 2087 "VBNET.ATG" out stmt); -#line 2004 "VBNET.ATG" +#line 2087 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(29)) { + } else if (StartOf(30)) { LocalDeclarationStatement( -#line 2005 "VBNET.ATG" +#line 2088 "VBNET.ATG" out stmt); -#line 2005 "VBNET.ATG" +#line 2088 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else SynErr(242); + } else SynErr(244); -#line 2008 "VBNET.ATG" +#line 2091 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5221,30 +5384,30 @@ out stmt); } void LabelName( -#line 2389 "VBNET.ATG" +#line 2472 "VBNET.ATG" out string name) { -#line 2391 "VBNET.ATG" +#line 2474 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2393 "VBNET.ATG" +#line 2476 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2394 "VBNET.ATG" +#line 2477 "VBNET.ATG" name = t.val; - } else SynErr(243); + } else SynErr(245); } void EmbeddedStatement( -#line 2047 "VBNET.ATG" +#line 2130 "VBNET.ATG" out Statement statement) { -#line 2049 "VBNET.ATG" +#line 2132 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5254,143 +5417,143 @@ out Statement statement) { case 93: { lexer.NextToken(); -#line 2054 "VBNET.ATG" +#line 2137 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2056 "VBNET.ATG" +#line 2139 "VBNET.ATG" exitType = ExitType.Sub; break; } case 99: { lexer.NextToken(); -#line 2058 "VBNET.ATG" +#line 2141 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2060 "VBNET.ATG" +#line 2143 "VBNET.ATG" exitType = ExitType.Property; break; } case 82: { lexer.NextToken(); -#line 2062 "VBNET.ATG" +#line 2145 "VBNET.ATG" exitType = ExitType.Do; break; } case 97: { lexer.NextToken(); -#line 2064 "VBNET.ATG" +#line 2147 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2066 "VBNET.ATG" +#line 2149 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2068 "VBNET.ATG" +#line 2151 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2070 "VBNET.ATG" +#line 2153 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(244); break; + default: SynErr(246); break; } -#line 2072 "VBNET.ATG" +#line 2155 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2073 "VBNET.ATG" +#line 2156 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2074 "VBNET.ATG" +#line 2157 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 82 || la.kind == 97 || la.kind == 181) { if (la.kind == 82) { lexer.NextToken(); -#line 2074 "VBNET.ATG" +#line 2157 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 97) { lexer.NextToken(); -#line 2074 "VBNET.ATG" +#line 2157 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2074 "VBNET.ATG" +#line 2157 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2074 "VBNET.ATG" +#line 2157 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } case 171: { lexer.NextToken(); - if (StartOf(18)) { + if (StartOf(19)) { Expr( -#line 2076 "VBNET.ATG" +#line 2159 "VBNET.ATG" out expr); } -#line 2076 "VBNET.ATG" +#line 2159 "VBNET.ATG" statement = new ThrowStatement(expr); break; } case 154: { lexer.NextToken(); - if (StartOf(18)) { + if (StartOf(19)) { Expr( -#line 2078 "VBNET.ATG" +#line 2161 "VBNET.ATG" out expr); } -#line 2078 "VBNET.ATG" +#line 2161 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2080 "VBNET.ATG" +#line 2163 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2080 "VBNET.ATG" +#line 2163 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(168); -#line 2081 "VBNET.ATG" +#line 2164 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5398,42 +5561,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2083 "VBNET.ATG" +#line 2166 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); - if (StartOf(17)) { + if (StartOf(18)) { ArgumentList( -#line 2084 "VBNET.ATG" +#line 2167 "VBNET.ATG" out p); } Expect(24); } -#line 2085 "VBNET.ATG" +#line 2168 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2087 "VBNET.ATG" +#line 2170 "VBNET.ATG" out statement); break; } case 41: { lexer.NextToken(); -#line 2089 "VBNET.ATG" +#line 2172 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2090 "VBNET.ATG" +#line 2173 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2090 "VBNET.ATG" +#line 2173 "VBNET.ATG" out handlerExpr); -#line 2092 "VBNET.ATG" +#line 2175 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5441,17 +5604,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2095 "VBNET.ATG" +#line 2178 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2096 "VBNET.ATG" +#line 2179 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2096 "VBNET.ATG" +#line 2179 "VBNET.ATG" out handlerExpr); -#line 2098 "VBNET.ATG" +#line 2181 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5459,16 +5622,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2101 "VBNET.ATG" +#line 2184 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2102 "VBNET.ATG" +#line 2185 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(181); -#line 2104 "VBNET.ATG" +#line 2187 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5476,23 +5639,23 @@ out embeddedStatement); case 82: { lexer.NextToken(); -#line 2109 "VBNET.ATG" +#line 2192 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2112 "VBNET.ATG" +#line 2195 "VBNET.ATG" out conditionType); Expr( -#line 2112 "VBNET.ATG" +#line 2195 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2113 "VBNET.ATG" +#line 2196 "VBNET.ATG" out embeddedStatement); Expect(117); -#line 2116 "VBNET.ATG" +#line 2199 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5501,28 +5664,28 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2123 "VBNET.ATG" +#line 2206 "VBNET.ATG" out embeddedStatement); Expect(117); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2124 "VBNET.ATG" +#line 2207 "VBNET.ATG" out conditionType); Expr( -#line 2124 "VBNET.ATG" +#line 2207 "VBNET.ATG" out expr); } -#line 2126 "VBNET.ATG" +#line 2209 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(245); + } else SynErr(247); break; } case 97: { lexer.NextToken(); -#line 2131 "VBNET.ATG" +#line 2214 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5531,24 +5694,24 @@ out expr); if (la.kind == 84) { lexer.NextToken(); LoopControlVariable( -#line 2138 "VBNET.ATG" +#line 2221 "VBNET.ATG" out typeReference, out typeName); Expect(108); Expr( -#line 2139 "VBNET.ATG" +#line 2222 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2140 "VBNET.ATG" +#line 2223 "VBNET.ATG" out embeddedStatement); Expect(127); - if (StartOf(18)) { + if (StartOf(19)) { Expr( -#line 2141 "VBNET.ATG" +#line 2224 "VBNET.ATG" out expr); } -#line 2143 "VBNET.ATG" +#line 2226 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5560,84 +5723,84 @@ out expr); } else if (StartOf(10)) { -#line 2154 "VBNET.ATG" +#line 2237 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2159 "VBNET.ATG" +#line 2242 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2160 "VBNET.ATG" +#line 2243 "VBNET.ATG" out start); Expect(172); Expr( -#line 2160 "VBNET.ATG" +#line 2243 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2160 "VBNET.ATG" +#line 2243 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2161 "VBNET.ATG" +#line 2244 "VBNET.ATG" out embeddedStatement); Expect(127); - if (StartOf(18)) { + if (StartOf(19)) { Expr( -#line 2164 "VBNET.ATG" +#line 2247 "VBNET.ATG" out nextExpr); -#line 2164 "VBNET.ATG" +#line 2247 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2165 "VBNET.ATG" +#line 2248 "VBNET.ATG" out nextExpr); -#line 2165 "VBNET.ATG" +#line 2248 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2168 "VBNET.ATG" +#line 2251 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); - } else SynErr(246); + } else SynErr(248); break; } case 91: { lexer.NextToken(); Expr( -#line 2172 "VBNET.ATG" +#line 2255 "VBNET.ATG" out expr); -#line 2172 "VBNET.ATG" +#line 2255 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2174 "VBNET.ATG" +#line 2257 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2174 "VBNET.ATG" +#line 2257 "VBNET.ATG" isPreserve = true; } Expr( -#line 2175 "VBNET.ATG" +#line 2258 "VBNET.ATG" out redimclause); -#line 2177 "VBNET.ATG" +#line 2260 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -5645,10 +5808,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2181 "VBNET.ATG" +#line 2264 "VBNET.ATG" out redimclause); -#line 2181 "VBNET.ATG" +#line 2264 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -5656,10 +5819,10 @@ out redimclause); case 90: { lexer.NextToken(); Expr( -#line 2184 "VBNET.ATG" +#line 2267 "VBNET.ATG" out expr); -#line 2185 "VBNET.ATG" +#line 2268 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5668,53 +5831,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2190 "VBNET.ATG" +#line 2273 "VBNET.ATG" out expr); -#line 2190 "VBNET.ATG" +#line 2273 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2191 "VBNET.ATG" +#line 2274 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2193 "VBNET.ATG" +#line 2276 "VBNET.ATG" statement = new StopStatement(); break; } case 105: { lexer.NextToken(); Expr( -#line 2195 "VBNET.ATG" +#line 2278 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2197 "VBNET.ATG" +#line 2280 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); -#line 2197 "VBNET.ATG" +#line 2280 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2200 "VBNET.ATG" +#line 2283 "VBNET.ATG" out embeddedStatement); -#line 2202 "VBNET.ATG" +#line 2285 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 86 || -#line 2206 "VBNET.ATG" +#line 2289 "VBNET.ATG" IsElseIf()) { if ( -#line 2206 "VBNET.ATG" +#line 2289 "VBNET.ATG" IsElseIf()) { Expect(85); Expect(105); @@ -5722,20 +5885,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2209 "VBNET.ATG" +#line 2292 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2210 "VBNET.ATG" +#line 2293 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2211 "VBNET.ATG" +#line 2294 "VBNET.ATG" out block); -#line 2213 "VBNET.ATG" +#line 2296 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5743,61 +5906,61 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2218 "VBNET.ATG" +#line 2301 "VBNET.ATG" out embeddedStatement); -#line 2220 "VBNET.ATG" +#line 2303 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(87); Expect(105); -#line 2224 "VBNET.ATG" +#line 2307 "VBNET.ATG" statement = ifStatement; - } else if (StartOf(28)) { + } else if (StartOf(29)) { EmbeddedStatement( -#line 2227 "VBNET.ATG" +#line 2310 "VBNET.ATG" out embeddedStatement); -#line 2229 "VBNET.ATG" +#line 2312 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2231 "VBNET.ATG" +#line 2314 "VBNET.ATG" out embeddedStatement); -#line 2231 "VBNET.ATG" +#line 2314 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 85) { lexer.NextToken(); - if (StartOf(28)) { + if (StartOf(29)) { EmbeddedStatement( -#line 2233 "VBNET.ATG" +#line 2316 "VBNET.ATG" out embeddedStatement); } -#line 2235 "VBNET.ATG" +#line 2318 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2238 "VBNET.ATG" +#line 2321 "VBNET.ATG" out embeddedStatement); -#line 2239 "VBNET.ATG" +#line 2322 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2242 "VBNET.ATG" +#line 2325 "VBNET.ATG" statement = ifStatement; - } else SynErr(247); + } else SynErr(249); break; } case 155: { @@ -5806,43 +5969,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2245 "VBNET.ATG" +#line 2328 "VBNET.ATG" out expr); EndOfStmt(); -#line 2246 "VBNET.ATG" +#line 2329 "VBNET.ATG" ArrayList selectSections = new ArrayList(); Statement block = null; while (la.kind == 56) { -#line 2250 "VBNET.ATG" +#line 2333 "VBNET.ATG" ArrayList caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2251 "VBNET.ATG" +#line 2334 "VBNET.ATG" out caseClauses); if ( -#line 2251 "VBNET.ATG" +#line 2334 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2253 "VBNET.ATG" +#line 2336 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2255 "VBNET.ATG" +#line 2338 "VBNET.ATG" out block); -#line 2257 "VBNET.ATG" +#line 2340 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2261 "VBNET.ATG" +#line 2344 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(87); Expect(155); @@ -5850,43 +6013,43 @@ out block); } case 134: { -#line 2263 "VBNET.ATG" +#line 2346 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2264 "VBNET.ATG" +#line 2347 "VBNET.ATG" out onErrorStatement); -#line 2264 "VBNET.ATG" +#line 2347 "VBNET.ATG" statement = onErrorStatement; break; } case 103: { -#line 2265 "VBNET.ATG" +#line 2348 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2266 "VBNET.ATG" +#line 2349 "VBNET.ATG" out goToStatement); -#line 2266 "VBNET.ATG" +#line 2349 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2267 "VBNET.ATG" +#line 2350 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2268 "VBNET.ATG" +#line 2351 "VBNET.ATG" out resumeStatement); -#line 2268 "VBNET.ATG" +#line 2351 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 195: { -#line 2271 "VBNET.ATG" +#line 2354 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5894,25 +6057,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2277 "VBNET.ATG" +#line 2360 "VBNET.ATG" out expr); - if (StartOf(30)) { + if (StartOf(31)) { AssignmentOperator( -#line 2279 "VBNET.ATG" +#line 2362 "VBNET.ATG" out op); Expr( -#line 2279 "VBNET.ATG" +#line 2362 "VBNET.ATG" out val); -#line 2279 "VBNET.ATG" +#line 2362 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 85) { -#line 2280 "VBNET.ATG" +#line 2363 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(248); + } else SynErr(250); -#line 2283 "VBNET.ATG" +#line 2366 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5925,10 +6088,10 @@ out val); case 55: { lexer.NextToken(); UnaryExpr( -#line 2290 "VBNET.ATG" +#line 2373 "VBNET.ATG" out expr); -#line 2290 "VBNET.ATG" +#line 2373 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -5936,7 +6099,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2292 "VBNET.ATG" +#line 2375 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -5944,57 +6107,57 @@ out expr); if (la.kind == 126) { lexer.NextToken(); Qualident( -#line 2296 "VBNET.ATG" +#line 2379 "VBNET.ATG" out typeName); -#line 2296 "VBNET.ATG" +#line 2379 "VBNET.ATG" ArrayList initializer = null; if (la.kind == 23) { lexer.NextToken(); - if (StartOf(17)) { + if (StartOf(18)) { ArgumentList( -#line 2296 "VBNET.ATG" +#line 2379 "VBNET.ATG" out initializer); } Expect(24); } -#line 2298 "VBNET.ATG" +#line 2381 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2301 "VBNET.ATG" +#line 2384 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2301 "VBNET.ATG" +#line 2384 "VBNET.ATG" out expr); -#line 2303 "VBNET.ATG" +#line 2386 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); - } else SynErr(249); + } else SynErr(251); Block( -#line 2306 "VBNET.ATG" +#line 2389 "VBNET.ATG" out block); Expect(87); Expect(188); -#line 2308 "VBNET.ATG" +#line 2391 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } - default: SynErr(250); break; + default: SynErr(252); break; } } void LocalDeclarationStatement( -#line 2016 "VBNET.ATG" +#line 2099 "VBNET.ATG" out Statement statement) { -#line 2018 "VBNET.ATG" +#line 2101 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6003,22 +6166,22 @@ out Statement statement) { if (la.kind == 70) { lexer.NextToken(); -#line 2024 "VBNET.ATG" +#line 2107 "VBNET.ATG" m.Add(Modifier.Const); } else if (la.kind == 161) { lexer.NextToken(); -#line 2025 "VBNET.ATG" +#line 2108 "VBNET.ATG" m.Add(Modifier.Static); } else { lexer.NextToken(); -#line 2026 "VBNET.ATG" +#line 2109 "VBNET.ATG" dimfound = true; } } -#line 2029 "VBNET.ATG" +#line 2112 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6031,137 +6194,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2040 "VBNET.ATG" +#line 2123 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2041 "VBNET.ATG" +#line 2124 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2043 "VBNET.ATG" +#line 2126 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2501 "VBNET.ATG" +#line 2584 "VBNET.ATG" out Statement tryStatement) { -#line 2503 "VBNET.ATG" +#line 2586 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;ArrayList catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2506 "VBNET.ATG" +#line 2589 "VBNET.ATG" out blockStmt); if (la.kind == 57 || la.kind == 87 || la.kind == 96) { CatchClauses( -#line 2507 "VBNET.ATG" +#line 2590 "VBNET.ATG" out catchClauses); } if (la.kind == 96) { lexer.NextToken(); EndOfStmt(); Block( -#line 2508 "VBNET.ATG" +#line 2591 "VBNET.ATG" out finallyStmt); } Expect(87); Expect(174); -#line 2511 "VBNET.ATG" +#line 2594 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2479 "VBNET.ATG" +#line 2562 "VBNET.ATG" out Statement withStatement) { -#line 2481 "VBNET.ATG" +#line 2564 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2484 "VBNET.ATG" +#line 2567 "VBNET.ATG" Point start = t.Location; Expr( -#line 2485 "VBNET.ATG" +#line 2568 "VBNET.ATG" out expr); EndOfStmt(); -#line 2487 "VBNET.ATG" +#line 2570 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2491 "VBNET.ATG" +#line 2574 "VBNET.ATG" out blockStmt); -#line 2493 "VBNET.ATG" +#line 2576 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(87); Expect(182); -#line 2497 "VBNET.ATG" +#line 2580 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2472 "VBNET.ATG" +#line 2555 "VBNET.ATG" out ConditionType conditionType) { -#line 2473 "VBNET.ATG" +#line 2556 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2474 "VBNET.ATG" +#line 2557 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2475 "VBNET.ATG" +#line 2558 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(251); + } else SynErr(253); } void LoopControlVariable( -#line 2313 "VBNET.ATG" +#line 2396 "VBNET.ATG" out TypeReference type, out string name) { -#line 2314 "VBNET.ATG" +#line 2397 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2318 "VBNET.ATG" +#line 2401 "VBNET.ATG" out name); if ( -#line 2319 "VBNET.ATG" +#line 2402 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2319 "VBNET.ATG" +#line 2402 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2320 "VBNET.ATG" +#line 2403 "VBNET.ATG" out type); -#line 2320 "VBNET.ATG" +#line 2403 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2322 "VBNET.ATG" +#line 2405 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6179,48 +6342,48 @@ out type); } void CaseClauses( -#line 2432 "VBNET.ATG" +#line 2515 "VBNET.ATG" out ArrayList caseClauses) { -#line 2434 "VBNET.ATG" +#line 2517 "VBNET.ATG" caseClauses = new ArrayList(); CaseLabel caseClause = null; CaseClause( -#line 2437 "VBNET.ATG" +#line 2520 "VBNET.ATG" out caseClause); -#line 2437 "VBNET.ATG" +#line 2520 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2438 "VBNET.ATG" +#line 2521 "VBNET.ATG" out caseClause); -#line 2438 "VBNET.ATG" +#line 2521 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2339 "VBNET.ATG" +#line 2422 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2341 "VBNET.ATG" +#line 2424 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(134); Expect(91); if ( -#line 2347 "VBNET.ATG" +#line 2430 "VBNET.ATG" IsNegativeLabelName()) { Expect(103); Expect(15); Expect(5); -#line 2349 "VBNET.ATG" +#line 2432 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6229,10 +6392,10 @@ IsNegativeLabelName()) { } else if (la.kind == 103) { GotoStatement( -#line 2355 "VBNET.ATG" +#line 2438 "VBNET.ATG" out goToStatement); -#line 2357 "VBNET.ATG" +#line 2440 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6249,63 +6412,63 @@ out goToStatement); lexer.NextToken(); Expect(127); -#line 2371 "VBNET.ATG" +#line 2454 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(252); + } else SynErr(254); } void GotoStatement( -#line 2377 "VBNET.ATG" +#line 2460 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2379 "VBNET.ATG" +#line 2462 "VBNET.ATG" string label = String.Empty; Expect(103); LabelName( -#line 2382 "VBNET.ATG" +#line 2465 "VBNET.ATG" out label); -#line 2384 "VBNET.ATG" +#line 2467 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2421 "VBNET.ATG" +#line 2504 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2423 "VBNET.ATG" +#line 2506 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2426 "VBNET.ATG" +#line 2509 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(127); -#line 2427 "VBNET.ATG" +#line 2510 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); - if (StartOf(31)) { + if (StartOf(32)) { LabelName( -#line 2428 "VBNET.ATG" +#line 2511 "VBNET.ATG" out label); } -#line 2428 "VBNET.ATG" +#line 2511 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(253); + } else SynErr(255); } void CaseClause( -#line 2442 "VBNET.ATG" +#line 2525 "VBNET.ATG" out CaseLabel caseClause) { -#line 2444 "VBNET.ATG" +#line 2527 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6314,9 +6477,9 @@ out CaseLabel caseClause) { if (la.kind == 85) { lexer.NextToken(); -#line 2450 "VBNET.ATG" +#line 2533 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(32)) { + } else if (StartOf(33)) { if (la.kind == 112) { lexer.NextToken(); } @@ -6324,76 +6487,76 @@ out CaseLabel caseClause) { case 26: { lexer.NextToken(); -#line 2454 "VBNET.ATG" +#line 2537 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 25: { lexer.NextToken(); -#line 2455 "VBNET.ATG" +#line 2538 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2539 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 2457 "VBNET.ATG" +#line 2540 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2458 "VBNET.ATG" +#line 2541 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 2459 "VBNET.ATG" +#line 2542 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(254); break; + default: SynErr(256); break; } Expr( -#line 2461 "VBNET.ATG" +#line 2544 "VBNET.ATG" out expr); -#line 2463 "VBNET.ATG" +#line 2546 "VBNET.ATG" caseClause = new CaseLabel(op, expr); - } else if (StartOf(18)) { + } else if (StartOf(19)) { Expr( -#line 2465 "VBNET.ATG" +#line 2548 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2465 "VBNET.ATG" +#line 2548 "VBNET.ATG" out sexpr); } -#line 2467 "VBNET.ATG" +#line 2550 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(255); + } else SynErr(257); } void CatchClauses( -#line 2516 "VBNET.ATG" +#line 2599 "VBNET.ATG" out ArrayList catchClauses) { -#line 2518 "VBNET.ATG" +#line 2601 "VBNET.ATG" catchClauses = new ArrayList(); TypeReference type = null; Statement blockStmt = null; @@ -6405,27 +6568,27 @@ out ArrayList catchClauses) { if (StartOf(10)) { Identifier(); -#line 2526 "VBNET.ATG" +#line 2609 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2526 "VBNET.ATG" +#line 2609 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2527 "VBNET.ATG" +#line 2610 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2529 "VBNET.ATG" +#line 2612 "VBNET.ATG" out blockStmt); -#line 2530 "VBNET.ATG" +#line 2613 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6679,62 +6842,64 @@ out blockStmt); case 197: s = "\"Narrowing\" expected"; break; case 198: s = "\"Widening\" expected"; break; case 199: s = "\"Partial\" expected"; break; - case 200: s = "??? expected"; break; - case 201: s = "invalid OptionStmt"; break; + case 200: s = "\"Custom\" expected"; break; + case 201: s = "??? expected"; break; case 202: s = "invalid OptionStmt"; break; - case 203: s = "invalid GlobalAttributeSection"; break; + case 203: s = "invalid OptionStmt"; break; case 204: s = "invalid GlobalAttributeSection"; break; - case 205: s = "invalid NamespaceMemberDecl"; break; - case 206: s = "invalid OptionValue"; break; - case 207: s = "invalid EndOfStmt"; break; - case 208: s = "invalid Identifier"; break; - case 209: s = "invalid TypeModifier"; break; - case 210: s = "invalid NonModuleDeclaration"; break; + case 205: s = "invalid GlobalAttributeSection"; break; + case 206: s = "invalid NamespaceMemberDecl"; break; + case 207: s = "invalid OptionValue"; break; + case 208: s = "invalid EndOfStmt"; break; + case 209: s = "invalid Identifier"; break; + case 210: s = "invalid TypeModifier"; break; case 211: s = "invalid NonModuleDeclaration"; break; - case 212: s = "invalid TypeParameterConstraints"; break; - case 213: s = "invalid PrimitiveTypeName"; break; - case 214: s = "invalid MemberModifier"; break; - case 215: s = "invalid StructureMemberDecl"; break; + case 212: s = "invalid NonModuleDeclaration"; break; + case 213: s = "invalid TypeParameterConstraints"; break; + case 214: s = "invalid PrimitiveTypeName"; break; + case 215: s = "invalid MemberModifier"; break; case 216: s = "invalid StructureMemberDecl"; break; case 217: s = "invalid StructureMemberDecl"; break; case 218: s = "invalid StructureMemberDecl"; break; case 219: s = "invalid StructureMemberDecl"; break; case 220: s = "invalid StructureMemberDecl"; break; case 221: s = "invalid StructureMemberDecl"; break; - case 222: s = "invalid InterfaceMemberDecl"; break; + case 222: s = "invalid StructureMemberDecl"; break; case 223: s = "invalid InterfaceMemberDecl"; break; - case 224: s = "invalid Charset"; break; - case 225: s = "invalid VariableDeclarator"; break; - case 226: s = "invalid AccessorDecls"; break; - case 227: s = "invalid VariableInitializer"; break; - case 228: s = "invalid EventMemberSpecifier"; break; - case 229: s = "invalid EventMemberSpecifier"; break; - case 230: s = "invalid SimpleExpr"; break; - case 231: s = "invalid SimpleExpr"; break; + case 224: s = "invalid InterfaceMemberDecl"; break; + case 225: s = "invalid Charset"; break; + case 226: s = "invalid VariableDeclarator"; break; + case 227: s = "invalid AccessorDecls"; break; + case 228: s = "invalid EventAccessorDeclaration"; break; + case 229: s = "invalid VariableInitializer"; break; + case 230: s = "invalid EventMemberSpecifier"; break; + case 231: s = "invalid EventMemberSpecifier"; break; case 232: s = "invalid SimpleExpr"; break; - case 233: s = "invalid AssignmentOperator"; break; - case 234: s = "invalid IdentifierOrKeyword"; break; - case 235: s = "invalid CastTarget"; break; - case 236: s = "invalid Argument"; break; - case 237: s = "invalid RelationalExpr"; break; - case 238: s = "invalid RelationalExpr"; break; - case 239: s = "invalid NonArrayTypeName"; break; - case 240: s = "invalid AttributeArguments"; break; - case 241: s = "invalid ParameterModifier"; break; - case 242: s = "invalid Statement"; break; - case 243: s = "invalid LabelName"; break; - case 244: s = "invalid EmbeddedStatement"; break; - case 245: s = "invalid EmbeddedStatement"; break; + case 233: s = "invalid SimpleExpr"; break; + case 234: s = "invalid SimpleExpr"; break; + case 235: s = "invalid AssignmentOperator"; break; + case 236: s = "invalid IdentifierOrKeyword"; break; + case 237: s = "invalid CastTarget"; break; + case 238: s = "invalid Argument"; break; + case 239: s = "invalid RelationalExpr"; break; + case 240: s = "invalid RelationalExpr"; break; + case 241: s = "invalid NonArrayTypeName"; break; + case 242: s = "invalid AttributeArguments"; break; + case 243: s = "invalid ParameterModifier"; break; + case 244: s = "invalid Statement"; break; + case 245: s = "invalid LabelName"; break; case 246: s = "invalid EmbeddedStatement"; break; case 247: s = "invalid EmbeddedStatement"; break; case 248: s = "invalid EmbeddedStatement"; break; case 249: s = "invalid EmbeddedStatement"; break; case 250: s = "invalid EmbeddedStatement"; break; - case 251: s = "invalid WhileOrUntil"; break; - case 252: s = "invalid OnErrorStatement"; break; - case 253: s = "invalid ResumeStatement"; break; - case 254: s = "invalid CaseClause"; break; - case 255: s = "invalid CaseClause"; break; + case 251: s = "invalid EmbeddedStatement"; break; + case 252: s = "invalid EmbeddedStatement"; break; + case 253: s = "invalid WhileOrUntil"; break; + case 254: s = "invalid OnErrorStatement"; break; + case 255: s = "invalid ResumeStatement"; break; + case 256: s = "invalid CaseClause"; break; + case 257: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -6747,39 +6912,40 @@ out blockStmt); } static bool[,] set = { - {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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,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,T,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,T,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,T,x,x, x,x,T,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,T,T,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,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,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,T,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,T,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,T,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,T,T,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,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,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,x, x,x,T,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,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,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,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,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,T,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, 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,x,x, x,x,x,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,x,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, T,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,T,T, T,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,T,x, x,x,x,x, x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,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,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, T,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,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,x,T, T,x,T,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,T, T,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,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,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,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,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,T,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, 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,x,x,x, x,x,x,T, 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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,T, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,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,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,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,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,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,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,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,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,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, 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,T, x,x}, - {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x}, - {x,T,x,x, x,x,x,x, x,x,x,T, 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,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,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,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,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,T, 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,x,x, x,x,x,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, x,x,x,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, T,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,T,T, 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, x,x,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,T, T,T,T,T, x,T,x,T, T,x,x,T, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,T, T,T,T,T, T,T,T,x, T,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,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,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,T,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,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, T,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, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,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,x,x, x,x,T,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, 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,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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} + {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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, + {x,x,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,T,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,T,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,T,x,x, x,x,T,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,T,T,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,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, x,x,x,x, x,x,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,T,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, 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,T,x,T, T,x,x,x, x,x,x,x, x,T,T,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,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,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,x, x,x,T,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,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,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,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,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,T,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, 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,x,x, x,x,x,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,x,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, T,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,T,T, T,T,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,T,x, x,x,x,x, x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,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,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,x,T, T,x,T,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,T, T,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,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,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,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,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,T,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, 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,x,x,x, 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,x,x, x,x,x,x, x,x,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,T, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,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,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,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,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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, 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,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,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,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,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,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,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, 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,T, x,x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,T, 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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, + {x,x,T,T, T,T,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,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,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,T, 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,x,x, x,x,x,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, x,x,x,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, T,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,T,T, 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,x, x,x,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,T, T,T,T,T, x,T,x,T, T,x,x,T, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T, T,T,T,T, T,T,T,x, T,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,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,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,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,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,T,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,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, T,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, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T, T,T,T,T, T,T,T,x, x,x,T,T, 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,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,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,x, x,x,x,x, x,x,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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} }; } // end Parser diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 49d1054f42..05d2dab60f 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -417,6 +417,7 @@ TOKENS "Narrowing" "Widening" "Partial" + "Custom" /* END AUTOGENERATED TOKENS SECTION */ PRODUCTIONS @@ -1190,6 +1191,88 @@ StructureMemberDecl attributes> compilationUnit.AddChild(pDecl); .) ) + | + "Custom" (. Point startPos = t.Location; .) "Event" + (. + EventAccessorDeclaration eventAccessorDeclaration; + EventAccessorDeclaration addHandlerAccessorDeclaration = null; + EventAccessorDeclaration removeHandlerAccessorDeclaration = null; + EventAccessorDeclaration raiseEventAccessorDeclaration = null; + ArrayList implementsClause = null; + .) + Identifier (. string customEventName = t.val; .) + "As" TypeName + [ ImplementsClause ] + EOL + { + EventAccessorDeclaration + (. + if(eventAccessorDeclaration.Type == EventAccessorType.AddHandlerAccessor) + { + addHandlerAccessorDeclaration = eventAccessorDeclaration; + } + else if(eventAccessorDeclaration.Type == EventAccessorType.RemoveHandlerAccessor) + { + removeHandlerAccessorDeclaration = eventAccessorDeclaration; + } + else if(eventAccessorDeclaration.Type == EventAccessorType.RaiseEventAccessor) + { + raiseEventAccessorDeclaration = eventAccessorDeclaration; + } + .) + } + "End" "Event" EOL + (. + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide AddHandler accessor."); + } + + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide RemoveHandler accessor."); + } + + if(addHandlerAccessorDeclaration == null) + { + Error("Need to provide RaiseEvent accessor."); + } + + CustomEventDeclaration decl = new CustomEventDeclaration(m.Modifier, attributes, customEventName, addHandlerAccessorDeclaration, removeHandlerAccessorDeclaration, raiseEventAccessorDeclaration, implementsClause); + decl.StartLocation = startPos; + decl.StartLocation = t.EndLocation; + compilationUnit.AddChild(decl); + .) + . + +EventAccessorDeclaration + (. + Statement stmt = null; + List p = new List(); + AttributeSection section; + List attributes = new List(); + eventAccessorDeclaration = null; + .) = + { AttributeSection (. attributes.Add(section); .) } + ( + "AddHandler" [ "(" [ FormalParameterList

] ")" ] EOL + Block "End" "AddHandler" EOL + (. + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.AddHandlerAccessor, attributes); + .) + | + "RemoveHandler" [ "(" [ FormalParameterList

] ")" ] EOL + Block "End" "RemoveHandler" EOL + (. + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.RemoveHandlerAccessor, attributes); + .) + | + "RaiseEvent" [ "(" [ FormalParameterList

] ")" ] EOL + Block "End" "RaiseEvent" EOL + (. + eventAccessorDeclaration = new EventAccessorDeclaration((BlockStatement)stmt, p, EventAccessorType.RaiseEventAccessor, attributes); + .) + ) . /* 9.7 */ diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj index 619e622935..8957460053 100644 --- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj +++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj @@ -8,7 +8,6 @@ ICSharpCode.NRefactory.Tests ICSharpCode.NRefactory.Tests Library - 4 False False OnSuccessfulBuild @@ -16,11 +15,9 @@ True - False - False True DEBUG - ..\..\..\..\bin\ + C:\corsavy\trunk\SharpDevelop\bin True @@ -34,7 +31,14 @@ - + + ..\..\..\..\bin\nunit.framework.dll + False + + + ..\..\..\..\bin\nunit.core.dll + False + @@ -127,6 +131,7 @@ + diff --git a/src/Libraries/NRefactory/Test/Parser/TypeLevel/CustomEventTests.cs b/src/Libraries/NRefactory/Test/Parser/TypeLevel/CustomEventTests.cs new file mode 100644 index 0000000000..008ef802a6 --- /dev/null +++ b/src/Libraries/NRefactory/Test/Parser/TypeLevel/CustomEventTests.cs @@ -0,0 +1,52 @@ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision: 230 $ +// + +using System; +using System.IO; +using NUnit.Framework; +using ICSharpCode.NRefactory.Parser; +using ICSharpCode.NRefactory.Parser.AST; + +namespace ICSharpCode.NRefactory.Tests.AST +{ + [TestFixture] + public class CustomEventTests + { + #region C# + // No C# representation + #endregion + + #region VB.NET + [Test] + public void VBNetContinueStatementTest() + { + string code = @" Public Custom Event TestEvent As EventHandler + AddHandler(ByVal value As EventHandler) + Handlers = CType([Delegate].Combine(Handlers, value), _ + EventHandler) + End AddHandler + + RemoveHandler(ByVal value as EventHandler) + Handlers = CType([Delegate].Remove(Handlers, value), _ + EventHandler) + End RemoveHandler + + RaiseEvent(ByVal sender As Object, ByVal e As EventArgs) + Dim TempHandlers As EventHandler = Handlers + + If TempHandlers IsNot Nothing Then + TempHandlers(sender, e) + End If + End RaiseEvent + End Event"; + CustomEventDeclaration customEventDecl = (CustomEventDeclaration)ParseUtilVBNet.ParseTypeMember(code, typeof(ContinueStatement)); + Assert.IsNotNull(customEventDecl); + Assert.AreEqual("TestEvent", customEventDecl.Name); + } + #endregion + } +}