From f9bf7d61cdd220a2672de8cba8ff11376c2ea384 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 26 Jun 2008 20:56:50 +0000 Subject: [PATCH] r3143@daniel-notebook: daniel | 2008-06-26 22:55:25 +0200 Fixed VB parser bugs related to ":" statement separator use in global scope git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3139 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Parser/VBNet/Parser.cs | 2278 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 35 +- .../GlobalScope/TypeDeclarationTests.cs | 24 + .../NRefactory/Test/Parser/ParseUtilVBNet.cs | 6 +- .../Parser/Statements/LabelStatementTests.cs | 4 +- 5 files changed, 1219 insertions(+), 1128 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index e93c518433..7aeec3ac42 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -38,71 +38,91 @@ partial class Parser : AbstractParser lexer.NextToken(); // get the first token compilationUnit = new CompilationUnit(); - while (la.kind == 1) { - lexer.NextToken(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); } while (la.kind == 137) { OptionStmt(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } while (la.kind == 109) { ImportsStmt(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } while ( -#line 238 "VBNET.ATG" +#line 239 "VBNET.ATG" IsGlobalAttrTarget()) { GlobalAttributeSection(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } while (StartOf(1)) { NamespaceMemberDecl(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(0); } + void EndOfStmt() { + if (la.kind == 1) { + lexer.NextToken(); + } else if (la.kind == 13) { + lexer.NextToken(); + } else SynErr(208); + } + void OptionStmt() { -#line 243 "VBNET.ATG" +#line 244 "VBNET.ATG" INode node = null; bool val = true; Expect(137); -#line 244 "VBNET.ATG" +#line 245 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 96) { lexer.NextToken(); if (la.kind == 135 || la.kind == 136) { OptionValue( -#line 246 "VBNET.ATG" +#line 247 "VBNET.ATG" ref val); } -#line 247 "VBNET.ATG" +#line 248 "VBNET.ATG" node = new OptionDeclaration(OptionType.Explicit, val); } else if (la.kind == 165) { lexer.NextToken(); if (la.kind == 135 || la.kind == 136) { OptionValue( -#line 249 "VBNET.ATG" +#line 250 "VBNET.ATG" ref val); } -#line 250 "VBNET.ATG" +#line 251 "VBNET.ATG" node = new OptionDeclaration(OptionType.Strict, val); } else if (la.kind == 71) { lexer.NextToken(); if (la.kind == 52) { lexer.NextToken(); -#line 252 "VBNET.ATG" +#line 253 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareBinary, val); } else if (la.kind == 170) { lexer.NextToken(); -#line 253 "VBNET.ATG" +#line 254 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareText, val); - } else SynErr(208); - } else SynErr(209); + } else SynErr(209); + } else SynErr(210); EndOfStmt(); -#line 258 "VBNET.ATG" +#line 259 "VBNET.ATG" if (node != null) { node.StartLocation = startPos; node.EndLocation = t.Location; @@ -113,33 +133,33 @@ ref val); void ImportsStmt() { -#line 281 "VBNET.ATG" +#line 282 "VBNET.ATG" List usings = new List(); Expect(109); -#line 285 "VBNET.ATG" +#line 286 "VBNET.ATG" Location startPos = t.Location; Using u; ImportClause( -#line 288 "VBNET.ATG" +#line 289 "VBNET.ATG" out u); -#line 288 "VBNET.ATG" +#line 289 "VBNET.ATG" if (u != null) { usings.Add(u); } while (la.kind == 12) { lexer.NextToken(); ImportClause( -#line 290 "VBNET.ATG" +#line 291 "VBNET.ATG" out u); -#line 290 "VBNET.ATG" +#line 291 "VBNET.ATG" if (u != null) { usings.Add(u); } } EndOfStmt(); -#line 294 "VBNET.ATG" +#line 295 "VBNET.ATG" UsingDeclaration usingDeclaration = new UsingDeclaration(usings); usingDeclaration.StartLocation = startPos; usingDeclaration.EndLocation = t.Location; @@ -150,28 +170,28 @@ out u); void GlobalAttributeSection() { Expect(28); -#line 2063 "VBNET.ATG" +#line 2080 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 50) { lexer.NextToken(); } else if (la.kind == 122) { lexer.NextToken(); - } else SynErr(210); + } else SynErr(211); -#line 2065 "VBNET.ATG" +#line 2082 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2069 "VBNET.ATG" +#line 2086 "VBNET.ATG" out attribute); -#line 2069 "VBNET.ATG" +#line 2086 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2070 "VBNET.ATG" +#line 2087 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -179,14 +199,14 @@ NotFinalComma()) { lexer.NextToken(); } else if (la.kind == 122) { lexer.NextToken(); - } else SynErr(211); + } else SynErr(212); Expect(13); } Attribute( -#line 2070 "VBNET.ATG" +#line 2087 "VBNET.ATG" out attribute); -#line 2070 "VBNET.ATG" +#line 2087 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -195,7 +215,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2075 "VBNET.ATG" +#line 2092 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -208,7 +228,7 @@ out attribute); void NamespaceMemberDecl() { -#line 323 "VBNET.ATG" +#line 324 "VBNET.ATG" ModifierList m = new ModifierList(); AttributeSection section; List attributes = new List(); @@ -217,14 +237,14 @@ out attribute); if (la.kind == 127) { lexer.NextToken(); -#line 330 "VBNET.ATG" +#line 331 "VBNET.ATG" Location startPos = t.Location; Qualident( -#line 332 "VBNET.ATG" +#line 333 "VBNET.ATG" out qualident); -#line 334 "VBNET.ATG" +#line 335 "VBNET.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; compilationUnit.AddChild(node); @@ -233,74 +253,66 @@ out qualident); EndOfStmt(); NamespaceBody(); -#line 342 "VBNET.ATG" +#line 343 "VBNET.ATG" node.EndLocation = t.Location; compilationUnit.BlockEnd(); } else if (StartOf(2)) { while (la.kind == 28) { AttributeSection( -#line 346 "VBNET.ATG" +#line 347 "VBNET.ATG" out section); -#line 346 "VBNET.ATG" +#line 347 "VBNET.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 347 "VBNET.ATG" +#line 348 "VBNET.ATG" m); } NonModuleDeclaration( -#line 347 "VBNET.ATG" +#line 348 "VBNET.ATG" m, attributes); - } else SynErr(212); + } else SynErr(213); } void OptionValue( -#line 266 "VBNET.ATG" +#line 267 "VBNET.ATG" ref bool val) { if (la.kind == 136) { lexer.NextToken(); -#line 268 "VBNET.ATG" +#line 269 "VBNET.ATG" val = true; } else if (la.kind == 135) { lexer.NextToken(); -#line 270 "VBNET.ATG" +#line 271 "VBNET.ATG" val = false; - } else SynErr(213); - } - - void EndOfStmt() { - if (la.kind == 1) { - lexer.NextToken(); - } else if (la.kind == 13) { - lexer.NextToken(); } else SynErr(214); } void ImportClause( -#line 301 "VBNET.ATG" +#line 302 "VBNET.ATG" out Using u) { -#line 303 "VBNET.ATG" +#line 304 "VBNET.ATG" string qualident = null; TypeReference aliasedType = null; u = null; Qualident( -#line 307 "VBNET.ATG" +#line 308 "VBNET.ATG" out qualident); if (la.kind == 11) { lexer.NextToken(); TypeName( -#line 308 "VBNET.ATG" +#line 309 "VBNET.ATG" out aliasedType); } -#line 310 "VBNET.ATG" +#line 311 "VBNET.ATG" if (qualident != null && qualident.Length > 0) { if (aliasedType != null) { u = new Using(qualident, aliasedType); @@ -312,47 +324,47 @@ out aliasedType); } void Qualident( -#line 2793 "VBNET.ATG" +#line 2810 "VBNET.ATG" out string qualident) { -#line 2795 "VBNET.ATG" +#line 2812 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2799 "VBNET.ATG" +#line 2816 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2800 "VBNET.ATG" +#line 2817 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2800 "VBNET.ATG" +#line 2817 "VBNET.ATG" out name); -#line 2800 "VBNET.ATG" +#line 2817 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2802 "VBNET.ATG" +#line 2819 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 1956 "VBNET.ATG" +#line 1973 "VBNET.ATG" out TypeReference typeref) { -#line 1957 "VBNET.ATG" +#line 1974 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1959 "VBNET.ATG" +#line 1976 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 1960 "VBNET.ATG" +#line 1977 "VBNET.ATG" out rank); -#line 1961 "VBNET.ATG" +#line 1978 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -360,8 +372,14 @@ out rank); } void NamespaceBody() { + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(1)) { NamespaceMemberDecl(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(89); Expect(127); @@ -369,35 +387,35 @@ out rank); } void AttributeSection( -#line 2136 "VBNET.ATG" +#line 2153 "VBNET.ATG" out AttributeSection section) { -#line 2138 "VBNET.ATG" +#line 2155 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2142 "VBNET.ATG" +#line 2159 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2143 "VBNET.ATG" +#line 2160 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 94) { lexer.NextToken(); -#line 2144 "VBNET.ATG" +#line 2161 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 155) { lexer.NextToken(); -#line 2145 "VBNET.ATG" +#line 2162 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2148 "VBNET.ATG" +#line 2165 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -410,20 +428,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2158 "VBNET.ATG" +#line 2175 "VBNET.ATG" out attribute); -#line 2158 "VBNET.ATG" +#line 2175 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2159 "VBNET.ATG" +#line 2176 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2159 "VBNET.ATG" +#line 2176 "VBNET.ATG" out attribute); -#line 2159 "VBNET.ATG" +#line 2176 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -431,7 +449,7 @@ out attribute); } Expect(27); -#line 2163 "VBNET.ATG" +#line 2180 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -442,69 +460,69 @@ out attribute); } void TypeModifier( -#line 2873 "VBNET.ATG" +#line 2890 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 149: { lexer.NextToken(); -#line 2874 "VBNET.ATG" +#line 2891 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 148: { lexer.NextToken(); -#line 2875 "VBNET.ATG" +#line 2892 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 100: { lexer.NextToken(); -#line 2876 "VBNET.ATG" +#line 2893 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 146: { lexer.NextToken(); -#line 2877 "VBNET.ATG" +#line 2894 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 159: { lexer.NextToken(); -#line 2878 "VBNET.ATG" +#line 2895 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 158: { lexer.NextToken(); -#line 2879 "VBNET.ATG" +#line 2896 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 123: { lexer.NextToken(); -#line 2880 "VBNET.ATG" +#line 2897 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 132: { lexer.NextToken(); -#line 2881 "VBNET.ATG" +#line 2898 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 205: { lexer.NextToken(); -#line 2882 "VBNET.ATG" +#line 2899 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -513,21 +531,21 @@ ModifierList m) { } void NonModuleDeclaration( -#line 406 "VBNET.ATG" +#line 407 "VBNET.ATG" ModifierList m, List attributes) { -#line 408 "VBNET.ATG" +#line 409 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 68: { -#line 411 "VBNET.ATG" +#line 412 "VBNET.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 414 "VBNET.ATG" +#line 415 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; compilationUnit.AddChild(newType); @@ -537,42 +555,42 @@ ModifierList m, List attributes) { Identifier(); -#line 421 "VBNET.ATG" +#line 422 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 422 "VBNET.ATG" +#line 423 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 424 "VBNET.ATG" +#line 425 "VBNET.ATG" newType.BodyStartLocation = t.Location; if (la.kind == 111) { ClassBaseType( -#line 425 "VBNET.ATG" +#line 426 "VBNET.ATG" out typeRef); -#line 425 "VBNET.ATG" +#line 426 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } while (la.kind == 108) { TypeImplementsClause( -#line 426 "VBNET.ATG" +#line 427 "VBNET.ATG" out baseInterfaces); -#line 426 "VBNET.ATG" +#line 427 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 427 "VBNET.ATG" +#line 428 "VBNET.ATG" newType); Expect(89); Expect(68); -#line 428 "VBNET.ATG" +#line 429 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 431 "VBNET.ATG" +#line 432 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -580,7 +598,7 @@ newType); case 122: { lexer.NextToken(); -#line 435 "VBNET.ATG" +#line 436 "VBNET.ATG" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -590,17 +608,17 @@ newType); Identifier(); -#line 442 "VBNET.ATG" +#line 443 "VBNET.ATG" newType.Name = t.val; EndOfStmt(); -#line 444 "VBNET.ATG" +#line 445 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 445 "VBNET.ATG" +#line 446 "VBNET.ATG" newType); -#line 447 "VBNET.ATG" +#line 448 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -608,7 +626,7 @@ newType); case 167: { lexer.NextToken(); -#line 451 "VBNET.ATG" +#line 452 "VBNET.ATG" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -618,28 +636,28 @@ newType); Identifier(); -#line 458 "VBNET.ATG" +#line 459 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 459 "VBNET.ATG" +#line 460 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 461 "VBNET.ATG" +#line 462 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 108) { TypeImplementsClause( -#line 462 "VBNET.ATG" +#line 463 "VBNET.ATG" out baseInterfaces); -#line 462 "VBNET.ATG" +#line 463 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 463 "VBNET.ATG" +#line 464 "VBNET.ATG" newType); -#line 465 "VBNET.ATG" +#line 466 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -647,7 +665,7 @@ newType); case 91: { lexer.NextToken(); -#line 470 "VBNET.ATG" +#line 471 "VBNET.ATG" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -658,26 +676,26 @@ newType); Identifier(); -#line 478 "VBNET.ATG" +#line 479 "VBNET.ATG" newType.Name = t.val; if (la.kind == 49) { lexer.NextToken(); NonArrayTypeName( -#line 479 "VBNET.ATG" +#line 480 "VBNET.ATG" out typeRef, false); -#line 479 "VBNET.ATG" +#line 480 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } EndOfStmt(); -#line 481 "VBNET.ATG" +#line 482 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 482 "VBNET.ATG" +#line 483 "VBNET.ATG" newType); -#line 484 "VBNET.ATG" +#line 485 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -685,7 +703,7 @@ newType); case 113: { lexer.NextToken(); -#line 489 "VBNET.ATG" +#line 490 "VBNET.ATG" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -695,28 +713,28 @@ newType); Identifier(); -#line 496 "VBNET.ATG" +#line 497 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 497 "VBNET.ATG" +#line 498 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 499 "VBNET.ATG" +#line 500 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 111) { InterfaceBase( -#line 500 "VBNET.ATG" +#line 501 "VBNET.ATG" out baseInterfaces); -#line 500 "VBNET.ATG" +#line 501 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 501 "VBNET.ATG" +#line 502 "VBNET.ATG" newType); -#line 503 "VBNET.ATG" +#line 504 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -724,7 +742,7 @@ newType); case 81: { lexer.NextToken(); -#line 508 "VBNET.ATG" +#line 509 "VBNET.ATG" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); @@ -735,63 +753,63 @@ newType); lexer.NextToken(); Identifier(); -#line 515 "VBNET.ATG" +#line 516 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 516 "VBNET.ATG" +#line 517 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 517 "VBNET.ATG" +#line 518 "VBNET.ATG" p); } Expect(26); -#line 517 "VBNET.ATG" +#line 518 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 101) { lexer.NextToken(); Identifier(); -#line 519 "VBNET.ATG" +#line 520 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 520 "VBNET.ATG" +#line 521 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 521 "VBNET.ATG" +#line 522 "VBNET.ATG" p); } Expect(26); -#line 521 "VBNET.ATG" +#line 522 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 49) { lexer.NextToken(); -#line 522 "VBNET.ATG" +#line 523 "VBNET.ATG" TypeReference type; TypeName( -#line 522 "VBNET.ATG" +#line 523 "VBNET.ATG" out type); -#line 522 "VBNET.ATG" +#line 523 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(216); -#line 524 "VBNET.ATG" +#line 525 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 527 "VBNET.ATG" +#line 528 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; @@ -801,31 +819,31 @@ out type); } void TypeParameterList( -#line 351 "VBNET.ATG" +#line 352 "VBNET.ATG" List templates) { -#line 353 "VBNET.ATG" +#line 354 "VBNET.ATG" TemplateDefinition template; if ( -#line 356 "VBNET.ATG" +#line 357 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(202); TypeParameter( -#line 357 "VBNET.ATG" +#line 358 "VBNET.ATG" out template); -#line 359 "VBNET.ATG" +#line 360 "VBNET.ATG" if (template != null) templates.Add(template); while (la.kind == 12) { lexer.NextToken(); TypeParameter( -#line 362 "VBNET.ATG" +#line 363 "VBNET.ATG" out template); -#line 364 "VBNET.ATG" +#line 365 "VBNET.ATG" if (template != null) templates.Add(template); } @@ -834,15 +852,15 @@ out template); } void TypeParameter( -#line 372 "VBNET.ATG" +#line 373 "VBNET.ATG" out TemplateDefinition template) { Identifier(); -#line 374 "VBNET.ATG" +#line 375 "VBNET.ATG" template = new TemplateDefinition(t.val, null); if (la.kind == 49) { TypeParameterConstraints( -#line 375 "VBNET.ATG" +#line 376 "VBNET.ATG" template); } } @@ -906,221 +924,239 @@ template); } void TypeParameterConstraints( -#line 379 "VBNET.ATG" +#line 380 "VBNET.ATG" TemplateDefinition template) { -#line 381 "VBNET.ATG" +#line 382 "VBNET.ATG" TypeReference constraint; Expect(49); if (la.kind == 23) { lexer.NextToken(); TypeParameterConstraint( -#line 387 "VBNET.ATG" +#line 388 "VBNET.ATG" out constraint); -#line 387 "VBNET.ATG" +#line 388 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); TypeParameterConstraint( -#line 390 "VBNET.ATG" +#line 391 "VBNET.ATG" out constraint); -#line 390 "VBNET.ATG" +#line 391 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(24); } else if (StartOf(5)) { TypeParameterConstraint( -#line 393 "VBNET.ATG" +#line 394 "VBNET.ATG" out constraint); -#line 393 "VBNET.ATG" +#line 394 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } else SynErr(219); } void TypeParameterConstraint( -#line 397 "VBNET.ATG" +#line 398 "VBNET.ATG" out TypeReference constraint) { -#line 398 "VBNET.ATG" +#line 399 "VBNET.ATG" constraint = null; if (la.kind == 68) { lexer.NextToken(); -#line 399 "VBNET.ATG" +#line 400 "VBNET.ATG" constraint = TypeReference.ClassConstraint; } else if (la.kind == 167) { lexer.NextToken(); -#line 400 "VBNET.ATG" +#line 401 "VBNET.ATG" constraint = TypeReference.StructConstraint; } else if (la.kind == 128) { lexer.NextToken(); -#line 401 "VBNET.ATG" +#line 402 "VBNET.ATG" constraint = TypeReference.NewConstraint; } else if (StartOf(6)) { TypeName( -#line 402 "VBNET.ATG" +#line 403 "VBNET.ATG" out constraint); } else SynErr(220); } void ClassBaseType( -#line 728 "VBNET.ATG" +#line 745 "VBNET.ATG" out TypeReference typeRef) { -#line 730 "VBNET.ATG" +#line 747 "VBNET.ATG" typeRef = null; Expect(111); TypeName( -#line 733 "VBNET.ATG" +#line 750 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1526 "VBNET.ATG" +#line 1543 "VBNET.ATG" out List baseInterfaces) { -#line 1528 "VBNET.ATG" +#line 1545 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(108); TypeName( -#line 1531 "VBNET.ATG" +#line 1548 "VBNET.ATG" out type); -#line 1533 "VBNET.ATG" +#line 1550 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1536 "VBNET.ATG" +#line 1553 "VBNET.ATG" out type); -#line 1537 "VBNET.ATG" +#line 1554 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 537 "VBNET.ATG" +#line 542 "VBNET.ATG" TypeDeclaration newType) { -#line 538 "VBNET.ATG" +#line 543 "VBNET.ATG" AttributeSection section; + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(7)) { -#line 540 "VBNET.ATG" +#line 546 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 543 "VBNET.ATG" +#line 549 "VBNET.ATG" out section); -#line 543 "VBNET.ATG" +#line 549 "VBNET.ATG" attributes.Add(section); } while (StartOf(8)) { MemberModifier( -#line 544 "VBNET.ATG" +#line 550 "VBNET.ATG" m); } ClassMemberDecl( -#line 545 "VBNET.ATG" +#line 551 "VBNET.ATG" m, attributes); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } } void ModuleBody( -#line 564 "VBNET.ATG" +#line 573 "VBNET.ATG" TypeDeclaration newType) { -#line 565 "VBNET.ATG" +#line 574 "VBNET.ATG" AttributeSection section; + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(7)) { -#line 567 "VBNET.ATG" +#line 577 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 570 "VBNET.ATG" +#line 580 "VBNET.ATG" out section); -#line 570 "VBNET.ATG" +#line 580 "VBNET.ATG" attributes.Add(section); } while (StartOf(8)) { MemberModifier( -#line 571 "VBNET.ATG" +#line 581 "VBNET.ATG" m); } ClassMemberDecl( -#line 572 "VBNET.ATG" +#line 582 "VBNET.ATG" m, attributes); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(89); Expect(122); -#line 574 "VBNET.ATG" +#line 585 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 549 "VBNET.ATG" +#line 556 "VBNET.ATG" TypeDeclaration newType) { -#line 550 "VBNET.ATG" +#line 557 "VBNET.ATG" AttributeSection section; + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(7)) { -#line 552 "VBNET.ATG" +#line 560 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 555 "VBNET.ATG" +#line 563 "VBNET.ATG" out section); -#line 555 "VBNET.ATG" +#line 563 "VBNET.ATG" attributes.Add(section); } while (StartOf(8)) { MemberModifier( -#line 556 "VBNET.ATG" +#line 564 "VBNET.ATG" m); } StructureMemberDecl( -#line 557 "VBNET.ATG" +#line 565 "VBNET.ATG" m, attributes); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(89); Expect(167); -#line 559 "VBNET.ATG" +#line 568 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 1979 "VBNET.ATG" +#line 1996 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1981 "VBNET.ATG" +#line 1998 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1130,255 +1166,267 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 1986 "VBNET.ATG" +#line 2003 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 1987 "VBNET.ATG" +#line 2004 "VBNET.ATG" out typeref, canBeUnbound); -#line 1988 "VBNET.ATG" +#line 2005 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 1989 "VBNET.ATG" +#line 2006 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 1990 "VBNET.ATG" +#line 2007 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 1991 "VBNET.ATG" +#line 2008 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 134) { lexer.NextToken(); -#line 1994 "VBNET.ATG" +#line 2011 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(10)) { PrimitiveTypeName( -#line 1995 "VBNET.ATG" +#line 2012 "VBNET.ATG" out name); -#line 1995 "VBNET.ATG" +#line 2012 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(221); } void EnumBody( -#line 578 "VBNET.ATG" +#line 589 "VBNET.ATG" TypeDeclaration newType) { -#line 579 "VBNET.ATG" +#line 590 "VBNET.ATG" FieldDeclaration f; + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(11)) { EnumMemberDecl( -#line 581 "VBNET.ATG" +#line 593 "VBNET.ATG" out f); -#line 581 "VBNET.ATG" +#line 593 "VBNET.ATG" compilationUnit.AddChild(f); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(89); Expect(91); -#line 583 "VBNET.ATG" +#line 596 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1511 "VBNET.ATG" +#line 1528 "VBNET.ATG" out List bases) { -#line 1513 "VBNET.ATG" +#line 1530 "VBNET.ATG" TypeReference type; bases = new List(); Expect(111); TypeName( -#line 1517 "VBNET.ATG" +#line 1534 "VBNET.ATG" out type); -#line 1517 "VBNET.ATG" +#line 1534 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1520 "VBNET.ATG" +#line 1537 "VBNET.ATG" out type); -#line 1520 "VBNET.ATG" +#line 1537 "VBNET.ATG" bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 587 "VBNET.ATG" +#line 600 "VBNET.ATG" TypeDeclaration newType) { + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } while (StartOf(12)) { InterfaceMemberDecl(); + while (la.kind == 1 || la.kind == 13) { + EndOfStmt(); + } } Expect(89); Expect(113); -#line 589 "VBNET.ATG" +#line 606 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2173 "VBNET.ATG" +#line 2190 "VBNET.ATG" List parameter) { -#line 2174 "VBNET.ATG" +#line 2191 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2176 "VBNET.ATG" +#line 2193 "VBNET.ATG" out p); -#line 2176 "VBNET.ATG" +#line 2193 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2178 "VBNET.ATG" +#line 2195 "VBNET.ATG" out p); -#line 2178 "VBNET.ATG" +#line 2195 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 2885 "VBNET.ATG" +#line 2902 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 123: { lexer.NextToken(); -#line 2886 "VBNET.ATG" +#line 2903 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 80: { lexer.NextToken(); -#line 2887 "VBNET.ATG" +#line 2904 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 100: { lexer.NextToken(); -#line 2888 "VBNET.ATG" +#line 2905 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 158: { lexer.NextToken(); -#line 2889 "VBNET.ATG" +#line 2906 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 143: { lexer.NextToken(); -#line 2890 "VBNET.ATG" +#line 2907 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 124: { lexer.NextToken(); -#line 2891 "VBNET.ATG" +#line 2908 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 146: { lexer.NextToken(); -#line 2892 "VBNET.ATG" +#line 2909 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 148: { lexer.NextToken(); -#line 2893 "VBNET.ATG" +#line 2910 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 149: { lexer.NextToken(); -#line 2894 "VBNET.ATG" +#line 2911 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 132: { lexer.NextToken(); -#line 2895 "VBNET.ATG" +#line 2912 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 133: { lexer.NextToken(); -#line 2896 "VBNET.ATG" +#line 2913 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 159: { lexer.NextToken(); -#line 2897 "VBNET.ATG" +#line 2914 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 142: { lexer.NextToken(); -#line 2898 "VBNET.ATG" +#line 2915 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 141: { lexer.NextToken(); -#line 2899 "VBNET.ATG" +#line 2916 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 151: { lexer.NextToken(); -#line 2900 "VBNET.ATG" +#line 2917 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 185: { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2918 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 2902 "VBNET.ATG" +#line 2919 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 82: { lexer.NextToken(); -#line 2903 "VBNET.ATG" +#line 2920 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } @@ -1387,18 +1435,18 @@ ModifierList m) { } void ClassMemberDecl( -#line 724 "VBNET.ATG" +#line 741 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 725 "VBNET.ATG" +#line 742 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 738 "VBNET.ATG" +#line 755 "VBNET.ATG" ModifierList m, List attributes) { -#line 740 "VBNET.ATG" +#line 757 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1408,37 +1456,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 68: case 81: case 91: case 113: case 122: case 167: { NonModuleDeclaration( -#line 747 "VBNET.ATG" +#line 764 "VBNET.ATG" m, attributes); break; } case 168: { lexer.NextToken(); -#line 751 "VBNET.ATG" +#line 768 "VBNET.ATG" Location startPos = t.Location; if (StartOf(13)) { -#line 755 "VBNET.ATG" +#line 772 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 761 "VBNET.ATG" +#line 778 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 764 "VBNET.ATG" +#line 781 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 765 "VBNET.ATG" +#line 782 "VBNET.ATG" p); } Expect(26); @@ -1446,23 +1494,23 @@ p); if (la.kind == 106 || la.kind == 108) { if (la.kind == 108) { ImplementsClause( -#line 768 "VBNET.ATG" +#line 785 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 770 "VBNET.ATG" +#line 787 "VBNET.ATG" out handlesClause); } } -#line 773 "VBNET.ATG" +#line 790 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 776 "VBNET.ATG" +#line 793 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 779 "VBNET.ATG" +#line 796 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1476,7 +1524,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 792 "VBNET.ATG" +#line 809 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1488,25 +1536,25 @@ IsMustOverride(m)) { compilationUnit.AddChild(methodDeclaration); -#line 803 "VBNET.ATG" +#line 820 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 804 "VBNET.ATG" +#line 821 "VBNET.ATG" out stmt); Expect(89); Expect(168); -#line 806 "VBNET.ATG" +#line 823 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 812 "VBNET.ATG" +#line 829 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 813 "VBNET.ATG" +#line 830 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(223); @@ -1516,39 +1564,39 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 817 "VBNET.ATG" +#line 834 "VBNET.ATG" p); } Expect(26); } -#line 818 "VBNET.ATG" +#line 835 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 819 "VBNET.ATG" +#line 836 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 822 "VBNET.ATG" +#line 839 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 823 "VBNET.ATG" +#line 840 "VBNET.ATG" out stmt); Expect(89); Expect(168); -#line 825 "VBNET.ATG" +#line 842 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 831 "VBNET.ATG" +#line 848 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 834 "VBNET.ATG" +#line 851 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1562,7 +1610,7 @@ out stmt); case 101: { lexer.NextToken(); -#line 846 "VBNET.ATG" +#line 863 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1572,16 +1620,16 @@ out stmt); Identifier(); -#line 853 "VBNET.ATG" +#line 870 "VBNET.ATG" name = t.val; TypeParameterList( -#line 854 "VBNET.ATG" +#line 871 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 855 "VBNET.ATG" +#line 872 "VBNET.ATG" p); } Expect(26); @@ -1590,15 +1638,15 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 856 "VBNET.ATG" +#line 873 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 856 "VBNET.ATG" +#line 873 "VBNET.ATG" out type); } -#line 858 "VBNET.ATG" +#line 875 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -1606,20 +1654,20 @@ out type); if (la.kind == 106 || la.kind == 108) { if (la.kind == 108) { ImplementsClause( -#line 864 "VBNET.ATG" +#line 881 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 866 "VBNET.ATG" +#line 883 "VBNET.ATG" out handlesClause); } } if ( -#line 871 "VBNET.ATG" +#line 888 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 874 "VBNET.ATG" +#line 891 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1638,7 +1686,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 892 "VBNET.ATG" +#line 909 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1657,12 +1705,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 909 "VBNET.ATG" +#line 926 "VBNET.ATG" out stmt); Expect(89); Expect(101); -#line 911 "VBNET.ATG" +#line 928 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1678,7 +1726,7 @@ out stmt); case 79: { lexer.NextToken(); -#line 925 "VBNET.ATG" +#line 942 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1688,39 +1736,39 @@ out stmt); if (StartOf(14)) { Charset( -#line 932 "VBNET.ATG" +#line 949 "VBNET.ATG" out charsetModifer); } if (la.kind == 168) { lexer.NextToken(); Identifier(); -#line 935 "VBNET.ATG" +#line 952 "VBNET.ATG" name = t.val; Expect(116); Expect(3); -#line 936 "VBNET.ATG" +#line 953 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 45) { lexer.NextToken(); Expect(3); -#line 937 "VBNET.ATG" +#line 954 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 938 "VBNET.ATG" +#line 955 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 941 "VBNET.ATG" +#line 958 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1730,25 +1778,25 @@ p); lexer.NextToken(); Identifier(); -#line 948 "VBNET.ATG" +#line 965 "VBNET.ATG" name = t.val; Expect(116); Expect(3); -#line 949 "VBNET.ATG" +#line 966 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 45) { lexer.NextToken(); Expect(3); -#line 950 "VBNET.ATG" +#line 967 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 951 "VBNET.ATG" +#line 968 "VBNET.ATG" p); } Expect(26); @@ -1756,12 +1804,12 @@ p); if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 952 "VBNET.ATG" +#line 969 "VBNET.ATG" out type); } EndOfStmt(); -#line 955 "VBNET.ATG" +#line 972 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1773,7 +1821,7 @@ out type); case 94: { lexer.NextToken(); -#line 965 "VBNET.ATG" +#line 982 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1782,19 +1830,19 @@ out type); Identifier(); -#line 971 "VBNET.ATG" +#line 988 "VBNET.ATG" name= t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 973 "VBNET.ATG" +#line 990 "VBNET.ATG" out type); } else if (StartOf(15)) { if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 975 "VBNET.ATG" +#line 992 "VBNET.ATG" p); } Expect(26); @@ -1802,11 +1850,11 @@ p); } else SynErr(227); if (la.kind == 108) { ImplementsClause( -#line 977 "VBNET.ATG" +#line 994 "VBNET.ATG" out implementsClause); } -#line 979 "VBNET.ATG" +#line 996 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1820,30 +1868,30 @@ out implementsClause); } case 2: case 48: case 50: case 51: case 52: case 71: case 96: case 135: case 145: case 170: case 177: case 178: { -#line 989 "VBNET.ATG" +#line 1006 "VBNET.ATG" Location startPos = t.Location; -#line 991 "VBNET.ATG" +#line 1008 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); IdentifierForFieldDeclaration(); -#line 995 "VBNET.ATG" +#line 1012 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 996 "VBNET.ATG" +#line 1013 "VBNET.ATG" variableDeclarators, name); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 997 "VBNET.ATG" +#line 1014 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1000 "VBNET.ATG" +#line 1017 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -1852,35 +1900,35 @@ variableDeclarators); } case 72: { -#line 1005 "VBNET.ATG" +#line 1022 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1006 "VBNET.ATG" +#line 1023 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1008 "VBNET.ATG" +#line 1025 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1012 "VBNET.ATG" +#line 1029 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1013 "VBNET.ATG" +#line 1030 "VBNET.ATG" constantDeclarators); } -#line 1015 "VBNET.ATG" +#line 1032 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1020 "VBNET.ATG" +#line 1037 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -1889,20 +1937,20 @@ constantDeclarators); case 147: { lexer.NextToken(); -#line 1026 "VBNET.ATG" +#line 1043 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; Identifier(); -#line 1030 "VBNET.ATG" +#line 1047 "VBNET.ATG" string propertyName = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1031 "VBNET.ATG" +#line 1048 "VBNET.ATG" p); } Expect(26); @@ -1910,26 +1958,26 @@ p); if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 1032 "VBNET.ATG" +#line 1049 "VBNET.ATG" out type); } -#line 1034 "VBNET.ATG" +#line 1051 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } if (la.kind == 108) { ImplementsClause( -#line 1038 "VBNET.ATG" +#line 1055 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1042 "VBNET.ATG" +#line 1059 "VBNET.ATG" IsMustOverride(m)) { -#line 1044 "VBNET.ATG" +#line 1061 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -1940,7 +1988,7 @@ IsMustOverride(m)) { } else if (StartOf(16)) { -#line 1054 "VBNET.ATG" +#line 1071 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -1952,13 +2000,13 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1064 "VBNET.ATG" +#line 1081 "VBNET.ATG" out getRegion, out setRegion); Expect(89); Expect(147); EndOfStmt(); -#line 1068 "VBNET.ATG" +#line 1085 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -1970,11 +2018,11 @@ out getRegion, out setRegion); case 206: { lexer.NextToken(); -#line 1075 "VBNET.ATG" +#line 1092 "VBNET.ATG" Location startPos = t.Location; Expect(94); -#line 1077 "VBNET.ATG" +#line 1094 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -1984,24 +2032,24 @@ out getRegion, out setRegion); Identifier(); -#line 1084 "VBNET.ATG" +#line 1101 "VBNET.ATG" string customEventName = t.val; Expect(49); TypeName( -#line 1085 "VBNET.ATG" +#line 1102 "VBNET.ATG" out type); if (la.kind == 108) { ImplementsClause( -#line 1086 "VBNET.ATG" +#line 1103 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(17)) { EventAccessorDeclaration( -#line 1089 "VBNET.ATG" +#line 1106 "VBNET.ATG" out eventAccessorDeclaration); -#line 1091 "VBNET.ATG" +#line 1108 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2020,7 +2068,7 @@ out eventAccessorDeclaration); Expect(94); EndOfStmt(); -#line 1107 "VBNET.ATG" +#line 1124 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2051,24 +2099,24 @@ out eventAccessorDeclaration); } case 189: case 203: case 204: { -#line 1133 "VBNET.ATG" +#line 1150 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 203 || la.kind == 204) { if (la.kind == 204) { lexer.NextToken(); -#line 1134 "VBNET.ATG" +#line 1151 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1135 "VBNET.ATG" +#line 1152 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(189); -#line 1138 "VBNET.ATG" +#line 1155 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2080,7 +2128,7 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1148 "VBNET.ATG" +#line 1165 "VBNET.ATG" out operatorType); Expect(25); if (la.kind == 56) { @@ -2088,16 +2136,16 @@ out operatorType); } Identifier(); -#line 1149 "VBNET.ATG" +#line 1166 "VBNET.ATG" operandName = t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 1150 "VBNET.ATG" +#line 1167 "VBNET.ATG" out operandType); } -#line 1151 "VBNET.ATG" +#line 1168 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2106,48 +2154,48 @@ out operandType); } Identifier(); -#line 1155 "VBNET.ATG" +#line 1172 "VBNET.ATG" operandName = t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 1156 "VBNET.ATG" +#line 1173 "VBNET.ATG" out operandType); } -#line 1157 "VBNET.ATG" +#line 1174 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); } Expect(26); -#line 1160 "VBNET.ATG" +#line 1177 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 49) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 1161 "VBNET.ATG" +#line 1178 "VBNET.ATG" out section); -#line 1161 "VBNET.ATG" +#line 1178 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1161 "VBNET.ATG" +#line 1178 "VBNET.ATG" out returnType); -#line 1161 "VBNET.ATG" +#line 1178 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1163 "VBNET.ATG" +#line 1180 "VBNET.ATG" out stmt); Expect(89); Expect(189); EndOfStmt(); -#line 1165 "VBNET.ATG" +#line 1182 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2171,25 +2219,25 @@ out stmt); } void EnumMemberDecl( -#line 706 "VBNET.ATG" +#line 723 "VBNET.ATG" out FieldDeclaration f) { -#line 708 "VBNET.ATG" +#line 725 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 28) { AttributeSection( -#line 712 "VBNET.ATG" +#line 729 "VBNET.ATG" out section); -#line 712 "VBNET.ATG" +#line 729 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 715 "VBNET.ATG" +#line 732 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2198,10 +2246,10 @@ out section); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 720 "VBNET.ATG" +#line 737 "VBNET.ATG" out expr); -#line 720 "VBNET.ATG" +#line 737 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2209,7 +2257,7 @@ out expr); void InterfaceMemberDecl() { -#line 597 "VBNET.ATG" +#line 614 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2221,33 +2269,33 @@ out expr); if (StartOf(18)) { while (la.kind == 28) { AttributeSection( -#line 605 "VBNET.ATG" +#line 622 "VBNET.ATG" out section); -#line 605 "VBNET.ATG" +#line 622 "VBNET.ATG" attributes.Add(section); } while (StartOf(8)) { MemberModifier( -#line 608 "VBNET.ATG" +#line 625 "VBNET.ATG" mod); } if (la.kind == 94) { lexer.NextToken(); -#line 612 "VBNET.ATG" +#line 629 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 615 "VBNET.ATG" +#line 632 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 616 "VBNET.ATG" +#line 633 "VBNET.ATG" p); } Expect(26); @@ -2255,12 +2303,12 @@ p); if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 617 "VBNET.ATG" +#line 634 "VBNET.ATG" out type); } EndOfStmt(); -#line 620 "VBNET.ATG" +#line 637 "VBNET.ATG" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2271,29 +2319,29 @@ out type); } else if (la.kind == 168) { lexer.NextToken(); -#line 630 "VBNET.ATG" +#line 647 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 633 "VBNET.ATG" +#line 650 "VBNET.ATG" name = t.val; TypeParameterList( -#line 634 "VBNET.ATG" +#line 651 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 635 "VBNET.ATG" +#line 652 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 638 "VBNET.ATG" +#line 655 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2309,22 +2357,22 @@ p); } else if (la.kind == 101) { lexer.NextToken(); -#line 653 "VBNET.ATG" +#line 670 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 656 "VBNET.ATG" +#line 673 "VBNET.ATG" name = t.val; TypeParameterList( -#line 657 "VBNET.ATG" +#line 674 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 658 "VBNET.ATG" +#line 675 "VBNET.ATG" p); } Expect(26); @@ -2333,15 +2381,15 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 659 "VBNET.ATG" +#line 676 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 659 "VBNET.ATG" +#line 676 "VBNET.ATG" out type); } -#line 661 "VBNET.ATG" +#line 678 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2362,19 +2410,19 @@ out type); } else if (la.kind == 147) { lexer.NextToken(); -#line 681 "VBNET.ATG" +#line 698 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 684 "VBNET.ATG" +#line 701 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 685 "VBNET.ATG" +#line 702 "VBNET.ATG" p); } Expect(26); @@ -2382,18 +2430,18 @@ p); if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 686 "VBNET.ATG" +#line 703 "VBNET.ATG" out type); } -#line 688 "VBNET.ATG" +#line 705 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } EndOfStmt(); -#line 694 "VBNET.ATG" +#line 711 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2403,98 +2451,98 @@ out type); } else SynErr(230); } else if (StartOf(19)) { NonModuleDeclaration( -#line 702 "VBNET.ATG" +#line 719 "VBNET.ATG" mod, attributes); } else SynErr(231); } void Expr( -#line 1570 "VBNET.ATG" +#line 1587 "VBNET.ATG" out Expression expr) { DisjunctionExpr( -#line 1572 "VBNET.ATG" +#line 1589 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1543 "VBNET.ATG" +#line 1560 "VBNET.ATG" out List baseInterfaces) { -#line 1545 "VBNET.ATG" +#line 1562 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(108); NonArrayTypeName( -#line 1550 "VBNET.ATG" +#line 1567 "VBNET.ATG" out type, false); -#line 1551 "VBNET.ATG" +#line 1568 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1552 "VBNET.ATG" +#line 1569 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1554 "VBNET.ATG" +#line 1571 "VBNET.ATG" out type, false); -#line 1555 "VBNET.ATG" +#line 1572 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1556 "VBNET.ATG" +#line 1573 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1501 "VBNET.ATG" +#line 1518 "VBNET.ATG" out List handlesClause) { -#line 1503 "VBNET.ATG" +#line 1520 "VBNET.ATG" handlesClause = new List(); string name; Expect(106); EventMemberSpecifier( -#line 1506 "VBNET.ATG" +#line 1523 "VBNET.ATG" out name); -#line 1506 "VBNET.ATG" +#line 1523 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1507 "VBNET.ATG" +#line 1524 "VBNET.ATG" out name); -#line 1507 "VBNET.ATG" +#line 1524 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2220 "VBNET.ATG" +#line 2237 "VBNET.ATG" out Statement stmt) { -#line 2223 "VBNET.ATG" +#line 2240 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(20) || -#line 2229 "VBNET.ATG" +#line 2246 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2229 "VBNET.ATG" +#line 2246 "VBNET.ATG" IsEndStmtAhead()) { Expect(89); EndOfStmt(); -#line 2229 "VBNET.ATG" +#line 2246 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2502,7 +2550,7 @@ IsEndStmtAhead()) { } } -#line 2234 "VBNET.ATG" +#line 2251 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2510,26 +2558,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1493 "VBNET.ATG" +#line 1510 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1494 "VBNET.ATG" +#line 1511 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 101 || la.kind == 168) { } else if (la.kind == 48) { lexer.NextToken(); -#line 1495 "VBNET.ATG" +#line 1512 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 51) { lexer.NextToken(); -#line 1496 "VBNET.ATG" +#line 1513 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 177) { lexer.NextToken(); -#line 1497 "VBNET.ATG" +#line 1514 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(232); } @@ -2589,10 +2637,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1369 "VBNET.ATG" +#line 1386 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1371 "VBNET.ATG" +#line 1388 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2600,28 +2648,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1377 "VBNET.ATG" +#line 1394 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1377 "VBNET.ATG" +#line 1394 "VBNET.ATG" out dimension); } if ( -#line 1378 "VBNET.ATG" +#line 1395 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1378 "VBNET.ATG" +#line 1395 "VBNET.ATG" out rank); } if ( -#line 1380 "VBNET.ATG" +#line 1397 "VBNET.ATG" IsObjectCreation()) { Expect(49); ObjectCreateExpression( -#line 1380 "VBNET.ATG" +#line 1397 "VBNET.ATG" out expr); -#line 1382 "VBNET.ATG" +#line 1399 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2632,10 +2680,10 @@ out expr); if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 1389 "VBNET.ATG" +#line 1406 "VBNET.ATG" out type); -#line 1391 "VBNET.ATG" +#line 1408 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2648,7 +2696,7 @@ out type); } -#line 1403 "VBNET.ATG" +#line 1420 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2675,12 +2723,12 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1426 "VBNET.ATG" +#line 1443 "VBNET.ATG" out expr); } } else SynErr(234); -#line 1429 "VBNET.ATG" +#line 1446 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2689,22 +2737,22 @@ out expr); } void VariableDeclarator( -#line 1363 "VBNET.ATG" +#line 1380 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1365 "VBNET.ATG" +#line 1382 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1366 "VBNET.ATG" +#line 1383 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1344 "VBNET.ATG" +#line 1361 "VBNET.ATG" List constantDeclaration) { -#line 1346 "VBNET.ATG" +#line 1363 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2712,20 +2760,20 @@ List constantDeclaration) { Identifier(); -#line 1351 "VBNET.ATG" +#line 1368 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 1352 "VBNET.ATG" +#line 1369 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1353 "VBNET.ATG" +#line 1370 "VBNET.ATG" out expr); -#line 1355 "VBNET.ATG" +#line 1372 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2734,10 +2782,10 @@ out expr); } void AccessorDecls( -#line 1278 "VBNET.ATG" +#line 1295 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1280 "VBNET.ATG" +#line 1297 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2745,60 +2793,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 28) { AttributeSection( -#line 1285 "VBNET.ATG" +#line 1302 "VBNET.ATG" out section); -#line 1285 "VBNET.ATG" +#line 1302 "VBNET.ATG" attributes.Add(section); } if (StartOf(22)) { GetAccessorDecl( -#line 1287 "VBNET.ATG" +#line 1304 "VBNET.ATG" out getBlock, attributes); if (StartOf(23)) { -#line 1289 "VBNET.ATG" +#line 1306 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1290 "VBNET.ATG" +#line 1307 "VBNET.ATG" out section); -#line 1290 "VBNET.ATG" +#line 1307 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1291 "VBNET.ATG" +#line 1308 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(24)) { SetAccessorDecl( -#line 1294 "VBNET.ATG" +#line 1311 "VBNET.ATG" out setBlock, attributes); if (StartOf(25)) { -#line 1296 "VBNET.ATG" +#line 1313 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1297 "VBNET.ATG" +#line 1314 "VBNET.ATG" out section); -#line 1297 "VBNET.ATG" +#line 1314 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1298 "VBNET.ATG" +#line 1315 "VBNET.ATG" out getBlock, attributes); } } else SynErr(235); } void EventAccessorDeclaration( -#line 1241 "VBNET.ATG" +#line 1258 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1243 "VBNET.ATG" +#line 1260 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2807,10 +2855,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 28) { AttributeSection( -#line 1249 "VBNET.ATG" +#line 1266 "VBNET.ATG" out section); -#line 1249 "VBNET.ATG" +#line 1266 "VBNET.ATG" attributes.Add(section); } if (la.kind == 43) { @@ -2819,20 +2867,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1251 "VBNET.ATG" +#line 1268 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1252 "VBNET.ATG" +#line 1269 "VBNET.ATG" out stmt); Expect(89); Expect(43); EndOfStmt(); -#line 1254 "VBNET.ATG" +#line 1271 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2843,20 +2891,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1259 "VBNET.ATG" +#line 1276 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1260 "VBNET.ATG" +#line 1277 "VBNET.ATG" out stmt); Expect(89); Expect(153); EndOfStmt(); -#line 1262 "VBNET.ATG" +#line 1279 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2867,20 +2915,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1267 "VBNET.ATG" +#line 1284 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1268 "VBNET.ATG" +#line 1285 "VBNET.ATG" out stmt); Expect(89); Expect(150); EndOfStmt(); -#line 1270 "VBNET.ATG" +#line 1287 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2889,163 +2937,163 @@ out stmt); } void OverloadableOperator( -#line 1183 "VBNET.ATG" +#line 1200 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1184 "VBNET.ATG" +#line 1201 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 14: { lexer.NextToken(); -#line 1186 "VBNET.ATG" +#line 1203 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 15: { lexer.NextToken(); -#line 1188 "VBNET.ATG" +#line 1205 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 16: { lexer.NextToken(); -#line 1190 "VBNET.ATG" +#line 1207 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 17: { lexer.NextToken(); -#line 1192 "VBNET.ATG" +#line 1209 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 18: { lexer.NextToken(); -#line 1194 "VBNET.ATG" +#line 1211 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 19: { lexer.NextToken(); -#line 1196 "VBNET.ATG" +#line 1213 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 117: { lexer.NextToken(); -#line 1198 "VBNET.ATG" +#line 1215 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 121: { lexer.NextToken(); -#line 1200 "VBNET.ATG" +#line 1217 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 46: { lexer.NextToken(); -#line 1202 "VBNET.ATG" +#line 1219 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 139: { lexer.NextToken(); -#line 1204 "VBNET.ATG" +#line 1221 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 186: { lexer.NextToken(); -#line 1206 "VBNET.ATG" +#line 1223 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1208 "VBNET.ATG" +#line 1225 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 32: { lexer.NextToken(); -#line 1210 "VBNET.ATG" +#line 1227 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1212 "VBNET.ATG" +#line 1229 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 11: { lexer.NextToken(); -#line 1214 "VBNET.ATG" +#line 1231 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 1216 "VBNET.ATG" +#line 1233 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 28: { lexer.NextToken(); -#line 1218 "VBNET.ATG" +#line 1235 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 31: { lexer.NextToken(); -#line 1220 "VBNET.ATG" +#line 1237 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 27: { lexer.NextToken(); -#line 1222 "VBNET.ATG" +#line 1239 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1224 "VBNET.ATG" +#line 1241 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 76: { lexer.NextToken(); -#line 1226 "VBNET.ATG" +#line 1243 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 48: case 50: case 51: case 52: case 71: case 96: case 135: case 145: case 170: case 177: case 178: case 206: { Identifier(); -#line 1230 "VBNET.ATG" +#line 1247 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3062,67 +3110,67 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1304 "VBNET.ATG" +#line 1321 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1305 "VBNET.ATG" +#line 1322 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1307 "VBNET.ATG" +#line 1324 "VBNET.ATG" out m); Expect(102); -#line 1309 "VBNET.ATG" +#line 1326 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1311 "VBNET.ATG" +#line 1328 "VBNET.ATG" out stmt); -#line 1312 "VBNET.ATG" +#line 1329 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(89); Expect(102); -#line 1314 "VBNET.ATG" +#line 1331 "VBNET.ATG" getBlock.Modifier = m; -#line 1315 "VBNET.ATG" +#line 1332 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1320 "VBNET.ATG" +#line 1337 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1322 "VBNET.ATG" +#line 1339 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1327 "VBNET.ATG" +#line 1344 "VBNET.ATG" out m); Expect(157); -#line 1329 "VBNET.ATG" +#line 1346 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1330 "VBNET.ATG" +#line 1347 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1332 "VBNET.ATG" +#line 1349 "VBNET.ATG" out stmt); -#line 1334 "VBNET.ATG" +#line 1351 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3130,73 +3178,73 @@ out stmt); Expect(89); Expect(157); -#line 1339 "VBNET.ATG" +#line 1356 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 2906 "VBNET.ATG" +#line 2923 "VBNET.ATG" out Modifiers m) { -#line 2907 "VBNET.ATG" +#line 2924 "VBNET.ATG" m = Modifiers.None; while (StartOf(26)) { if (la.kind == 149) { lexer.NextToken(); -#line 2909 "VBNET.ATG" +#line 2926 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 148) { lexer.NextToken(); -#line 2910 "VBNET.ATG" +#line 2927 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 100) { lexer.NextToken(); -#line 2911 "VBNET.ATG" +#line 2928 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 2912 "VBNET.ATG" +#line 2929 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1437 "VBNET.ATG" +#line 1454 "VBNET.ATG" out List arrayModifiers) { -#line 1439 "VBNET.ATG" +#line 1456 "VBNET.ATG" arrayModifiers = null; Expect(25); InitializationRankList( -#line 1441 "VBNET.ATG" +#line 1458 "VBNET.ATG" out arrayModifiers); Expect(26); } void ArrayNameModifier( -#line 2015 "VBNET.ATG" +#line 2032 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2017 "VBNET.ATG" +#line 2034 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2019 "VBNET.ATG" +#line 2036 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1868 "VBNET.ATG" +#line 1885 "VBNET.ATG" out Expression oce) { -#line 1870 "VBNET.ATG" +#line 1887 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3206,38 +3254,38 @@ out Expression oce) { Expect(128); NonArrayTypeName( -#line 1877 "VBNET.ATG" +#line 1894 "VBNET.ATG" out type, false); if (la.kind == 25) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1878 "VBNET.ATG" +#line 1895 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(26); if (la.kind == 23 || -#line 1879 "VBNET.ATG" +#line 1896 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1879 "VBNET.ATG" +#line 1896 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1880 "VBNET.ATG" +#line 1897 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1881 "VBNET.ATG" +#line 1898 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1882 "VBNET.ATG" +#line 1899 "VBNET.ATG" out initializer); } } -#line 1884 "VBNET.ATG" +#line 1901 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } -#line 1887 "VBNET.ATG" +#line 1904 "VBNET.ATG" if (type == null) type = new TypeReference("Object"); // fallback type on parser errors if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); @@ -3253,106 +3301,106 @@ out initializer); } void VariableInitializer( -#line 1465 "VBNET.ATG" +#line 1482 "VBNET.ATG" out Expression initializerExpression) { -#line 1467 "VBNET.ATG" +#line 1484 "VBNET.ATG" initializerExpression = null; if (StartOf(27)) { Expr( -#line 1469 "VBNET.ATG" +#line 1486 "VBNET.ATG" out initializerExpression); } else if (la.kind == 23) { CollectionInitializer( -#line 1470 "VBNET.ATG" +#line 1487 "VBNET.ATG" out initializerExpression); } else SynErr(238); } void InitializationRankList( -#line 1445 "VBNET.ATG" +#line 1462 "VBNET.ATG" out List rank) { -#line 1447 "VBNET.ATG" +#line 1464 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1450 "VBNET.ATG" +#line 1467 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 1451 "VBNET.ATG" +#line 1468 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1452 "VBNET.ATG" +#line 1469 "VBNET.ATG" out expr); } -#line 1454 "VBNET.ATG" +#line 1471 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1456 "VBNET.ATG" +#line 1473 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 1457 "VBNET.ATG" +#line 1474 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1458 "VBNET.ATG" +#line 1475 "VBNET.ATG" out expr); } -#line 1460 "VBNET.ATG" +#line 1477 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1474 "VBNET.ATG" +#line 1491 "VBNET.ATG" out Expression outExpr) { -#line 1476 "VBNET.ATG" +#line 1493 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(23); if (StartOf(28)) { VariableInitializer( -#line 1481 "VBNET.ATG" +#line 1498 "VBNET.ATG" out expr); -#line 1483 "VBNET.ATG" +#line 1500 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1486 "VBNET.ATG" +#line 1503 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1486 "VBNET.ATG" +#line 1503 "VBNET.ATG" out expr); -#line 1487 "VBNET.ATG" +#line 1504 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(24); -#line 1490 "VBNET.ATG" +#line 1507 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1560 "VBNET.ATG" +#line 1577 "VBNET.ATG" out string name) { -#line 1561 "VBNET.ATG" +#line 1578 "VBNET.ATG" string eventName; if (StartOf(13)) { Identifier(); @@ -3362,136 +3410,136 @@ out string name) { lexer.NextToken(); } else SynErr(239); -#line 1564 "VBNET.ATG" +#line 1581 "VBNET.ATG" name = t.val; Expect(10); IdentifierOrKeyword( -#line 1566 "VBNET.ATG" +#line 1583 "VBNET.ATG" out eventName); -#line 1567 "VBNET.ATG" +#line 1584 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 2840 "VBNET.ATG" +#line 2857 "VBNET.ATG" out string name) { -#line 2842 "VBNET.ATG" +#line 2859 "VBNET.ATG" lexer.NextToken(); name = t.val; } void DisjunctionExpr( -#line 1712 "VBNET.ATG" +#line 1729 "VBNET.ATG" out Expression outExpr) { -#line 1714 "VBNET.ATG" +#line 1731 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1717 "VBNET.ATG" +#line 1734 "VBNET.ATG" out outExpr); while (la.kind == 139 || la.kind == 140 || la.kind == 186) { if (la.kind == 139) { lexer.NextToken(); -#line 1720 "VBNET.ATG" +#line 1737 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 140) { lexer.NextToken(); -#line 1721 "VBNET.ATG" +#line 1738 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1722 "VBNET.ATG" +#line 1739 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1724 "VBNET.ATG" +#line 1741 "VBNET.ATG" out expr); -#line 1724 "VBNET.ATG" +#line 1741 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1575 "VBNET.ATG" +#line 1592 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1576 "VBNET.ATG" +#line 1593 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1577 "VBNET.ATG" +#line 1594 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 42: { lexer.NextToken(); -#line 1578 "VBNET.ATG" +#line 1595 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 34: { lexer.NextToken(); -#line 1579 "VBNET.ATG" +#line 1596 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 36: { lexer.NextToken(); -#line 1580 "VBNET.ATG" +#line 1597 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 37: { lexer.NextToken(); -#line 1581 "VBNET.ATG" +#line 1598 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 38: { lexer.NextToken(); -#line 1582 "VBNET.ATG" +#line 1599 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 39: { lexer.NextToken(); -#line 1583 "VBNET.ATG" +#line 1600 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 35: { lexer.NextToken(); -#line 1584 "VBNET.ATG" +#line 1601 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 40: { lexer.NextToken(); -#line 1585 "VBNET.ATG" +#line 1602 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 41: { lexer.NextToken(); -#line 1586 "VBNET.ATG" +#line 1603 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3500,44 +3548,44 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1590 "VBNET.ATG" +#line 1607 "VBNET.ATG" out Expression pexpr) { -#line 1591 "VBNET.ATG" +#line 1608 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1593 "VBNET.ATG" +#line 1610 "VBNET.ATG" out pexpr); while (la.kind == 10 || la.kind == 22 || la.kind == 25) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1595 "VBNET.ATG" +#line 1612 "VBNET.ATG" out name); -#line 1595 "VBNET.ATG" +#line 1612 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); } else if (la.kind == 22) { lexer.NextToken(); IdentifierOrKeyword( -#line 1596 "VBNET.ATG" +#line 1613 "VBNET.ATG" out name); -#line 1596 "VBNET.ATG" +#line 1613 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); } else { InvocationExpression( -#line 1597 "VBNET.ATG" +#line 1614 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1601 "VBNET.ATG" +#line 1618 "VBNET.ATG" out Expression pexpr) { -#line 1603 "VBNET.ATG" +#line 1620 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -3548,146 +3596,146 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1611 "VBNET.ATG" +#line 1628 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1612 "VBNET.ATG" +#line 1629 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1613 "VBNET.ATG" +#line 1630 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1614 "VBNET.ATG" +#line 1631 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1615 "VBNET.ATG" +#line 1632 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1616 "VBNET.ATG" +#line 1633 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1617 "VBNET.ATG" +#line 1634 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 174: { lexer.NextToken(); -#line 1619 "VBNET.ATG" +#line 1636 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 97: { lexer.NextToken(); -#line 1620 "VBNET.ATG" +#line 1637 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 131: { lexer.NextToken(); -#line 1621 "VBNET.ATG" +#line 1638 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 25: { lexer.NextToken(); Expr( -#line 1622 "VBNET.ATG" +#line 1639 "VBNET.ATG" out expr); Expect(26); -#line 1622 "VBNET.ATG" +#line 1639 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 48: case 50: case 51: case 52: case 71: case 96: case 135: case 145: case 170: case 177: case 178: case 206: { Identifier(); -#line 1624 "VBNET.ATG" +#line 1641 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); -#line 1625 "VBNET.ATG" +#line 1642 "VBNET.ATG" pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; break; } case 53: case 55: case 66: case 77: case 78: case 85: case 112: case 118: case 134: case 160: case 161: case 166: case 192: case 193: case 194: case 195: { -#line 1626 "VBNET.ATG" +#line 1643 "VBNET.ATG" string val = String.Empty; if (StartOf(10)) { PrimitiveTypeName( -#line 1627 "VBNET.ATG" +#line 1644 "VBNET.ATG" out val); } else if (la.kind == 134) { lexer.NextToken(); -#line 1627 "VBNET.ATG" +#line 1644 "VBNET.ATG" val = "Object"; } else SynErr(241); Expect(10); -#line 1628 "VBNET.ATG" +#line 1645 "VBNET.ATG" t.val = ""; Identifier(); -#line 1628 "VBNET.ATG" +#line 1645 "VBNET.ATG" pexpr = new MemberReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 120: { lexer.NextToken(); -#line 1629 "VBNET.ATG" +#line 1646 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 125: case 126: { -#line 1630 "VBNET.ATG" +#line 1647 "VBNET.ATG" Expression retExpr = null; if (la.kind == 125) { lexer.NextToken(); -#line 1631 "VBNET.ATG" +#line 1648 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 126) { lexer.NextToken(); -#line 1632 "VBNET.ATG" +#line 1649 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(242); Expect(10); IdentifierOrKeyword( -#line 1634 "VBNET.ATG" +#line 1651 "VBNET.ATG" out name); -#line 1634 "VBNET.ATG" +#line 1651 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -3696,77 +3744,77 @@ out name); Expect(10); Identifier(); -#line 1636 "VBNET.ATG" +#line 1653 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1638 "VBNET.ATG" +#line 1655 "VBNET.ATG" type.IsGlobal = true; -#line 1639 "VBNET.ATG" +#line 1656 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 128: { ObjectCreateExpression( -#line 1640 "VBNET.ATG" +#line 1657 "VBNET.ATG" out expr); -#line 1640 "VBNET.ATG" +#line 1657 "VBNET.ATG" pexpr = expr; break; } case 76: case 83: case 201: { -#line 1642 "VBNET.ATG" +#line 1659 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 83) { lexer.NextToken(); } else if (la.kind == 76) { lexer.NextToken(); -#line 1644 "VBNET.ATG" +#line 1661 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 201) { lexer.NextToken(); -#line 1645 "VBNET.ATG" +#line 1662 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(243); Expect(25); Expr( -#line 1647 "VBNET.ATG" +#line 1664 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1647 "VBNET.ATG" +#line 1664 "VBNET.ATG" out type); Expect(26); -#line 1648 "VBNET.ATG" +#line 1665 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 69: case 70: case 73: case 74: case 75: case 196: case 197: case 198: case 199: { CastTarget( -#line 1649 "VBNET.ATG" +#line 1666 "VBNET.ATG" out type); Expect(25); Expr( -#line 1649 "VBNET.ATG" +#line 1666 "VBNET.ATG" out expr); Expect(26); -#line 1649 "VBNET.ATG" +#line 1666 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 44: { lexer.NextToken(); Expr( -#line 1650 "VBNET.ATG" +#line 1667 "VBNET.ATG" out expr); -#line 1650 "VBNET.ATG" +#line 1667 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3774,25 +3822,25 @@ out expr); lexer.NextToken(); Expect(25); GetTypeTypeName( -#line 1651 "VBNET.ATG" +#line 1668 "VBNET.ATG" out type); Expect(26); -#line 1651 "VBNET.ATG" +#line 1668 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 176: { lexer.NextToken(); SimpleExpr( -#line 1652 "VBNET.ATG" +#line 1669 "VBNET.ATG" out expr); Expect(114); TypeName( -#line 1652 "VBNET.ATG" +#line 1669 "VBNET.ATG" out type); -#line 1652 "VBNET.ATG" +#line 1669 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } @@ -3800,41 +3848,41 @@ out type); } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1656 "VBNET.ATG" +#line 1673 "VBNET.ATG" out name); -#line 1656 "VBNET.ATG" +#line 1673 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); } else SynErr(244); } void InvocationExpression( -#line 1660 "VBNET.ATG" +#line 1677 "VBNET.ATG" ref Expression pexpr) { -#line 1661 "VBNET.ATG" +#line 1678 "VBNET.ATG" List typeParameters = new List(); List parameters = null; TypeReference type; Expect(25); -#line 1665 "VBNET.ATG" +#line 1682 "VBNET.ATG" Location start = t.Location; if (la.kind == 202) { lexer.NextToken(); TypeName( -#line 1667 "VBNET.ATG" +#line 1684 "VBNET.ATG" out type); -#line 1667 "VBNET.ATG" +#line 1684 "VBNET.ATG" if (type != null) typeParameters.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1670 "VBNET.ATG" +#line 1687 "VBNET.ATG" out type); -#line 1670 "VBNET.ATG" +#line 1687 "VBNET.ATG" if (type != null) typeParameters.Add(type); } Expect(26); @@ -3842,141 +3890,141 @@ out type); lexer.NextToken(); Identifier(); -#line 1675 "VBNET.ATG" +#line 1692 "VBNET.ATG" pexpr = new MemberReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); } else if (la.kind == 25) { lexer.NextToken(); ArgumentList( -#line 1677 "VBNET.ATG" +#line 1694 "VBNET.ATG" out parameters); Expect(26); -#line 1679 "VBNET.ATG" +#line 1696 "VBNET.ATG" pexpr = CreateInvocationExpression(pexpr, parameters, typeParameters); } else SynErr(245); } else if (StartOf(30)) { ArgumentList( -#line 1681 "VBNET.ATG" +#line 1698 "VBNET.ATG" out parameters); Expect(26); -#line 1683 "VBNET.ATG" +#line 1700 "VBNET.ATG" pexpr = CreateInvocationExpression(pexpr, parameters, typeParameters); } else SynErr(246); -#line 1685 "VBNET.ATG" +#line 1702 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 2847 "VBNET.ATG" +#line 2864 "VBNET.ATG" out string type) { -#line 2848 "VBNET.ATG" +#line 2865 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 53: { lexer.NextToken(); -#line 2849 "VBNET.ATG" +#line 2866 "VBNET.ATG" type = "Boolean"; break; } case 77: { lexer.NextToken(); -#line 2850 "VBNET.ATG" +#line 2867 "VBNET.ATG" type = "Date"; break; } case 66: { lexer.NextToken(); -#line 2851 "VBNET.ATG" +#line 2868 "VBNET.ATG" type = "Char"; break; } case 166: { lexer.NextToken(); -#line 2852 "VBNET.ATG" +#line 2869 "VBNET.ATG" type = "String"; break; } case 78: { lexer.NextToken(); -#line 2853 "VBNET.ATG" +#line 2870 "VBNET.ATG" type = "Decimal"; break; } case 55: { lexer.NextToken(); -#line 2854 "VBNET.ATG" +#line 2871 "VBNET.ATG" type = "Byte"; break; } case 160: { lexer.NextToken(); -#line 2855 "VBNET.ATG" +#line 2872 "VBNET.ATG" type = "Short"; break; } case 112: { lexer.NextToken(); -#line 2856 "VBNET.ATG" +#line 2873 "VBNET.ATG" type = "Integer"; break; } case 118: { lexer.NextToken(); -#line 2857 "VBNET.ATG" +#line 2874 "VBNET.ATG" type = "Long"; break; } case 161: { lexer.NextToken(); -#line 2858 "VBNET.ATG" +#line 2875 "VBNET.ATG" type = "Single"; break; } case 85: { lexer.NextToken(); -#line 2859 "VBNET.ATG" +#line 2876 "VBNET.ATG" type = "Double"; break; } case 193: { lexer.NextToken(); -#line 2860 "VBNET.ATG" +#line 2877 "VBNET.ATG" type = "UInteger"; break; } case 194: { lexer.NextToken(); -#line 2861 "VBNET.ATG" +#line 2878 "VBNET.ATG" type = "ULong"; break; } case 195: { lexer.NextToken(); -#line 2862 "VBNET.ATG" +#line 2879 "VBNET.ATG" type = "UShort"; break; } case 192: { lexer.NextToken(); -#line 2863 "VBNET.ATG" +#line 2880 "VBNET.ATG" type = "SByte"; break; } @@ -3985,122 +4033,122 @@ out string type) { } void CastTarget( -#line 1690 "VBNET.ATG" +#line 1707 "VBNET.ATG" out TypeReference type) { -#line 1692 "VBNET.ATG" +#line 1709 "VBNET.ATG" type = null; switch (la.kind) { case 60: { lexer.NextToken(); -#line 1694 "VBNET.ATG" +#line 1711 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 61: { lexer.NextToken(); -#line 1695 "VBNET.ATG" +#line 1712 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 196: { lexer.NextToken(); -#line 1696 "VBNET.ATG" +#line 1713 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 62: { lexer.NextToken(); -#line 1697 "VBNET.ATG" +#line 1714 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 63: { lexer.NextToken(); -#line 1698 "VBNET.ATG" +#line 1715 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 65: { lexer.NextToken(); -#line 1699 "VBNET.ATG" +#line 1716 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 64: { lexer.NextToken(); -#line 1700 "VBNET.ATG" +#line 1717 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 73: { lexer.NextToken(); -#line 1701 "VBNET.ATG" +#line 1718 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 67: { lexer.NextToken(); -#line 1702 "VBNET.ATG" +#line 1719 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 69: { lexer.NextToken(); -#line 1703 "VBNET.ATG" +#line 1720 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 197: { lexer.NextToken(); -#line 1704 "VBNET.ATG" +#line 1721 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 198: { lexer.NextToken(); -#line 1705 "VBNET.ATG" +#line 1722 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 199: { lexer.NextToken(); -#line 1706 "VBNET.ATG" +#line 1723 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 70: { lexer.NextToken(); -#line 1707 "VBNET.ATG" +#line 1724 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 74: { lexer.NextToken(); -#line 1708 "VBNET.ATG" +#line 1725 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 75: { lexer.NextToken(); -#line 1709 "VBNET.ATG" +#line 1726 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -4109,19 +4157,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 1967 "VBNET.ATG" +#line 1984 "VBNET.ATG" out TypeReference typeref) { -#line 1968 "VBNET.ATG" +#line 1985 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1970 "VBNET.ATG" +#line 1987 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 1971 "VBNET.ATG" +#line 1988 "VBNET.ATG" out rank); -#line 1972 "VBNET.ATG" +#line 1989 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4129,348 +4177,348 @@ out rank); } void ArgumentList( -#line 1902 "VBNET.ATG" +#line 1919 "VBNET.ATG" out List arguments) { -#line 1904 "VBNET.ATG" +#line 1921 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(27)) { Argument( -#line 1907 "VBNET.ATG" +#line 1924 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1908 "VBNET.ATG" +#line 1925 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(27)) { Argument( -#line 1909 "VBNET.ATG" +#line 1926 "VBNET.ATG" out expr); } -#line 1910 "VBNET.ATG" +#line 1927 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 1912 "VBNET.ATG" +#line 1929 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1728 "VBNET.ATG" +#line 1745 "VBNET.ATG" out Expression outExpr) { -#line 1730 "VBNET.ATG" +#line 1747 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1733 "VBNET.ATG" +#line 1750 "VBNET.ATG" out outExpr); while (la.kind == 46 || la.kind == 47) { if (la.kind == 46) { lexer.NextToken(); -#line 1736 "VBNET.ATG" +#line 1753 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1737 "VBNET.ATG" +#line 1754 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1739 "VBNET.ATG" +#line 1756 "VBNET.ATG" out expr); -#line 1739 "VBNET.ATG" +#line 1756 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1743 "VBNET.ATG" +#line 1760 "VBNET.ATG" out Expression outExpr) { -#line 1744 "VBNET.ATG" +#line 1761 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 130) { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1762 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1746 "VBNET.ATG" +#line 1763 "VBNET.ATG" out outExpr); -#line 1747 "VBNET.ATG" +#line 1764 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1752 "VBNET.ATG" +#line 1769 "VBNET.ATG" out Expression outExpr) { -#line 1754 "VBNET.ATG" +#line 1771 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1757 "VBNET.ATG" +#line 1774 "VBNET.ATG" out outExpr); while (StartOf(31)) { switch (la.kind) { case 28: { lexer.NextToken(); -#line 1760 "VBNET.ATG" +#line 1777 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 1761 "VBNET.ATG" +#line 1778 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 1762 "VBNET.ATG" +#line 1779 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 1763 "VBNET.ATG" +#line 1780 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1764 "VBNET.ATG" +#line 1781 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 11: { lexer.NextToken(); -#line 1765 "VBNET.ATG" +#line 1782 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 117: { lexer.NextToken(); -#line 1766 "VBNET.ATG" +#line 1783 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 114: { lexer.NextToken(); -#line 1767 "VBNET.ATG" +#line 1784 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 191: { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1785 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(32)) { ShiftExpr( -#line 1771 "VBNET.ATG" +#line 1788 "VBNET.ATG" out expr); -#line 1771 "VBNET.ATG" +#line 1788 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 130) { lexer.NextToken(); ShiftExpr( -#line 1774 "VBNET.ATG" +#line 1791 "VBNET.ATG" out expr); -#line 1774 "VBNET.ATG" +#line 1791 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); } else SynErr(249); } } void ShiftExpr( -#line 1779 "VBNET.ATG" +#line 1796 "VBNET.ATG" out Expression outExpr) { -#line 1781 "VBNET.ATG" +#line 1798 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1784 "VBNET.ATG" +#line 1801 "VBNET.ATG" out outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 32) { lexer.NextToken(); -#line 1787 "VBNET.ATG" +#line 1804 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1788 "VBNET.ATG" +#line 1805 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1790 "VBNET.ATG" +#line 1807 "VBNET.ATG" out expr); -#line 1790 "VBNET.ATG" +#line 1807 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1794 "VBNET.ATG" +#line 1811 "VBNET.ATG" out Expression outExpr) { -#line 1795 "VBNET.ATG" +#line 1812 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1797 "VBNET.ATG" +#line 1814 "VBNET.ATG" out outExpr); while (la.kind == 19) { lexer.NextToken(); AdditiveExpr( -#line 1797 "VBNET.ATG" +#line 1814 "VBNET.ATG" out expr); -#line 1797 "VBNET.ATG" +#line 1814 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1800 "VBNET.ATG" +#line 1817 "VBNET.ATG" out Expression outExpr) { -#line 1802 "VBNET.ATG" +#line 1819 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1805 "VBNET.ATG" +#line 1822 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15) { if (la.kind == 14) { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1825 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1826 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1811 "VBNET.ATG" +#line 1828 "VBNET.ATG" out expr); -#line 1811 "VBNET.ATG" +#line 1828 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1815 "VBNET.ATG" +#line 1832 "VBNET.ATG" out Expression outExpr) { -#line 1816 "VBNET.ATG" +#line 1833 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1818 "VBNET.ATG" +#line 1835 "VBNET.ATG" out outExpr); while (la.kind == 121) { lexer.NextToken(); IntegerDivisionExpr( -#line 1818 "VBNET.ATG" +#line 1835 "VBNET.ATG" out expr); -#line 1818 "VBNET.ATG" +#line 1835 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1821 "VBNET.ATG" +#line 1838 "VBNET.ATG" out Expression outExpr) { -#line 1822 "VBNET.ATG" +#line 1839 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1824 "VBNET.ATG" +#line 1841 "VBNET.ATG" out outExpr); while (la.kind == 18) { lexer.NextToken(); MultiplicativeExpr( -#line 1824 "VBNET.ATG" +#line 1841 "VBNET.ATG" out expr); -#line 1824 "VBNET.ATG" +#line 1841 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1827 "VBNET.ATG" +#line 1844 "VBNET.ATG" out Expression outExpr) { -#line 1829 "VBNET.ATG" +#line 1846 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1832 "VBNET.ATG" +#line 1849 "VBNET.ATG" out outExpr); while (la.kind == 16 || la.kind == 17) { if (la.kind == 16) { lexer.NextToken(); -#line 1835 "VBNET.ATG" +#line 1852 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1836 "VBNET.ATG" +#line 1853 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1838 "VBNET.ATG" +#line 1855 "VBNET.ATG" out expr); -#line 1838 "VBNET.ATG" +#line 1855 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1842 "VBNET.ATG" +#line 1859 "VBNET.ATG" out Expression uExpr) { -#line 1844 "VBNET.ATG" +#line 1861 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4479,25 +4527,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1848 "VBNET.ATG" +#line 1865 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1866 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1850 "VBNET.ATG" +#line 1867 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 1852 "VBNET.ATG" +#line 1869 "VBNET.ATG" out expr); -#line 1854 "VBNET.ATG" +#line 1871 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4507,107 +4555,107 @@ out expr); } void ExponentiationExpr( -#line 1862 "VBNET.ATG" +#line 1879 "VBNET.ATG" out Expression outExpr) { -#line 1863 "VBNET.ATG" +#line 1880 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1865 "VBNET.ATG" +#line 1882 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1865 "VBNET.ATG" +#line 1882 "VBNET.ATG" out expr); -#line 1865 "VBNET.ATG" +#line 1882 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 1916 "VBNET.ATG" +#line 1933 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 1918 "VBNET.ATG" +#line 1935 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(27)) { Argument( -#line 1923 "VBNET.ATG" +#line 1940 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 1924 "VBNET.ATG" +#line 1941 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 1925 "VBNET.ATG" +#line 1942 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 1928 "VBNET.ATG" +#line 1945 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 1929 "VBNET.ATG" +#line 1946 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 1930 "VBNET.ATG" +#line 1947 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(27)) { Argument( -#line 1931 "VBNET.ATG" +#line 1948 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 1932 "VBNET.ATG" +#line 1949 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 1933 "VBNET.ATG" +#line 1950 "VBNET.ATG" out expr); } } -#line 1935 "VBNET.ATG" +#line 1952 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 1937 "VBNET.ATG" +#line 1954 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2024 "VBNET.ATG" +#line 2041 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2026 "VBNET.ATG" +#line 2043 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2029 "VBNET.ATG" +#line 2046 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2031 "VBNET.ATG" +#line 2048 "VBNET.ATG" out i); } -#line 2033 "VBNET.ATG" +#line 2050 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2038 "VBNET.ATG" +#line 2055 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4615,69 +4663,69 @@ out i); } void Argument( -#line 1941 "VBNET.ATG" +#line 1958 "VBNET.ATG" out Expression argumentexpr) { -#line 1943 "VBNET.ATG" +#line 1960 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1947 "VBNET.ATG" +#line 1964 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1947 "VBNET.ATG" +#line 1964 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1947 "VBNET.ATG" +#line 1964 "VBNET.ATG" out expr); -#line 1949 "VBNET.ATG" +#line 1966 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(27)) { Expr( -#line 1952 "VBNET.ATG" +#line 1969 "VBNET.ATG" out argumentexpr); } else SynErr(250); } void QualIdentAndTypeArguments( -#line 1998 "VBNET.ATG" +#line 2015 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1999 "VBNET.ATG" +#line 2016 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2001 "VBNET.ATG" +#line 2018 "VBNET.ATG" out name); -#line 2002 "VBNET.ATG" +#line 2019 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2003 "VBNET.ATG" +#line 2020 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(202); if ( -#line 2005 "VBNET.ATG" +#line 2022 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2006 "VBNET.ATG" +#line 2023 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2007 "VBNET.ATG" +#line 2024 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(6)) { TypeArgumentList( -#line 2008 "VBNET.ATG" +#line 2025 "VBNET.ATG" typeref.GenericTypes); } else SynErr(251); Expect(26); @@ -4685,48 +4733,48 @@ typeref.GenericTypes); } void TypeArgumentList( -#line 2051 "VBNET.ATG" +#line 2068 "VBNET.ATG" List typeArguments) { -#line 2053 "VBNET.ATG" +#line 2070 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2055 "VBNET.ATG" +#line 2072 "VBNET.ATG" out typeref); -#line 2055 "VBNET.ATG" +#line 2072 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2058 "VBNET.ATG" +#line 2075 "VBNET.ATG" out typeref); -#line 2058 "VBNET.ATG" +#line 2075 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2045 "VBNET.ATG" +#line 2062 "VBNET.ATG" out int i) { -#line 2046 "VBNET.ATG" +#line 2063 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2047 "VBNET.ATG" +#line 2064 "VBNET.ATG" ++i; } } void Attribute( -#line 2086 "VBNET.ATG" +#line 2103 "VBNET.ATG" out ASTAttribute attribute) { -#line 2087 "VBNET.ATG" +#line 2104 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4736,39 +4784,39 @@ out ASTAttribute attribute) { Expect(10); } Qualident( -#line 2092 "VBNET.ATG" +#line 2109 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2093 "VBNET.ATG" +#line 2110 "VBNET.ATG" positional, named); } -#line 2094 "VBNET.ATG" +#line 2111 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2098 "VBNET.ATG" +#line 2115 "VBNET.ATG" List positional, List named) { -#line 2100 "VBNET.ATG" +#line 2117 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2106 "VBNET.ATG" +#line 2123 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2108 "VBNET.ATG" +#line 2125 "VBNET.ATG" IsNamedAssign()) { -#line 2108 "VBNET.ATG" +#line 2125 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2109 "VBNET.ATG" +#line 2126 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4776,10 +4824,10 @@ out name); Expect(11); } Expr( -#line 2111 "VBNET.ATG" +#line 2128 "VBNET.ATG" out expr); -#line 2113 "VBNET.ATG" +#line 2130 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -4788,13 +4836,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2121 "VBNET.ATG" +#line 2138 "VBNET.ATG" IsNamedAssign()) { -#line 2121 "VBNET.ATG" +#line 2138 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2122 "VBNET.ATG" +#line 2139 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4802,14 +4850,14 @@ out name); Expect(11); } else if (StartOf(27)) { -#line 2124 "VBNET.ATG" +#line 2141 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(252); Expr( -#line 2125 "VBNET.ATG" +#line 2142 "VBNET.ATG" out expr); -#line 2125 "VBNET.ATG" +#line 2142 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4820,10 +4868,10 @@ out expr); } void FormalParameter( -#line 2182 "VBNET.ATG" +#line 2199 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2184 "VBNET.ATG" +#line 2201 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -4834,36 +4882,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2193 "VBNET.ATG" +#line 2210 "VBNET.ATG" out section); -#line 2193 "VBNET.ATG" +#line 2210 "VBNET.ATG" attributes.Add(section); } while (StartOf(33)) { ParameterModifier( -#line 2194 "VBNET.ATG" +#line 2211 "VBNET.ATG" mod); } Identifier(); -#line 2195 "VBNET.ATG" +#line 2212 "VBNET.ATG" string parameterName = t.val; if ( -#line 2196 "VBNET.ATG" +#line 2213 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2196 "VBNET.ATG" +#line 2213 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2197 "VBNET.ATG" +#line 2214 "VBNET.ATG" out type); } -#line 2199 "VBNET.ATG" +#line 2216 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4879,11 +4927,11 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2211 "VBNET.ATG" +#line 2228 "VBNET.ATG" out expr); } -#line 2213 "VBNET.ATG" +#line 2230 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -4891,34 +4939,34 @@ out expr); } void ParameterModifier( -#line 2866 "VBNET.ATG" +#line 2883 "VBNET.ATG" ParamModifierList m) { if (la.kind == 56) { lexer.NextToken(); -#line 2867 "VBNET.ATG" +#line 2884 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 54) { lexer.NextToken(); -#line 2868 "VBNET.ATG" +#line 2885 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 138) { lexer.NextToken(); -#line 2869 "VBNET.ATG" +#line 2886 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 144) { lexer.NextToken(); -#line 2870 "VBNET.ATG" +#line 2887 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(253); } void Statement() { -#line 2242 "VBNET.ATG" +#line 2259 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -4926,34 +4974,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2248 "VBNET.ATG" +#line 2265 "VBNET.ATG" IsLabel()) { LabelName( -#line 2248 "VBNET.ATG" +#line 2265 "VBNET.ATG" out label); -#line 2250 "VBNET.ATG" +#line 2267 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(34)) { EmbeddedStatement( -#line 2253 "VBNET.ATG" +#line 2270 "VBNET.ATG" out stmt); -#line 2253 "VBNET.ATG" +#line 2270 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(35)) { LocalDeclarationStatement( -#line 2254 "VBNET.ATG" +#line 2271 "VBNET.ATG" out stmt); -#line 2254 "VBNET.ATG" +#line 2271 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(254); -#line 2257 "VBNET.ATG" +#line 2274 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -4962,30 +5010,30 @@ out stmt); } void LabelName( -#line 2645 "VBNET.ATG" +#line 2662 "VBNET.ATG" out string name) { -#line 2647 "VBNET.ATG" +#line 2664 "VBNET.ATG" name = String.Empty; if (StartOf(13)) { Identifier(); -#line 2649 "VBNET.ATG" +#line 2666 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2650 "VBNET.ATG" +#line 2667 "VBNET.ATG" name = t.val; } else SynErr(255); } void EmbeddedStatement( -#line 2296 "VBNET.ATG" +#line 2313 "VBNET.ATG" out Statement statement) { -#line 2298 "VBNET.ATG" +#line 2315 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -4996,103 +5044,103 @@ out Statement statement) { case 95: { lexer.NextToken(); -#line 2304 "VBNET.ATG" +#line 2321 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 168: { lexer.NextToken(); -#line 2306 "VBNET.ATG" +#line 2323 "VBNET.ATG" exitType = ExitType.Sub; break; } case 101: { lexer.NextToken(); -#line 2308 "VBNET.ATG" +#line 2325 "VBNET.ATG" exitType = ExitType.Function; break; } case 147: { lexer.NextToken(); -#line 2310 "VBNET.ATG" +#line 2327 "VBNET.ATG" exitType = ExitType.Property; break; } case 84: { lexer.NextToken(); -#line 2312 "VBNET.ATG" +#line 2329 "VBNET.ATG" exitType = ExitType.Do; break; } case 99: { lexer.NextToken(); -#line 2314 "VBNET.ATG" +#line 2331 "VBNET.ATG" exitType = ExitType.For; break; } case 175: { lexer.NextToken(); -#line 2316 "VBNET.ATG" +#line 2333 "VBNET.ATG" exitType = ExitType.Try; break; } case 182: { lexer.NextToken(); -#line 2318 "VBNET.ATG" +#line 2335 "VBNET.ATG" exitType = ExitType.While; break; } case 156: { lexer.NextToken(); -#line 2320 "VBNET.ATG" +#line 2337 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(256); break; } -#line 2322 "VBNET.ATG" +#line 2339 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 175: { TryStatement( -#line 2323 "VBNET.ATG" +#line 2340 "VBNET.ATG" out statement); break; } case 188: { lexer.NextToken(); -#line 2324 "VBNET.ATG" +#line 2341 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 84 || la.kind == 99 || la.kind == 182) { if (la.kind == 84) { lexer.NextToken(); -#line 2324 "VBNET.ATG" +#line 2341 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 99) { lexer.NextToken(); -#line 2324 "VBNET.ATG" +#line 2341 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2324 "VBNET.ATG" +#line 2341 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2324 "VBNET.ATG" +#line 2341 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5100,11 +5148,11 @@ out statement); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2326 "VBNET.ATG" +#line 2343 "VBNET.ATG" out expr); } -#line 2326 "VBNET.ATG" +#line 2343 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5112,27 +5160,27 @@ out expr); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2328 "VBNET.ATG" +#line 2345 "VBNET.ATG" out expr); } -#line 2328 "VBNET.ATG" +#line 2345 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 169: { lexer.NextToken(); Expr( -#line 2330 "VBNET.ATG" +#line 2347 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2330 "VBNET.ATG" +#line 2347 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(169); -#line 2331 "VBNET.ATG" +#line 2348 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5140,42 +5188,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2333 "VBNET.ATG" +#line 2350 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(30)) { ArgumentList( -#line 2334 "VBNET.ATG" +#line 2351 "VBNET.ATG" out p); } Expect(26); } -#line 2335 "VBNET.ATG" +#line 2352 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 183: { WithStatement( -#line 2337 "VBNET.ATG" +#line 2354 "VBNET.ATG" out statement); break; } case 43: { lexer.NextToken(); -#line 2339 "VBNET.ATG" +#line 2356 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2340 "VBNET.ATG" +#line 2357 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2340 "VBNET.ATG" +#line 2357 "VBNET.ATG" out handlerExpr); -#line 2342 "VBNET.ATG" +#line 2359 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5183,17 +5231,17 @@ out handlerExpr); case 153: { lexer.NextToken(); -#line 2345 "VBNET.ATG" +#line 2362 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2346 "VBNET.ATG" +#line 2363 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2346 "VBNET.ATG" +#line 2363 "VBNET.ATG" out handlerExpr); -#line 2348 "VBNET.ATG" +#line 2365 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5201,16 +5249,16 @@ out handlerExpr); case 182: { lexer.NextToken(); Expr( -#line 2351 "VBNET.ATG" +#line 2368 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2352 "VBNET.ATG" +#line 2369 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(182); -#line 2354 "VBNET.ATG" +#line 2371 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5218,23 +5266,23 @@ out embeddedStatement); case 84: { lexer.NextToken(); -#line 2359 "VBNET.ATG" +#line 2376 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2362 "VBNET.ATG" +#line 2379 "VBNET.ATG" out conditionType); Expr( -#line 2362 "VBNET.ATG" +#line 2379 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2363 "VBNET.ATG" +#line 2380 "VBNET.ATG" out embeddedStatement); Expect(119); -#line 2366 "VBNET.ATG" +#line 2383 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5243,19 +5291,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2373 "VBNET.ATG" +#line 2390 "VBNET.ATG" out embeddedStatement); Expect(119); if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2374 "VBNET.ATG" +#line 2391 "VBNET.ATG" out conditionType); Expr( -#line 2374 "VBNET.ATG" +#line 2391 "VBNET.ATG" out expr); } -#line 2376 "VBNET.ATG" +#line 2393 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(257); @@ -5264,7 +5312,7 @@ out expr); case 99: { lexer.NextToken(); -#line 2381 "VBNET.ATG" +#line 2398 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5273,24 +5321,24 @@ out expr); if (la.kind == 86) { lexer.NextToken(); LoopControlVariable( -#line 2388 "VBNET.ATG" +#line 2405 "VBNET.ATG" out typeReference, out typeName); Expect(110); Expr( -#line 2389 "VBNET.ATG" +#line 2406 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2390 "VBNET.ATG" +#line 2407 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2391 "VBNET.ATG" +#line 2408 "VBNET.ATG" out expr); } -#line 2393 "VBNET.ATG" +#line 2410 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5302,53 +5350,53 @@ out expr); } else if (StartOf(13)) { -#line 2404 "VBNET.ATG" +#line 2421 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2409 "VBNET.ATG" +#line 2426 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2410 "VBNET.ATG" +#line 2427 "VBNET.ATG" out start); Expect(173); Expr( -#line 2410 "VBNET.ATG" +#line 2427 "VBNET.ATG" out end); if (la.kind == 163) { lexer.NextToken(); Expr( -#line 2410 "VBNET.ATG" +#line 2427 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2411 "VBNET.ATG" +#line 2428 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2414 "VBNET.ATG" +#line 2431 "VBNET.ATG" out nextExpr); -#line 2414 "VBNET.ATG" +#line 2431 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2415 "VBNET.ATG" +#line 2432 "VBNET.ATG" out nextExpr); -#line 2415 "VBNET.ATG" +#line 2432 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2418 "VBNET.ATG" +#line 2435 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(258); @@ -5357,29 +5405,29 @@ out nextExpr); case 93: { lexer.NextToken(); Expr( -#line 2422 "VBNET.ATG" +#line 2439 "VBNET.ATG" out expr); -#line 2422 "VBNET.ATG" +#line 2439 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 152: { lexer.NextToken(); -#line 2424 "VBNET.ATG" +#line 2441 "VBNET.ATG" bool isPreserve = false; if (la.kind == 145) { lexer.NextToken(); -#line 2424 "VBNET.ATG" +#line 2441 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2425 "VBNET.ATG" +#line 2442 "VBNET.ATG" out expr); -#line 2427 "VBNET.ATG" +#line 2444 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5387,10 +5435,10 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2431 "VBNET.ATG" +#line 2448 "VBNET.ATG" out expr); -#line 2432 "VBNET.ATG" +#line 2449 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } break; @@ -5398,10 +5446,10 @@ out expr); case 92: { lexer.NextToken(); Expr( -#line 2436 "VBNET.ATG" +#line 2453 "VBNET.ATG" out expr); -#line 2437 "VBNET.ATG" +#line 2454 "VBNET.ATG" List arrays = new List(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5410,31 +5458,31 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2442 "VBNET.ATG" +#line 2459 "VBNET.ATG" out expr); -#line 2442 "VBNET.ATG" +#line 2459 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2443 "VBNET.ATG" +#line 2460 "VBNET.ATG" statement = eraseStatement; break; } case 164: { lexer.NextToken(); -#line 2445 "VBNET.ATG" +#line 2462 "VBNET.ATG" statement = new StopStatement(); break; } case 107: { lexer.NextToken(); -#line 2447 "VBNET.ATG" +#line 2464 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2447 "VBNET.ATG" +#line 2464 "VBNET.ATG" out expr); if (la.kind == 171) { lexer.NextToken(); @@ -5442,46 +5490,46 @@ out expr); if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2450 "VBNET.ATG" +#line 2467 "VBNET.ATG" out embeddedStatement); -#line 2452 "VBNET.ATG" +#line 2469 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 88 || -#line 2458 "VBNET.ATG" +#line 2475 "VBNET.ATG" IsElseIf()) { if ( -#line 2458 "VBNET.ATG" +#line 2475 "VBNET.ATG" IsElseIf()) { Expect(87); -#line 2458 "VBNET.ATG" +#line 2475 "VBNET.ATG" elseIfStart = t.Location; Expect(107); } else { lexer.NextToken(); -#line 2459 "VBNET.ATG" +#line 2476 "VBNET.ATG" elseIfStart = t.Location; } -#line 2461 "VBNET.ATG" +#line 2478 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2462 "VBNET.ATG" +#line 2479 "VBNET.ATG" out condition); if (la.kind == 171) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2463 "VBNET.ATG" +#line 2480 "VBNET.ATG" out block); -#line 2465 "VBNET.ATG" +#line 2482 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5493,39 +5541,39 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2474 "VBNET.ATG" +#line 2491 "VBNET.ATG" out embeddedStatement); -#line 2476 "VBNET.ATG" +#line 2493 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(89); Expect(107); -#line 2480 "VBNET.ATG" +#line 2497 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(36)) { -#line 2485 "VBNET.ATG" +#line 2502 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 2488 "VBNET.ATG" +#line 2505 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 87) { lexer.NextToken(); if (StartOf(36)) { SingleLineStatementList( -#line 2491 "VBNET.ATG" +#line 2508 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 2493 "VBNET.ATG" +#line 2510 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(259); break; @@ -5536,45 +5584,45 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 2496 "VBNET.ATG" +#line 2513 "VBNET.ATG" out expr); EndOfStmt(); -#line 2497 "VBNET.ATG" +#line 2514 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 58) { -#line 2501 "VBNET.ATG" +#line 2518 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 2502 "VBNET.ATG" +#line 2519 "VBNET.ATG" out caseClauses); if ( -#line 2502 "VBNET.ATG" +#line 2519 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2504 "VBNET.ATG" +#line 2521 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 2507 "VBNET.ATG" +#line 2524 "VBNET.ATG" out block); -#line 2509 "VBNET.ATG" +#line 2526 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 2514 "VBNET.ATG" +#line 2531 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(89); Expect(156); @@ -5582,43 +5630,43 @@ out block); } case 136: { -#line 2516 "VBNET.ATG" +#line 2533 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2517 "VBNET.ATG" +#line 2534 "VBNET.ATG" out onErrorStatement); -#line 2517 "VBNET.ATG" +#line 2534 "VBNET.ATG" statement = onErrorStatement; break; } case 105: { -#line 2518 "VBNET.ATG" +#line 2535 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2519 "VBNET.ATG" +#line 2536 "VBNET.ATG" out goToStatement); -#line 2519 "VBNET.ATG" +#line 2536 "VBNET.ATG" statement = goToStatement; break; } case 154: { -#line 2520 "VBNET.ATG" +#line 2537 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2521 "VBNET.ATG" +#line 2538 "VBNET.ATG" out resumeStatement); -#line 2521 "VBNET.ATG" +#line 2538 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 25: case 44: case 48: case 50: case 51: case 52: case 53: case 55: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 67: case 69: case 70: case 71: case 73: case 74: case 75: case 76: case 77: case 78: case 83: case 85: case 96: case 97: case 103: case 112: case 118: case 120: case 125: case 126: case 128: case 131: case 134: case 135: case 145: case 160: case 161: case 166: case 170: case 174: case 176: case 177: case 178: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: case 200: case 201: case 206: { -#line 2524 "VBNET.ATG" +#line 2541 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5626,25 +5674,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2530 "VBNET.ATG" +#line 2547 "VBNET.ATG" out expr); if (StartOf(37)) { AssignmentOperator( -#line 2532 "VBNET.ATG" +#line 2549 "VBNET.ATG" out op); Expr( -#line 2532 "VBNET.ATG" +#line 2549 "VBNET.ATG" out val); -#line 2532 "VBNET.ATG" +#line 2549 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 87) { -#line 2533 "VBNET.ATG" +#line 2550 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(260); -#line 2536 "VBNET.ATG" +#line 2553 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5657,48 +5705,48 @@ out val); case 57: { lexer.NextToken(); SimpleExpr( -#line 2543 "VBNET.ATG" +#line 2560 "VBNET.ATG" out expr); -#line 2543 "VBNET.ATG" +#line 2560 "VBNET.ATG" statement = new ExpressionStatement(expr); break; } case 190: { lexer.NextToken(); -#line 2545 "VBNET.ATG" +#line 2562 "VBNET.ATG" Statement block; if ( -#line 2546 "VBNET.ATG" +#line 2563 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2547 "VBNET.ATG" +#line 2564 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2548 "VBNET.ATG" +#line 2565 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2550 "VBNET.ATG" +#line 2567 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2552 "VBNET.ATG" +#line 2569 "VBNET.ATG" out block); -#line 2553 "VBNET.ATG" +#line 2570 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(27)) { Expr( -#line 2554 "VBNET.ATG" +#line 2571 "VBNET.ATG" out expr); Block( -#line 2555 "VBNET.ATG" +#line 2572 "VBNET.ATG" out block); -#line 2556 "VBNET.ATG" +#line 2573 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(261); Expect(89); @@ -5710,10 +5758,10 @@ out block); } void LocalDeclarationStatement( -#line 2265 "VBNET.ATG" +#line 2282 "VBNET.ATG" out Statement statement) { -#line 2267 "VBNET.ATG" +#line 2284 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5722,22 +5770,22 @@ out Statement statement) { if (la.kind == 72) { lexer.NextToken(); -#line 2273 "VBNET.ATG" +#line 2290 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 162) { lexer.NextToken(); -#line 2274 "VBNET.ATG" +#line 2291 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2275 "VBNET.ATG" +#line 2292 "VBNET.ATG" dimfound = true; } } -#line 2278 "VBNET.ATG" +#line 2295 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5750,135 +5798,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2289 "VBNET.ATG" +#line 2306 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2290 "VBNET.ATG" +#line 2307 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2292 "VBNET.ATG" +#line 2309 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2759 "VBNET.ATG" +#line 2776 "VBNET.ATG" out Statement tryStatement) { -#line 2761 "VBNET.ATG" +#line 2778 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(175); EndOfStmt(); Block( -#line 2764 "VBNET.ATG" +#line 2781 "VBNET.ATG" out blockStmt); if (la.kind == 59 || la.kind == 89 || la.kind == 98) { CatchClauses( -#line 2765 "VBNET.ATG" +#line 2782 "VBNET.ATG" out catchClauses); } if (la.kind == 98) { lexer.NextToken(); EndOfStmt(); Block( -#line 2766 "VBNET.ATG" +#line 2783 "VBNET.ATG" out finallyStmt); } Expect(89); Expect(175); -#line 2769 "VBNET.ATG" +#line 2786 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2739 "VBNET.ATG" +#line 2756 "VBNET.ATG" out Statement withStatement) { -#line 2741 "VBNET.ATG" +#line 2758 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(183); -#line 2744 "VBNET.ATG" +#line 2761 "VBNET.ATG" Location start = t.Location; Expr( -#line 2745 "VBNET.ATG" +#line 2762 "VBNET.ATG" out expr); EndOfStmt(); -#line 2747 "VBNET.ATG" +#line 2764 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2750 "VBNET.ATG" +#line 2767 "VBNET.ATG" out blockStmt); -#line 2752 "VBNET.ATG" +#line 2769 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(89); Expect(183); -#line 2755 "VBNET.ATG" +#line 2772 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2732 "VBNET.ATG" +#line 2749 "VBNET.ATG" out ConditionType conditionType) { -#line 2733 "VBNET.ATG" +#line 2750 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 182) { lexer.NextToken(); -#line 2734 "VBNET.ATG" +#line 2751 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 178) { lexer.NextToken(); -#line 2735 "VBNET.ATG" +#line 2752 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(263); } void LoopControlVariable( -#line 2575 "VBNET.ATG" +#line 2592 "VBNET.ATG" out TypeReference type, out string name) { -#line 2576 "VBNET.ATG" +#line 2593 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2580 "VBNET.ATG" +#line 2597 "VBNET.ATG" out name); if ( -#line 2581 "VBNET.ATG" +#line 2598 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2581 "VBNET.ATG" +#line 2598 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2582 "VBNET.ATG" +#line 2599 "VBNET.ATG" out type); -#line 2582 "VBNET.ATG" +#line 2599 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2584 "VBNET.ATG" +#line 2601 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5890,34 +5938,34 @@ out type); } void ReDimClause( -#line 2654 "VBNET.ATG" +#line 2671 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 2656 "VBNET.ATG" +#line 2673 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 2657 "VBNET.ATG" +#line 2674 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 2561 "VBNET.ATG" +#line 2578 "VBNET.ATG" List list) { -#line 2562 "VBNET.ATG" +#line 2579 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 89) { lexer.NextToken(); -#line 2564 "VBNET.ATG" +#line 2581 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(34)) { EmbeddedStatement( -#line 2565 "VBNET.ATG" +#line 2582 "VBNET.ATG" out embeddedStatement); } else SynErr(264); -#line 2566 "VBNET.ATG" +#line 2583 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); @@ -5927,62 +5975,62 @@ out embeddedStatement); if (la.kind == 89) { lexer.NextToken(); -#line 2568 "VBNET.ATG" +#line 2585 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(34)) { EmbeddedStatement( -#line 2569 "VBNET.ATG" +#line 2586 "VBNET.ATG" out embeddedStatement); } else SynErr(265); -#line 2570 "VBNET.ATG" +#line 2587 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 2692 "VBNET.ATG" +#line 2709 "VBNET.ATG" out List caseClauses) { -#line 2694 "VBNET.ATG" +#line 2711 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2697 "VBNET.ATG" +#line 2714 "VBNET.ATG" out caseClause); -#line 2697 "VBNET.ATG" +#line 2714 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2698 "VBNET.ATG" +#line 2715 "VBNET.ATG" out caseClause); -#line 2698 "VBNET.ATG" +#line 2715 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2595 "VBNET.ATG" +#line 2612 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2597 "VBNET.ATG" +#line 2614 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(136); Expect(93); if ( -#line 2603 "VBNET.ATG" +#line 2620 "VBNET.ATG" IsNegativeLabelName()) { Expect(105); Expect(15); Expect(5); -#line 2605 "VBNET.ATG" +#line 2622 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5991,10 +6039,10 @@ IsNegativeLabelName()) { } else if (la.kind == 105) { GotoStatement( -#line 2611 "VBNET.ATG" +#line 2628 "VBNET.ATG" out goToStatement); -#line 2613 "VBNET.ATG" +#line 2630 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6011,88 +6059,88 @@ out goToStatement); lexer.NextToken(); Expect(129); -#line 2627 "VBNET.ATG" +#line 2644 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(266); } void GotoStatement( -#line 2633 "VBNET.ATG" +#line 2650 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2635 "VBNET.ATG" +#line 2652 "VBNET.ATG" string label = String.Empty; Expect(105); LabelName( -#line 2638 "VBNET.ATG" +#line 2655 "VBNET.ATG" out label); -#line 2640 "VBNET.ATG" +#line 2657 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2681 "VBNET.ATG" +#line 2698 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2683 "VBNET.ATG" +#line 2700 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2686 "VBNET.ATG" +#line 2703 "VBNET.ATG" IsResumeNext()) { Expect(154); Expect(129); -#line 2687 "VBNET.ATG" +#line 2704 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 154) { lexer.NextToken(); if (StartOf(38)) { LabelName( -#line 2688 "VBNET.ATG" +#line 2705 "VBNET.ATG" out label); } -#line 2688 "VBNET.ATG" +#line 2705 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(267); } void ReDimClauseInternal( -#line 2660 "VBNET.ATG" +#line 2677 "VBNET.ATG" ref Expression expr) { -#line 2661 "VBNET.ATG" +#line 2678 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 10 || -#line 2664 "VBNET.ATG" +#line 2681 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 2663 "VBNET.ATG" +#line 2680 "VBNET.ATG" out name); -#line 2663 "VBNET.ATG" +#line 2680 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 2665 "VBNET.ATG" +#line 2682 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 2668 "VBNET.ATG" +#line 2685 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 2670 "VBNET.ATG" +#line 2687 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -6104,10 +6152,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 2702 "VBNET.ATG" +#line 2719 "VBNET.ATG" out CaseLabel caseClause) { -#line 2704 "VBNET.ATG" +#line 2721 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6116,7 +6164,7 @@ out CaseLabel caseClause) { if (la.kind == 87) { lexer.NextToken(); -#line 2710 "VBNET.ATG" +#line 2727 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(39)) { if (la.kind == 114) { @@ -6126,76 +6174,76 @@ out CaseLabel caseClause) { case 28: { lexer.NextToken(); -#line 2714 "VBNET.ATG" +#line 2731 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 2715 "VBNET.ATG" +#line 2732 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 2716 "VBNET.ATG" +#line 2733 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 2717 "VBNET.ATG" +#line 2734 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2718 "VBNET.ATG" +#line 2735 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 2719 "VBNET.ATG" +#line 2736 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(268); break; } Expr( -#line 2721 "VBNET.ATG" +#line 2738 "VBNET.ATG" out expr); -#line 2723 "VBNET.ATG" +#line 2740 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(27)) { Expr( -#line 2725 "VBNET.ATG" +#line 2742 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); Expr( -#line 2725 "VBNET.ATG" +#line 2742 "VBNET.ATG" out sexpr); } -#line 2727 "VBNET.ATG" +#line 2744 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(269); } void CatchClauses( -#line 2774 "VBNET.ATG" +#line 2791 "VBNET.ATG" out List catchClauses) { -#line 2776 "VBNET.ATG" +#line 2793 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6207,27 +6255,27 @@ out List catchClauses) { if (StartOf(13)) { Identifier(); -#line 2784 "VBNET.ATG" +#line 2801 "VBNET.ATG" name = t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2784 "VBNET.ATG" +#line 2801 "VBNET.ATG" out type); } } if (la.kind == 181) { lexer.NextToken(); Expr( -#line 2785 "VBNET.ATG" +#line 2802 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2787 "VBNET.ATG" +#line 2804 "VBNET.ATG" out blockStmt); -#line 2788 "VBNET.ATG" +#line 2805 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6452,13 +6500,13 @@ out blockStmt); case 205: s = "\"Partial\" expected"; break; case 206: s = "\"Custom\" expected"; break; case 207: s = "??? expected"; break; - case 208: s = "invalid OptionStmt"; break; + case 208: s = "invalid EndOfStmt"; break; case 209: s = "invalid OptionStmt"; break; - case 210: s = "invalid GlobalAttributeSection"; break; + case 210: s = "invalid OptionStmt"; break; case 211: s = "invalid GlobalAttributeSection"; break; - case 212: s = "invalid NamespaceMemberDecl"; break; - case 213: s = "invalid OptionValue"; break; - case 214: s = "invalid EndOfStmt"; break; + case 212: s = "invalid GlobalAttributeSection"; break; + case 213: s = "invalid NamespaceMemberDecl"; break; + case 214: s = "invalid OptionValue"; break; case 215: s = "invalid TypeModifier"; break; case 216: s = "invalid NonModuleDeclaration"; break; case 217: s = "invalid NonModuleDeclaration"; break; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 32f8a00790..d60b9539a4 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -231,14 +231,15 @@ VBNET (. lexer.NextToken(); // get the first token compilationUnit = new CompilationUnit(); - .) = - { EOL } - { OptionStmt } - { ImportsStmt} - { IF (IsGlobalAttrTarget()) GlobalAttributeSection } - { NamespaceMemberDecl } + .) += + { EndOfStmt } + { OptionStmt { EndOfStmt } } + { ImportsStmt { EndOfStmt } } + { IF (IsGlobalAttrTarget()) GlobalAttributeSection { EndOfStmt } } + { NamespaceMemberDecl { EndOfStmt } } EOF - . +. OptionStmt (. INode node = null; bool val = true; .) = "Option" (. Location startPos = t.Location; .) @@ -529,13 +530,18 @@ NonModuleDeclaration attributes> . NamespaceBody = - { NamespaceMemberDecl } + { EndOfStmt } /* allow empty lines at begin of body */ + { + NamespaceMemberDecl + { EndOfStmt } /* allow empty lines in body */ + } "End" "Namespace" EndOfStmt . ClassBody (. AttributeSection section; .) = + { EndOfStmt } /* allow empty lines at begin of body */ { (.List attributes = new List(); ModifierList m = new ModifierList(); @@ -543,11 +549,13 @@ ClassBody { AttributeSection (. attributes.Add(section); .) } { MemberModifier } ClassMemberDecl + { EndOfStmt } /* allow empty lines in body */ } . StructureBody (. AttributeSection section; .) = + { EndOfStmt } /* allow empty lines at begin of body */ { (.List attributes = new List(); ModifierList m = new ModifierList(); @@ -555,6 +563,7 @@ StructureBody { AttributeSection (. attributes.Add(section); .) } { MemberModifier } StructureMemberDecl + { EndOfStmt } /* allow empty lines in body */ } "End" "Structure" (. newType.EndLocation = t.EndLocation; .) EndOfStmt @@ -563,6 +572,7 @@ StructureBody /* 7.7.1 */ ModuleBody (. AttributeSection section; .) = + { EndOfStmt } /* allow empty lines at begin of body */ { (.List attributes = new List(); ModifierList m = new ModifierList(); @@ -570,6 +580,7 @@ ModuleBody { AttributeSection (. attributes.Add(section); .) } { MemberModifier } ClassMemberDecl + { EndOfStmt } /* allow empty lines in body */ } "End" "Module" (. newType.EndLocation = t.EndLocation; .) EndOfStmt @@ -577,15 +588,21 @@ ModuleBody EnumBody (. FieldDeclaration f; .) = + { EndOfStmt } /* allow empty lines at begin of body */ { EnumMemberDecl (. compilationUnit.AddChild(f); .) + { EndOfStmt } /* allow empty lines in body */ } "End" "Enum" (. newType.EndLocation = t.EndLocation; .) EndOfStmt . InterfaceBody = - { InterfaceMemberDecl } + { EndOfStmt } /* allow empty lines at begin of body */ + { + InterfaceMemberDecl + { EndOfStmt } /* allow empty lines in body */ + } "End" "Interface" (. newType.EndLocation = t.EndLocation; .) EndOfStmt . diff --git a/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs b/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs index de6e7279bb..61f8d417a1 100644 --- a/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs @@ -220,6 +220,18 @@ public abstract class MyClass : MyBase, Interface1, My.Test.Interface2 Assert.AreEqual(3, td.Children.Count); } + [Test] + public void VBNetEnumOnSingleLine2() + { + string program = "Enum TestEnum : A : : B = 1 :: C : End Enum"; + TypeDeclaration td = ParseUtilVBNet.ParseGlobal(program); + + Assert.AreEqual("TestEnum", td.Name); + Assert.AreEqual(ClassType.Enum, td.Type); + Assert.AreEqual(3, td.Children.Count); + } + + [Test] public void VBNetEnumWithSystemBaseClassDeclarationTest() { @@ -246,6 +258,18 @@ public abstract class MyClass : MyBase, Interface1, My.Test.Interface2 Assert.AreEqual(2, td.EndLocation.Y, "end line"); } + [Test] + public void VBNetSimpleClassTypeDeclarationWithColon() + { + string program = "Class TestClass\n" + + " : \n" + + "End Class"; + TypeDeclaration td = ParseUtilVBNet.ParseGlobal(program); + + Assert.AreEqual("TestClass", td.Name); + Assert.AreEqual(ClassType.Class, td.Type); + } + [Test] public void VBNetSimplePartialClassTypeDeclarationTest() { diff --git a/src/Libraries/NRefactory/Test/Parser/ParseUtilVBNet.cs b/src/Libraries/NRefactory/Test/Parser/ParseUtilVBNet.cs index bff1b335fc..6dae74ba30 100644 --- a/src/Libraries/NRefactory/Test/Parser/ParseUtilVBNet.cs +++ b/src/Libraries/NRefactory/Test/Parser/ParseUtilVBNet.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.IsFalse(parser.Errors.ErrorOutput.Length == 0, "Expected errors, but operation completed successfully"); else Assert.AreEqual("", parser.Errors.ErrorOutput); - Assert.IsTrue(parser.CompilationUnit.Children.Count > 0); + Assert.AreEqual(1, parser.CompilationUnit.Children.Count); Type type = typeof(T); Assert.IsTrue(type.IsAssignableFrom(parser.CompilationUnit.Children[0].GetType()), String.Format("Parsed expression was {0} instead of {1} ({2})", parser.CompilationUnit.Children[0].GetType(), type, parser.CompilationUnit.Children[0])); return (T)parser.CompilationUnit.Children[0]; @@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast public static T ParseTypeMember(string typeMember, bool expectErrors) where T : INode { TypeDeclaration td = ParseGlobal("Class TestClass\n " + typeMember + "\n End Class\n", expectErrors); - Assert.IsTrue(td.Children.Count > 0); + Assert.AreEqual(1, td.Children.Count); Type type = typeof(T); Assert.IsTrue(type.IsAssignableFrom(td.Children[0].GetType()), String.Format("Parsed expression was {0} instead of {1} ({2})", td.GetType(), type, td)); return (T)td.Children[0]; @@ -51,7 +51,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast public static T ParseStatement(string statement, bool expectErrors) where T : INode { MethodDeclaration md = ParseTypeMember("Sub A()\n " + statement + "\nEnd Sub\n", expectErrors); - Assert.IsTrue(md.Body.Children.Count > 0); + Assert.AreEqual(1, md.Body.Children.Count); Type type = typeof(T); Assert.IsTrue(type.IsAssignableFrom(md.Body.Children[0].GetType()), String.Format("Parsed expression was {0} instead of {1} ({2})", md.GetType(), type, md)); return (T)md.Body.Children[0]; diff --git a/src/Libraries/NRefactory/Test/Parser/Statements/LabelStatementTests.cs b/src/Libraries/NRefactory/Test/Parser/Statements/LabelStatementTests.cs index d7f40a4f38..ab32176211 100644 --- a/src/Libraries/NRefactory/Test/Parser/Statements/LabelStatementTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Statements/LabelStatementTests.cs @@ -35,7 +35,9 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetLabelStatementTest() { - LabelStatement labelStmt = ParseUtilVBNet.ParseStatement("myLabel: Console.WriteLine()"); + MethodDeclaration method = ParseUtilVBNet.ParseTypeMember("Sub Test \n myLabel: Console.WriteLine() \n End Sub"); + Assert.AreEqual(2, method.Body.Children.Count); + LabelStatement labelStmt = (LabelStatement)method.Body.Children[0]; Assert.AreEqual("myLabel", labelStmt.Label); } #endregion