From 7dfd63273aecbd1afe7b002ed1a2d97a5dc1d020 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 23 Dec 2006 13:56:43 +0000 Subject: [PATCH] Improved VB -> C# converter. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2202 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Src/Project/VBToCSharpConverter.cs | 10 +- .../Src/Project/CSharpToVBConverter.cs | 10 +- .../NRefactory/Project/NRefactory.csproj | 1 - .../Project/Src/Ast/General/Expression.cs | 11 +- .../Project/Src/Parser/VBNet/Parser.cs | 1488 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 20 +- .../Project/Src/Parser/VBNet/VBNetParser.cs | 16 + .../CSharp/CSharpOutputVisitor.cs | 17 +- .../Src/Visitors/LookupTableVisitor.cs | 6 +- .../Visitors/VBNetToCSharpConvertVisitor.cs | 28 - .../Output/CSharp/VBToCSharpConverterTest.cs | 6 +- .../Parser/Statements/ReDimStatementTests.cs | 2 + .../VBConverter/CSharpConvertBuffer.cs | 7 +- .../Src/Commands/VBConverter/ConvertBuffer.cs | 2 +- .../Project/Converter/LanguageConverter.cs | 42 +- .../Gui/AsynchronousWaitDialog.cs | 2 +- src/Main/Base/Test/CodeConverterTests.cs | 61 +- src/Main/Base/Test/NRefactoryResolverTests.cs | 44 +- .../ICSharpCode.SharpDevelop.Dom.csproj | 1 + .../CSharpToVBNetConvertVisitor.cs | 10 +- .../NRefactoryResolver/NRefactoryResolver.cs | 18 +- .../Src/NRefactoryResolver/TypeVisitor.cs | 4 + .../VBNetToCSharpConvertVisitor.cs | 208 +++ 23 files changed, 1186 insertions(+), 828 deletions(-) delete mode 100644 src/Libraries/NRefactory/Project/Src/Visitors/VBNetToCSharpConvertVisitor.cs create mode 100644 src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/VBNetToCSharpConvertVisitor.cs diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBToCSharpConverter.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBToCSharpConverter.cs index baf5fb208d..510b85d28a 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBToCSharpConverter.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBToCSharpConverter.cs @@ -7,13 +7,12 @@ using System; using System.Collections.Generic; -using System.IO; - using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.PrettyPrinter; -using ICSharpCode.NRefactory.Visitors; -using ICSharpCode.SharpDevelop.Internal.Templates; +using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver; using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project.Converter; @@ -42,7 +41,8 @@ namespace CSharpBinding protected override void ConvertAst(CompilationUnit compilationUnit, List specials, FileProjectItem sourceItem) { PreprocessingDirective.VBToCSharp(specials); - compilationUnit.AcceptVisitor(new VBNetToCSharpConvertVisitor(), null); + IProjectContent pc = ParserService.GetProjectContent(sourceItem.Project) ?? ParserService.CurrentProjectContent; + compilationUnit.AcceptVisitor(new VBNetToCSharpConvertVisitor(pc, sourceItem.FileName), null); } } } diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/CSharpToVBConverter.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/CSharpToVBConverter.cs index 4b01ecad1b..e0bacb8fbe 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/CSharpToVBConverter.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/CSharpToVBConverter.cs @@ -7,18 +7,14 @@ using System; using System.Collections.Generic; -using System.IO; - using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.PrettyPrinter; -using ICSharpCode.NRefactory.Visitors; -using ICSharpCode.SharpDevelop.Internal.Templates; -using ICSharpCode.SharpDevelop.Project; -using ICSharpCode.SharpDevelop.Project.Converter; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver; -using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Project; +using ICSharpCode.SharpDevelop.Project.Converter; namespace VBNetBinding { diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index f8c98aa64f..d3ef34523c 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -104,7 +104,6 @@ - diff --git a/src/Libraries/NRefactory/Project/Src/Ast/General/Expression.cs b/src/Libraries/NRefactory/Project/Src/Ast/General/Expression.cs index 15fb20b3ef..897d18db7b 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/General/Expression.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/General/Expression.cs @@ -30,8 +30,8 @@ namespace ICSharpCode.NRefactory.Ast /// /// Returns the existing expression plus the specified integer value. - /// WARNING: This method modifies and possibly returns - /// again, but it might also create a new expression around . + /// The old object is not modified, but might be a subobject on the new expression + /// (and thus its parent property is modified). /// public static Expression AddInteger(Expression expr, int value) { @@ -42,6 +42,9 @@ namespace ICSharpCode.NRefactory.Ast } BinaryOperatorExpression boe = expr as BinaryOperatorExpression; if (boe != null && boe.Op == BinaryOperatorType.Add) { + // clone boe: + boe = new BinaryOperatorExpression(boe.Left, boe.Op, boe.Right); + boe.Right = AddInteger(boe.Right, value); if (boe.Right is PrimitiveExpression && ((PrimitiveExpression)boe.Right).Value is int) { int newVal = (int)((PrimitiveExpression)boe.Right).Value; @@ -60,6 +63,10 @@ namespace ICSharpCode.NRefactory.Ast int newVal = (int)pe.Value - value; if (newVal == 0) return boe.Left; + + // clone boe: + boe = new BinaryOperatorExpression(boe.Left, boe.Op, boe.Right); + if (newVal < 0) { newVal = -newVal; boe.Op = BinaryOperatorType.Add; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index be5b770187..186db2296f 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -150,7 +150,7 @@ out u); void GlobalAttributeSection() { Expect(27); -#line 2029 "VBNET.ATG" +#line 2039 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 49) { lexer.NextToken(); @@ -158,20 +158,20 @@ out u); lexer.NextToken(); } else SynErr(208); -#line 2031 "VBNET.ATG" +#line 2041 "VBNET.ATG" string attributeTarget = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2035 "VBNET.ATG" +#line 2045 "VBNET.ATG" out attribute); -#line 2035 "VBNET.ATG" +#line 2045 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2036 "VBNET.ATG" +#line 2046 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -183,10 +183,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2036 "VBNET.ATG" +#line 2046 "VBNET.ATG" out attribute); -#line 2036 "VBNET.ATG" +#line 2046 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -195,7 +195,7 @@ out attribute); Expect(26); EndOfStmt(); -#line 2041 "VBNET.ATG" +#line 2051 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -312,47 +312,47 @@ out aliasedType); } void Qualident( -#line 2757 "VBNET.ATG" +#line 2765 "VBNET.ATG" out string qualident) { -#line 2759 "VBNET.ATG" +#line 2767 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2763 "VBNET.ATG" +#line 2771 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2764 "VBNET.ATG" +#line 2772 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2764 "VBNET.ATG" +#line 2772 "VBNET.ATG" out name); -#line 2764 "VBNET.ATG" +#line 2772 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2766 "VBNET.ATG" +#line 2774 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 1922 "VBNET.ATG" +#line 1932 "VBNET.ATG" out TypeReference typeref) { -#line 1923 "VBNET.ATG" +#line 1933 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1925 "VBNET.ATG" +#line 1935 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 1926 "VBNET.ATG" +#line 1936 "VBNET.ATG" out rank); -#line 1927 "VBNET.ATG" +#line 1937 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -369,35 +369,35 @@ out rank); } void AttributeSection( -#line 2099 "VBNET.ATG" +#line 2109 "VBNET.ATG" out AttributeSection section) { -#line 2101 "VBNET.ATG" +#line 2111 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(27); -#line 2105 "VBNET.ATG" +#line 2115 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2106 "VBNET.ATG" +#line 2116 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 93) { lexer.NextToken(); -#line 2107 "VBNET.ATG" +#line 2117 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2108 "VBNET.ATG" +#line 2118 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2111 "VBNET.ATG" +#line 2121 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -410,20 +410,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2121 "VBNET.ATG" +#line 2131 "VBNET.ATG" out attribute); -#line 2121 "VBNET.ATG" +#line 2131 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2122 "VBNET.ATG" +#line 2132 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2122 "VBNET.ATG" +#line 2132 "VBNET.ATG" out attribute); -#line 2122 "VBNET.ATG" +#line 2132 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -431,7 +431,7 @@ out attribute); } Expect(26); -#line 2126 "VBNET.ATG" +#line 2136 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -439,69 +439,69 @@ out attribute); } void TypeModifier( -#line 2833 "VBNET.ATG" +#line 2841 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2834 "VBNET.ATG" +#line 2842 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2835 "VBNET.ATG" +#line 2843 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 99: { lexer.NextToken(); -#line 2836 "VBNET.ATG" +#line 2844 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2837 "VBNET.ATG" +#line 2845 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2838 "VBNET.ATG" +#line 2846 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2839 "VBNET.ATG" +#line 2847 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 122: { lexer.NextToken(); -#line 2840 "VBNET.ATG" +#line 2848 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 131: { lexer.NextToken(); -#line 2841 "VBNET.ATG" +#line 2849 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 203: { lexer.NextToken(); -#line 2842 "VBNET.ATG" +#line 2850 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -967,28 +967,28 @@ out typeRef); } void TypeImplementsClause( -#line 1494 "VBNET.ATG" +#line 1502 "VBNET.ATG" out List baseInterfaces) { -#line 1496 "VBNET.ATG" +#line 1504 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(107); TypeName( -#line 1499 "VBNET.ATG" +#line 1507 "VBNET.ATG" out type); -#line 1501 "VBNET.ATG" +#line 1509 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1504 "VBNET.ATG" +#line 1512 "VBNET.ATG" out type); -#line 1505 "VBNET.ATG" +#line 1513 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1106,10 +1106,10 @@ m, attributes); } void NonArrayTypeName( -#line 1945 "VBNET.ATG" +#line 1955 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1947 "VBNET.ATG" +#line 1957 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1119,38 +1119,38 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 1952 "VBNET.ATG" +#line 1962 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 1953 "VBNET.ATG" +#line 1963 "VBNET.ATG" out typeref, canBeUnbound); -#line 1954 "VBNET.ATG" +#line 1964 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 1955 "VBNET.ATG" +#line 1965 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 1956 "VBNET.ATG" +#line 1966 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 1957 "VBNET.ATG" +#line 1967 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 133) { lexer.NextToken(); -#line 1960 "VBNET.ATG" +#line 1970 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(10)) { PrimitiveTypeName( -#line 1961 "VBNET.ATG" +#line 1971 "VBNET.ATG" out name); -#line 1961 "VBNET.ATG" +#line 1971 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(219); } @@ -1178,27 +1178,27 @@ out f); } void InterfaceBase( -#line 1479 "VBNET.ATG" +#line 1487 "VBNET.ATG" out List bases) { -#line 1481 "VBNET.ATG" +#line 1489 "VBNET.ATG" TypeReference type; bases = new List(); Expect(110); TypeName( -#line 1485 "VBNET.ATG" +#line 1493 "VBNET.ATG" out type); -#line 1485 "VBNET.ATG" +#line 1493 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1488 "VBNET.ATG" +#line 1496 "VBNET.ATG" out type); -#line 1488 "VBNET.ATG" +#line 1496 "VBNET.ATG" bases.Add(type); } Expect(1); @@ -1219,27 +1219,27 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2133 "VBNET.ATG" +#line 2143 "VBNET.ATG" List parameter) { -#line 2135 "VBNET.ATG" +#line 2145 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 2139 "VBNET.ATG" +#line 2149 "VBNET.ATG" out section); -#line 2139 "VBNET.ATG" +#line 2149 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2141 "VBNET.ATG" +#line 2151 "VBNET.ATG" out p); -#line 2143 "VBNET.ATG" +#line 2153 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1247,152 +1247,152 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2148 "VBNET.ATG" +#line 2158 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 27) { AttributeSection( -#line 2149 "VBNET.ATG" +#line 2159 "VBNET.ATG" out section); -#line 2149 "VBNET.ATG" +#line 2159 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2151 "VBNET.ATG" +#line 2161 "VBNET.ATG" out p); -#line 2151 "VBNET.ATG" +#line 2161 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2845 "VBNET.ATG" +#line 2853 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 122: { lexer.NextToken(); -#line 2846 "VBNET.ATG" +#line 2854 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 79: { lexer.NextToken(); -#line 2847 "VBNET.ATG" +#line 2855 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 99: { lexer.NextToken(); -#line 2848 "VBNET.ATG" +#line 2856 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2849 "VBNET.ATG" +#line 2857 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2850 "VBNET.ATG" +#line 2858 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 123: { lexer.NextToken(); -#line 2851 "VBNET.ATG" +#line 2859 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 2852 "VBNET.ATG" +#line 2860 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 2853 "VBNET.ATG" +#line 2861 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 2854 "VBNET.ATG" +#line 2862 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 131: { lexer.NextToken(); -#line 2855 "VBNET.ATG" +#line 2863 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 132: { lexer.NextToken(); -#line 2856 "VBNET.ATG" +#line 2864 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 2857 "VBNET.ATG" +#line 2865 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 141: { lexer.NextToken(); -#line 2858 "VBNET.ATG" +#line 2866 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 140: { lexer.NextToken(); -#line 2859 "VBNET.ATG" +#line 2867 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 2860 "VBNET.ATG" +#line 2868 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 2861 "VBNET.ATG" +#line 2869 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 183: { lexer.NextToken(); -#line 2862 "VBNET.ATG" +#line 2870 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 81: { lexer.NextToken(); -#line 2863 "VBNET.ATG" +#line 2871 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } @@ -2196,7 +2196,7 @@ out section); f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); - f.StartLocation = t.Location; + f.StartLocation = varDecl.StartLocation = t.Location; if (la.kind == 11) { lexer.NextToken(); @@ -2402,91 +2402,91 @@ mod, attributes); } void Expr( -#line 1540 "VBNET.ATG" +#line 1548 "VBNET.ATG" out Expression expr) { DisjunctionExpr( -#line 1542 "VBNET.ATG" +#line 1550 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1511 "VBNET.ATG" +#line 1519 "VBNET.ATG" out List baseInterfaces) { -#line 1513 "VBNET.ATG" +#line 1521 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(107); NonArrayTypeName( -#line 1518 "VBNET.ATG" +#line 1526 "VBNET.ATG" out type, false); -#line 1519 "VBNET.ATG" +#line 1527 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1520 "VBNET.ATG" +#line 1528 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1522 "VBNET.ATG" +#line 1530 "VBNET.ATG" out type, false); -#line 1523 "VBNET.ATG" +#line 1531 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1524 "VBNET.ATG" +#line 1532 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1469 "VBNET.ATG" +#line 1477 "VBNET.ATG" out List handlesClause) { -#line 1471 "VBNET.ATG" +#line 1479 "VBNET.ATG" handlesClause = new List(); string name; Expect(105); EventMemberSpecifier( -#line 1474 "VBNET.ATG" +#line 1482 "VBNET.ATG" out name); -#line 1474 "VBNET.ATG" +#line 1482 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1475 "VBNET.ATG" +#line 1483 "VBNET.ATG" out name); -#line 1475 "VBNET.ATG" +#line 1483 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2189 "VBNET.ATG" +#line 2199 "VBNET.ATG" out Statement stmt) { -#line 2192 "VBNET.ATG" +#line 2202 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(20) || -#line 2197 "VBNET.ATG" +#line 2207 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2197 "VBNET.ATG" +#line 2207 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); EndOfStmt(); -#line 2197 "VBNET.ATG" +#line 2207 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2494,7 +2494,7 @@ IsEndStmtAhead()) { } } -#line 2202 "VBNET.ATG" +#line 2212 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2502,26 +2502,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1461 "VBNET.ATG" +#line 1469 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1462 "VBNET.ATG" +#line 1470 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 100 || la.kind == 167) { } else if (la.kind == 47) { lexer.NextToken(); -#line 1463 "VBNET.ATG" +#line 1471 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 50) { lexer.NextToken(); -#line 1464 "VBNET.ATG" +#line 1472 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1465 "VBNET.ATG" +#line 1473 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(230); } @@ -2573,38 +2573,39 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1341 "VBNET.ATG" +#line 1343 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1343 "VBNET.ATG" +#line 1345 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; List dimension = null; + Location startLocation = t.Location; if ( -#line 1348 "VBNET.ATG" +#line 1351 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1348 "VBNET.ATG" +#line 1351 "VBNET.ATG" out dimension); } if ( -#line 1349 "VBNET.ATG" +#line 1352 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1349 "VBNET.ATG" +#line 1352 "VBNET.ATG" out rank); } if ( -#line 1351 "VBNET.ATG" +#line 1354 "VBNET.ATG" IsObjectCreation()) { Expect(48); ObjectCreateExpression( -#line 1351 "VBNET.ATG" +#line 1354 "VBNET.ATG" out expr); -#line 1353 "VBNET.ATG" +#line 1356 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2615,10 +2616,10 @@ out expr); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1360 "VBNET.ATG" +#line 1363 "VBNET.ATG" out type); -#line 1362 "VBNET.ATG" +#line 1365 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2631,7 +2632,7 @@ out type); } -#line 1374 "VBNET.ATG" +#line 1377 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2660,24 +2661,28 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1399 "VBNET.ATG" +#line 1402 "VBNET.ATG" out expr); } } else SynErr(232); -#line 1401 "VBNET.ATG" - fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); +#line 1405 "VBNET.ATG" + VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); + varDecl.StartLocation = startLocation; + varDecl.EndLocation = t.Location; + fieldDeclaration.Add(varDecl); + } void VariableDeclarator( -#line 1335 "VBNET.ATG" +#line 1337 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1337 "VBNET.ATG" +#line 1339 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1338 "VBNET.ATG" +#line 1340 "VBNET.ATG" fieldDeclaration, name); } @@ -2689,25 +2694,27 @@ List constantDeclaration) { Expression expr = null; TypeReference type = null; string name = String.Empty; + Location location; Identifier(); -#line 1324 "VBNET.ATG" - name = t.val; +#line 1325 "VBNET.ATG" + name = t.val; location = t.Location; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1325 "VBNET.ATG" +#line 1326 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1326 "VBNET.ATG" +#line 1327 "VBNET.ATG" out expr); -#line 1328 "VBNET.ATG" +#line 1329 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; + f.StartLocation = location; constantDeclaration.Add(f); } @@ -3115,67 +3122,67 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 2866 "VBNET.ATG" +#line 2874 "VBNET.ATG" out Modifiers m) { -#line 2867 "VBNET.ATG" +#line 2875 "VBNET.ATG" m = Modifiers.None; while (StartOf(26)) { if (la.kind == 148) { lexer.NextToken(); -#line 2869 "VBNET.ATG" +#line 2877 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 147) { lexer.NextToken(); -#line 2870 "VBNET.ATG" +#line 2878 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 99) { lexer.NextToken(); -#line 2871 "VBNET.ATG" +#line 2879 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 2872 "VBNET.ATG" +#line 2880 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1405 "VBNET.ATG" +#line 1413 "VBNET.ATG" out List arrayModifiers) { -#line 1407 "VBNET.ATG" +#line 1415 "VBNET.ATG" arrayModifiers = null; Expect(24); InitializationRankList( -#line 1409 "VBNET.ATG" +#line 1417 "VBNET.ATG" out arrayModifiers); Expect(25); } void ArrayNameModifier( -#line 1981 "VBNET.ATG" +#line 1991 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1983 "VBNET.ATG" +#line 1993 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1985 "VBNET.ATG" +#line 1995 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1834 "VBNET.ATG" +#line 1844 "VBNET.ATG" out Expression oce) { -#line 1836 "VBNET.ATG" +#line 1846 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3185,38 +3192,38 @@ out Expression oce) { Expect(127); NonArrayTypeName( -#line 1843 "VBNET.ATG" +#line 1853 "VBNET.ATG" out type, false); if (la.kind == 24) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1844 "VBNET.ATG" +#line 1854 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(25); if (la.kind == 22 || -#line 1845 "VBNET.ATG" +#line 1855 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1845 "VBNET.ATG" +#line 1855 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1846 "VBNET.ATG" +#line 1856 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1847 "VBNET.ATG" +#line 1857 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1848 "VBNET.ATG" +#line 1858 "VBNET.ATG" out initializer); } } -#line 1850 "VBNET.ATG" +#line 1860 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } -#line 1853 "VBNET.ATG" +#line 1863 "VBNET.ATG" if (type == null) type = new TypeReference("Object"); // fallback type on parser errors if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); @@ -3232,116 +3239,116 @@ out initializer); } void VariableInitializer( -#line 1433 "VBNET.ATG" +#line 1441 "VBNET.ATG" out Expression initializerExpression) { -#line 1435 "VBNET.ATG" +#line 1443 "VBNET.ATG" initializerExpression = null; if (StartOf(27)) { Expr( -#line 1437 "VBNET.ATG" +#line 1445 "VBNET.ATG" out initializerExpression); } else if (la.kind == 22) { CollectionInitializer( -#line 1438 "VBNET.ATG" +#line 1446 "VBNET.ATG" out initializerExpression); } else SynErr(236); } void InitializationRankList( -#line 1413 "VBNET.ATG" +#line 1421 "VBNET.ATG" out List rank) { -#line 1415 "VBNET.ATG" +#line 1423 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1418 "VBNET.ATG" +#line 1426 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1419 "VBNET.ATG" +#line 1427 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1420 "VBNET.ATG" +#line 1428 "VBNET.ATG" out expr); } -#line 1422 "VBNET.ATG" +#line 1430 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1424 "VBNET.ATG" +#line 1432 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1425 "VBNET.ATG" +#line 1433 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1426 "VBNET.ATG" +#line 1434 "VBNET.ATG" out expr); } -#line 1428 "VBNET.ATG" +#line 1436 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1442 "VBNET.ATG" +#line 1450 "VBNET.ATG" out Expression outExpr) { -#line 1444 "VBNET.ATG" +#line 1452 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(22); if (StartOf(28)) { VariableInitializer( -#line 1449 "VBNET.ATG" +#line 1457 "VBNET.ATG" out expr); -#line 1451 "VBNET.ATG" +#line 1459 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1454 "VBNET.ATG" +#line 1462 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1454 "VBNET.ATG" +#line 1462 "VBNET.ATG" out expr); -#line 1455 "VBNET.ATG" +#line 1463 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(23); -#line 1458 "VBNET.ATG" +#line 1466 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1528 "VBNET.ATG" +#line 1536 "VBNET.ATG" out string name) { -#line 1529 "VBNET.ATG" +#line 1537 "VBNET.ATG" string type; name = String.Empty; if (StartOf(13)) { Identifier(); -#line 1530 "VBNET.ATG" +#line 1538 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1532 "VBNET.ATG" +#line 1540 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 124) { lexer.NextToken(); @@ -3349,128 +3356,128 @@ out string name) { if (StartOf(13)) { Identifier(); -#line 1535 "VBNET.ATG" +#line 1543 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 92) { lexer.NextToken(); -#line 1536 "VBNET.ATG" +#line 1544 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(237); } else SynErr(238); } void DisjunctionExpr( -#line 1678 "VBNET.ATG" +#line 1688 "VBNET.ATG" out Expression outExpr) { -#line 1680 "VBNET.ATG" +#line 1690 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1683 "VBNET.ATG" +#line 1693 "VBNET.ATG" out outExpr); while (la.kind == 138 || la.kind == 139 || la.kind == 185) { if (la.kind == 138) { lexer.NextToken(); -#line 1686 "VBNET.ATG" +#line 1696 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 139) { lexer.NextToken(); -#line 1687 "VBNET.ATG" +#line 1697 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1688 "VBNET.ATG" +#line 1698 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1690 "VBNET.ATG" +#line 1700 "VBNET.ATG" out expr); -#line 1690 "VBNET.ATG" +#line 1700 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1545 "VBNET.ATG" +#line 1553 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1546 "VBNET.ATG" +#line 1554 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1547 "VBNET.ATG" +#line 1555 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 41: { lexer.NextToken(); -#line 1548 "VBNET.ATG" +#line 1556 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 33: { lexer.NextToken(); -#line 1549 "VBNET.ATG" +#line 1557 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 35: { lexer.NextToken(); -#line 1550 "VBNET.ATG" +#line 1558 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 36: { lexer.NextToken(); -#line 1551 "VBNET.ATG" +#line 1559 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 37: { lexer.NextToken(); -#line 1552 "VBNET.ATG" +#line 1560 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 38: { lexer.NextToken(); -#line 1553 "VBNET.ATG" +#line 1561 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 34: { lexer.NextToken(); -#line 1554 "VBNET.ATG" +#line 1562 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 39: { lexer.NextToken(); -#line 1555 "VBNET.ATG" +#line 1563 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 40: { lexer.NextToken(); -#line 1556 "VBNET.ATG" +#line 1564 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3479,36 +3486,36 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1560 "VBNET.ATG" +#line 1568 "VBNET.ATG" out Expression pexpr) { SimpleNonInvocationExpression( -#line 1562 "VBNET.ATG" +#line 1570 "VBNET.ATG" out pexpr); while (la.kind == 10 || la.kind == 24) { if (la.kind == 10) { -#line 1563 "VBNET.ATG" +#line 1571 "VBNET.ATG" string name; lexer.NextToken(); IdentifierOrKeyword( -#line 1564 "VBNET.ATG" +#line 1572 "VBNET.ATG" out name); -#line 1564 "VBNET.ATG" +#line 1572 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { InvocationExpression( -#line 1565 "VBNET.ATG" +#line 1573 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1569 "VBNET.ATG" +#line 1577 "VBNET.ATG" out Expression pexpr) { -#line 1571 "VBNET.ATG" +#line 1579 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -3519,143 +3526,146 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1579 "VBNET.ATG" +#line 1587 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1580 "VBNET.ATG" +#line 1588 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1581 "VBNET.ATG" +#line 1589 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1582 "VBNET.ATG" +#line 1590 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1583 "VBNET.ATG" +#line 1591 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1584 "VBNET.ATG" +#line 1592 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1585 "VBNET.ATG" +#line 1593 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 173: { lexer.NextToken(); -#line 1587 "VBNET.ATG" +#line 1595 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 96: { lexer.NextToken(); -#line 1588 "VBNET.ATG" +#line 1596 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 130: { lexer.NextToken(); -#line 1589 "VBNET.ATG" +#line 1597 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 24: { lexer.NextToken(); Expr( -#line 1590 "VBNET.ATG" +#line 1598 "VBNET.ATG" out expr); Expect(25); -#line 1590 "VBNET.ATG" +#line 1598 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: case 204: { Identifier(); -#line 1591 "VBNET.ATG" +#line 1600 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); + +#line 1601 "VBNET.ATG" + pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; break; } case 52: case 54: case 65: case 76: case 77: case 84: case 111: case 117: case 133: case 159: case 160: case 165: case 190: case 191: case 192: case 193: { -#line 1592 "VBNET.ATG" +#line 1602 "VBNET.ATG" string val = String.Empty; if (StartOf(10)) { PrimitiveTypeName( -#line 1593 "VBNET.ATG" +#line 1603 "VBNET.ATG" out val); } else if (la.kind == 133) { lexer.NextToken(); -#line 1593 "VBNET.ATG" +#line 1603 "VBNET.ATG" val = "Object"; } else SynErr(240); Expect(10); -#line 1594 "VBNET.ATG" +#line 1604 "VBNET.ATG" t.val = ""; Identifier(); -#line 1594 "VBNET.ATG" +#line 1604 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 119: { lexer.NextToken(); -#line 1595 "VBNET.ATG" +#line 1605 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 124: case 125: { -#line 1596 "VBNET.ATG" +#line 1606 "VBNET.ATG" Expression retExpr = null; if (la.kind == 124) { lexer.NextToken(); -#line 1597 "VBNET.ATG" +#line 1607 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 125) { lexer.NextToken(); -#line 1598 "VBNET.ATG" +#line 1608 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(241); Expect(10); IdentifierOrKeyword( -#line 1600 "VBNET.ATG" +#line 1610 "VBNET.ATG" out name); -#line 1600 "VBNET.ATG" +#line 1610 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); break; } @@ -3664,77 +3674,77 @@ out name); Expect(10); Identifier(); -#line 1602 "VBNET.ATG" +#line 1612 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1604 "VBNET.ATG" +#line 1614 "VBNET.ATG" type.IsGlobal = true; -#line 1605 "VBNET.ATG" +#line 1615 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 127: { ObjectCreateExpression( -#line 1606 "VBNET.ATG" +#line 1616 "VBNET.ATG" out expr); -#line 1606 "VBNET.ATG" +#line 1616 "VBNET.ATG" pexpr = expr; break; } case 75: case 82: case 199: { -#line 1608 "VBNET.ATG" +#line 1618 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 82) { lexer.NextToken(); } else if (la.kind == 75) { lexer.NextToken(); -#line 1610 "VBNET.ATG" +#line 1620 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 199) { lexer.NextToken(); -#line 1611 "VBNET.ATG" +#line 1621 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(242); Expect(24); Expr( -#line 1613 "VBNET.ATG" +#line 1623 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1613 "VBNET.ATG" +#line 1623 "VBNET.ATG" out type); Expect(25); -#line 1614 "VBNET.ATG" +#line 1624 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 59: case 60: case 61: case 62: case 63: case 64: case 66: case 68: case 69: case 72: case 73: case 74: case 194: case 195: case 196: case 197: { CastTarget( -#line 1615 "VBNET.ATG" +#line 1625 "VBNET.ATG" out type); Expect(24); Expr( -#line 1615 "VBNET.ATG" +#line 1625 "VBNET.ATG" out expr); Expect(25); -#line 1615 "VBNET.ATG" +#line 1625 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 43: { lexer.NextToken(); Expr( -#line 1616 "VBNET.ATG" +#line 1626 "VBNET.ATG" out expr); -#line 1616 "VBNET.ATG" +#line 1626 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3742,25 +3752,25 @@ out expr); lexer.NextToken(); Expect(24); GetTypeTypeName( -#line 1617 "VBNET.ATG" +#line 1627 "VBNET.ATG" out type); Expect(25); -#line 1617 "VBNET.ATG" +#line 1627 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 175: { lexer.NextToken(); SimpleExpr( -#line 1618 "VBNET.ATG" +#line 1628 "VBNET.ATG" out expr); Expect(113); TypeName( -#line 1618 "VBNET.ATG" +#line 1628 "VBNET.ATG" out type); -#line 1618 "VBNET.ATG" +#line 1628 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } @@ -3768,49 +3778,49 @@ out type); } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1622 "VBNET.ATG" +#line 1632 "VBNET.ATG" out name); -#line 1622 "VBNET.ATG" +#line 1632 "VBNET.ATG" pexpr = new FieldReferenceExpression(null, name); } else SynErr(243); } void IdentifierOrKeyword( -#line 2800 "VBNET.ATG" +#line 2808 "VBNET.ATG" out string name) { -#line 2802 "VBNET.ATG" +#line 2810 "VBNET.ATG" lexer.NextToken(); name = t.val; } void InvocationExpression( -#line 1626 "VBNET.ATG" +#line 1636 "VBNET.ATG" ref Expression pexpr) { -#line 1627 "VBNET.ATG" +#line 1637 "VBNET.ATG" List typeParameters = new List(); List parameters = null; TypeReference type; Expect(24); -#line 1631 "VBNET.ATG" +#line 1641 "VBNET.ATG" Location start = t.Location; if (la.kind == 200) { lexer.NextToken(); TypeName( -#line 1633 "VBNET.ATG" +#line 1643 "VBNET.ATG" out type); -#line 1633 "VBNET.ATG" +#line 1643 "VBNET.ATG" if (type != null) typeParameters.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1636 "VBNET.ATG" +#line 1646 "VBNET.ATG" out type); -#line 1636 "VBNET.ATG" +#line 1646 "VBNET.ATG" if (type != null) typeParameters.Add(type); } Expect(25); @@ -3818,141 +3828,141 @@ out type); lexer.NextToken(); Identifier(); -#line 1641 "VBNET.ATG" +#line 1651 "VBNET.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); } else if (la.kind == 24) { lexer.NextToken(); ArgumentList( -#line 1643 "VBNET.ATG" +#line 1653 "VBNET.ATG" out parameters); Expect(25); -#line 1645 "VBNET.ATG" +#line 1655 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); } else SynErr(244); } else if (StartOf(30)) { ArgumentList( -#line 1647 "VBNET.ATG" +#line 1657 "VBNET.ATG" out parameters); Expect(25); -#line 1649 "VBNET.ATG" +#line 1659 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); } else SynErr(245); -#line 1651 "VBNET.ATG" +#line 1661 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 2807 "VBNET.ATG" +#line 2815 "VBNET.ATG" out string type) { -#line 2808 "VBNET.ATG" +#line 2816 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 52: { lexer.NextToken(); -#line 2809 "VBNET.ATG" +#line 2817 "VBNET.ATG" type = "Boolean"; break; } case 76: { lexer.NextToken(); -#line 2810 "VBNET.ATG" +#line 2818 "VBNET.ATG" type = "Date"; break; } case 65: { lexer.NextToken(); -#line 2811 "VBNET.ATG" +#line 2819 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2812 "VBNET.ATG" +#line 2820 "VBNET.ATG" type = "String"; break; } case 77: { lexer.NextToken(); -#line 2813 "VBNET.ATG" +#line 2821 "VBNET.ATG" type = "Decimal"; break; } case 54: { lexer.NextToken(); -#line 2814 "VBNET.ATG" +#line 2822 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2815 "VBNET.ATG" +#line 2823 "VBNET.ATG" type = "Short"; break; } case 111: { lexer.NextToken(); -#line 2816 "VBNET.ATG" +#line 2824 "VBNET.ATG" type = "Integer"; break; } case 117: { lexer.NextToken(); -#line 2817 "VBNET.ATG" +#line 2825 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2818 "VBNET.ATG" +#line 2826 "VBNET.ATG" type = "Single"; break; } case 84: { lexer.NextToken(); -#line 2819 "VBNET.ATG" +#line 2827 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2820 "VBNET.ATG" +#line 2828 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2821 "VBNET.ATG" +#line 2829 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2822 "VBNET.ATG" +#line 2830 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2823 "VBNET.ATG" +#line 2831 "VBNET.ATG" type = "SByte"; break; } @@ -3961,122 +3971,122 @@ out string type) { } void CastTarget( -#line 1656 "VBNET.ATG" +#line 1666 "VBNET.ATG" out TypeReference type) { -#line 1658 "VBNET.ATG" +#line 1668 "VBNET.ATG" type = null; switch (la.kind) { case 59: { lexer.NextToken(); -#line 1660 "VBNET.ATG" +#line 1670 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 60: { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1671 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 194: { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1672 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 61: { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1673 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 62: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1674 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 64: { lexer.NextToken(); -#line 1665 "VBNET.ATG" +#line 1675 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 63: { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1676 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 72: { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1677 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 66: { lexer.NextToken(); -#line 1668 "VBNET.ATG" +#line 1678 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 68: { lexer.NextToken(); -#line 1669 "VBNET.ATG" +#line 1679 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 195: { lexer.NextToken(); -#line 1670 "VBNET.ATG" +#line 1680 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 196: { lexer.NextToken(); -#line 1671 "VBNET.ATG" +#line 1681 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 197: { lexer.NextToken(); -#line 1672 "VBNET.ATG" +#line 1682 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 69: { lexer.NextToken(); -#line 1673 "VBNET.ATG" +#line 1683 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 73: { lexer.NextToken(); -#line 1674 "VBNET.ATG" +#line 1684 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 74: { lexer.NextToken(); -#line 1675 "VBNET.ATG" +#line 1685 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -4085,19 +4095,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 1933 "VBNET.ATG" +#line 1943 "VBNET.ATG" out TypeReference typeref) { -#line 1934 "VBNET.ATG" +#line 1944 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1936 "VBNET.ATG" +#line 1946 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 1937 "VBNET.ATG" +#line 1947 "VBNET.ATG" out rank); -#line 1938 "VBNET.ATG" +#line 1948 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4105,348 +4115,348 @@ out rank); } void ArgumentList( -#line 1868 "VBNET.ATG" +#line 1878 "VBNET.ATG" out List arguments) { -#line 1870 "VBNET.ATG" +#line 1880 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(27)) { Argument( -#line 1873 "VBNET.ATG" +#line 1883 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1874 "VBNET.ATG" +#line 1884 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(27)) { Argument( -#line 1875 "VBNET.ATG" +#line 1885 "VBNET.ATG" out expr); } -#line 1876 "VBNET.ATG" +#line 1886 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 1878 "VBNET.ATG" +#line 1888 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1694 "VBNET.ATG" +#line 1704 "VBNET.ATG" out Expression outExpr) { -#line 1696 "VBNET.ATG" +#line 1706 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1699 "VBNET.ATG" +#line 1709 "VBNET.ATG" out outExpr); while (la.kind == 45 || la.kind == 46) { if (la.kind == 45) { lexer.NextToken(); -#line 1702 "VBNET.ATG" +#line 1712 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1703 "VBNET.ATG" +#line 1713 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1705 "VBNET.ATG" +#line 1715 "VBNET.ATG" out expr); -#line 1705 "VBNET.ATG" +#line 1715 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1709 "VBNET.ATG" +#line 1719 "VBNET.ATG" out Expression outExpr) { -#line 1710 "VBNET.ATG" +#line 1720 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 129) { lexer.NextToken(); -#line 1711 "VBNET.ATG" +#line 1721 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1712 "VBNET.ATG" +#line 1722 "VBNET.ATG" out outExpr); -#line 1713 "VBNET.ATG" +#line 1723 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1718 "VBNET.ATG" +#line 1728 "VBNET.ATG" out Expression outExpr) { -#line 1720 "VBNET.ATG" +#line 1730 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1723 "VBNET.ATG" +#line 1733 "VBNET.ATG" out outExpr); while (StartOf(31)) { switch (la.kind) { case 27: { lexer.NextToken(); -#line 1726 "VBNET.ATG" +#line 1736 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 1727 "VBNET.ATG" +#line 1737 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1728 "VBNET.ATG" +#line 1738 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1729 "VBNET.ATG" +#line 1739 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 1730 "VBNET.ATG" +#line 1740 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 11: { lexer.NextToken(); -#line 1731 "VBNET.ATG" +#line 1741 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 116: { lexer.NextToken(); -#line 1732 "VBNET.ATG" +#line 1742 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 113: { lexer.NextToken(); -#line 1733 "VBNET.ATG" +#line 1743 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 189: { lexer.NextToken(); -#line 1734 "VBNET.ATG" +#line 1744 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(32)) { ShiftExpr( -#line 1737 "VBNET.ATG" +#line 1747 "VBNET.ATG" out expr); -#line 1737 "VBNET.ATG" +#line 1747 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 129) { lexer.NextToken(); ShiftExpr( -#line 1740 "VBNET.ATG" +#line 1750 "VBNET.ATG" out expr); -#line 1740 "VBNET.ATG" +#line 1750 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); } else SynErr(248); } } void ShiftExpr( -#line 1745 "VBNET.ATG" +#line 1755 "VBNET.ATG" out Expression outExpr) { -#line 1747 "VBNET.ATG" +#line 1757 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1750 "VBNET.ATG" +#line 1760 "VBNET.ATG" out outExpr); while (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1763 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1764 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1756 "VBNET.ATG" +#line 1766 "VBNET.ATG" out expr); -#line 1756 "VBNET.ATG" +#line 1766 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1760 "VBNET.ATG" +#line 1770 "VBNET.ATG" out Expression outExpr) { -#line 1761 "VBNET.ATG" +#line 1771 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1763 "VBNET.ATG" +#line 1773 "VBNET.ATG" out outExpr); while (la.kind == 19) { lexer.NextToken(); AdditiveExpr( -#line 1763 "VBNET.ATG" +#line 1773 "VBNET.ATG" out expr); -#line 1763 "VBNET.ATG" +#line 1773 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1766 "VBNET.ATG" +#line 1776 "VBNET.ATG" out Expression outExpr) { -#line 1768 "VBNET.ATG" +#line 1778 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1771 "VBNET.ATG" +#line 1781 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15) { if (la.kind == 14) { lexer.NextToken(); -#line 1774 "VBNET.ATG" +#line 1784 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1775 "VBNET.ATG" +#line 1785 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1777 "VBNET.ATG" +#line 1787 "VBNET.ATG" out expr); -#line 1777 "VBNET.ATG" +#line 1787 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1781 "VBNET.ATG" +#line 1791 "VBNET.ATG" out Expression outExpr) { -#line 1782 "VBNET.ATG" +#line 1792 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1784 "VBNET.ATG" +#line 1794 "VBNET.ATG" out outExpr); while (la.kind == 120) { lexer.NextToken(); IntegerDivisionExpr( -#line 1784 "VBNET.ATG" +#line 1794 "VBNET.ATG" out expr); -#line 1784 "VBNET.ATG" +#line 1794 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1787 "VBNET.ATG" +#line 1797 "VBNET.ATG" out Expression outExpr) { -#line 1788 "VBNET.ATG" +#line 1798 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1790 "VBNET.ATG" +#line 1800 "VBNET.ATG" out outExpr); while (la.kind == 18) { lexer.NextToken(); MultiplicativeExpr( -#line 1790 "VBNET.ATG" +#line 1800 "VBNET.ATG" out expr); -#line 1790 "VBNET.ATG" +#line 1800 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1793 "VBNET.ATG" +#line 1803 "VBNET.ATG" out Expression outExpr) { -#line 1795 "VBNET.ATG" +#line 1805 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1798 "VBNET.ATG" +#line 1808 "VBNET.ATG" out outExpr); while (la.kind == 16 || la.kind == 17) { if (la.kind == 16) { lexer.NextToken(); -#line 1801 "VBNET.ATG" +#line 1811 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1802 "VBNET.ATG" +#line 1812 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1804 "VBNET.ATG" +#line 1814 "VBNET.ATG" out expr); -#line 1804 "VBNET.ATG" +#line 1814 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1808 "VBNET.ATG" +#line 1818 "VBNET.ATG" out Expression uExpr) { -#line 1810 "VBNET.ATG" +#line 1820 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4455,25 +4465,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1814 "VBNET.ATG" +#line 1824 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1815 "VBNET.ATG" +#line 1825 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1816 "VBNET.ATG" +#line 1826 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } ExponentiationExpr( -#line 1818 "VBNET.ATG" +#line 1828 "VBNET.ATG" out expr); -#line 1820 "VBNET.ATG" +#line 1830 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4483,107 +4493,107 @@ out expr); } void ExponentiationExpr( -#line 1828 "VBNET.ATG" +#line 1838 "VBNET.ATG" out Expression outExpr) { -#line 1829 "VBNET.ATG" +#line 1839 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1831 "VBNET.ATG" +#line 1841 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1831 "VBNET.ATG" +#line 1841 "VBNET.ATG" out expr); -#line 1831 "VBNET.ATG" +#line 1841 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 1882 "VBNET.ATG" +#line 1892 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 1884 "VBNET.ATG" +#line 1894 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(27)) { Argument( -#line 1889 "VBNET.ATG" +#line 1899 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1890 "VBNET.ATG" +#line 1900 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 1891 "VBNET.ATG" +#line 1901 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 1894 "VBNET.ATG" +#line 1904 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 1895 "VBNET.ATG" +#line 1905 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 1896 "VBNET.ATG" +#line 1906 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(27)) { Argument( -#line 1897 "VBNET.ATG" +#line 1907 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1898 "VBNET.ATG" +#line 1908 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 1899 "VBNET.ATG" +#line 1909 "VBNET.ATG" out expr); } } -#line 1901 "VBNET.ATG" +#line 1911 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 1903 "VBNET.ATG" +#line 1913 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 1990 "VBNET.ATG" +#line 2000 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1992 "VBNET.ATG" +#line 2002 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1995 "VBNET.ATG" +#line 2005 "VBNET.ATG" IsDims()) { Expect(24); if (la.kind == 12 || la.kind == 25) { RankList( -#line 1997 "VBNET.ATG" +#line 2007 "VBNET.ATG" out i); } -#line 1999 "VBNET.ATG" +#line 2009 "VBNET.ATG" arrayModifiers.Add(i); Expect(25); } -#line 2004 "VBNET.ATG" +#line 2014 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4591,69 +4601,69 @@ out i); } void Argument( -#line 1907 "VBNET.ATG" +#line 1917 "VBNET.ATG" out Expression argumentexpr) { -#line 1909 "VBNET.ATG" +#line 1919 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1913 "VBNET.ATG" +#line 1923 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1913 "VBNET.ATG" +#line 1923 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1913 "VBNET.ATG" +#line 1923 "VBNET.ATG" out expr); -#line 1915 "VBNET.ATG" +#line 1925 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(27)) { Expr( -#line 1918 "VBNET.ATG" +#line 1928 "VBNET.ATG" out argumentexpr); } else SynErr(249); } void QualIdentAndTypeArguments( -#line 1964 "VBNET.ATG" +#line 1974 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1965 "VBNET.ATG" +#line 1975 "VBNET.ATG" string name; typeref = null; Qualident( -#line 1967 "VBNET.ATG" +#line 1977 "VBNET.ATG" out name); -#line 1968 "VBNET.ATG" +#line 1978 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1969 "VBNET.ATG" +#line 1979 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); if ( -#line 1971 "VBNET.ATG" +#line 1981 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 1972 "VBNET.ATG" +#line 1982 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 1973 "VBNET.ATG" +#line 1983 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(6)) { TypeArgumentList( -#line 1974 "VBNET.ATG" +#line 1984 "VBNET.ATG" typeref.GenericTypes); } else SynErr(250); Expect(25); @@ -4661,48 +4671,48 @@ typeref.GenericTypes); } void TypeArgumentList( -#line 2017 "VBNET.ATG" +#line 2027 "VBNET.ATG" List typeArguments) { -#line 2019 "VBNET.ATG" +#line 2029 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2021 "VBNET.ATG" +#line 2031 "VBNET.ATG" out typeref); -#line 2021 "VBNET.ATG" +#line 2031 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2024 "VBNET.ATG" +#line 2034 "VBNET.ATG" out typeref); -#line 2024 "VBNET.ATG" +#line 2034 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2011 "VBNET.ATG" +#line 2021 "VBNET.ATG" out int i) { -#line 2012 "VBNET.ATG" +#line 2022 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2013 "VBNET.ATG" +#line 2023 "VBNET.ATG" ++i; } } void Attribute( -#line 2049 "VBNET.ATG" +#line 2059 "VBNET.ATG" out ASTAttribute attribute) { -#line 2050 "VBNET.ATG" +#line 2060 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4712,39 +4722,39 @@ out ASTAttribute attribute) { Expect(10); } Qualident( -#line 2055 "VBNET.ATG" +#line 2065 "VBNET.ATG" out name); if (la.kind == 24) { AttributeArguments( -#line 2056 "VBNET.ATG" +#line 2066 "VBNET.ATG" positional, named); } -#line 2057 "VBNET.ATG" +#line 2067 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2061 "VBNET.ATG" +#line 2071 "VBNET.ATG" List positional, List named) { -#line 2063 "VBNET.ATG" +#line 2073 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(24); if ( -#line 2069 "VBNET.ATG" +#line 2079 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2071 "VBNET.ATG" +#line 2081 "VBNET.ATG" IsNamedAssign()) { -#line 2071 "VBNET.ATG" +#line 2081 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2072 "VBNET.ATG" +#line 2082 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4752,10 +4762,10 @@ out name); Expect(11); } Expr( -#line 2074 "VBNET.ATG" +#line 2084 "VBNET.ATG" out expr); -#line 2076 "VBNET.ATG" +#line 2086 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -4764,13 +4774,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2084 "VBNET.ATG" +#line 2094 "VBNET.ATG" IsNamedAssign()) { -#line 2084 "VBNET.ATG" +#line 2094 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2085 "VBNET.ATG" +#line 2095 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4778,14 +4788,14 @@ out name); Expect(11); } else if (StartOf(27)) { -#line 2087 "VBNET.ATG" +#line 2097 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(251); Expr( -#line 2088 "VBNET.ATG" +#line 2098 "VBNET.ATG" out expr); -#line 2088 "VBNET.ATG" +#line 2098 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4796,10 +4806,10 @@ out expr); } void FormalParameter( -#line 2157 "VBNET.ATG" +#line 2167 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2159 "VBNET.ATG" +#line 2169 "VBNET.ATG" TypeReference type = null; ParamModifierList mod = new ParamModifierList(this); Expression expr = null; @@ -4807,28 +4817,28 @@ out ParameterDeclarationExpression p) { while (StartOf(33)) { ParameterModifier( -#line 2164 "VBNET.ATG" +#line 2174 "VBNET.ATG" mod); } Identifier(); -#line 2165 "VBNET.ATG" +#line 2175 "VBNET.ATG" string parameterName = t.val; if ( -#line 2166 "VBNET.ATG" +#line 2176 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2166 "VBNET.ATG" +#line 2176 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2167 "VBNET.ATG" +#line 2177 "VBNET.ATG" out type); } -#line 2169 "VBNET.ATG" +#line 2179 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4844,45 +4854,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2181 "VBNET.ATG" +#line 2191 "VBNET.ATG" out expr); } -#line 2183 "VBNET.ATG" +#line 2193 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2826 "VBNET.ATG" +#line 2834 "VBNET.ATG" ParamModifierList m) { if (la.kind == 55) { lexer.NextToken(); -#line 2827 "VBNET.ATG" +#line 2835 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 53) { lexer.NextToken(); -#line 2828 "VBNET.ATG" +#line 2836 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 137) { lexer.NextToken(); -#line 2829 "VBNET.ATG" +#line 2837 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2830 "VBNET.ATG" +#line 2838 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(252); } void Statement() { -#line 2210 "VBNET.ATG" +#line 2220 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -4890,34 +4900,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2216 "VBNET.ATG" +#line 2226 "VBNET.ATG" IsLabel()) { LabelName( -#line 2216 "VBNET.ATG" +#line 2226 "VBNET.ATG" out label); -#line 2218 "VBNET.ATG" +#line 2228 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(34)) { EmbeddedStatement( -#line 2221 "VBNET.ATG" +#line 2231 "VBNET.ATG" out stmt); -#line 2221 "VBNET.ATG" +#line 2231 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(35)) { LocalDeclarationStatement( -#line 2222 "VBNET.ATG" +#line 2232 "VBNET.ATG" out stmt); -#line 2222 "VBNET.ATG" +#line 2232 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(253); -#line 2225 "VBNET.ATG" +#line 2235 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -4926,30 +4936,30 @@ out stmt); } void LabelName( -#line 2609 "VBNET.ATG" +#line 2617 "VBNET.ATG" out string name) { -#line 2611 "VBNET.ATG" +#line 2619 "VBNET.ATG" name = String.Empty; if (StartOf(13)) { Identifier(); -#line 2613 "VBNET.ATG" +#line 2621 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2614 "VBNET.ATG" +#line 2622 "VBNET.ATG" name = t.val; } else SynErr(254); } void EmbeddedStatement( -#line 2264 "VBNET.ATG" +#line 2274 "VBNET.ATG" out Statement statement) { -#line 2266 "VBNET.ATG" +#line 2276 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -4960,103 +4970,103 @@ out Statement statement) { case 94: { lexer.NextToken(); -#line 2272 "VBNET.ATG" +#line 2282 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2274 "VBNET.ATG" +#line 2284 "VBNET.ATG" exitType = ExitType.Sub; break; } case 100: { lexer.NextToken(); -#line 2276 "VBNET.ATG" +#line 2286 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2278 "VBNET.ATG" +#line 2288 "VBNET.ATG" exitType = ExitType.Property; break; } case 83: { lexer.NextToken(); -#line 2280 "VBNET.ATG" +#line 2290 "VBNET.ATG" exitType = ExitType.Do; break; } case 98: { lexer.NextToken(); -#line 2282 "VBNET.ATG" +#line 2292 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2284 "VBNET.ATG" +#line 2294 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2286 "VBNET.ATG" +#line 2296 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2288 "VBNET.ATG" +#line 2298 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(255); break; } -#line 2290 "VBNET.ATG" +#line 2300 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2291 "VBNET.ATG" +#line 2301 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2292 "VBNET.ATG" +#line 2302 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 83 || la.kind == 98 || la.kind == 181) { if (la.kind == 83) { lexer.NextToken(); -#line 2292 "VBNET.ATG" +#line 2302 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 98) { lexer.NextToken(); -#line 2292 "VBNET.ATG" +#line 2302 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2292 "VBNET.ATG" +#line 2302 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2292 "VBNET.ATG" +#line 2302 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5064,11 +5074,11 @@ out statement); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2294 "VBNET.ATG" +#line 2304 "VBNET.ATG" out expr); } -#line 2294 "VBNET.ATG" +#line 2304 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5076,27 +5086,27 @@ out expr); lexer.NextToken(); if (StartOf(27)) { Expr( -#line 2296 "VBNET.ATG" +#line 2306 "VBNET.ATG" out expr); } -#line 2296 "VBNET.ATG" +#line 2306 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2298 "VBNET.ATG" +#line 2308 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2298 "VBNET.ATG" +#line 2308 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(168); -#line 2299 "VBNET.ATG" +#line 2309 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5104,42 +5114,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2301 "VBNET.ATG" +#line 2311 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(30)) { ArgumentList( -#line 2302 "VBNET.ATG" +#line 2312 "VBNET.ATG" out p); } Expect(25); } -#line 2303 "VBNET.ATG" +#line 2313 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2305 "VBNET.ATG" +#line 2315 "VBNET.ATG" out statement); break; } case 42: { lexer.NextToken(); -#line 2307 "VBNET.ATG" +#line 2317 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2308 "VBNET.ATG" +#line 2318 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2308 "VBNET.ATG" +#line 2318 "VBNET.ATG" out handlerExpr); -#line 2310 "VBNET.ATG" +#line 2320 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5147,17 +5157,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2313 "VBNET.ATG" +#line 2323 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2314 "VBNET.ATG" +#line 2324 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2314 "VBNET.ATG" +#line 2324 "VBNET.ATG" out handlerExpr); -#line 2316 "VBNET.ATG" +#line 2326 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5165,16 +5175,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2319 "VBNET.ATG" +#line 2329 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2320 "VBNET.ATG" +#line 2330 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(181); -#line 2322 "VBNET.ATG" +#line 2332 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5182,23 +5192,23 @@ out embeddedStatement); case 83: { lexer.NextToken(); -#line 2327 "VBNET.ATG" +#line 2337 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2330 "VBNET.ATG" +#line 2340 "VBNET.ATG" out conditionType); Expr( -#line 2330 "VBNET.ATG" +#line 2340 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2331 "VBNET.ATG" +#line 2341 "VBNET.ATG" out embeddedStatement); Expect(118); -#line 2334 "VBNET.ATG" +#line 2344 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5207,19 +5217,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2341 "VBNET.ATG" +#line 2351 "VBNET.ATG" out embeddedStatement); Expect(118); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2342 "VBNET.ATG" +#line 2352 "VBNET.ATG" out conditionType); Expr( -#line 2342 "VBNET.ATG" +#line 2352 "VBNET.ATG" out expr); } -#line 2344 "VBNET.ATG" +#line 2354 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(256); @@ -5228,7 +5238,7 @@ out expr); case 98: { lexer.NextToken(); -#line 2349 "VBNET.ATG" +#line 2359 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5237,24 +5247,24 @@ out expr); if (la.kind == 85) { lexer.NextToken(); LoopControlVariable( -#line 2356 "VBNET.ATG" +#line 2366 "VBNET.ATG" out typeReference, out typeName); Expect(109); Expr( -#line 2357 "VBNET.ATG" +#line 2367 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2358 "VBNET.ATG" +#line 2368 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(27)) { Expr( -#line 2359 "VBNET.ATG" +#line 2369 "VBNET.ATG" out expr); } -#line 2361 "VBNET.ATG" +#line 2371 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5266,53 +5276,53 @@ out expr); } else if (StartOf(13)) { -#line 2372 "VBNET.ATG" +#line 2382 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2377 "VBNET.ATG" +#line 2387 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2378 "VBNET.ATG" +#line 2388 "VBNET.ATG" out start); Expect(172); Expr( -#line 2378 "VBNET.ATG" +#line 2388 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2378 "VBNET.ATG" +#line 2388 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2379 "VBNET.ATG" +#line 2389 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(27)) { Expr( -#line 2382 "VBNET.ATG" +#line 2392 "VBNET.ATG" out nextExpr); -#line 2382 "VBNET.ATG" +#line 2392 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2383 "VBNET.ATG" +#line 2393 "VBNET.ATG" out nextExpr); -#line 2383 "VBNET.ATG" +#line 2393 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2386 "VBNET.ATG" +#line 2396 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(257); @@ -5321,55 +5331,51 @@ out nextExpr); case 92: { lexer.NextToken(); Expr( -#line 2390 "VBNET.ATG" +#line 2400 "VBNET.ATG" out expr); -#line 2390 "VBNET.ATG" +#line 2400 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2392 "VBNET.ATG" +#line 2402 "VBNET.ATG" bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2392 "VBNET.ATG" +#line 2402 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2393 "VBNET.ATG" +#line 2403 "VBNET.ATG" out expr); -#line 2395 "VBNET.ATG" +#line 2405 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; - InvocationExpression redimClause = expr as InvocationExpression; - if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } + SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2400 "VBNET.ATG" +#line 2409 "VBNET.ATG" out expr); -#line 2401 "VBNET.ATG" - redimClause = expr as InvocationExpression; - -#line 2402 "VBNET.ATG" - if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } +#line 2410 "VBNET.ATG" + SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } break; } case 91: { lexer.NextToken(); Expr( -#line 2406 "VBNET.ATG" +#line 2414 "VBNET.ATG" out expr); -#line 2407 "VBNET.ATG" +#line 2415 "VBNET.ATG" List arrays = new List(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5378,85 +5384,85 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2412 "VBNET.ATG" +#line 2420 "VBNET.ATG" out expr); -#line 2412 "VBNET.ATG" +#line 2420 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2413 "VBNET.ATG" +#line 2421 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2415 "VBNET.ATG" +#line 2423 "VBNET.ATG" statement = new StopStatement(); break; } case 106: { lexer.NextToken(); -#line 2417 "VBNET.ATG" +#line 2425 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2417 "VBNET.ATG" +#line 2425 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2419 "VBNET.ATG" +#line 2427 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); -#line 2419 "VBNET.ATG" +#line 2427 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); statement.StartLocation = ifStartLocation; statement.EndLocation = t.Location; } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2422 "VBNET.ATG" +#line 2430 "VBNET.ATG" out embeddedStatement); -#line 2424 "VBNET.ATG" +#line 2432 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 87 || -#line 2430 "VBNET.ATG" +#line 2438 "VBNET.ATG" IsElseIf()) { if ( -#line 2430 "VBNET.ATG" +#line 2438 "VBNET.ATG" IsElseIf()) { Expect(86); -#line 2430 "VBNET.ATG" +#line 2438 "VBNET.ATG" elseIfStart = t.Location; Expect(106); } else { lexer.NextToken(); -#line 2431 "VBNET.ATG" +#line 2439 "VBNET.ATG" elseIfStart = t.Location; } -#line 2433 "VBNET.ATG" +#line 2441 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2434 "VBNET.ATG" +#line 2442 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2435 "VBNET.ATG" +#line 2443 "VBNET.ATG" out block); -#line 2437 "VBNET.ATG" +#line 2445 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5468,61 +5474,61 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2446 "VBNET.ATG" +#line 2454 "VBNET.ATG" out embeddedStatement); -#line 2448 "VBNET.ATG" +#line 2456 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(88); Expect(106); -#line 2452 "VBNET.ATG" +#line 2460 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(34)) { EmbeddedStatement( -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" out embeddedStatement); -#line 2458 "VBNET.ATG" +#line 2466 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2461 "VBNET.ATG" +#line 2469 "VBNET.ATG" out embeddedStatement); -#line 2461 "VBNET.ATG" +#line 2469 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 86) { lexer.NextToken(); if (StartOf(34)) { EmbeddedStatement( -#line 2463 "VBNET.ATG" +#line 2471 "VBNET.ATG" out embeddedStatement); } -#line 2465 "VBNET.ATG" +#line 2473 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2468 "VBNET.ATG" +#line 2476 "VBNET.ATG" out embeddedStatement); -#line 2469 "VBNET.ATG" +#line 2477 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2472 "VBNET.ATG" +#line 2480 "VBNET.ATG" ifStatement.EndLocation = ifStartLocation; statement = ifStatement; } else SynErr(258); break; @@ -5533,43 +5539,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2475 "VBNET.ATG" +#line 2483 "VBNET.ATG" out expr); EndOfStmt(); -#line 2476 "VBNET.ATG" +#line 2484 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 57) { -#line 2480 "VBNET.ATG" +#line 2488 "VBNET.ATG" List caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2481 "VBNET.ATG" +#line 2489 "VBNET.ATG" out caseClauses); if ( -#line 2481 "VBNET.ATG" +#line 2489 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2483 "VBNET.ATG" +#line 2491 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2485 "VBNET.ATG" +#line 2493 "VBNET.ATG" out block); -#line 2487 "VBNET.ATG" +#line 2495 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2491 "VBNET.ATG" +#line 2499 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(88); Expect(155); @@ -5577,43 +5583,43 @@ out block); } case 135: { -#line 2493 "VBNET.ATG" +#line 2501 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2494 "VBNET.ATG" +#line 2502 "VBNET.ATG" out onErrorStatement); -#line 2494 "VBNET.ATG" +#line 2502 "VBNET.ATG" statement = onErrorStatement; break; } case 104: { -#line 2495 "VBNET.ATG" +#line 2503 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2496 "VBNET.ATG" +#line 2504 "VBNET.ATG" out goToStatement); -#line 2496 "VBNET.ATG" +#line 2504 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2497 "VBNET.ATG" +#line 2505 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2498 "VBNET.ATG" +#line 2506 "VBNET.ATG" out resumeStatement); -#line 2498 "VBNET.ATG" +#line 2506 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 24: case 43: case 47: case 49: case 50: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: case 133: case 144: case 159: case 160: case 165: case 169: case 173: case 175: case 176: case 177: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: case 204: { -#line 2501 "VBNET.ATG" +#line 2509 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5621,25 +5627,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2507 "VBNET.ATG" +#line 2515 "VBNET.ATG" out expr); if (StartOf(36)) { AssignmentOperator( -#line 2509 "VBNET.ATG" +#line 2517 "VBNET.ATG" out op); Expr( -#line 2509 "VBNET.ATG" +#line 2517 "VBNET.ATG" out val); -#line 2509 "VBNET.ATG" +#line 2517 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 86) { -#line 2510 "VBNET.ATG" +#line 2518 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(259); -#line 2513 "VBNET.ATG" +#line 2521 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5652,48 +5658,48 @@ out val); case 56: { lexer.NextToken(); SimpleExpr( -#line 2520 "VBNET.ATG" +#line 2528 "VBNET.ATG" out expr); -#line 2520 "VBNET.ATG" +#line 2528 "VBNET.ATG" statement = new ExpressionStatement(expr); break; } case 188: { lexer.NextToken(); -#line 2522 "VBNET.ATG" +#line 2530 "VBNET.ATG" Statement block; if ( -#line 2523 "VBNET.ATG" +#line 2531 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2524 "VBNET.ATG" +#line 2532 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2525 "VBNET.ATG" +#line 2533 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2527 "VBNET.ATG" +#line 2535 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2529 "VBNET.ATG" +#line 2537 "VBNET.ATG" out block); -#line 2530 "VBNET.ATG" +#line 2538 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(27)) { Expr( -#line 2531 "VBNET.ATG" +#line 2539 "VBNET.ATG" out expr); Block( -#line 2532 "VBNET.ATG" +#line 2540 "VBNET.ATG" out block); -#line 2533 "VBNET.ATG" +#line 2541 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(260); Expect(88); @@ -5705,10 +5711,10 @@ out block); } void LocalDeclarationStatement( -#line 2233 "VBNET.ATG" +#line 2243 "VBNET.ATG" out Statement statement) { -#line 2235 "VBNET.ATG" +#line 2245 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5717,22 +5723,22 @@ out Statement statement) { if (la.kind == 71) { lexer.NextToken(); -#line 2241 "VBNET.ATG" +#line 2251 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2242 "VBNET.ATG" +#line 2252 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2243 "VBNET.ATG" +#line 2253 "VBNET.ATG" dimfound = true; } } -#line 2246 "VBNET.ATG" +#line 2256 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5745,135 +5751,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2257 "VBNET.ATG" +#line 2267 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2258 "VBNET.ATG" +#line 2268 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2260 "VBNET.ATG" +#line 2270 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2723 "VBNET.ATG" +#line 2731 "VBNET.ATG" out Statement tryStatement) { -#line 2725 "VBNET.ATG" +#line 2733 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2728 "VBNET.ATG" +#line 2736 "VBNET.ATG" out blockStmt); if (la.kind == 58 || la.kind == 88 || la.kind == 97) { CatchClauses( -#line 2729 "VBNET.ATG" +#line 2737 "VBNET.ATG" out catchClauses); } if (la.kind == 97) { lexer.NextToken(); EndOfStmt(); Block( -#line 2730 "VBNET.ATG" +#line 2738 "VBNET.ATG" out finallyStmt); } Expect(88); Expect(174); -#line 2733 "VBNET.ATG" +#line 2741 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2703 "VBNET.ATG" +#line 2711 "VBNET.ATG" out Statement withStatement) { -#line 2705 "VBNET.ATG" +#line 2713 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2708 "VBNET.ATG" +#line 2716 "VBNET.ATG" Location start = t.Location; Expr( -#line 2709 "VBNET.ATG" +#line 2717 "VBNET.ATG" out expr); EndOfStmt(); -#line 2711 "VBNET.ATG" +#line 2719 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2714 "VBNET.ATG" +#line 2722 "VBNET.ATG" out blockStmt); -#line 2716 "VBNET.ATG" +#line 2724 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(88); Expect(182); -#line 2719 "VBNET.ATG" +#line 2727 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2696 "VBNET.ATG" +#line 2704 "VBNET.ATG" out ConditionType conditionType) { -#line 2697 "VBNET.ATG" +#line 2705 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2698 "VBNET.ATG" +#line 2706 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2699 "VBNET.ATG" +#line 2707 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(262); } void LoopControlVariable( -#line 2539 "VBNET.ATG" +#line 2547 "VBNET.ATG" out TypeReference type, out string name) { -#line 2540 "VBNET.ATG" +#line 2548 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2544 "VBNET.ATG" +#line 2552 "VBNET.ATG" out name); if ( -#line 2545 "VBNET.ATG" +#line 2553 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2545 "VBNET.ATG" +#line 2553 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2546 "VBNET.ATG" +#line 2554 "VBNET.ATG" out type); -#line 2546 "VBNET.ATG" +#line 2554 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2548 "VBNET.ATG" +#line 2556 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5885,59 +5891,59 @@ out type); } void ReDimClause( -#line 2618 "VBNET.ATG" +#line 2626 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 2620 "VBNET.ATG" +#line 2628 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 2621 "VBNET.ATG" +#line 2629 "VBNET.ATG" ref expr); } void CaseClauses( -#line 2656 "VBNET.ATG" +#line 2664 "VBNET.ATG" out List caseClauses) { -#line 2658 "VBNET.ATG" +#line 2666 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2661 "VBNET.ATG" +#line 2669 "VBNET.ATG" out caseClause); -#line 2661 "VBNET.ATG" +#line 2669 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2662 "VBNET.ATG" +#line 2670 "VBNET.ATG" out caseClause); -#line 2662 "VBNET.ATG" +#line 2670 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2559 "VBNET.ATG" +#line 2567 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2561 "VBNET.ATG" +#line 2569 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(135); Expect(92); if ( -#line 2567 "VBNET.ATG" +#line 2575 "VBNET.ATG" IsNegativeLabelName()) { Expect(104); Expect(15); Expect(5); -#line 2569 "VBNET.ATG" +#line 2577 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5946,10 +5952,10 @@ IsNegativeLabelName()) { } else if (la.kind == 104) { GotoStatement( -#line 2575 "VBNET.ATG" +#line 2583 "VBNET.ATG" out goToStatement); -#line 2577 "VBNET.ATG" +#line 2585 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -5966,88 +5972,88 @@ out goToStatement); lexer.NextToken(); Expect(128); -#line 2591 "VBNET.ATG" +#line 2599 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(263); } void GotoStatement( -#line 2597 "VBNET.ATG" +#line 2605 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2599 "VBNET.ATG" +#line 2607 "VBNET.ATG" string label = String.Empty; Expect(104); LabelName( -#line 2602 "VBNET.ATG" +#line 2610 "VBNET.ATG" out label); -#line 2604 "VBNET.ATG" +#line 2612 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2645 "VBNET.ATG" +#line 2653 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2647 "VBNET.ATG" +#line 2655 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2650 "VBNET.ATG" +#line 2658 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(128); -#line 2651 "VBNET.ATG" +#line 2659 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(37)) { LabelName( -#line 2652 "VBNET.ATG" +#line 2660 "VBNET.ATG" out label); } -#line 2652 "VBNET.ATG" +#line 2660 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(264); } void ReDimClauseInternal( -#line 2624 "VBNET.ATG" +#line 2632 "VBNET.ATG" ref Expression expr) { -#line 2625 "VBNET.ATG" +#line 2633 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 10 || -#line 2628 "VBNET.ATG" +#line 2636 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 2627 "VBNET.ATG" +#line 2635 "VBNET.ATG" out name); -#line 2627 "VBNET.ATG" +#line 2635 "VBNET.ATG" expr = new FieldReferenceExpression(expr, name); } else { InvocationExpression( -#line 2629 "VBNET.ATG" +#line 2637 "VBNET.ATG" ref expr); } } Expect(24); NormalOrReDimArgumentList( -#line 2632 "VBNET.ATG" +#line 2640 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(25); -#line 2634 "VBNET.ATG" +#line 2642 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -6059,10 +6065,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 2666 "VBNET.ATG" +#line 2674 "VBNET.ATG" out CaseLabel caseClause) { -#line 2668 "VBNET.ATG" +#line 2676 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6071,7 +6077,7 @@ out CaseLabel caseClause) { if (la.kind == 86) { lexer.NextToken(); -#line 2674 "VBNET.ATG" +#line 2682 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(38)) { if (la.kind == 113) { @@ -6081,76 +6087,76 @@ out CaseLabel caseClause) { case 27: { lexer.NextToken(); -#line 2678 "VBNET.ATG" +#line 2686 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 2679 "VBNET.ATG" +#line 2687 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 2680 "VBNET.ATG" +#line 2688 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2689 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2682 "VBNET.ATG" +#line 2690 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 2683 "VBNET.ATG" +#line 2691 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(265); break; } Expr( -#line 2685 "VBNET.ATG" +#line 2693 "VBNET.ATG" out expr); -#line 2687 "VBNET.ATG" +#line 2695 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(27)) { Expr( -#line 2689 "VBNET.ATG" +#line 2697 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2689 "VBNET.ATG" +#line 2697 "VBNET.ATG" out sexpr); } -#line 2691 "VBNET.ATG" +#line 2699 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(266); } void CatchClauses( -#line 2738 "VBNET.ATG" +#line 2746 "VBNET.ATG" out List catchClauses) { -#line 2740 "VBNET.ATG" +#line 2748 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6162,27 +6168,27 @@ out List catchClauses) { if (StartOf(13)) { Identifier(); -#line 2748 "VBNET.ATG" +#line 2756 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2748 "VBNET.ATG" +#line 2756 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2749 "VBNET.ATG" +#line 2757 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2751 "VBNET.ATG" +#line 2759 "VBNET.ATG" out blockStmt); -#line 2752 "VBNET.ATG" +#line 2760 "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 5d5ecdcbd1..01abcaa857 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -703,7 +703,7 @@ EnumMemberDecl f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); - f.StartLocation = t.Location; + f.StartLocation = varDecl.StartLocation = t.Location; .) [ "=" Expr (. varDecl.Initializer = expr; .) ] EOL @@ -1320,13 +1320,15 @@ ConstantDeclarator constantDeclaration> Expression expr = null; TypeReference type = null; string name = String.Empty; + Location location; .) = - Identifier (. name = t.val; .) + Identifier (. name = t.val; location = t.Location; .) ["As" TypeName ] "=" Expr (. VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; + f.StartLocation = location; constantDeclaration.Add(f); .) . @@ -1344,6 +1346,7 @@ VariableDeclaratorPartAfterIdentifier fieldDeclaration TypeReference type = null; ArrayList rank = null; List dimension = null; + Location startLocation = t.Location; .) = [ IF(IsSize() && !IsDims()) ArrayInitializationModifier ] [ IF(IsDims()) ArrayNameModifier ] @@ -1398,7 +1401,12 @@ VariableDeclaratorPartAfterIdentifier fieldDeclaration .) [ "=" VariableInitializer ] ) - (. fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); .) + (. + VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); + varDecl.StartLocation = startLocation; + varDecl.EndLocation = t.Location; + fieldDeclaration.Add(varDecl); + .) . /* 6.8 */ @@ -2396,12 +2404,10 @@ EmbeddedStatement (. ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; - InvocationExpression redimClause = expr as InvocationExpression; - if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } + SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); .) { "," ReDimClause - (. redimClause = expr as InvocationExpression; .) - (. if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } .) + (. SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); .) } | /* 10.12.2 */ "Erase" diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs index 31850d4eaa..4616f0bef6 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Diagnostics; using ICSharpCode.NRefactory.Ast; @@ -244,5 +245,20 @@ namespace ICSharpCode.NRefactory.Parser.VB if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") Error("lower bound of array must be zero"); } + + /// + /// Adds a child item to a collection stored in the parent node. + /// Also set's the item's parent to . + /// Does nothing if item is null. + /// + static void SafeAdd(INode parent, List list, T item) where T : class, INode + { + Debug.Assert(parent != null); + Debug.Assert((parent is INullable) ? !(parent as INullable).IsNull : true); + if (item != null) { + list.Add(item); + item.Parent = parent; + } + } } } diff --git a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs index a2adfcedff..487c57edd9 100644 --- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs @@ -1034,7 +1034,21 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public override object TrackedVisitReDimStatement(ReDimStatement reDimStatement, object data) { - NotSupported(reDimStatement); + if (!reDimStatement.IsPreserve) { + NotSupported(reDimStatement); + return null; + } + foreach (InvocationExpression ie in reDimStatement.ReDimClauses) { + outputFormatter.PrintText("Array.Resize(ref "); + ie.TargetObject.AcceptVisitor(this, data); + outputFormatter.PrintText(", "); + for (int i = 0; i < ie.Arguments.Count; i++) { + if (i > 0) outputFormatter.PrintText(", "); + Expression.AddInteger(ie.Arguments[i], 1).AcceptVisitor(this, data); + } + outputFormatter.PrintText(")"); + outputFormatter.PrintToken(Tokens.Semicolon); + } return null; } @@ -2081,6 +2095,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.PrintToken(Tokens.Assign); break; case AssignmentOperatorType.Add: + case AssignmentOperatorType.ConcatString: outputFormatter.PrintToken(Tokens.PlusAssign); break; case AssignmentOperatorType.Subtract: diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/LookupTableVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/LookupTableVisitor.cs index c737530662..68f6cc7578 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/LookupTableVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/LookupTableVisitor.cs @@ -14,6 +14,7 @@ namespace ICSharpCode.NRefactory.Visitors { public sealed class LocalLookupVariable { + public readonly string Name; public readonly TypeReference TypeRef; public readonly Location StartPos; public readonly Location EndPos; @@ -21,8 +22,9 @@ namespace ICSharpCode.NRefactory.Visitors public readonly bool IsLoopVariable; public readonly Expression Initializer; - public LocalLookupVariable(TypeReference typeRef, Location startPos, Location endPos, bool isConst, bool isLoopVariable, Expression initializer) + public LocalLookupVariable(string name, TypeReference typeRef, Location startPos, Location endPos, bool isConst, bool isLoopVariable, Expression initializer) { + this.Name = name; this.TypeRef = typeRef; this.StartPos = startPos; this.EndPos = endPos; @@ -69,7 +71,7 @@ namespace ICSharpCode.NRefactory.Visitors } else { list = (List)variables[name]; } - list.Add(new LocalLookupVariable(typeRef, startPos, endPos, isConst, isLoopVariable, initializer)); + list.Add(new LocalLookupVariable(name, typeRef, startPos, endPos, isConst, isLoopVariable, initializer)); } public override object VisitWithStatement(WithStatement withStatement, object data) diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/VBNetToCSharpConvertVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/VBNetToCSharpConvertVisitor.cs deleted file mode 100644 index fabc0f59f1..0000000000 --- a/src/Libraries/NRefactory/Project/Src/Visitors/VBNetToCSharpConvertVisitor.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.NRefactory.Ast; - -namespace ICSharpCode.NRefactory.Visitors -{ - /// - /// This class converts VB.NET constructs to their C# equivalents. - /// Applying the VBNetToCSharpConvertVisitor on a CompilationUnit has the same effect - /// as applying the VBNetConstructsConvertVisitor and ToCSharpConvertVisitor. - /// - public class VBNetToCSharpConvertVisitor : VBNetConstructsConvertVisitor - { - public override object VisitCompilationUnit(CompilationUnit compilationUnit, object data) - { - base.VisitCompilationUnit(compilationUnit, data); - ToCSharpConvertVisitor v = new ToCSharpConvertVisitor(); - compilationUnit.AcceptVisitor(v, data); - return null; - } - } -} diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs index ecff316f54..7847204e28 100644 --- a/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs +++ b/src/Libraries/NRefactory/Test/Output/CSharp/VBToCSharpConverterTest.cs @@ -24,7 +24,8 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(input)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); - parser.CompilationUnit.AcceptVisitor(new VBNetToCSharpConvertVisitor(), null); + parser.CompilationUnit.AcceptVisitor(new VBNetConstructsConvertVisitor(), null); + parser.CompilationUnit.AcceptVisitor(new ToCSharpConvertVisitor(), null); CSharpOutputVisitor outputVisitor = new CSharpOutputVisitor(); outputVisitor.VisitCompilationUnit(parser.CompilationUnit, null); Assert.AreEqual("", outputVisitor.Errors.ErrorOutput); @@ -303,6 +304,9 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter { TestStatement("x = \"Hello \" & \"World\"", "x = \"Hello \" + \"World\";"); + + TestStatement("x &= \"Hello\"", + "x += \"Hello\";"); } [Test] diff --git a/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs b/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs index 67d88d31dc..02806ffb93 100644 --- a/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs @@ -20,6 +20,8 @@ namespace ICSharpCode.NRefactory.Tests.Ast public void VBNetReDimStatementTest() { ReDimStatement reDimStatement = ParseUtilVBNet.ParseStatement("ReDim Preserve MyArray(15)"); + Assert.AreEqual(1, reDimStatement.ReDimClauses.Count); + Assert.AreSame(reDimStatement, reDimStatement.ReDimClauses[0].Parent); } [Test] diff --git a/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs b/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs index 3ed17825c3..767066e8eb 100644 --- a/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs +++ b/src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs @@ -14,6 +14,7 @@ using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.PrettyPrinter; using ICSharpCode.NRefactory.Visitors; using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver; namespace ICSharpCode.SharpDevelop.Commands { @@ -34,12 +35,14 @@ namespace ICSharpCode.SharpDevelop.Commands ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor output = new ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor(); List specials = p.Lexer.SpecialTracker.CurrentSpecials; PreprocessingDirective.VBToCSharp(specials); - new VBNetToCSharpConvertVisitor().VisitCompilationUnit(p.CompilationUnit, null); + IAstVisitor v = new VBNetToCSharpConvertVisitor(ParserService.CurrentProjectContent, + window.ViewContent.FileName); + v.VisitCompilationUnit(p.CompilationUnit, null); using (SpecialNodesInserter.Install(specials, output)) { output.VisitCompilationUnit(p.CompilationUnit, null); } - FileService.NewFile("Generated.CS", "C#", output.Text); + FileService.NewFile("Generated.cs", "C#", output.Text); } } } diff --git a/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs b/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs index 26c78ae619..80a060c326 100644 --- a/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs +++ b/src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs @@ -44,7 +44,7 @@ namespace ICSharpCode.SharpDevelop.Commands vbv.VisitCompilationUnit(p.CompilationUnit, null); } - FileService.NewFile("Generated.VB", "VBNET", vbv.Text); + FileService.NewFile("Generated.vb", "VBNET", vbv.Text); } } } diff --git a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs index babf1c4ab7..87584b0db9 100644 --- a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs +++ b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs @@ -11,6 +11,7 @@ using System.IO; using System.Text; using System.Windows.Forms; +using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.Core; using ICSharpCode.NRefactory; using ICSharpCode.NRefactory.Ast; @@ -18,6 +19,7 @@ using ICSharpCode.NRefactory.PrettyPrinter; using ICSharpCode.SharpDevelop.Project.Commands; using MSBuild = Microsoft.Build.BuildEngine; using ICSharpCode.SharpDevelop.Internal.Templates; +using AsynchronousWaitDialog = SearchAndReplace.AsynchronousWaitDialog; namespace ICSharpCode.SharpDevelop.Project.Converter { @@ -109,7 +111,7 @@ namespace ICSharpCode.SharpDevelop.Project.Converter } } - protected virtual void CopyItems(IProject sourceProject, IProject targetProject) + protected virtual void CopyItems(IProject sourceProject, IProject targetProject, IProgressMonitor monitor) { if (sourceProject == null) throw new ArgumentNullException("sourceProject"); @@ -118,7 +120,11 @@ namespace ICSharpCode.SharpDevelop.Project.Converter IProjectItemListProvider targetProjectItems = targetProject as IProjectItemListProvider; if (targetProjectItems == null) throw new ArgumentNullException("targetProjectItems"); - foreach (ProjectItem item in sourceProject.Items) { + + ICollection sourceItems = sourceProject.Items; + monitor.BeginTask("Converting", sourceItems.Count, true); + int workDone = 0; + foreach (ProjectItem item in sourceItems) { FileProjectItem fileItem = item as FileProjectItem; if (fileItem != null && FileUtility.IsBaseDirectory(sourceProject.Directory, fileItem.FileName)) { FileProjectItem targetItem = new FileProjectItem(targetProject, fileItem.ItemType); @@ -134,7 +140,12 @@ namespace ICSharpCode.SharpDevelop.Project.Converter } else { targetProjectItems.AddProjectItem(item.CloneFor(targetProject)); } + if (monitor.IsCancelled) { + return; + } + monitor.WorkDone = ++workDone; } + monitor.Done(); } protected StringBuilder conversionLog; @@ -158,16 +169,23 @@ namespace ICSharpCode.SharpDevelop.Project.Converter conversionLog.Append(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.TargetDirectory")).Append(": "); conversionLog.AppendLine(targetProjectDirectory); - Directory.CreateDirectory(targetProjectDirectory); - IProject targetProject = CreateProject(targetProjectDirectory, sourceProject); - CopyProperties(sourceProject, targetProject); - conversionLog.AppendLine(); - CopyItems(sourceProject, targetProject); - conversionLog.AppendLine(); - AfterConversion(targetProject); - conversionLog.AppendLine(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.ConversionComplete")); - targetProject.Save(); - targetProject.Dispose(); + IProject targetProject; + using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog(translatedTitle)) { + Directory.CreateDirectory(targetProjectDirectory); + targetProject = CreateProject(targetProjectDirectory, sourceProject); + CopyProperties(sourceProject, targetProject); + conversionLog.AppendLine(); + CopyItems(sourceProject, targetProject, monitor); + if (monitor.IsCancelled) { + return; + } + conversionLog.AppendLine(); + AfterConversion(targetProject); + conversionLog.AppendLine(ResourceService.GetString("ICSharpCode.SharpDevelop.Commands.Convert.ConversionComplete")); + targetProject.Save(); + targetProject.Dispose(); + } + TreeNode node = ProjectBrowserPad.Instance.SelectedNode; if (node == null) { node = ProjectBrowserPad.Instance.SolutionNode; diff --git a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/AsynchronousWaitDialog.cs b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/AsynchronousWaitDialog.cs index 59f96eaec5..917a3417c7 100644 --- a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/AsynchronousWaitDialog.cs +++ b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/AsynchronousWaitDialog.cs @@ -35,7 +35,7 @@ namespace SearchAndReplace /// long_running_action(); /// } /// or: - /// using (IProgressMonitor monitor = AsynchronousWaitDialog.ShowWaitDialog("title")) { + /// using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("title")) { /// long_running_action(monitor); /// } /// diff --git a/src/Main/Base/Test/CodeConverterTests.cs b/src/Main/Base/Test/CodeConverterTests.cs index 73f1207bb6..07d1c930df 100644 --- a/src/Main/Base/Test/CodeConverterTests.cs +++ b/src/Main/Base/Test/CodeConverterTests.cs @@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop.Tests void TestProgramVB2CS(string sourceCode, string expectedOutput) { - TestProgram(SupportedLanguage.CSharp, sourceCode, expectedOutput); + TestProgram(SupportedLanguage.VBNet, sourceCode, expectedOutput); } void TestProgram(SupportedLanguage sourceLanguage, string sourceCode, string expectedOutput) @@ -72,7 +72,7 @@ namespace ICSharpCode.SharpDevelop.Tests CSharpToVBNetConvertVisitor convertVisitor = new CSharpToVBNetConvertVisitor(pc, visitor.Cu.FileName); parser.CompilationUnit.AcceptVisitor(convertVisitor, null); } else { - VBNetToCSharpConvertVisitor convertVisitor = new VBNetToCSharpConvertVisitor(); + VBNetToCSharpConvertVisitor convertVisitor = new VBNetToCSharpConvertVisitor(pc, visitor.Cu.FileName); parser.CompilationUnit.AcceptVisitor(convertVisitor, null); } @@ -123,7 +123,7 @@ namespace ICSharpCode.SharpDevelop.Tests "using System;\n" + "using Microsoft.VisualBasic;\n" + - "class MyClassName {\n" + + "class MyClassName\n{\n" + IndentAllLines(expectedCode) + "}"); } @@ -138,6 +138,16 @@ namespace ICSharpCode.SharpDevelop.Tests IndentAllLines(expectedCode) + "End Sub"); } + + void TestStatementsVB2CS(string sourceCode, string expectedCode) + { + TestMemberVB2CS("Private Sub T()\n" + + IndentAllLines(sourceCode) + + "End Sub", + "private void T()\n{\n" + + IndentAllLines(expectedCode) + + "}"); + } #endregion [Test] @@ -194,5 +204,50 @@ namespace ICSharpCode.SharpDevelop.Tests "If a = b Then\n" + "End If"); } + + [Test] + public void FixVBCasing() + { + TestStatementsVB2CS("Dim obj as iDisposable\n" + + "Obj.dispose()", + "IDisposable obj;\n" + + "obj.Dispose();"); + } + + [Test] + public void FixVBCasingAndAddMethodCallParenthesis() + { + TestStatementsVB2CS("Dim i as Integer = appdomain.getcurrentthreadid", + "int i = AppDomain.GetCurrentThreadId();"); + } + + [Test] + public void IndexerExpression() + { + TestStatementsVB2CS("Dim i(10) as Integer\n" + + "Dim i2 As Integer = i(4)", + "int[] i = new int[11];\n" + + "int i2 = i[4];"); + TestStatementsVB2CS("Dim s as string = appdomain.currentdomain.GetAssemblies()(1).location", + "string s = AppDomain.CurrentDomain.GetAssemblies()[1].Location;"); + } + + [Test] + public void Redim() + { + TestStatementsVB2CS("Dim i(10) as Integer\n" + + "Redim i(20)", + "int[] i = new int[11];\n" + + "i = new int[21];"); + } + + [Test] + public void RedimPreserve() + { + TestStatementsVB2CS("Dim i(10) as Integer\n" + + "Redim Preserve i(20)", + "int[] i = new int[11];\n" + + "Array.Resize(ref i, 21);"); + } } } diff --git a/src/Main/Base/Test/NRefactoryResolverTests.cs b/src/Main/Base/Test/NRefactoryResolverTests.cs index ab534ea20c..c0f1f408b9 100644 --- a/src/Main/Base/Test/NRefactoryResolverTests.cs +++ b/src/Main/Base/Test/NRefactoryResolverTests.cs @@ -362,11 +362,29 @@ class A { } } "; - ResolveResult result = Resolve(program, "eh(this, new ResolveEventArgs())", 5); - Assert.AreEqual("eh", (result as LocalResolveResult).Field.Name); + LocalResolveResult result = Resolve(program, "eh(this, new ResolveEventArgs())", 5); + Assert.AreEqual("eh", result.Field.Name); - result = Resolve(program, "eh(this, new ResolveEventArgs()).GetType(\"bla\")", 5); - Assert.AreEqual("System.Reflection.Module.GetType", (result as MemberResolveResult).ResolvedMember.FullyQualifiedName); + MemberResolveResult mrr = Resolve(program, "eh(this, new ResolveEventArgs()).GetType(\"bla\")", 5); + Assert.AreEqual("System.Reflection.Module.GetType", mrr.ResolvedMember.FullyQualifiedName); + } + + [Test] + public void DelegateReturnedFromMethodCallTest() + { + string program = @"using System; +class A { + void Method() { + + } + abstract Predicate GetHandler(); +} +"; + ResolveResult result = Resolve(program, "GetHandler()(abc)", 4); + Assert.AreEqual("System.Boolean", result.ResolvedType.FullyQualifiedName); + + MemberResolveResult mrr = Resolve(program, "GetHandler()(abc).ToString()", 4); + Assert.AreEqual("System.Boolean.ToString", mrr.ResolvedMember.FullyQualifiedName); } [Test] @@ -588,6 +606,24 @@ class TestClass { rr = Resolve(program, "(short.MaxValue)", 4); Assert.AreEqual("System.Int16", rr.ResolvedType.FullyQualifiedName); } + + [Test] + public void VBNetArrayReturnedFromMethodTest() + { + string program = @"Module Main + Sub Main() + + End Sub + Function F() As String() + End Function +End Module +"; + MemberResolveResult result = ResolveVB(program, "F()(0)", 3); + Assert.AreEqual("System.String", result.ResolvedType.FullyQualifiedName); + Assert.IsFalse(result.ResolvedType.IsArrayReturnType); + Assert.IsInstanceOfType(typeof(IProperty), result.ResolvedMember); + Assert.IsTrue((result.ResolvedMember as IProperty).IsIndexer); + } #endregion #region Import namespace tests diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj index beb99f0f79..0b9a4fc1d9 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj @@ -92,6 +92,7 @@ + diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/CSharpToVBNetConvertVisitor.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/CSharpToVBNetConvertVisitor.cs index 5d547d80be..b4c4080958 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/CSharpToVBNetConvertVisitor.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/CSharpToVBNetConvertVisitor.cs @@ -40,13 +40,19 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver if (!methodDeclaration.Body.IsNull) { if (_resolver.Initialize(_fileName, methodDeclaration.Body.StartLocation.Y, methodDeclaration.Body.StartLocation.X)) { _resolver.RunLookupTableVisitor(methodDeclaration); - } else { - LoggingService.Warn("Resolver initialization failed"); } } return base.VisitMethodDeclaration(methodDeclaration, data); } + public override object VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, object data) + { + if (_resolver.Initialize(_fileName, propertyDeclaration.BodyStart.Y, propertyDeclaration.BodyStart.X)) { + _resolver.RunLookupTableVisitor(propertyDeclaration); + } + return base.VisitPropertyDeclaration(propertyDeclaration, data); + } + public override object VisitExpressionStatement(ExpressionStatement expressionStatement, object data) { if (_resolver.CompilationUnit == null) diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs index 12cb7f07d3..89602f6f7f 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs @@ -619,10 +619,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver return new MixedResolveResult(result, result2); } - IField CreateLocalVariableField(LocalLookupVariable var, string identifier) + IField CreateLocalVariableField(LocalLookupVariable var) { IReturnType type = GetVariableType(var); - IField f = new DefaultField.LocalVariableField(type, identifier, new DomRegion(var.StartPos, var.EndPos), callingClass); + IField f = new DefaultField.LocalVariableField(type, var.Name, new DomRegion(var.StartPos, var.EndPos), callingClass); if (var.IsConst) { f.Modifiers |= ModifierEnum.Const; } @@ -634,7 +634,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver if (callingMember != null) { // LocalResolveResult requires callingMember to be set LocalLookupVariable var = SearchVariable(identifier, position); if (var != null) { - return new LocalResolveResult(callingMember, CreateLocalVariableField(var, identifier)); + return new LocalResolveResult(callingMember, CreateLocalVariableField(var)); } IParameter para = SearchMethodParameter(identifier); if (para != null) { @@ -726,14 +726,14 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver return null; foreach (IMethod method in type.GetMethods()) { if (IsSameName(identifier, method.Name)) - return new MethodResolveResult(callingClass, callingMember, type, identifier); + return new MethodResolveResult(callingClass, callingMember, type, method.Name); } if (languageProperties.SupportsExtensionMethods && callingClass != null) { ArrayList list = new ArrayList(); ResolveResult.AddExtensions(languageProperties, list, callingClass, type); foreach (IMethodOrProperty mp in list) { if (mp is IMethod && IsSameName(mp.Name, identifier)) { - return new MethodResolveResult(callingClass, callingMember, type, identifier); + return new MethodResolveResult(callingClass, callingMember, type, mp.Name); } } } @@ -829,8 +829,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver public IReturnType SearchType(string name, NR.Location position) { - Debug.Assert(!position.IsEmpty); - return projectContent.SearchType(new SearchTypeRequest(name, 0, callingClass, cu, position.Line, position.Column)).Result; + if (position.IsEmpty) + return projectContent.SearchType(new SearchTypeRequest(name, 0, callingClass, cu, caretLine, caretColumn)).Result; + else + return projectContent.SearchType(new SearchTypeRequest(name, 0, callingClass, cu, position.Line, position.Column)).Result; } #region Helper for TypeVisitor @@ -1069,7 +1071,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver foreach (LocalLookupVariable v in pair.Value) { if (IsInside(new NR.Location(caretColumn, caretLine), v.StartPos, v.EndPos)) { // convert to a field for display - result.Add(CreateLocalVariableField(v, pair.Key)); + result.Add(CreateLocalVariableField(v)); break; } } diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/TypeVisitor.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/TypeVisitor.cs index e6312a0000..a2909a0b14 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/TypeVisitor.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/TypeVisitor.cs @@ -150,6 +150,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver if (methods.Count == 0 && resolver.Language == SupportedLanguage.VBNet) return GetVisualBasicIndexer(invocationExpression); return FindOverload(methods, typeParameters, invocationExpression.Arguments, null); + } else { + // this could be a nested indexer access + if (resolver.Language == SupportedLanguage.VBNet) + return GetVisualBasicIndexer(invocationExpression); } return null; } diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/VBNetToCSharpConvertVisitor.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/VBNetToCSharpConvertVisitor.cs new file mode 100644 index 0000000000..f6aba33b59 --- /dev/null +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/VBNetToCSharpConvertVisitor.cs @@ -0,0 +1,208 @@ +// +// +// +// +// $Revision$ +// + +using System; +using ICSharpCode.NRefactory; +using ICSharpCode.NRefactory.Ast; +using ICSharpCode.NRefactory.Visitors; + +namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver +{ + /// + /// This class converts C# constructs to their VB.NET equivalents. + /// + public class VBNetToCSharpConvertVisitor : VBNetConstructsConvertVisitor + { + // Fixes identifier casing + // Adds using statements for the default usings + + NRefactoryResolver _resolver; + string _fileName; + + public VBNetToCSharpConvertVisitor(IProjectContent pc, string fileName) + { + _resolver = new NRefactoryResolver(pc, LanguageProperties.VBNet); + _fileName = fileName; + } + + public override object VisitCompilationUnit(CompilationUnit compilationUnit, object data) + { + base.VisitCompilationUnit(compilationUnit, data); + ToCSharpConvertVisitor v = new ToCSharpConvertVisitor(); + compilationUnit.AcceptVisitor(v, data); + if (_resolver.ProjectContent.DefaultImports != null) { + int index = 0; + foreach (string u in _resolver.ProjectContent.DefaultImports.Usings) { + compilationUnit.Children.Insert(index++, new UsingDeclaration(u)); + } + } + return null; + } + + public override object VisitMethodDeclaration(MethodDeclaration methodDeclaration, object data) + { + // Initialize resolver for method: + if (!methodDeclaration.Body.IsNull) { + if (_resolver.Initialize(_fileName, methodDeclaration.Body.StartLocation.Line, methodDeclaration.Body.StartLocation.Column)) { + _resolver.RunLookupTableVisitor(methodDeclaration); + } + } + return base.VisitMethodDeclaration(methodDeclaration, data); + } + + public override object VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration, object data) + { + if (!constructorDeclaration.Body.IsNull) { + if (_resolver.Initialize(_fileName, constructorDeclaration.Body.StartLocation.Line, constructorDeclaration.Body.StartLocation.Column)) { + _resolver.RunLookupTableVisitor(constructorDeclaration); + } + } + return base.VisitConstructorDeclaration(constructorDeclaration, data); + } + + public override object VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, object data) + { + if (_resolver.Initialize(_fileName, propertyDeclaration.BodyStart.Line, propertyDeclaration.BodyStart.Column)) { + _resolver.RunLookupTableVisitor(propertyDeclaration); + } + return base.VisitPropertyDeclaration(propertyDeclaration, data); + } + + public override object VisitIdentifierExpression(IdentifierExpression identifierExpression, object data) + { + base.VisitIdentifierExpression(identifierExpression, data); + if (_resolver.CompilationUnit == null) + return null; + + ResolveResult rr = _resolver.ResolveInternal(identifierExpression, ExpressionContext.Default); + string ident = GetIdentifierFromResult(rr); + if (ident != null) { + identifierExpression.Identifier = ident; + } + return null; + } + + public override object VisitFieldReferenceExpression(FieldReferenceExpression fieldReferenceExpression, object data) + { + base.VisitFieldReferenceExpression(fieldReferenceExpression, data); + + if (_resolver.CompilationUnit == null) + return null; + + ResolveResult rr = _resolver.ResolveInternal(fieldReferenceExpression, ExpressionContext.Default); + string ident = GetIdentifierFromResult(rr); + if (ident != null) { + fieldReferenceExpression.FieldName = ident; + } + if (rr is MethodResolveResult + && !(fieldReferenceExpression.Parent is AddressOfExpression) + && !(fieldReferenceExpression.Parent is InvocationExpression)) + { + ReplaceCurrentNode(new InvocationExpression(fieldReferenceExpression)); + } + + return rr; + } + + public override object VisitInvocationExpression(InvocationExpression invocationExpression, object data) + { + base.VisitInvocationExpression(invocationExpression, data); + + if (_resolver.CompilationUnit == null) + return null; + + if (invocationExpression.Arguments.Count > 0 + && !(invocationExpression.Parent is ReDimStatement)) + { + MemberResolveResult rr = _resolver.ResolveInternal(invocationExpression, ExpressionContext.Default) as MemberResolveResult; + if (rr != null) { + IProperty p = rr.ResolvedMember as IProperty; + if (p != null) { + ReplaceCurrentNode(new IndexerExpression(invocationExpression.TargetObject, invocationExpression.Arguments)); + } + } + } + + return null; + } + + ClassFinder CreateContext() + { + return new ClassFinder(_resolver.CallingClass, _resolver.CallingMember, _resolver.CaretLine, _resolver.CaretColumn); + } + + public override object VisitReDimStatement(ReDimStatement reDimStatement, object data) + { + base.VisitReDimStatement(reDimStatement, data); + + if (_resolver.CompilationUnit == null) + return null; + + if (!reDimStatement.IsPreserve && reDimStatement.ReDimClauses.Count == 1) { + // replace with array create expression + + ResolveResult rr = _resolver.ResolveInternal(reDimStatement.ReDimClauses[0].TargetObject, ExpressionContext.Default); + if (rr != null && rr.ResolvedType != null && rr.ResolvedType.IsArrayReturnType) { + ArrayCreateExpression ace = new ArrayCreateExpression( + Refactoring.CodeGenerator.ConvertType(rr.ResolvedType, CreateContext()) + ); + foreach (Expression arg in reDimStatement.ReDimClauses[0].Arguments) { + ace.Arguments.Add(Expression.AddInteger(arg, 1)); + } + + ReplaceCurrentNode(new ExpressionStatement( + new AssignmentExpression(reDimStatement.ReDimClauses[0].TargetObject, AssignmentOperatorType.Assign, ace))); + } + } + return null; + } + + public override object VisitLocalVariableDeclaration(LocalVariableDeclaration localVariableDeclaration, object data) + { + FixTypeReferenceCasing(localVariableDeclaration.TypeReference, localVariableDeclaration.StartLocation); + return base.VisitLocalVariableDeclaration(localVariableDeclaration, data); + } + + public override object VisitVariableDeclaration(VariableDeclaration variableDeclaration, object data) + { + FixTypeReferenceCasing(variableDeclaration.TypeReference, variableDeclaration.StartLocation); + return base.VisitVariableDeclaration(variableDeclaration, data); + } + + void FixTypeReferenceCasing(TypeReference tr, Location loc) + { + if (_resolver.CompilationUnit == null) return; + if (tr.IsNull) return; + IReturnType rt = _resolver.SearchType(tr.SystemType, loc); + if (rt != null) { + IClass c = rt.GetUnderlyingClass(); + if (c != null) { + if (string.Equals(tr.Type, c.Name, StringComparison.InvariantCultureIgnoreCase)) { + tr.Type = c.Name; + } + } + } + } + + string GetIdentifierFromResult(ResolveResult rr) + { + LocalResolveResult lrr = rr as LocalResolveResult; + if (lrr != null) + return lrr.Field.Name; + MemberResolveResult mrr = rr as MemberResolveResult; + if (mrr != null) + return mrr.ResolvedMember.Name; + MethodResolveResult mtrr = rr as MethodResolveResult; + if (mtrr != null) + return mtrr.Name; + TypeResolveResult trr = rr as TypeResolveResult; + if (trr != null && trr.ResolvedClass != null) + return trr.ResolvedClass.Name; + return null; + } + } +}