diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index fbc43f1aa2..cb4a67e3cc 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 2171 "VBNET.ATG" +#line 2191 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 50) { lexer.NextToken(); @@ -178,20 +178,20 @@ out u); lexer.NextToken(); } else SynErr(211); -#line 2173 "VBNET.ATG" +#line 2193 "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 2177 "VBNET.ATG" +#line 2197 "VBNET.ATG" out attribute); -#line 2177 "VBNET.ATG" +#line 2197 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2178 "VBNET.ATG" +#line 2198 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -203,10 +203,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2178 "VBNET.ATG" +#line 2198 "VBNET.ATG" out attribute); -#line 2178 "VBNET.ATG" +#line 2198 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -215,7 +215,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2183 "VBNET.ATG" +#line 2203 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -324,30 +324,30 @@ out aliasedType); } void Qualident( -#line 2924 "VBNET.ATG" +#line 2944 "VBNET.ATG" out string qualident) { -#line 2926 "VBNET.ATG" +#line 2946 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2930 "VBNET.ATG" +#line 2950 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2931 "VBNET.ATG" +#line 2951 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2931 "VBNET.ATG" +#line 2951 "VBNET.ATG" out name); -#line 2931 "VBNET.ATG" +#line 2951 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2933 "VBNET.ATG" +#line 2953 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } @@ -361,10 +361,10 @@ out TypeReference typeref) { #line 2067 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2068 "VBNET.ATG" +#line 2071 "VBNET.ATG" out rank); -#line 2069 "VBNET.ATG" +#line 2072 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -387,35 +387,35 @@ out rank); } void AttributeSection( -#line 2248 "VBNET.ATG" +#line 2268 "VBNET.ATG" out AttributeSection section) { -#line 2250 "VBNET.ATG" +#line 2270 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2254 "VBNET.ATG" +#line 2274 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2255 "VBNET.ATG" +#line 2275 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 94) { lexer.NextToken(); -#line 2256 "VBNET.ATG" +#line 2276 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 155) { lexer.NextToken(); -#line 2257 "VBNET.ATG" +#line 2277 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2260 "VBNET.ATG" +#line 2280 "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 2270 "VBNET.ATG" +#line 2290 "VBNET.ATG" out attribute); -#line 2270 "VBNET.ATG" +#line 2290 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2271 "VBNET.ATG" +#line 2291 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2271 "VBNET.ATG" +#line 2291 "VBNET.ATG" out attribute); -#line 2271 "VBNET.ATG" +#line 2291 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -449,7 +449,7 @@ out attribute); } Expect(27); -#line 2275 "VBNET.ATG" +#line 2295 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -460,69 +460,69 @@ out attribute); } void TypeModifier( -#line 3004 "VBNET.ATG" +#line 3024 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 149: { lexer.NextToken(); -#line 3005 "VBNET.ATG" +#line 3025 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 148: { lexer.NextToken(); -#line 3006 "VBNET.ATG" +#line 3026 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 100: { lexer.NextToken(); -#line 3007 "VBNET.ATG" +#line 3027 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 146: { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3028 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 159: { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3029 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 158: { lexer.NextToken(); -#line 3010 "VBNET.ATG" +#line 3030 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 123: { lexer.NextToken(); -#line 3011 "VBNET.ATG" +#line 3031 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 132: { lexer.NextToken(); -#line 3012 "VBNET.ATG" +#line 3032 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 205: { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3033 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1153,10 +1153,10 @@ m, attributes); } void NonArrayTypeName( -#line 2087 "VBNET.ATG" +#line 2090 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2089 "VBNET.ATG" +#line 2092 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1166,39 +1166,57 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 2094 "VBNET.ATG" +#line 2097 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2095 "VBNET.ATG" +#line 2098 "VBNET.ATG" out typeref, canBeUnbound); -#line 2096 "VBNET.ATG" +#line 2099 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 2097 "VBNET.ATG" +#line 2100 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2099 "VBNET.ATG" +#line 2102 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 134) { lexer.NextToken(); -#line 2102 "VBNET.ATG" +#line 2105 "VBNET.ATG" typeref = new TypeReference("System.Object"); + if (la.kind == 21) { + lexer.NextToken(); + +#line 2109 "VBNET.ATG" + List typeArguments = new List(1); + if (typeref != null) typeArguments.Add(typeref); + typeref = new TypeReference("System.Nullable", typeArguments); + + } } else if (StartOf(10)) { PrimitiveTypeName( -#line 2103 "VBNET.ATG" +#line 2115 "VBNET.ATG" out name); -#line 2103 "VBNET.ATG" +#line 2115 "VBNET.ATG" typeref = new TypeReference(name); + if (la.kind == 21) { + lexer.NextToken(); + +#line 2119 "VBNET.ATG" + List typeArguments = new List(1); + if (typeref != null) typeArguments.Add(typeref); + typeref = new TypeReference("System.Nullable", typeArguments); + + } } else SynErr(221); } @@ -1280,162 +1298,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2285 "VBNET.ATG" +#line 2305 "VBNET.ATG" List parameter) { -#line 2286 "VBNET.ATG" +#line 2306 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2288 "VBNET.ATG" +#line 2308 "VBNET.ATG" out p); -#line 2288 "VBNET.ATG" +#line 2308 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2290 "VBNET.ATG" +#line 2310 "VBNET.ATG" out p); -#line 2290 "VBNET.ATG" +#line 2310 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3016 "VBNET.ATG" +#line 3036 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 123: { lexer.NextToken(); -#line 3017 "VBNET.ATG" +#line 3037 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 80: { lexer.NextToken(); -#line 3018 "VBNET.ATG" +#line 3038 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 100: { lexer.NextToken(); -#line 3019 "VBNET.ATG" +#line 3039 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 158: { lexer.NextToken(); -#line 3020 "VBNET.ATG" +#line 3040 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 143: { lexer.NextToken(); -#line 3021 "VBNET.ATG" +#line 3041 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 124: { lexer.NextToken(); -#line 3022 "VBNET.ATG" +#line 3042 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 146: { lexer.NextToken(); -#line 3023 "VBNET.ATG" +#line 3043 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 148: { lexer.NextToken(); -#line 3024 "VBNET.ATG" +#line 3044 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 149: { lexer.NextToken(); -#line 3025 "VBNET.ATG" +#line 3045 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 132: { lexer.NextToken(); -#line 3026 "VBNET.ATG" +#line 3046 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 133: { lexer.NextToken(); -#line 3027 "VBNET.ATG" +#line 3047 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 159: { lexer.NextToken(); -#line 3028 "VBNET.ATG" +#line 3048 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 142: { lexer.NextToken(); -#line 3029 "VBNET.ATG" +#line 3049 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 141: { lexer.NextToken(); -#line 3030 "VBNET.ATG" +#line 3050 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 151: { lexer.NextToken(); -#line 3031 "VBNET.ATG" +#line 3051 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 185: { lexer.NextToken(); -#line 3032 "VBNET.ATG" +#line 3052 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 3033 "VBNET.ATG" +#line 3053 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 82: { lexer.NextToken(); -#line 3034 "VBNET.ATG" +#line 3054 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 205: { lexer.NextToken(); -#line 3035 "VBNET.ATG" +#line 3055 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2534,25 +2552,25 @@ out name); } void Block( -#line 2332 "VBNET.ATG" +#line 2352 "VBNET.ATG" out Statement stmt) { -#line 2335 "VBNET.ATG" +#line 2355 "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 2341 "VBNET.ATG" +#line 2361 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2341 "VBNET.ATG" +#line 2361 "VBNET.ATG" IsEndStmtAhead()) { Expect(89); EndOfStmt(); -#line 2341 "VBNET.ATG" +#line 2361 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2560,7 +2578,7 @@ IsEndStmtAhead()) { } } -#line 2346 "VBNET.ATG" +#line 2366 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -3195,31 +3213,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3038 "VBNET.ATG" +#line 3058 "VBNET.ATG" out Modifiers m) { -#line 3039 "VBNET.ATG" +#line 3059 "VBNET.ATG" m = Modifiers.None; while (StartOf(26)) { if (la.kind == 149) { lexer.NextToken(); -#line 3041 "VBNET.ATG" +#line 3061 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 148) { lexer.NextToken(); -#line 3042 "VBNET.ATG" +#line 3062 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 100) { lexer.NextToken(); -#line 3043 "VBNET.ATG" +#line 3063 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3044 "VBNET.ATG" +#line 3064 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3240,14 +3258,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2123 "VBNET.ATG" +#line 2143 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2125 "VBNET.ATG" +#line 2145 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2127 "VBNET.ATG" +#line 2147 "VBNET.ATG" out arrayModifiers); } @@ -3473,10 +3491,10 @@ out eventName); } void IdentifierOrKeyword( -#line 2971 "VBNET.ATG" +#line 2991 "VBNET.ATG" out string name) { -#line 2973 "VBNET.ATG" +#line 2993 "VBNET.ATG" lexer.NextToken(); name = t.val; } @@ -3933,114 +3951,114 @@ out parameters); } void PrimitiveTypeName( -#line 2978 "VBNET.ATG" +#line 2998 "VBNET.ATG" out string type) { -#line 2979 "VBNET.ATG" +#line 2999 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 53: { lexer.NextToken(); -#line 2980 "VBNET.ATG" +#line 3000 "VBNET.ATG" type = "Boolean"; break; } case 77: { lexer.NextToken(); -#line 2981 "VBNET.ATG" +#line 3001 "VBNET.ATG" type = "Date"; break; } case 66: { lexer.NextToken(); -#line 2982 "VBNET.ATG" +#line 3002 "VBNET.ATG" type = "Char"; break; } case 166: { lexer.NextToken(); -#line 2983 "VBNET.ATG" +#line 3003 "VBNET.ATG" type = "String"; break; } case 78: { lexer.NextToken(); -#line 2984 "VBNET.ATG" +#line 3004 "VBNET.ATG" type = "Decimal"; break; } case 55: { lexer.NextToken(); -#line 2985 "VBNET.ATG" +#line 3005 "VBNET.ATG" type = "Byte"; break; } case 160: { lexer.NextToken(); -#line 2986 "VBNET.ATG" +#line 3006 "VBNET.ATG" type = "Short"; break; } case 112: { lexer.NextToken(); -#line 2987 "VBNET.ATG" +#line 3007 "VBNET.ATG" type = "Integer"; break; } case 118: { lexer.NextToken(); -#line 2988 "VBNET.ATG" +#line 3008 "VBNET.ATG" type = "Long"; break; } case 161: { lexer.NextToken(); -#line 2989 "VBNET.ATG" +#line 3009 "VBNET.ATG" type = "Single"; break; } case 85: { lexer.NextToken(); -#line 2990 "VBNET.ATG" +#line 3010 "VBNET.ATG" type = "Double"; break; } case 193: { lexer.NextToken(); -#line 2991 "VBNET.ATG" +#line 3011 "VBNET.ATG" type = "UInteger"; break; } case 194: { lexer.NextToken(); -#line 2992 "VBNET.ATG" +#line 3012 "VBNET.ATG" type = "ULong"; break; } case 195: { lexer.NextToken(); -#line 2993 "VBNET.ATG" +#line 3013 "VBNET.ATG" type = "UShort"; break; } case 192: { lexer.NextToken(); -#line 2994 "VBNET.ATG" +#line 3014 "VBNET.ATG" type = "SByte"; break; } @@ -4173,19 +4191,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2075 "VBNET.ATG" +#line 2078 "VBNET.ATG" out TypeReference typeref) { -#line 2076 "VBNET.ATG" +#line 2079 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2078 "VBNET.ATG" +#line 2081 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2079 "VBNET.ATG" +#line 2082 "VBNET.ATG" out rank); -#line 2080 "VBNET.ATG" +#line 2083 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4700,30 +4718,30 @@ out expr); } void ArrayTypeModifiers( -#line 2132 "VBNET.ATG" +#line 2152 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2134 "VBNET.ATG" +#line 2154 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2137 "VBNET.ATG" +#line 2157 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2139 "VBNET.ATG" +#line 2159 "VBNET.ATG" out i); } -#line 2141 "VBNET.ATG" +#line 2161 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2146 "VBNET.ATG" +#line 2166 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4789,37 +4807,37 @@ out argumentexpr); } void QualIdentAndTypeArguments( -#line 2106 "VBNET.ATG" +#line 2126 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2107 "VBNET.ATG" +#line 2127 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2109 "VBNET.ATG" +#line 2129 "VBNET.ATG" out name); -#line 2110 "VBNET.ATG" +#line 2130 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2111 "VBNET.ATG" +#line 2131 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(202); if ( -#line 2113 "VBNET.ATG" +#line 2133 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2114 "VBNET.ATG" +#line 2134 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2115 "VBNET.ATG" +#line 2135 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(6)) { TypeArgumentList( -#line 2116 "VBNET.ATG" +#line 2136 "VBNET.ATG" typeref.GenericTypes); } else SynErr(251); Expect(26); @@ -4827,48 +4845,48 @@ typeref.GenericTypes); } void TypeArgumentList( -#line 2159 "VBNET.ATG" +#line 2179 "VBNET.ATG" List typeArguments) { -#line 2161 "VBNET.ATG" +#line 2181 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2163 "VBNET.ATG" +#line 2183 "VBNET.ATG" out typeref); -#line 2163 "VBNET.ATG" +#line 2183 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2166 "VBNET.ATG" +#line 2186 "VBNET.ATG" out typeref); -#line 2166 "VBNET.ATG" +#line 2186 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2153 "VBNET.ATG" +#line 2173 "VBNET.ATG" out int i) { -#line 2154 "VBNET.ATG" +#line 2174 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2155 "VBNET.ATG" +#line 2175 "VBNET.ATG" ++i; } } void Attribute( -#line 2194 "VBNET.ATG" +#line 2214 "VBNET.ATG" out ASTAttribute attribute) { -#line 2195 "VBNET.ATG" +#line 2215 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4878,15 +4896,15 @@ out ASTAttribute attribute) { Expect(10); } Qualident( -#line 2200 "VBNET.ATG" +#line 2220 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2201 "VBNET.ATG" +#line 2221 "VBNET.ATG" positional, named); } -#line 2203 "VBNET.ATG" +#line 2223 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); SetParent(positional, attribute); SetParent(named, attribute); @@ -4894,26 +4912,26 @@ positional, named); } void AttributeArguments( -#line 2210 "VBNET.ATG" +#line 2230 "VBNET.ATG" List positional, List named) { -#line 2212 "VBNET.ATG" +#line 2232 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2218 "VBNET.ATG" +#line 2238 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2220 "VBNET.ATG" +#line 2240 "VBNET.ATG" IsNamedAssign()) { -#line 2220 "VBNET.ATG" +#line 2240 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2221 "VBNET.ATG" +#line 2241 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4921,10 +4939,10 @@ out name); Expect(11); } Expr( -#line 2223 "VBNET.ATG" +#line 2243 "VBNET.ATG" out expr); -#line 2225 "VBNET.ATG" +#line 2245 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -4933,13 +4951,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2233 "VBNET.ATG" +#line 2253 "VBNET.ATG" IsNamedAssign()) { -#line 2233 "VBNET.ATG" +#line 2253 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2234 "VBNET.ATG" +#line 2254 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4947,14 +4965,14 @@ out name); Expect(11); } else if (StartOf(27)) { -#line 2236 "VBNET.ATG" +#line 2256 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(252); Expr( -#line 2237 "VBNET.ATG" +#line 2257 "VBNET.ATG" out expr); -#line 2237 "VBNET.ATG" +#line 2257 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4965,10 +4983,10 @@ out expr); } void FormalParameter( -#line 2294 "VBNET.ATG" +#line 2314 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2296 "VBNET.ATG" +#line 2316 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -4979,36 +4997,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2305 "VBNET.ATG" +#line 2325 "VBNET.ATG" out section); -#line 2305 "VBNET.ATG" +#line 2325 "VBNET.ATG" attributes.Add(section); } while (StartOf(35)) { ParameterModifier( -#line 2306 "VBNET.ATG" +#line 2326 "VBNET.ATG" mod); } Identifier(); -#line 2307 "VBNET.ATG" +#line 2327 "VBNET.ATG" string parameterName = t.val; if ( -#line 2308 "VBNET.ATG" +#line 2328 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2308 "VBNET.ATG" +#line 2328 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2309 "VBNET.ATG" +#line 2329 "VBNET.ATG" out type); } -#line 2311 "VBNET.ATG" +#line 2331 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5024,11 +5042,11 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2323 "VBNET.ATG" +#line 2343 "VBNET.ATG" out expr); } -#line 2325 "VBNET.ATG" +#line 2345 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -5036,34 +5054,34 @@ out expr); } void ParameterModifier( -#line 2997 "VBNET.ATG" +#line 3017 "VBNET.ATG" ParamModifierList m) { if (la.kind == 56) { lexer.NextToken(); -#line 2998 "VBNET.ATG" +#line 3018 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 54) { lexer.NextToken(); -#line 2999 "VBNET.ATG" +#line 3019 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 138) { lexer.NextToken(); -#line 3000 "VBNET.ATG" +#line 3020 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 144) { lexer.NextToken(); -#line 3001 "VBNET.ATG" +#line 3021 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(253); } void Statement() { -#line 2354 "VBNET.ATG" +#line 2374 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -5071,34 +5089,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2360 "VBNET.ATG" +#line 2380 "VBNET.ATG" IsLabel()) { LabelName( -#line 2360 "VBNET.ATG" +#line 2380 "VBNET.ATG" out label); -#line 2362 "VBNET.ATG" +#line 2382 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2365 "VBNET.ATG" +#line 2385 "VBNET.ATG" out stmt); -#line 2365 "VBNET.ATG" +#line 2385 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(37)) { LocalDeclarationStatement( -#line 2366 "VBNET.ATG" +#line 2386 "VBNET.ATG" out stmt); -#line 2366 "VBNET.ATG" +#line 2386 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(254); -#line 2369 "VBNET.ATG" +#line 2389 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5107,30 +5125,30 @@ out stmt); } void LabelName( -#line 2775 "VBNET.ATG" +#line 2795 "VBNET.ATG" out string name) { -#line 2777 "VBNET.ATG" +#line 2797 "VBNET.ATG" name = String.Empty; if (StartOf(13)) { Identifier(); -#line 2779 "VBNET.ATG" +#line 2799 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2780 "VBNET.ATG" +#line 2800 "VBNET.ATG" name = t.val; } else SynErr(255); } void EmbeddedStatement( -#line 2409 "VBNET.ATG" +#line 2429 "VBNET.ATG" out Statement statement) { -#line 2411 "VBNET.ATG" +#line 2431 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5141,103 +5159,103 @@ out Statement statement) { case 95: { lexer.NextToken(); -#line 2417 "VBNET.ATG" +#line 2437 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 168: { lexer.NextToken(); -#line 2419 "VBNET.ATG" +#line 2439 "VBNET.ATG" exitType = ExitType.Sub; break; } case 101: { lexer.NextToken(); -#line 2421 "VBNET.ATG" +#line 2441 "VBNET.ATG" exitType = ExitType.Function; break; } case 147: { lexer.NextToken(); -#line 2423 "VBNET.ATG" +#line 2443 "VBNET.ATG" exitType = ExitType.Property; break; } case 84: { lexer.NextToken(); -#line 2425 "VBNET.ATG" +#line 2445 "VBNET.ATG" exitType = ExitType.Do; break; } case 99: { lexer.NextToken(); -#line 2427 "VBNET.ATG" +#line 2447 "VBNET.ATG" exitType = ExitType.For; break; } case 175: { lexer.NextToken(); -#line 2429 "VBNET.ATG" +#line 2449 "VBNET.ATG" exitType = ExitType.Try; break; } case 182: { lexer.NextToken(); -#line 2431 "VBNET.ATG" +#line 2451 "VBNET.ATG" exitType = ExitType.While; break; } case 156: { lexer.NextToken(); -#line 2433 "VBNET.ATG" +#line 2453 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(256); break; } -#line 2435 "VBNET.ATG" +#line 2455 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 175: { TryStatement( -#line 2436 "VBNET.ATG" +#line 2456 "VBNET.ATG" out statement); break; } case 188: { lexer.NextToken(); -#line 2437 "VBNET.ATG" +#line 2457 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 84 || la.kind == 99 || la.kind == 182) { if (la.kind == 84) { lexer.NextToken(); -#line 2437 "VBNET.ATG" +#line 2457 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 99) { lexer.NextToken(); -#line 2437 "VBNET.ATG" +#line 2457 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2437 "VBNET.ATG" +#line 2457 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2437 "VBNET.ATG" +#line 2457 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5245,11 +5263,11 @@ out statement); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2439 "VBNET.ATG" +#line 2459 "VBNET.ATG" out expr); } -#line 2439 "VBNET.ATG" +#line 2459 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5257,27 +5275,27 @@ out expr); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2441 "VBNET.ATG" +#line 2461 "VBNET.ATG" out expr); } -#line 2441 "VBNET.ATG" +#line 2461 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 169: { lexer.NextToken(); Expr( -#line 2443 "VBNET.ATG" +#line 2463 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2443 "VBNET.ATG" +#line 2463 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(169); -#line 2444 "VBNET.ATG" +#line 2464 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5285,19 +5303,19 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2446 "VBNET.ATG" +#line 2466 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(32)) { ArgumentList( -#line 2447 "VBNET.ATG" +#line 2467 "VBNET.ATG" out p); } Expect(26); } -#line 2449 "VBNET.ATG" +#line 2469 "VBNET.ATG" statement = new RaiseEventStatement(name, p); SetParent(p, statement); @@ -5305,24 +5323,24 @@ out p); } case 183: { WithStatement( -#line 2453 "VBNET.ATG" +#line 2473 "VBNET.ATG" out statement); break; } case 43: { lexer.NextToken(); -#line 2455 "VBNET.ATG" +#line 2475 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2456 "VBNET.ATG" +#line 2476 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2456 "VBNET.ATG" +#line 2476 "VBNET.ATG" out handlerExpr); -#line 2458 "VBNET.ATG" +#line 2478 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5330,17 +5348,17 @@ out handlerExpr); case 153: { lexer.NextToken(); -#line 2461 "VBNET.ATG" +#line 2481 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2462 "VBNET.ATG" +#line 2482 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2462 "VBNET.ATG" +#line 2482 "VBNET.ATG" out handlerExpr); -#line 2464 "VBNET.ATG" +#line 2484 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5348,16 +5366,16 @@ out handlerExpr); case 182: { lexer.NextToken(); Expr( -#line 2467 "VBNET.ATG" +#line 2487 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2468 "VBNET.ATG" +#line 2488 "VBNET.ATG" out embeddedStatement); Expect(89); Expect(182); -#line 2470 "VBNET.ATG" +#line 2490 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5365,23 +5383,23 @@ out embeddedStatement); case 84: { lexer.NextToken(); -#line 2475 "VBNET.ATG" +#line 2495 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2478 "VBNET.ATG" +#line 2498 "VBNET.ATG" out conditionType); Expr( -#line 2478 "VBNET.ATG" +#line 2498 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2479 "VBNET.ATG" +#line 2499 "VBNET.ATG" out embeddedStatement); Expect(119); -#line 2482 "VBNET.ATG" +#line 2502 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5390,19 +5408,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2489 "VBNET.ATG" +#line 2509 "VBNET.ATG" out embeddedStatement); Expect(119); if (la.kind == 178 || la.kind == 182) { WhileOrUntil( -#line 2490 "VBNET.ATG" +#line 2510 "VBNET.ATG" out conditionType); Expr( -#line 2490 "VBNET.ATG" +#line 2510 "VBNET.ATG" out expr); } -#line 2492 "VBNET.ATG" +#line 2512 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(257); @@ -5411,7 +5429,7 @@ out expr); case 99: { lexer.NextToken(); -#line 2497 "VBNET.ATG" +#line 2517 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5420,24 +5438,24 @@ out expr); if (la.kind == 86) { lexer.NextToken(); LoopControlVariable( -#line 2504 "VBNET.ATG" +#line 2524 "VBNET.ATG" out typeReference, out typeName); Expect(110); Expr( -#line 2505 "VBNET.ATG" +#line 2525 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2506 "VBNET.ATG" +#line 2526 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2507 "VBNET.ATG" +#line 2527 "VBNET.ATG" out expr); } -#line 2509 "VBNET.ATG" +#line 2529 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5449,55 +5467,55 @@ out expr); } else if (StartOf(13)) { -#line 2520 "VBNET.ATG" +#line 2540 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2525 "VBNET.ATG" +#line 2545 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2526 "VBNET.ATG" +#line 2546 "VBNET.ATG" out start); Expect(173); Expr( -#line 2526 "VBNET.ATG" +#line 2546 "VBNET.ATG" out end); if (la.kind == 163) { lexer.NextToken(); Expr( -#line 2526 "VBNET.ATG" +#line 2546 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2527 "VBNET.ATG" +#line 2547 "VBNET.ATG" out embeddedStatement); Expect(129); if (StartOf(27)) { Expr( -#line 2530 "VBNET.ATG" +#line 2550 "VBNET.ATG" out nextExpr); -#line 2532 "VBNET.ATG" +#line 2552 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2535 "VBNET.ATG" +#line 2555 "VBNET.ATG" out nextExpr); -#line 2535 "VBNET.ATG" +#line 2555 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2538 "VBNET.ATG" +#line 2558 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); SetParent(nextExpressions, statement); @@ -5507,29 +5525,29 @@ out nextExpr); case 93: { lexer.NextToken(); Expr( -#line 2543 "VBNET.ATG" +#line 2563 "VBNET.ATG" out expr); -#line 2543 "VBNET.ATG" +#line 2563 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 152: { lexer.NextToken(); -#line 2545 "VBNET.ATG" +#line 2565 "VBNET.ATG" bool isPreserve = false; if (la.kind == 145) { lexer.NextToken(); -#line 2545 "VBNET.ATG" +#line 2565 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2546 "VBNET.ATG" +#line 2566 "VBNET.ATG" out expr); -#line 2548 "VBNET.ATG" +#line 2568 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5537,10 +5555,10 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2552 "VBNET.ATG" +#line 2572 "VBNET.ATG" out expr); -#line 2553 "VBNET.ATG" +#line 2573 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } break; @@ -5548,41 +5566,41 @@ out expr); case 92: { lexer.NextToken(); Expr( -#line 2557 "VBNET.ATG" +#line 2577 "VBNET.ATG" out expr); -#line 2559 "VBNET.ATG" +#line 2579 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2562 "VBNET.ATG" +#line 2582 "VBNET.ATG" out expr); -#line 2562 "VBNET.ATG" +#line 2582 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 2563 "VBNET.ATG" +#line 2583 "VBNET.ATG" statement = eraseStatement; break; } case 164: { lexer.NextToken(); -#line 2565 "VBNET.ATG" +#line 2585 "VBNET.ATG" statement = new StopStatement(); break; } case 107: { lexer.NextToken(); -#line 2567 "VBNET.ATG" +#line 2587 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2567 "VBNET.ATG" +#line 2587 "VBNET.ATG" out expr); if (la.kind == 171) { lexer.NextToken(); @@ -5590,46 +5608,46 @@ out expr); if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2570 "VBNET.ATG" +#line 2590 "VBNET.ATG" out embeddedStatement); -#line 2572 "VBNET.ATG" +#line 2592 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 88 || -#line 2578 "VBNET.ATG" +#line 2598 "VBNET.ATG" IsElseIf()) { if ( -#line 2578 "VBNET.ATG" +#line 2598 "VBNET.ATG" IsElseIf()) { Expect(87); -#line 2578 "VBNET.ATG" +#line 2598 "VBNET.ATG" elseIfStart = t.Location; Expect(107); } else { lexer.NextToken(); -#line 2579 "VBNET.ATG" +#line 2599 "VBNET.ATG" elseIfStart = t.Location; } -#line 2581 "VBNET.ATG" +#line 2601 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2582 "VBNET.ATG" +#line 2602 "VBNET.ATG" out condition); if (la.kind == 171) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2583 "VBNET.ATG" +#line 2603 "VBNET.ATG" out block); -#line 2585 "VBNET.ATG" +#line 2605 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5641,43 +5659,43 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2594 "VBNET.ATG" +#line 2614 "VBNET.ATG" out embeddedStatement); -#line 2596 "VBNET.ATG" +#line 2616 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(89); Expect(107); -#line 2600 "VBNET.ATG" +#line 2620 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(38)) { -#line 2605 "VBNET.ATG" +#line 2625 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 2608 "VBNET.ATG" +#line 2628 "VBNET.ATG" ifStatement.TrueStatement); -#line 2610 "VBNET.ATG" +#line 2630 "VBNET.ATG" SetParent(ifStatement.TrueStatement, ifStatement); if (la.kind == 87) { lexer.NextToken(); if (StartOf(38)) { SingleLineStatementList( -#line 2614 "VBNET.ATG" +#line 2634 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 2616 "VBNET.ATG" +#line 2636 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(259); break; @@ -5688,46 +5706,46 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 2619 "VBNET.ATG" +#line 2639 "VBNET.ATG" out expr); EndOfStmt(); -#line 2620 "VBNET.ATG" +#line 2640 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 58) { -#line 2624 "VBNET.ATG" +#line 2644 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 2625 "VBNET.ATG" +#line 2645 "VBNET.ATG" out caseClauses); if ( -#line 2625 "VBNET.ATG" +#line 2645 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2627 "VBNET.ATG" +#line 2647 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); SetParent(caseClauses, selectSection); selectSection.StartLocation = caseLocation; Block( -#line 2631 "VBNET.ATG" +#line 2651 "VBNET.ATG" out block); -#line 2633 "VBNET.ATG" +#line 2653 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 2639 "VBNET.ATG" +#line 2659 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); SetParent(selectSections, statement); @@ -5737,43 +5755,43 @@ out block); } case 136: { -#line 2643 "VBNET.ATG" +#line 2663 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2644 "VBNET.ATG" +#line 2664 "VBNET.ATG" out onErrorStatement); -#line 2644 "VBNET.ATG" +#line 2664 "VBNET.ATG" statement = onErrorStatement; break; } case 105: { -#line 2645 "VBNET.ATG" +#line 2665 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2646 "VBNET.ATG" +#line 2666 "VBNET.ATG" out goToStatement); -#line 2646 "VBNET.ATG" +#line 2666 "VBNET.ATG" statement = goToStatement; break; } case 154: { -#line 2647 "VBNET.ATG" +#line 2667 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2648 "VBNET.ATG" +#line 2668 "VBNET.ATG" out resumeStatement); -#line 2648 "VBNET.ATG" +#line 2668 "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 2651 "VBNET.ATG" +#line 2671 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5781,25 +5799,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2657 "VBNET.ATG" +#line 2677 "VBNET.ATG" out expr); if (StartOf(39)) { AssignmentOperator( -#line 2659 "VBNET.ATG" +#line 2679 "VBNET.ATG" out op); Expr( -#line 2659 "VBNET.ATG" +#line 2679 "VBNET.ATG" out val); -#line 2659 "VBNET.ATG" +#line 2679 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 87) { -#line 2660 "VBNET.ATG" +#line 2680 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(260); -#line 2663 "VBNET.ATG" +#line 2683 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5812,50 +5830,50 @@ out val); case 57: { lexer.NextToken(); SimpleExpr( -#line 2670 "VBNET.ATG" +#line 2690 "VBNET.ATG" out expr); -#line 2670 "VBNET.ATG" +#line 2690 "VBNET.ATG" statement = new ExpressionStatement(expr); break; } case 190: { lexer.NextToken(); -#line 2672 "VBNET.ATG" +#line 2692 "VBNET.ATG" Statement block; if ( -#line 2673 "VBNET.ATG" +#line 2693 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2674 "VBNET.ATG" +#line 2694 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2675 "VBNET.ATG" +#line 2695 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2677 "VBNET.ATG" +#line 2697 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2679 "VBNET.ATG" +#line 2699 "VBNET.ATG" out block); -#line 2681 "VBNET.ATG" +#line 2701 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); SetParent(resourceAquisition.Variables, resourceAquisition); } else if (StartOf(27)) { Expr( -#line 2684 "VBNET.ATG" +#line 2704 "VBNET.ATG" out expr); Block( -#line 2685 "VBNET.ATG" +#line 2705 "VBNET.ATG" out block); -#line 2686 "VBNET.ATG" +#line 2706 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(261); Expect(89); @@ -5867,10 +5885,10 @@ out block); } void LocalDeclarationStatement( -#line 2377 "VBNET.ATG" +#line 2397 "VBNET.ATG" out Statement statement) { -#line 2379 "VBNET.ATG" +#line 2399 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5879,22 +5897,22 @@ out Statement statement) { if (la.kind == 72) { lexer.NextToken(); -#line 2385 "VBNET.ATG" +#line 2405 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 162) { lexer.NextToken(); -#line 2386 "VBNET.ATG" +#line 2406 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2387 "VBNET.ATG" +#line 2407 "VBNET.ATG" dimfound = true; } } -#line 2390 "VBNET.ATG" +#line 2410 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5907,136 +5925,136 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2401 "VBNET.ATG" +#line 2421 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2402 "VBNET.ATG" +#line 2422 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2404 "VBNET.ATG" +#line 2424 "VBNET.ATG" SetParent(localVariableDeclaration.Variables, localVariableDeclaration); statement = localVariableDeclaration; } void TryStatement( -#line 2890 "VBNET.ATG" +#line 2910 "VBNET.ATG" out Statement tryStatement) { -#line 2892 "VBNET.ATG" +#line 2912 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(175); EndOfStmt(); Block( -#line 2895 "VBNET.ATG" +#line 2915 "VBNET.ATG" out blockStmt); if (la.kind == 59 || la.kind == 89 || la.kind == 98) { CatchClauses( -#line 2896 "VBNET.ATG" +#line 2916 "VBNET.ATG" out catchClauses); } if (la.kind == 98) { lexer.NextToken(); EndOfStmt(); Block( -#line 2897 "VBNET.ATG" +#line 2917 "VBNET.ATG" out finallyStmt); } Expect(89); Expect(175); -#line 2900 "VBNET.ATG" +#line 2920 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2870 "VBNET.ATG" +#line 2890 "VBNET.ATG" out Statement withStatement) { -#line 2872 "VBNET.ATG" +#line 2892 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(183); -#line 2875 "VBNET.ATG" +#line 2895 "VBNET.ATG" Location start = t.Location; Expr( -#line 2876 "VBNET.ATG" +#line 2896 "VBNET.ATG" out expr); EndOfStmt(); -#line 2878 "VBNET.ATG" +#line 2898 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2881 "VBNET.ATG" +#line 2901 "VBNET.ATG" out blockStmt); -#line 2883 "VBNET.ATG" +#line 2903 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(89); Expect(183); -#line 2886 "VBNET.ATG" +#line 2906 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2863 "VBNET.ATG" +#line 2883 "VBNET.ATG" out ConditionType conditionType) { -#line 2864 "VBNET.ATG" +#line 2884 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 182) { lexer.NextToken(); -#line 2865 "VBNET.ATG" +#line 2885 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 178) { lexer.NextToken(); -#line 2866 "VBNET.ATG" +#line 2886 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(263); } void LoopControlVariable( -#line 2705 "VBNET.ATG" +#line 2725 "VBNET.ATG" out TypeReference type, out string name) { -#line 2706 "VBNET.ATG" +#line 2726 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2710 "VBNET.ATG" +#line 2730 "VBNET.ATG" out name); if ( -#line 2711 "VBNET.ATG" +#line 2731 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2711 "VBNET.ATG" +#line 2731 "VBNET.ATG" out arrayModifiers); } if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2712 "VBNET.ATG" +#line 2732 "VBNET.ATG" out type); -#line 2712 "VBNET.ATG" +#line 2732 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2714 "VBNET.ATG" +#line 2734 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6048,34 +6066,34 @@ out type); } void ReDimClause( -#line 2784 "VBNET.ATG" +#line 2804 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 2786 "VBNET.ATG" +#line 2806 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 2787 "VBNET.ATG" +#line 2807 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 2691 "VBNET.ATG" +#line 2711 "VBNET.ATG" List list) { -#line 2692 "VBNET.ATG" +#line 2712 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 89) { lexer.NextToken(); -#line 2694 "VBNET.ATG" +#line 2714 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2695 "VBNET.ATG" +#line 2715 "VBNET.ATG" out embeddedStatement); } else SynErr(264); -#line 2696 "VBNET.ATG" +#line 2716 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); @@ -6085,62 +6103,62 @@ out embeddedStatement); if (la.kind == 89) { lexer.NextToken(); -#line 2698 "VBNET.ATG" +#line 2718 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2699 "VBNET.ATG" +#line 2719 "VBNET.ATG" out embeddedStatement); } else SynErr(265); -#line 2700 "VBNET.ATG" +#line 2720 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 2823 "VBNET.ATG" +#line 2843 "VBNET.ATG" out List caseClauses) { -#line 2825 "VBNET.ATG" +#line 2845 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2828 "VBNET.ATG" +#line 2848 "VBNET.ATG" out caseClause); -#line 2828 "VBNET.ATG" +#line 2848 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2829 "VBNET.ATG" +#line 2849 "VBNET.ATG" out caseClause); -#line 2829 "VBNET.ATG" +#line 2849 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2725 "VBNET.ATG" +#line 2745 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2727 "VBNET.ATG" +#line 2747 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(136); Expect(93); if ( -#line 2733 "VBNET.ATG" +#line 2753 "VBNET.ATG" IsNegativeLabelName()) { Expect(105); Expect(15); Expect(5); -#line 2735 "VBNET.ATG" +#line 2755 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6149,10 +6167,10 @@ IsNegativeLabelName()) { } else if (la.kind == 105) { GotoStatement( -#line 2741 "VBNET.ATG" +#line 2761 "VBNET.ATG" out goToStatement); -#line 2743 "VBNET.ATG" +#line 2763 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6169,88 +6187,88 @@ out goToStatement); lexer.NextToken(); Expect(129); -#line 2757 "VBNET.ATG" +#line 2777 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(266); } void GotoStatement( -#line 2763 "VBNET.ATG" +#line 2783 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2765 "VBNET.ATG" +#line 2785 "VBNET.ATG" string label = String.Empty; Expect(105); LabelName( -#line 2768 "VBNET.ATG" +#line 2788 "VBNET.ATG" out label); -#line 2770 "VBNET.ATG" +#line 2790 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2812 "VBNET.ATG" +#line 2832 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2814 "VBNET.ATG" +#line 2834 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2817 "VBNET.ATG" +#line 2837 "VBNET.ATG" IsResumeNext()) { Expect(154); Expect(129); -#line 2818 "VBNET.ATG" +#line 2838 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 154) { lexer.NextToken(); if (StartOf(40)) { LabelName( -#line 2819 "VBNET.ATG" +#line 2839 "VBNET.ATG" out label); } -#line 2819 "VBNET.ATG" +#line 2839 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(267); } void ReDimClauseInternal( -#line 2790 "VBNET.ATG" +#line 2810 "VBNET.ATG" ref Expression expr) { -#line 2791 "VBNET.ATG" +#line 2811 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 10 || -#line 2794 "VBNET.ATG" +#line 2814 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 2793 "VBNET.ATG" +#line 2813 "VBNET.ATG" out name); -#line 2793 "VBNET.ATG" +#line 2813 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 2795 "VBNET.ATG" +#line 2815 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 2798 "VBNET.ATG" +#line 2818 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 2800 "VBNET.ATG" +#line 2820 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); SetParent(arguments, expr); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { @@ -6263,10 +6281,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 2833 "VBNET.ATG" +#line 2853 "VBNET.ATG" out CaseLabel caseClause) { -#line 2835 "VBNET.ATG" +#line 2855 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6275,7 +6293,7 @@ out CaseLabel caseClause) { if (la.kind == 87) { lexer.NextToken(); -#line 2841 "VBNET.ATG" +#line 2861 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(41)) { if (la.kind == 114) { @@ -6285,76 +6303,76 @@ out CaseLabel caseClause) { case 28: { lexer.NextToken(); -#line 2845 "VBNET.ATG" +#line 2865 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 2846 "VBNET.ATG" +#line 2866 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 2847 "VBNET.ATG" +#line 2867 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 2848 "VBNET.ATG" +#line 2868 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2849 "VBNET.ATG" +#line 2869 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 2850 "VBNET.ATG" +#line 2870 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(268); break; } Expr( -#line 2852 "VBNET.ATG" +#line 2872 "VBNET.ATG" out expr); -#line 2854 "VBNET.ATG" +#line 2874 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(27)) { Expr( -#line 2856 "VBNET.ATG" +#line 2876 "VBNET.ATG" out expr); if (la.kind == 173) { lexer.NextToken(); Expr( -#line 2856 "VBNET.ATG" +#line 2876 "VBNET.ATG" out sexpr); } -#line 2858 "VBNET.ATG" +#line 2878 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(269); } void CatchClauses( -#line 2905 "VBNET.ATG" +#line 2925 "VBNET.ATG" out List catchClauses) { -#line 2907 "VBNET.ATG" +#line 2927 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6366,27 +6384,27 @@ out List catchClauses) { if (StartOf(13)) { Identifier(); -#line 2915 "VBNET.ATG" +#line 2935 "VBNET.ATG" name = t.val; if (la.kind == 49) { lexer.NextToken(); TypeName( -#line 2915 "VBNET.ATG" +#line 2935 "VBNET.ATG" out type); } } if (la.kind == 181) { lexer.NextToken(); Expr( -#line 2916 "VBNET.ATG" +#line 2936 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2918 "VBNET.ATG" +#line 2938 "VBNET.ATG" out blockStmt); -#line 2919 "VBNET.ATG" +#line 2939 "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 97a720a905..f0b2827be4 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -2065,6 +2065,9 @@ TypeName (. ArrayList rank = null; .) = NonArrayTypeName + + + ArrayTypeModifiers (. if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); @@ -2100,7 +2103,24 @@ NonArrayTypeName } ) | "Object" (. typeref = new TypeReference("System.Object"); .) + [ + "?" + (. + List typeArguments = new List(1); + if (typeref != null) typeArguments.Add(typeref); + typeref = new TypeReference("System.Nullable", typeArguments); + .) + ] + | PrimitiveTypeName (. typeref = new TypeReference(name); .) + [ + "?" + (. + List typeArguments = new List(1); + if (typeref != null) typeArguments.Add(typeref); + typeref = new TypeReference("System.Nullable", typeArguments); + .) + ] . QualIdentAndTypeArguments diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs index b81272db71..6a84720c40 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs @@ -241,6 +241,24 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.IsInstanceOfType(typeof(PrimitiveExpression), ((NamedArgumentExpression)oce.ObjectInitializer.CreateExpressions[1]).Expression); } + [Test] + public void VBNetNullableObjectCreateExpressionTest() + { + ObjectCreateExpression oce = ParseUtilVBNet.ParseExpression("New Integer?"); + Assert.AreEqual("System.Nullable", oce.CreateType.SystemType); + Assert.AreEqual(1, oce.CreateType.GenericTypes.Count); + Assert.AreEqual("Integer", oce.CreateType.GenericTypes[0].Type); + } + + [Test] + public void VBNetNullableObjectArrayCreateExpressionTest() + { + ObjectCreateExpression oce = ParseUtilVBNet.ParseExpression("New Integer?()"); + Assert.AreEqual("System.Nullable", oce.CreateType.SystemType); + Assert.AreEqual(1, oce.CreateType.GenericTypes.Count); + Assert.AreEqual("Integer", oce.CreateType.GenericTypes[0].Type); + } + #endregion } }