From e7df280557b7c9bd68fc4b6f3d097dc9939be7e9 Mon Sep 17 00:00:00 2001 From: Markus Palme Date: Fri, 15 Aug 2008 17:23:22 +0000 Subject: [PATCH] anonymous types for VB.NET git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3372 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Parser/VBNet/Parser.cs | 983 +++++++++--------- .../Project/Src/Parser/VBNet/VBNET.ATG | 17 +- .../ObjectCreateExpressionTests.cs | 17 +- 3 files changed, 517 insertions(+), 500 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 870915fd84..fbc43f1aa2 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -170,7 +170,7 @@ out u); void GlobalAttributeSection() { Expect(28); -#line 2170 "VBNET.ATG" +#line 2171 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 50) { lexer.NextToken(); @@ -178,20 +178,20 @@ out u); lexer.NextToken(); } else SynErr(211); -#line 2172 "VBNET.ATG" +#line 2173 "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 2176 "VBNET.ATG" +#line 2177 "VBNET.ATG" out attribute); -#line 2176 "VBNET.ATG" +#line 2177 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2177 "VBNET.ATG" +#line 2178 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -203,10 +203,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2177 "VBNET.ATG" +#line 2178 "VBNET.ATG" out attribute); -#line 2177 "VBNET.ATG" +#line 2178 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -215,7 +215,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2182 "VBNET.ATG" +#line 2183 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -324,47 +324,47 @@ out aliasedType); } void Qualident( -#line 2923 "VBNET.ATG" +#line 2924 "VBNET.ATG" out string qualident) { -#line 2925 "VBNET.ATG" +#line 2926 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2929 "VBNET.ATG" +#line 2930 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2930 "VBNET.ATG" +#line 2931 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2930 "VBNET.ATG" +#line 2931 "VBNET.ATG" out name); -#line 2930 "VBNET.ATG" +#line 2931 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2932 "VBNET.ATG" +#line 2933 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2063 "VBNET.ATG" +#line 2064 "VBNET.ATG" out TypeReference typeref) { -#line 2064 "VBNET.ATG" +#line 2065 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2066 "VBNET.ATG" +#line 2067 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2067 "VBNET.ATG" +#line 2068 "VBNET.ATG" out rank); -#line 2068 "VBNET.ATG" +#line 2069 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -387,35 +387,35 @@ out rank); } void AttributeSection( -#line 2247 "VBNET.ATG" +#line 2248 "VBNET.ATG" out AttributeSection section) { -#line 2249 "VBNET.ATG" +#line 2250 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2253 "VBNET.ATG" +#line 2254 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2254 "VBNET.ATG" +#line 2255 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 94) { lexer.NextToken(); -#line 2255 "VBNET.ATG" +#line 2256 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 155) { lexer.NextToken(); -#line 2256 "VBNET.ATG" +#line 2257 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2259 "VBNET.ATG" +#line 2260 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -428,20 +428,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2269 "VBNET.ATG" +#line 2270 "VBNET.ATG" out attribute); -#line 2269 "VBNET.ATG" +#line 2270 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2270 "VBNET.ATG" +#line 2271 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2270 "VBNET.ATG" +#line 2271 "VBNET.ATG" out attribute); -#line 2270 "VBNET.ATG" +#line 2271 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -449,7 +449,7 @@ out attribute); } Expect(27); -#line 2274 "VBNET.ATG" +#line 2275 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -460,69 +460,69 @@ out attribute); } void TypeModifier( -#line 3003 "VBNET.ATG" +#line 3004 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 149: { lexer.NextToken(); -#line 3004 "VBNET.ATG" +#line 3005 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 148: { lexer.NextToken(); -#line 3005 "VBNET.ATG" +#line 3006 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 100: { lexer.NextToken(); -#line 3006 "VBNET.ATG" +#line 3007 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 146: { lexer.NextToken(); -#line 3007 "VBNET.ATG" +#line 3008 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 159: { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3009 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 158: { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3010 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 123: { lexer.NextToken(); -#line 3010 "VBNET.ATG" +#line 3011 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 132: { lexer.NextToken(); -#line 3011 "VBNET.ATG" +#line 3012 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 205: { lexer.NextToken(); -#line 3012 "VBNET.ATG" +#line 3013 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1153,10 +1153,10 @@ m, attributes); } void NonArrayTypeName( -#line 2086 "VBNET.ATG" +#line 2087 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2088 "VBNET.ATG" +#line 2089 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1166,38 +1166,38 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 2093 "VBNET.ATG" +#line 2094 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2094 "VBNET.ATG" +#line 2095 "VBNET.ATG" out typeref, canBeUnbound); -#line 2095 "VBNET.ATG" +#line 2096 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 2096 "VBNET.ATG" +#line 2097 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2097 "VBNET.ATG" +#line 2098 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2098 "VBNET.ATG" +#line 2099 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 134) { lexer.NextToken(); -#line 2101 "VBNET.ATG" +#line 2102 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(10)) { PrimitiveTypeName( -#line 2102 "VBNET.ATG" +#line 2103 "VBNET.ATG" out name); -#line 2102 "VBNET.ATG" +#line 2103 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(221); } @@ -1280,162 +1280,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2284 "VBNET.ATG" +#line 2285 "VBNET.ATG" List parameter) { -#line 2285 "VBNET.ATG" +#line 2286 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2287 "VBNET.ATG" +#line 2288 "VBNET.ATG" out p); -#line 2287 "VBNET.ATG" +#line 2288 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2289 "VBNET.ATG" +#line 2290 "VBNET.ATG" out p); -#line 2289 "VBNET.ATG" +#line 2290 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3015 "VBNET.ATG" +#line 3016 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 123: { lexer.NextToken(); -#line 3016 "VBNET.ATG" +#line 3017 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 80: { lexer.NextToken(); -#line 3017 "VBNET.ATG" +#line 3018 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 100: { lexer.NextToken(); -#line 3018 "VBNET.ATG" +#line 3019 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 158: { lexer.NextToken(); -#line 3019 "VBNET.ATG" +#line 3020 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 143: { lexer.NextToken(); -#line 3020 "VBNET.ATG" +#line 3021 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 124: { lexer.NextToken(); -#line 3021 "VBNET.ATG" +#line 3022 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 146: { lexer.NextToken(); -#line 3022 "VBNET.ATG" +#line 3023 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 148: { lexer.NextToken(); -#line 3023 "VBNET.ATG" +#line 3024 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 149: { lexer.NextToken(); -#line 3024 "VBNET.ATG" +#line 3025 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 132: { lexer.NextToken(); -#line 3025 "VBNET.ATG" +#line 3026 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 133: { lexer.NextToken(); -#line 3026 "VBNET.ATG" +#line 3027 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 159: { lexer.NextToken(); -#line 3027 "VBNET.ATG" +#line 3028 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 142: { lexer.NextToken(); -#line 3028 "VBNET.ATG" +#line 3029 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 141: { lexer.NextToken(); -#line 3029 "VBNET.ATG" +#line 3030 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 151: { lexer.NextToken(); -#line 3030 "VBNET.ATG" +#line 3031 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 185: { lexer.NextToken(); -#line 3031 "VBNET.ATG" +#line 3032 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 3032 "VBNET.ATG" +#line 3033 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 82: { lexer.NextToken(); -#line 3033 "VBNET.ATG" +#line 3034 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 205: { lexer.NextToken(); -#line 3034 "VBNET.ATG" +#line 3035 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2534,25 +2534,25 @@ out name); } void Block( -#line 2331 "VBNET.ATG" +#line 2332 "VBNET.ATG" out Statement stmt) { -#line 2334 "VBNET.ATG" +#line 2335 "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 2340 "VBNET.ATG" +#line 2341 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2340 "VBNET.ATG" +#line 2341 "VBNET.ATG" IsEndStmtAhead()) { Expect(89); EndOfStmt(); -#line 2340 "VBNET.ATG" +#line 2341 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2560,7 +2560,7 @@ IsEndStmtAhead()) { } } -#line 2345 "VBNET.ATG" +#line 2346 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -3195,31 +3195,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3037 "VBNET.ATG" +#line 3038 "VBNET.ATG" out Modifiers m) { -#line 3038 "VBNET.ATG" +#line 3039 "VBNET.ATG" m = Modifiers.None; while (StartOf(26)) { if (la.kind == 149) { lexer.NextToken(); -#line 3040 "VBNET.ATG" +#line 3041 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 148) { lexer.NextToken(); -#line 3041 "VBNET.ATG" +#line 3042 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 100) { lexer.NextToken(); -#line 3042 "VBNET.ATG" +#line 3043 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3043 "VBNET.ATG" +#line 3044 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3240,14 +3240,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2122 "VBNET.ATG" +#line 2123 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2124 "VBNET.ATG" +#line 2125 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2126 "VBNET.ATG" +#line 2127 "VBNET.ATG" out arrayModifiers); } @@ -3264,43 +3264,44 @@ out Expression oce) { bool canBeNormal; bool canBeReDim; Expect(128); - NonArrayTypeName( -#line 1941 "VBNET.ATG" -out type, false); - if (la.kind == 25) { - lexer.NextToken(); - NormalOrReDimArgumentList( + if (StartOf(6)) { + NonArrayTypeName( #line 1942 "VBNET.ATG" -out arguments, out canBeNormal, out canBeReDim); - Expect(26); - if (la.kind == 23 || -#line 1943 "VBNET.ATG" -la.kind == Tokens.OpenParenthesis) { - if ( +out type, false); + if (la.kind == 25) { + lexer.NextToken(); + NormalOrReDimArgumentList( #line 1943 "VBNET.ATG" +out arguments, out canBeNormal, out canBeReDim); + Expect(26); + if (la.kind == 23 || +#line 1944 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { - ArrayTypeModifiers( + if ( #line 1944 "VBNET.ATG" -out dimensions); - CollectionInitializer( +la.kind == Tokens.OpenParenthesis) { + ArrayTypeModifiers( #line 1945 "VBNET.ATG" -out initializer); - } else { - CollectionInitializer( +out dimensions); + CollectionInitializer( #line 1946 "VBNET.ATG" out initializer); + } else { + CollectionInitializer( +#line 1947 "VBNET.ATG" +out initializer); + } } - } -#line 1948 "VBNET.ATG" - if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); +#line 1949 "VBNET.ATG" + if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); + } } -#line 1951 "VBNET.ATG" - if (type == null) type = new TypeReference("Object"); // fallback type on parser errors +#line 1953 "VBNET.ATG" if (initializer == null) { - oce = new ObjectCreateExpression(type, arguments); - SetParent(arguments, oce); + oce = new ObjectCreateExpression(type, arguments); + SetParent(arguments, oce); } else { if (dimensions == null) dimensions = new ArrayList(); dimensions.Insert(0, (arguments == null) ? 0 : Math.Max(arguments.Count - 1, 0)); @@ -3313,34 +3314,34 @@ out initializer); if (la.kind == 183) { -#line 1968 "VBNET.ATG" +#line 1969 "VBNET.ATG" NamedArgumentExpression memberInitializer = null; lexer.NextToken(); -#line 1972 "VBNET.ATG" +#line 1973 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(23); MemberInitializer( -#line 1976 "VBNET.ATG" +#line 1977 "VBNET.ATG" out memberInitializer); -#line 1977 "VBNET.ATG" +#line 1978 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 12) { lexer.NextToken(); MemberInitializer( -#line 1979 "VBNET.ATG" +#line 1980 "VBNET.ATG" out memberInitializer); -#line 1980 "VBNET.ATG" +#line 1981 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(24); -#line 1984 "VBNET.ATG" +#line 1985 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3472,10 +3473,10 @@ out eventName); } void IdentifierOrKeyword( -#line 2970 "VBNET.ATG" +#line 2971 "VBNET.ATG" out string name) { -#line 2972 "VBNET.ATG" +#line 2973 "VBNET.ATG" lexer.NextToken(); name = t.val; } @@ -3932,114 +3933,114 @@ out parameters); } void PrimitiveTypeName( -#line 2977 "VBNET.ATG" +#line 2978 "VBNET.ATG" out string type) { -#line 2978 "VBNET.ATG" +#line 2979 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 53: { lexer.NextToken(); -#line 2979 "VBNET.ATG" +#line 2980 "VBNET.ATG" type = "Boolean"; break; } case 77: { lexer.NextToken(); -#line 2980 "VBNET.ATG" +#line 2981 "VBNET.ATG" type = "Date"; break; } case 66: { lexer.NextToken(); -#line 2981 "VBNET.ATG" +#line 2982 "VBNET.ATG" type = "Char"; break; } case 166: { lexer.NextToken(); -#line 2982 "VBNET.ATG" +#line 2983 "VBNET.ATG" type = "String"; break; } case 78: { lexer.NextToken(); -#line 2983 "VBNET.ATG" +#line 2984 "VBNET.ATG" type = "Decimal"; break; } case 55: { lexer.NextToken(); -#line 2984 "VBNET.ATG" +#line 2985 "VBNET.ATG" type = "Byte"; break; } case 160: { lexer.NextToken(); -#line 2985 "VBNET.ATG" +#line 2986 "VBNET.ATG" type = "Short"; break; } case 112: { lexer.NextToken(); -#line 2986 "VBNET.ATG" +#line 2987 "VBNET.ATG" type = "Integer"; break; } case 118: { lexer.NextToken(); -#line 2987 "VBNET.ATG" +#line 2988 "VBNET.ATG" type = "Long"; break; } case 161: { lexer.NextToken(); -#line 2988 "VBNET.ATG" +#line 2989 "VBNET.ATG" type = "Single"; break; } case 85: { lexer.NextToken(); -#line 2989 "VBNET.ATG" +#line 2990 "VBNET.ATG" type = "Double"; break; } case 193: { lexer.NextToken(); -#line 2990 "VBNET.ATG" +#line 2991 "VBNET.ATG" type = "UInteger"; break; } case 194: { lexer.NextToken(); -#line 2991 "VBNET.ATG" +#line 2992 "VBNET.ATG" type = "ULong"; break; } case 195: { lexer.NextToken(); -#line 2992 "VBNET.ATG" +#line 2993 "VBNET.ATG" type = "UShort"; break; } case 192: { lexer.NextToken(); -#line 2993 "VBNET.ATG" +#line 2994 "VBNET.ATG" type = "SByte"; break; } @@ -4172,19 +4173,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2074 "VBNET.ATG" +#line 2075 "VBNET.ATG" out TypeReference typeref) { -#line 2075 "VBNET.ATG" +#line 2076 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2077 "VBNET.ATG" +#line 2078 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2078 "VBNET.ATG" +#line 2079 "VBNET.ATG" out rank); -#line 2079 "VBNET.ATG" +#line 2080 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4244,34 +4245,34 @@ out falseExpr); } void ArgumentList( -#line 2009 "VBNET.ATG" +#line 2010 "VBNET.ATG" out List arguments) { -#line 2011 "VBNET.ATG" +#line 2012 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(27)) { Argument( -#line 2014 "VBNET.ATG" +#line 2015 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 2015 "VBNET.ATG" +#line 2016 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(27)) { Argument( -#line 2016 "VBNET.ATG" +#line 2017 "VBNET.ATG" out expr); } -#line 2017 "VBNET.ATG" +#line 2018 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2019 "VBNET.ATG" +#line 2020 "VBNET.ATG" if (expr != null) arguments.Add(expr); } @@ -4642,87 +4643,87 @@ out expr); } void NormalOrReDimArgumentList( -#line 2023 "VBNET.ATG" +#line 2024 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2025 "VBNET.ATG" +#line 2026 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(27)) { Argument( -#line 2030 "VBNET.ATG" +#line 2031 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 2031 "VBNET.ATG" +#line 2032 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2032 "VBNET.ATG" +#line 2033 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 2035 "VBNET.ATG" +#line 2036 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2036 "VBNET.ATG" +#line 2037 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2037 "VBNET.ATG" +#line 2038 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(27)) { Argument( -#line 2038 "VBNET.ATG" +#line 2039 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); -#line 2039 "VBNET.ATG" +#line 2040 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2040 "VBNET.ATG" +#line 2041 "VBNET.ATG" out expr); } } -#line 2042 "VBNET.ATG" +#line 2043 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2044 "VBNET.ATG" +#line 2045 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2131 "VBNET.ATG" +#line 2132 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2133 "VBNET.ATG" +#line 2134 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2136 "VBNET.ATG" +#line 2137 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2138 "VBNET.ATG" +#line 2139 "VBNET.ATG" out i); } -#line 2140 "VBNET.ATG" +#line 2141 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2145 "VBNET.ATG" +#line 2146 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4730,10 +4731,10 @@ out i); } void MemberInitializer( -#line 1993 "VBNET.ATG" +#line 1994 "VBNET.ATG" out NamedArgumentExpression memberInitializer) { -#line 1995 "VBNET.ATG" +#line 1996 "VBNET.ATG" memberInitializer = new NamedArgumentExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -4741,14 +4742,14 @@ out NamedArgumentExpression memberInitializer) { Expect(10); IdentifierOrKeyword( -#line 2000 "VBNET.ATG" +#line 2001 "VBNET.ATG" out name); Expect(11); Expr( -#line 2000 "VBNET.ATG" +#line 2001 "VBNET.ATG" out initExpr); -#line 2002 "VBNET.ATG" +#line 2003 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.EndLocation = t.EndLocation; @@ -4756,69 +4757,69 @@ out initExpr); } void Argument( -#line 2048 "VBNET.ATG" +#line 2049 "VBNET.ATG" out Expression argumentexpr) { -#line 2050 "VBNET.ATG" +#line 2051 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2054 "VBNET.ATG" +#line 2055 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2054 "VBNET.ATG" +#line 2055 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 2054 "VBNET.ATG" +#line 2055 "VBNET.ATG" out expr); -#line 2056 "VBNET.ATG" +#line 2057 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(27)) { Expr( -#line 2059 "VBNET.ATG" +#line 2060 "VBNET.ATG" out argumentexpr); } else SynErr(250); } void QualIdentAndTypeArguments( -#line 2105 "VBNET.ATG" +#line 2106 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2106 "VBNET.ATG" +#line 2107 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2108 "VBNET.ATG" +#line 2109 "VBNET.ATG" out name); -#line 2109 "VBNET.ATG" +#line 2110 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2110 "VBNET.ATG" +#line 2111 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(202); if ( -#line 2112 "VBNET.ATG" +#line 2113 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2113 "VBNET.ATG" +#line 2114 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2114 "VBNET.ATG" +#line 2115 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(6)) { TypeArgumentList( -#line 2115 "VBNET.ATG" +#line 2116 "VBNET.ATG" typeref.GenericTypes); } else SynErr(251); Expect(26); @@ -4826,48 +4827,48 @@ typeref.GenericTypes); } void TypeArgumentList( -#line 2158 "VBNET.ATG" +#line 2159 "VBNET.ATG" List typeArguments) { -#line 2160 "VBNET.ATG" +#line 2161 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2162 "VBNET.ATG" +#line 2163 "VBNET.ATG" out typeref); -#line 2162 "VBNET.ATG" +#line 2163 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2165 "VBNET.ATG" +#line 2166 "VBNET.ATG" out typeref); -#line 2165 "VBNET.ATG" +#line 2166 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2152 "VBNET.ATG" +#line 2153 "VBNET.ATG" out int i) { -#line 2153 "VBNET.ATG" +#line 2154 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2154 "VBNET.ATG" +#line 2155 "VBNET.ATG" ++i; } } void Attribute( -#line 2193 "VBNET.ATG" +#line 2194 "VBNET.ATG" out ASTAttribute attribute) { -#line 2194 "VBNET.ATG" +#line 2195 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4877,15 +4878,15 @@ out ASTAttribute attribute) { Expect(10); } Qualident( -#line 2199 "VBNET.ATG" +#line 2200 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2200 "VBNET.ATG" +#line 2201 "VBNET.ATG" positional, named); } -#line 2202 "VBNET.ATG" +#line 2203 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); SetParent(positional, attribute); SetParent(named, attribute); @@ -4893,26 +4894,26 @@ positional, named); } void AttributeArguments( -#line 2209 "VBNET.ATG" +#line 2210 "VBNET.ATG" List positional, List named) { -#line 2211 "VBNET.ATG" +#line 2212 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2217 "VBNET.ATG" +#line 2218 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2219 "VBNET.ATG" +#line 2220 "VBNET.ATG" IsNamedAssign()) { -#line 2219 "VBNET.ATG" +#line 2220 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2220 "VBNET.ATG" +#line 2221 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4920,10 +4921,10 @@ out name); Expect(11); } Expr( -#line 2222 "VBNET.ATG" +#line 2223 "VBNET.ATG" out expr); -#line 2224 "VBNET.ATG" +#line 2225 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -4932,13 +4933,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2232 "VBNET.ATG" +#line 2233 "VBNET.ATG" IsNamedAssign()) { -#line 2232 "VBNET.ATG" +#line 2233 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2233 "VBNET.ATG" +#line 2234 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4946,14 +4947,14 @@ out name); Expect(11); } else if (StartOf(27)) { -#line 2235 "VBNET.ATG" +#line 2236 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(252); Expr( -#line 2236 "VBNET.ATG" +#line 2237 "VBNET.ATG" out expr); -#line 2236 "VBNET.ATG" +#line 2237 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4964,10 +4965,10 @@ out expr); } void FormalParameter( -#line 2293 "VBNET.ATG" +#line 2294 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2295 "VBNET.ATG" +#line 2296 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -4978,36 +4979,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2304 "VBNET.ATG" +#line 2305 "VBNET.ATG" out section); -#line 2304 "VBNET.ATG" +#line 2305 "VBNET.ATG" attributes.Add(section); } while (StartOf(35)) { ParameterModifier( -#line 2305 "VBNET.ATG" +#line 2306 "VBNET.ATG" mod); } Identifier(); -#line 2306 "VBNET.ATG" +#line 2307 "VBNET.ATG" string parameterName = t.val; if ( -#line 2307 "VBNET.ATG" +#line 2308 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2307 "VBNET.ATG" +#line 2308 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2308 "VBNET.ATG" +#line 2309 "VBNET.ATG" out type); } -#line 2310 "VBNET.ATG" +#line 2311 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5023,11 +5024,11 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2322 "VBNET.ATG" +#line 2323 "VBNET.ATG" out expr); } -#line 2324 "VBNET.ATG" +#line 2325 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -5035,34 +5036,34 @@ out expr); } void ParameterModifier( -#line 2996 "VBNET.ATG" +#line 2997 "VBNET.ATG" ParamModifierList m) { if (la.kind == 56) { lexer.NextToken(); -#line 2997 "VBNET.ATG" +#line 2998 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 54) { lexer.NextToken(); -#line 2998 "VBNET.ATG" +#line 2999 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 138) { lexer.NextToken(); -#line 2999 "VBNET.ATG" +#line 3000 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 144) { lexer.NextToken(); -#line 3000 "VBNET.ATG" +#line 3001 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(253); } void Statement() { -#line 2353 "VBNET.ATG" +#line 2354 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -5070,34 +5071,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2359 "VBNET.ATG" +#line 2360 "VBNET.ATG" IsLabel()) { LabelName( -#line 2359 "VBNET.ATG" +#line 2360 "VBNET.ATG" out label); -#line 2361 "VBNET.ATG" +#line 2362 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2364 "VBNET.ATG" +#line 2365 "VBNET.ATG" out stmt); -#line 2364 "VBNET.ATG" +#line 2365 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(37)) { LocalDeclarationStatement( -#line 2365 "VBNET.ATG" +#line 2366 "VBNET.ATG" out stmt); -#line 2365 "VBNET.ATG" +#line 2366 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(254); -#line 2368 "VBNET.ATG" +#line 2369 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5106,30 +5107,30 @@ out stmt); } void LabelName( -#line 2774 "VBNET.ATG" +#line 2775 "VBNET.ATG" out string name) { -#line 2776 "VBNET.ATG" +#line 2777 "VBNET.ATG" name = String.Empty; if (StartOf(13)) { Identifier(); -#line 2778 "VBNET.ATG" +#line 2779 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2779 "VBNET.ATG" +#line 2780 "VBNET.ATG" name = t.val; } else SynErr(255); } void EmbeddedStatement( -#line 2408 "VBNET.ATG" +#line 2409 "VBNET.ATG" out Statement statement) { -#line 2410 "VBNET.ATG" +#line 2411 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5140,103 +5141,103 @@ out Statement statement) { case 95: { lexer.NextToken(); -#line 2416 "VBNET.ATG" +#line 2417 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 168: { lexer.NextToken(); -#line 2418 "VBNET.ATG" +#line 2419 "VBNET.ATG" exitType = ExitType.Sub; break; } case 101: { lexer.NextToken(); -#line 2420 "VBNET.ATG" +#line 2421 "VBNET.ATG" exitType = ExitType.Function; break; } case 147: { lexer.NextToken(); -#line 2422 "VBNET.ATG" +#line 2423 "VBNET.ATG" exitType = ExitType.Property; break; } case 84: { lexer.NextToken(); -#line 2424 "VBNET.ATG" +#line 2425 "VBNET.ATG" exitType = ExitType.Do; break; } case 99: { lexer.NextToken(); -#line 2426 "VBNET.ATG" +#line 2427 "VBNET.ATG" exitType = ExitType.For; break; } case 175: { lexer.NextToken(); -#line 2428 "VBNET.ATG" +#line 2429 "VBNET.ATG" exitType = ExitType.Try; break; } case 182: { lexer.NextToken(); -#line 2430 "VBNET.ATG" +#line 2431 "VBNET.ATG" exitType = ExitType.While; break; } case 156: { lexer.NextToken(); -#line 2432 "VBNET.ATG" +#line 2433 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(256); break; } -#line 2434 "VBNET.ATG" +#line 2435 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 175: { TryStatement( -#line 2435 "VBNET.ATG" +#line 2436 "VBNET.ATG" out statement); break; } case 188: { lexer.NextToken(); -#line 2436 "VBNET.ATG" +#line 2437 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 84 || la.kind == 99 || la.kind == 182) { if (la.kind == 84) { lexer.NextToken(); -#line 2436 "VBNET.ATG" +#line 2437 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 99) { lexer.NextToken(); -#line 2436 "VBNET.ATG" +#line 2437 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2436 "VBNET.ATG" +#line 2437 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2436 "VBNET.ATG" +#line 2437 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5244,11 +5245,11 @@ out statement); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2438 "VBNET.ATG" +#line 2439 "VBNET.ATG" out expr); } -#line 2438 "VBNET.ATG" +#line 2439 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5256,27 +5257,27 @@ out expr); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2440 "VBNET.ATG" +#line 2441 "VBNET.ATG" out expr); } -#line 2440 "VBNET.ATG" +#line 2441 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 169: { lexer.NextToken(); Expr( -#line 2442 "VBNET.ATG" +#line 2443 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2442 "VBNET.ATG" +#line 2443 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(169); -#line 2443 "VBNET.ATG" +#line 2444 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5284,19 +5285,19 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2445 "VBNET.ATG" +#line 2446 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(32)) { ArgumentList( -#line 2446 "VBNET.ATG" +#line 2447 "VBNET.ATG" out p); } Expect(26); } -#line 2448 "VBNET.ATG" +#line 2449 "VBNET.ATG" statement = new RaiseEventStatement(name, p); SetParent(p, statement); @@ -5304,24 +5305,24 @@ out p); } case 183: { WithStatement( -#line 2452 "VBNET.ATG" +#line 2453 "VBNET.ATG" out statement); break; } case 43: { lexer.NextToken(); -#line 2454 "VBNET.ATG" +#line 2455 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2455 "VBNET.ATG" +#line 2456 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2455 "VBNET.ATG" +#line 2456 "VBNET.ATG" out handlerExpr); -#line 2457 "VBNET.ATG" +#line 2458 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5329,17 +5330,17 @@ out handlerExpr); case 153: { lexer.NextToken(); -#line 2460 "VBNET.ATG" +#line 2461 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2461 "VBNET.ATG" +#line 2462 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2461 "VBNET.ATG" +#line 2462 "VBNET.ATG" out handlerExpr); -#line 2463 "VBNET.ATG" +#line 2464 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5347,16 +5348,16 @@ out handlerExpr); case 182: { lexer.NextToken(); Expr( -#line 2466 "VBNET.ATG" +#line 2467 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2467 "VBNET.ATG" +#line 2468 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(182); -#line 2469 "VBNET.ATG" +#line 2470 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5364,23 +5365,23 @@ out embeddedStatement); case 84: { lexer.NextToken(); -#line 2474 "VBNET.ATG" +#line 2475 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2477 "VBNET.ATG" +#line 2478 "VBNET.ATG" out conditionType); Expr( -#line 2477 "VBNET.ATG" +#line 2478 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2478 "VBNET.ATG" +#line 2479 "VBNET.ATG" out embeddedStatement); Expect(119); -#line 2481 "VBNET.ATG" +#line 2482 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5389,19 +5390,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2488 "VBNET.ATG" +#line 2489 "VBNET.ATG" out embeddedStatement); Expect(119); if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2489 "VBNET.ATG" +#line 2490 "VBNET.ATG" out conditionType); Expr( -#line 2489 "VBNET.ATG" +#line 2490 "VBNET.ATG" out expr); } -#line 2491 "VBNET.ATG" +#line 2492 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(257); @@ -5410,7 +5411,7 @@ out expr); case 99: { lexer.NextToken(); -#line 2496 "VBNET.ATG" +#line 2497 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5419,24 +5420,24 @@ out expr); if (la.kind == 86) { lexer.NextToken(); LoopControlVariable( -#line 2503 "VBNET.ATG" +#line 2504 "VBNET.ATG" out typeReference, out typeName); Expect(110); Expr( -#line 2504 "VBNET.ATG" +#line 2505 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2505 "VBNET.ATG" +#line 2506 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2506 "VBNET.ATG" +#line 2507 "VBNET.ATG" out expr); } -#line 2508 "VBNET.ATG" +#line 2509 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5448,55 +5449,55 @@ out expr); } else if (StartOf(13)) { -#line 2519 "VBNET.ATG" +#line 2520 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2524 "VBNET.ATG" +#line 2525 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2525 "VBNET.ATG" +#line 2526 "VBNET.ATG" out start); Expect(173); Expr( -#line 2525 "VBNET.ATG" +#line 2526 "VBNET.ATG" out end); if (la.kind == 163) { lexer.NextToken(); Expr( -#line 2525 "VBNET.ATG" +#line 2526 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2526 "VBNET.ATG" +#line 2527 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2529 "VBNET.ATG" +#line 2530 "VBNET.ATG" out nextExpr); -#line 2531 "VBNET.ATG" +#line 2532 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2534 "VBNET.ATG" +#line 2535 "VBNET.ATG" out nextExpr); -#line 2534 "VBNET.ATG" +#line 2535 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2537 "VBNET.ATG" +#line 2538 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); SetParent(nextExpressions, statement); @@ -5506,29 +5507,29 @@ out nextExpr); case 93: { lexer.NextToken(); Expr( -#line 2542 "VBNET.ATG" +#line 2543 "VBNET.ATG" out expr); -#line 2542 "VBNET.ATG" +#line 2543 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 152: { lexer.NextToken(); -#line 2544 "VBNET.ATG" +#line 2545 "VBNET.ATG" bool isPreserve = false; if (la.kind == 145) { lexer.NextToken(); -#line 2544 "VBNET.ATG" +#line 2545 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2545 "VBNET.ATG" +#line 2546 "VBNET.ATG" out expr); -#line 2547 "VBNET.ATG" +#line 2548 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5536,10 +5537,10 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2551 "VBNET.ATG" +#line 2552 "VBNET.ATG" out expr); -#line 2552 "VBNET.ATG" +#line 2553 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } break; @@ -5547,41 +5548,41 @@ out expr); case 92: { lexer.NextToken(); Expr( -#line 2556 "VBNET.ATG" +#line 2557 "VBNET.ATG" out expr); -#line 2558 "VBNET.ATG" +#line 2559 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2561 "VBNET.ATG" +#line 2562 "VBNET.ATG" out expr); -#line 2561 "VBNET.ATG" +#line 2562 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 2562 "VBNET.ATG" +#line 2563 "VBNET.ATG" statement = eraseStatement; break; } case 164: { lexer.NextToken(); -#line 2564 "VBNET.ATG" +#line 2565 "VBNET.ATG" statement = new StopStatement(); break; } case 107: { lexer.NextToken(); -#line 2566 "VBNET.ATG" +#line 2567 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2566 "VBNET.ATG" +#line 2567 "VBNET.ATG" out expr); if (la.kind == 171) { lexer.NextToken(); @@ -5589,46 +5590,46 @@ out expr); if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2569 "VBNET.ATG" +#line 2570 "VBNET.ATG" out embeddedStatement); -#line 2571 "VBNET.ATG" +#line 2572 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 88 || -#line 2577 "VBNET.ATG" +#line 2578 "VBNET.ATG" IsElseIf()) { if ( -#line 2577 "VBNET.ATG" +#line 2578 "VBNET.ATG" IsElseIf()) { Expect(87); -#line 2577 "VBNET.ATG" +#line 2578 "VBNET.ATG" elseIfStart = t.Location; Expect(107); } else { lexer.NextToken(); -#line 2578 "VBNET.ATG" +#line 2579 "VBNET.ATG" elseIfStart = t.Location; } -#line 2580 "VBNET.ATG" +#line 2581 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2581 "VBNET.ATG" +#line 2582 "VBNET.ATG" out condition); if (la.kind == 171) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2582 "VBNET.ATG" +#line 2583 "VBNET.ATG" out block); -#line 2584 "VBNET.ATG" +#line 2585 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5640,43 +5641,43 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2593 "VBNET.ATG" +#line 2594 "VBNET.ATG" out embeddedStatement); -#line 2595 "VBNET.ATG" +#line 2596 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(89); Expect(107); -#line 2599 "VBNET.ATG" +#line 2600 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(38)) { -#line 2604 "VBNET.ATG" +#line 2605 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 2607 "VBNET.ATG" +#line 2608 "VBNET.ATG" ifStatement.TrueStatement); -#line 2609 "VBNET.ATG" +#line 2610 "VBNET.ATG" SetParent(ifStatement.TrueStatement, ifStatement); if (la.kind == 87) { lexer.NextToken(); if (StartOf(38)) { SingleLineStatementList( -#line 2613 "VBNET.ATG" +#line 2614 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 2615 "VBNET.ATG" +#line 2616 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(259); break; @@ -5687,46 +5688,46 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 2618 "VBNET.ATG" +#line 2619 "VBNET.ATG" out expr); EndOfStmt(); -#line 2619 "VBNET.ATG" +#line 2620 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 58) { -#line 2623 "VBNET.ATG" +#line 2624 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 2624 "VBNET.ATG" +#line 2625 "VBNET.ATG" out caseClauses); if ( -#line 2624 "VBNET.ATG" +#line 2625 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2626 "VBNET.ATG" +#line 2627 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); SetParent(caseClauses, selectSection); selectSection.StartLocation = caseLocation; Block( -#line 2630 "VBNET.ATG" +#line 2631 "VBNET.ATG" out block); -#line 2632 "VBNET.ATG" +#line 2633 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 2638 "VBNET.ATG" +#line 2639 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); SetParent(selectSections, statement); @@ -5736,43 +5737,43 @@ out block); } case 136: { -#line 2642 "VBNET.ATG" +#line 2643 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2643 "VBNET.ATG" +#line 2644 "VBNET.ATG" out onErrorStatement); -#line 2643 "VBNET.ATG" +#line 2644 "VBNET.ATG" statement = onErrorStatement; break; } case 105: { -#line 2644 "VBNET.ATG" +#line 2645 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2645 "VBNET.ATG" +#line 2646 "VBNET.ATG" out goToStatement); -#line 2645 "VBNET.ATG" +#line 2646 "VBNET.ATG" statement = goToStatement; break; } case 154: { -#line 2646 "VBNET.ATG" +#line 2647 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2647 "VBNET.ATG" +#line 2648 "VBNET.ATG" out resumeStatement); -#line 2647 "VBNET.ATG" +#line 2648 "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 2650 "VBNET.ATG" +#line 2651 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5780,25 +5781,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2656 "VBNET.ATG" +#line 2657 "VBNET.ATG" out expr); if (StartOf(39)) { AssignmentOperator( -#line 2658 "VBNET.ATG" +#line 2659 "VBNET.ATG" out op); Expr( -#line 2658 "VBNET.ATG" +#line 2659 "VBNET.ATG" out val); -#line 2658 "VBNET.ATG" +#line 2659 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 87) { -#line 2659 "VBNET.ATG" +#line 2660 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(260); -#line 2662 "VBNET.ATG" +#line 2663 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5811,50 +5812,50 @@ out val); case 57: { lexer.NextToken(); SimpleExpr( -#line 2669 "VBNET.ATG" +#line 2670 "VBNET.ATG" out expr); -#line 2669 "VBNET.ATG" +#line 2670 "VBNET.ATG" statement = new ExpressionStatement(expr); break; } case 190: { lexer.NextToken(); -#line 2671 "VBNET.ATG" +#line 2672 "VBNET.ATG" Statement block; if ( -#line 2672 "VBNET.ATG" +#line 2673 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2673 "VBNET.ATG" +#line 2674 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2674 "VBNET.ATG" +#line 2675 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2676 "VBNET.ATG" +#line 2677 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2678 "VBNET.ATG" +#line 2679 "VBNET.ATG" out block); -#line 2680 "VBNET.ATG" +#line 2681 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); SetParent(resourceAquisition.Variables, resourceAquisition); } else if (StartOf(27)) { Expr( -#line 2683 "VBNET.ATG" +#line 2684 "VBNET.ATG" out expr); Block( -#line 2684 "VBNET.ATG" +#line 2685 "VBNET.ATG" out block); -#line 2685 "VBNET.ATG" +#line 2686 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(261); Expect(89); @@ -5866,10 +5867,10 @@ out block); } void LocalDeclarationStatement( -#line 2376 "VBNET.ATG" +#line 2377 "VBNET.ATG" out Statement statement) { -#line 2378 "VBNET.ATG" +#line 2379 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5878,22 +5879,22 @@ out Statement statement) { if (la.kind == 72) { lexer.NextToken(); -#line 2384 "VBNET.ATG" +#line 2385 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 162) { lexer.NextToken(); -#line 2385 "VBNET.ATG" +#line 2386 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2386 "VBNET.ATG" +#line 2387 "VBNET.ATG" dimfound = true; } } -#line 2389 "VBNET.ATG" +#line 2390 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5906,136 +5907,136 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2400 "VBNET.ATG" +#line 2401 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2401 "VBNET.ATG" +#line 2402 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2403 "VBNET.ATG" +#line 2404 "VBNET.ATG" SetParent(localVariableDeclaration.Variables, localVariableDeclaration); statement = localVariableDeclaration; } void TryStatement( -#line 2889 "VBNET.ATG" +#line 2890 "VBNET.ATG" out Statement tryStatement) { -#line 2891 "VBNET.ATG" +#line 2892 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(175); EndOfStmt(); Block( -#line 2894 "VBNET.ATG" +#line 2895 "VBNET.ATG" out blockStmt); if (la.kind == 59 || la.kind == 89 || la.kind == 98) { CatchClauses( -#line 2895 "VBNET.ATG" +#line 2896 "VBNET.ATG" out catchClauses); } if (la.kind == 98) { lexer.NextToken(); EndOfStmt(); Block( -#line 2896 "VBNET.ATG" +#line 2897 "VBNET.ATG" out finallyStmt); } Expect(89); Expect(175); -#line 2899 "VBNET.ATG" +#line 2900 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2869 "VBNET.ATG" +#line 2870 "VBNET.ATG" out Statement withStatement) { -#line 2871 "VBNET.ATG" +#line 2872 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(183); -#line 2874 "VBNET.ATG" +#line 2875 "VBNET.ATG" Location start = t.Location; Expr( -#line 2875 "VBNET.ATG" +#line 2876 "VBNET.ATG" out expr); EndOfStmt(); -#line 2877 "VBNET.ATG" +#line 2878 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2880 "VBNET.ATG" +#line 2881 "VBNET.ATG" out blockStmt); -#line 2882 "VBNET.ATG" +#line 2883 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(89); Expect(183); -#line 2885 "VBNET.ATG" +#line 2886 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2862 "VBNET.ATG" +#line 2863 "VBNET.ATG" out ConditionType conditionType) { -#line 2863 "VBNET.ATG" +#line 2864 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 182) { lexer.NextToken(); -#line 2864 "VBNET.ATG" +#line 2865 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 178) { lexer.NextToken(); -#line 2865 "VBNET.ATG" +#line 2866 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(263); } void LoopControlVariable( -#line 2704 "VBNET.ATG" +#line 2705 "VBNET.ATG" out TypeReference type, out string name) { -#line 2705 "VBNET.ATG" +#line 2706 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2709 "VBNET.ATG" +#line 2710 "VBNET.ATG" out name); if ( -#line 2710 "VBNET.ATG" +#line 2711 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2710 "VBNET.ATG" +#line 2711 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2711 "VBNET.ATG" +#line 2712 "VBNET.ATG" out type); -#line 2711 "VBNET.ATG" +#line 2712 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2713 "VBNET.ATG" +#line 2714 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6047,34 +6048,34 @@ out type); } void ReDimClause( -#line 2783 "VBNET.ATG" +#line 2784 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 2785 "VBNET.ATG" +#line 2786 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 2786 "VBNET.ATG" +#line 2787 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 2690 "VBNET.ATG" +#line 2691 "VBNET.ATG" List list) { -#line 2691 "VBNET.ATG" +#line 2692 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 89) { lexer.NextToken(); -#line 2693 "VBNET.ATG" +#line 2694 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2694 "VBNET.ATG" +#line 2695 "VBNET.ATG" out embeddedStatement); } else SynErr(264); -#line 2695 "VBNET.ATG" +#line 2696 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); @@ -6084,62 +6085,62 @@ out embeddedStatement); if (la.kind == 89) { lexer.NextToken(); -#line 2697 "VBNET.ATG" +#line 2698 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2698 "VBNET.ATG" +#line 2699 "VBNET.ATG" out embeddedStatement); } else SynErr(265); -#line 2699 "VBNET.ATG" +#line 2700 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 2822 "VBNET.ATG" +#line 2823 "VBNET.ATG" out List caseClauses) { -#line 2824 "VBNET.ATG" +#line 2825 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2827 "VBNET.ATG" +#line 2828 "VBNET.ATG" out caseClause); -#line 2827 "VBNET.ATG" +#line 2828 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2828 "VBNET.ATG" +#line 2829 "VBNET.ATG" out caseClause); -#line 2828 "VBNET.ATG" +#line 2829 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2724 "VBNET.ATG" +#line 2725 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2726 "VBNET.ATG" +#line 2727 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(136); Expect(93); if ( -#line 2732 "VBNET.ATG" +#line 2733 "VBNET.ATG" IsNegativeLabelName()) { Expect(105); Expect(15); Expect(5); -#line 2734 "VBNET.ATG" +#line 2735 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6148,10 +6149,10 @@ IsNegativeLabelName()) { } else if (la.kind == 105) { GotoStatement( -#line 2740 "VBNET.ATG" +#line 2741 "VBNET.ATG" out goToStatement); -#line 2742 "VBNET.ATG" +#line 2743 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6168,88 +6169,88 @@ out goToStatement); lexer.NextToken(); Expect(129); -#line 2756 "VBNET.ATG" +#line 2757 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(266); } void GotoStatement( -#line 2762 "VBNET.ATG" +#line 2763 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2764 "VBNET.ATG" +#line 2765 "VBNET.ATG" string label = String.Empty; Expect(105); LabelName( -#line 2767 "VBNET.ATG" +#line 2768 "VBNET.ATG" out label); -#line 2769 "VBNET.ATG" +#line 2770 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2811 "VBNET.ATG" +#line 2812 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2813 "VBNET.ATG" +#line 2814 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2816 "VBNET.ATG" +#line 2817 "VBNET.ATG" IsResumeNext()) { Expect(154); Expect(129); -#line 2817 "VBNET.ATG" +#line 2818 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 154) { lexer.NextToken(); if (StartOf(40)) { LabelName( -#line 2818 "VBNET.ATG" +#line 2819 "VBNET.ATG" out label); } -#line 2818 "VBNET.ATG" +#line 2819 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(267); } void ReDimClauseInternal( -#line 2789 "VBNET.ATG" +#line 2790 "VBNET.ATG" ref Expression expr) { -#line 2790 "VBNET.ATG" +#line 2791 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 10 || -#line 2793 "VBNET.ATG" +#line 2794 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 2792 "VBNET.ATG" +#line 2793 "VBNET.ATG" out name); -#line 2792 "VBNET.ATG" +#line 2793 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 2794 "VBNET.ATG" +#line 2795 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 2797 "VBNET.ATG" +#line 2798 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 2799 "VBNET.ATG" +#line 2800 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); SetParent(arguments, expr); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { @@ -6262,10 +6263,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 2832 "VBNET.ATG" +#line 2833 "VBNET.ATG" out CaseLabel caseClause) { -#line 2834 "VBNET.ATG" +#line 2835 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6274,7 +6275,7 @@ out CaseLabel caseClause) { if (la.kind == 87) { lexer.NextToken(); -#line 2840 "VBNET.ATG" +#line 2841 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(41)) { if (la.kind == 114) { @@ -6284,76 +6285,76 @@ out CaseLabel caseClause) { case 28: { lexer.NextToken(); -#line 2844 "VBNET.ATG" +#line 2845 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 2845 "VBNET.ATG" +#line 2846 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 2846 "VBNET.ATG" +#line 2847 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 2847 "VBNET.ATG" +#line 2848 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2848 "VBNET.ATG" +#line 2849 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 2849 "VBNET.ATG" +#line 2850 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(268); break; } Expr( -#line 2851 "VBNET.ATG" +#line 2852 "VBNET.ATG" out expr); -#line 2853 "VBNET.ATG" +#line 2854 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(27)) { Expr( -#line 2855 "VBNET.ATG" +#line 2856 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); Expr( -#line 2855 "VBNET.ATG" +#line 2856 "VBNET.ATG" out sexpr); } -#line 2857 "VBNET.ATG" +#line 2858 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(269); } void CatchClauses( -#line 2904 "VBNET.ATG" +#line 2905 "VBNET.ATG" out List catchClauses) { -#line 2906 "VBNET.ATG" +#line 2907 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6365,27 +6366,27 @@ out List catchClauses) { if (StartOf(13)) { Identifier(); -#line 2914 "VBNET.ATG" +#line 2915 "VBNET.ATG" name = t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2914 "VBNET.ATG" +#line 2915 "VBNET.ATG" out type); } } if (la.kind == 181) { lexer.NextToken(); Expr( -#line 2915 "VBNET.ATG" +#line 2916 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2917 "VBNET.ATG" +#line 2918 "VBNET.ATG" out blockStmt); -#line 2918 "VBNET.ATG" +#line 2919 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 8af31d34f7..97a720a905 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1938,17 +1938,18 @@ ObjectCreateExpression oce = null; bool canBeNormal; bool canBeReDim; .) = - "New" NonArrayTypeName - ["(" NormalOrReDimArgumentList ")" - [ IF (la.kind == Tokens.OpenParenthesis) - ArrayTypeModifiers - CollectionInitializer - | CollectionInitializer + "New" + [ NonArrayTypeName + ["(" NormalOrReDimArgumentList ")" + [ IF (la.kind == Tokens.OpenParenthesis) + ArrayTypeModifiers + CollectionInitializer + | CollectionInitializer + ] + (. if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); .) ] - (. if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); .) ] (. - if (type == null) type = new TypeReference("Object"); // fallback type on parser errors if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); SetParent(arguments, oce); diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs index b574668120..b81272db71 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs @@ -190,6 +190,21 @@ namespace ICSharpCode.NRefactory.Tests.Ast #endregion #region VB.NET + + [Test] + public void VBNetAnonymousType() + { + ObjectCreateExpression oce = ParseUtilVBNet.ParseExpression( + "New With {.Id = 1, .Name= \"Bill Gates\" }"); + + Assert.IsTrue(oce.CreateType.IsNull); + Assert.AreEqual(0, oce.Parameters.Count); + Assert.AreEqual(2, oce.ObjectInitializer.CreateExpressions.Count); + + Assert.IsInstanceOfType(typeof(PrimitiveExpression), CheckPropertyInitializationExpression(oce.ObjectInitializer.CreateExpressions[0], "Id")); + Assert.IsInstanceOfType(typeof(NamedArgumentExpression), oce.ObjectInitializer.CreateExpressions[1]); + } + [Test] public void VBNetSimpleObjectCreateExpressionTest() { @@ -221,7 +236,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.AreEqual("FirstName", ((NamedArgumentExpression)oce.ObjectInitializer.CreateExpressions[0]).Name); Assert.AreEqual("LastName", ((NamedArgumentExpression)oce.ObjectInitializer.CreateExpressions[1]).Name); - + Assert.IsInstanceOfType(typeof(PrimitiveExpression), ((NamedArgumentExpression)oce.ObjectInitializer.CreateExpressions[0]).Expression); Assert.IsInstanceOfType(typeof(PrimitiveExpression), ((NamedArgumentExpression)oce.ObjectInitializer.CreateExpressions[1]).Expression); }