diff --git a/samples/LineCounter/Article/LineCounterSDAddIn/LineCounter.sdaddin b/samples/LineCounter/Article/LineCounterSDAddIn/LineCounter.sdaddin new file mode 100644 index 0000000000..3eabb6da92 Binary files /dev/null and b/samples/LineCounter/Article/LineCounterSDAddIn/LineCounter.sdaddin differ diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/addinmanager.png b/samples/LineCounter/Article/LineCounterSDAddIn/addinmanager.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/addinmanager.png rename to samples/LineCounter/Article/LineCounterSDAddIn/addinmanager.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/projectbrowser.png b/samples/LineCounter/Article/LineCounterSDAddIn/projectbrowser.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/projectbrowser.png rename to samples/LineCounter/Article/LineCounterSDAddIn/projectbrowser.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/properties.png b/samples/LineCounter/Article/LineCounterSDAddIn/properties.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/properties.png rename to samples/LineCounter/Article/LineCounterSDAddIn/properties.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/screenshot.png b/samples/LineCounter/Article/LineCounterSDAddIn/screenshot.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/screenshot.png rename to samples/LineCounter/Article/LineCounterSDAddIn/screenshot.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/screenshot2.png b/samples/LineCounter/Article/LineCounterSDAddIn/screenshot2.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/screenshot2.png rename to samples/LineCounter/Article/LineCounterSDAddIn/screenshot2.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn/templatetype.png b/samples/LineCounter/Article/LineCounterSDAddIn/templatetype.png similarity index 100% rename from samples/LineCounter/Article/LineCounterSharpDevelopAddIn/templatetype.png rename to samples/LineCounter/Article/LineCounterSDAddIn/templatetype.png diff --git a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn.html b/samples/LineCounter/Article/LineCounterSharpDevelopAddIn.html index e01d449a0c..ab9d87648c 100644 --- a/samples/LineCounter/Article/LineCounterSharpDevelopAddIn.html +++ b/samples/LineCounter/Article/LineCounterSharpDevelopAddIn.html @@ -13,21 +13,25 @@ - -
-
-
-
-
+ + + \ No newline at end of file diff --git a/samples/LineCounter/LineCounter.addin b/samples/LineCounter/LineCounter.addin index d2091518fd..20f2903c67 100644 --- a/samples/LineCounter/LineCounter.addin +++ b/samples/LineCounter/LineCounter.addin @@ -5,7 +5,7 @@ - + diff --git a/samples/LineCounter/LineCounter.csproj b/samples/LineCounter/LineCounter.csproj index 3cd9bb19b5..7d141be14c 100644 --- a/samples/LineCounter/LineCounter.csproj +++ b/samples/LineCounter/LineCounter.csproj @@ -51,6 +51,11 @@ False False + + ..\..\bin\ICSharpCode.SharpDevelop.Dom.dll + False + False + diff --git a/samples/SdaUser/SharpDevelopInteraction/InteractionClass.cs b/samples/SdaUser/SharpDevelopInteraction/InteractionClass.cs index 047c7e557f..d42da95edd 100644 --- a/samples/SdaUser/SharpDevelopInteraction/InteractionClass.cs +++ b/samples/SdaUser/SharpDevelopInteraction/InteractionClass.cs @@ -24,7 +24,7 @@ namespace SharpDevelopInteraction { public void MakeTransparent() { - WorkbenchSingleton.SafeThreadAsyncCall(new MethodInvoker(MakeTransparentInternal)); + WorkbenchSingleton.SafeThreadAsyncCall(MakeTransparentInternal); } void MakeTransparentInternal() diff --git a/samples/SdaUser/SharpDevelopInteraction/SharpDevelopInteraction.csproj b/samples/SdaUser/SharpDevelopInteraction/SharpDevelopInteraction.csproj index 61770806c2..e5c5ea4f33 100644 --- a/samples/SdaUser/SharpDevelopInteraction/SharpDevelopInteraction.csproj +++ b/samples/SdaUser/SharpDevelopInteraction/SharpDevelopInteraction.csproj @@ -50,6 +50,11 @@ False + + ..\..\..\bin\ICSharpCode.SharpDevelop.Dom.dll + False + False + diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 668e229713..0d88da91c8 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -149,7 +149,7 @@ out u); void GlobalAttributeSection() { -#line 1983 "VBNET.ATG" +#line 2005 "VBNET.ATG" Location startPos = t.Location; Expect(27); if (la.kind == 49) { @@ -158,20 +158,20 @@ out u); lexer.NextToken(); } else SynErr(208); -#line 1985 "VBNET.ATG" +#line 2007 "VBNET.ATG" string attributeTarget = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 1989 "VBNET.ATG" +#line 2011 "VBNET.ATG" out attribute); -#line 1989 "VBNET.ATG" +#line 2011 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1990 "VBNET.ATG" +#line 2012 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -183,10 +183,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 1990 "VBNET.ATG" +#line 2012 "VBNET.ATG" out attribute); -#line 1990 "VBNET.ATG" +#line 2012 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -195,7 +195,7 @@ out attribute); Expect(26); EndOfStmt(); -#line 1995 "VBNET.ATG" +#line 2017 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -312,47 +312,47 @@ out aliasedType); } void Qualident( -#line 2699 "VBNET.ATG" +#line 2722 "VBNET.ATG" out string qualident) { -#line 2701 "VBNET.ATG" +#line 2724 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2705 "VBNET.ATG" +#line 2728 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2706 "VBNET.ATG" +#line 2729 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2706 "VBNET.ATG" +#line 2729 "VBNET.ATG" out name); -#line 2706 "VBNET.ATG" +#line 2729 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2708 "VBNET.ATG" +#line 2731 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 1876 "VBNET.ATG" +#line 1898 "VBNET.ATG" out TypeReference typeref) { -#line 1877 "VBNET.ATG" +#line 1899 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1879 "VBNET.ATG" +#line 1901 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 1880 "VBNET.ATG" +#line 1902 "VBNET.ATG" out rank); -#line 1881 "VBNET.ATG" +#line 1903 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -369,35 +369,35 @@ out rank); } void AttributeSection( -#line 2053 "VBNET.ATG" +#line 2075 "VBNET.ATG" out AttributeSection section) { -#line 2055 "VBNET.ATG" +#line 2077 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(27); -#line 2059 "VBNET.ATG" +#line 2081 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2060 "VBNET.ATG" +#line 2082 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 93) { lexer.NextToken(); -#line 2061 "VBNET.ATG" +#line 2083 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2062 "VBNET.ATG" +#line 2084 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2065 "VBNET.ATG" +#line 2087 "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 2075 "VBNET.ATG" +#line 2097 "VBNET.ATG" out attribute); -#line 2075 "VBNET.ATG" +#line 2097 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2076 "VBNET.ATG" +#line 2098 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2076 "VBNET.ATG" +#line 2098 "VBNET.ATG" out attribute); -#line 2076 "VBNET.ATG" +#line 2098 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -431,7 +431,7 @@ out attribute); } Expect(26); -#line 2080 "VBNET.ATG" +#line 2102 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -439,69 +439,69 @@ out attribute); } void TypeModifier( -#line 2775 "VBNET.ATG" +#line 2798 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2776 "VBNET.ATG" +#line 2799 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2777 "VBNET.ATG" +#line 2800 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 99: { lexer.NextToken(); -#line 2778 "VBNET.ATG" +#line 2801 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2779 "VBNET.ATG" +#line 2802 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2780 "VBNET.ATG" +#line 2803 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2781 "VBNET.ATG" +#line 2804 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 122: { lexer.NextToken(); -#line 2782 "VBNET.ATG" +#line 2805 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 131: { lexer.NextToken(); -#line 2783 "VBNET.ATG" +#line 2806 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 203: { lexer.NextToken(); -#line 2784 "VBNET.ATG" +#line 2807 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -939,28 +939,28 @@ out typeRef); } void TypeImplementsClause( -#line 1476 "VBNET.ATG" +#line 1470 "VBNET.ATG" out List baseInterfaces) { -#line 1478 "VBNET.ATG" +#line 1472 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(107); TypeName( -#line 1481 "VBNET.ATG" +#line 1475 "VBNET.ATG" out type); -#line 1483 "VBNET.ATG" +#line 1477 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1486 "VBNET.ATG" +#line 1480 "VBNET.ATG" out type); -#line 1487 "VBNET.ATG" +#line 1481 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1078,10 +1078,10 @@ m, attributes); } void NonArrayTypeName( -#line 1899 "VBNET.ATG" +#line 1921 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1901 "VBNET.ATG" +#line 1923 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1091,38 +1091,38 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 1906 "VBNET.ATG" +#line 1928 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 1907 "VBNET.ATG" +#line 1929 "VBNET.ATG" out typeref, canBeUnbound); -#line 1908 "VBNET.ATG" +#line 1930 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 1909 "VBNET.ATG" +#line 1931 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 1910 "VBNET.ATG" +#line 1932 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 1911 "VBNET.ATG" +#line 1933 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 133) { lexer.NextToken(); -#line 1914 "VBNET.ATG" +#line 1936 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(9)) { PrimitiveTypeName( -#line 1915 "VBNET.ATG" +#line 1937 "VBNET.ATG" out name); -#line 1915 "VBNET.ATG" +#line 1937 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(218); } @@ -1150,27 +1150,27 @@ out f); } void InterfaceBase( -#line 1461 "VBNET.ATG" +#line 1455 "VBNET.ATG" out List bases) { -#line 1463 "VBNET.ATG" +#line 1457 "VBNET.ATG" TypeReference type; bases = new List(); Expect(110); TypeName( -#line 1467 "VBNET.ATG" +#line 1461 "VBNET.ATG" out type); -#line 1467 "VBNET.ATG" +#line 1461 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1470 "VBNET.ATG" +#line 1464 "VBNET.ATG" out type); -#line 1470 "VBNET.ATG" +#line 1464 "VBNET.ATG" bases.Add(type); } Expect(1); @@ -1191,27 +1191,27 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2087 "VBNET.ATG" +#line 2109 "VBNET.ATG" List parameter) { -#line 2089 "VBNET.ATG" +#line 2111 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 2093 "VBNET.ATG" +#line 2115 "VBNET.ATG" out section); -#line 2093 "VBNET.ATG" +#line 2115 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2095 "VBNET.ATG" +#line 2117 "VBNET.ATG" out p); -#line 2097 "VBNET.ATG" +#line 2119 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1219,152 +1219,152 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2102 "VBNET.ATG" +#line 2124 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 27) { AttributeSection( -#line 2103 "VBNET.ATG" +#line 2125 "VBNET.ATG" out section); -#line 2103 "VBNET.ATG" +#line 2125 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2105 "VBNET.ATG" +#line 2127 "VBNET.ATG" out p); -#line 2105 "VBNET.ATG" +#line 2127 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2787 "VBNET.ATG" +#line 2810 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 122: { lexer.NextToken(); -#line 2788 "VBNET.ATG" +#line 2811 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 79: { lexer.NextToken(); -#line 2789 "VBNET.ATG" +#line 2812 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 99: { lexer.NextToken(); -#line 2790 "VBNET.ATG" +#line 2813 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2791 "VBNET.ATG" +#line 2814 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2792 "VBNET.ATG" +#line 2815 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 123: { lexer.NextToken(); -#line 2793 "VBNET.ATG" +#line 2816 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 2794 "VBNET.ATG" +#line 2817 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 2795 "VBNET.ATG" +#line 2818 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 2796 "VBNET.ATG" +#line 2819 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 131: { lexer.NextToken(); -#line 2797 "VBNET.ATG" +#line 2820 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 132: { lexer.NextToken(); -#line 2798 "VBNET.ATG" +#line 2821 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2822 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 141: { lexer.NextToken(); -#line 2800 "VBNET.ATG" +#line 2823 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 140: { lexer.NextToken(); -#line 2801 "VBNET.ATG" +#line 2824 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 2802 "VBNET.ATG" +#line 2825 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 2803 "VBNET.ATG" +#line 2826 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 183: { lexer.NextToken(); -#line 2804 "VBNET.ATG" +#line 2827 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 81: { lexer.NextToken(); -#line 2805 "VBNET.ATG" +#line 2828 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } @@ -2362,91 +2362,91 @@ mod, attributes); } void Expr( -#line 1522 "VBNET.ATG" +#line 1516 "VBNET.ATG" out Expression expr) { DisjunctionExpr( -#line 1524 "VBNET.ATG" +#line 1518 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1493 "VBNET.ATG" +#line 1487 "VBNET.ATG" out List baseInterfaces) { -#line 1495 "VBNET.ATG" +#line 1489 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(107); NonArrayTypeName( -#line 1500 "VBNET.ATG" +#line 1494 "VBNET.ATG" out type, false); -#line 1501 "VBNET.ATG" +#line 1495 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1502 "VBNET.ATG" +#line 1496 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1504 "VBNET.ATG" +#line 1498 "VBNET.ATG" out type, false); -#line 1505 "VBNET.ATG" +#line 1499 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1506 "VBNET.ATG" +#line 1500 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1451 "VBNET.ATG" +#line 1445 "VBNET.ATG" out List handlesClause) { -#line 1453 "VBNET.ATG" +#line 1447 "VBNET.ATG" handlesClause = new List(); string name; Expect(105); EventMemberSpecifier( -#line 1456 "VBNET.ATG" +#line 1450 "VBNET.ATG" out name); -#line 1456 "VBNET.ATG" +#line 1450 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1457 "VBNET.ATG" +#line 1451 "VBNET.ATG" out name); -#line 1457 "VBNET.ATG" +#line 1451 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2143 "VBNET.ATG" +#line 2165 "VBNET.ATG" out Statement stmt) { -#line 2146 "VBNET.ATG" +#line 2168 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(19) || -#line 2151 "VBNET.ATG" +#line 2173 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2151 "VBNET.ATG" +#line 2173 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); EndOfStmt(); -#line 2151 "VBNET.ATG" +#line 2173 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2454,7 +2454,7 @@ IsEndStmtAhead()) { } } -#line 2156 "VBNET.ATG" +#line 2178 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2462,26 +2462,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1443 "VBNET.ATG" +#line 1437 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1444 "VBNET.ATG" +#line 1438 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 100 || la.kind == 167) { } else if (la.kind == 47) { lexer.NextToken(); -#line 1445 "VBNET.ATG" +#line 1439 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 50) { lexer.NextToken(); -#line 1446 "VBNET.ATG" +#line 1440 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1447 "VBNET.ATG" +#line 1441 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(229); } @@ -3075,31 +3075,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 2808 "VBNET.ATG" +#line 2831 "VBNET.ATG" out Modifiers m) { -#line 2809 "VBNET.ATG" +#line 2832 "VBNET.ATG" m = Modifiers.None; while (StartOf(25)) { if (la.kind == 148) { lexer.NextToken(); -#line 2811 "VBNET.ATG" +#line 2834 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 147) { lexer.NextToken(); -#line 2812 "VBNET.ATG" +#line 2835 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 99) { lexer.NextToken(); -#line 2813 "VBNET.ATG" +#line 2836 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 2814 "VBNET.ATG" +#line 2837 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3120,59 +3120,63 @@ out arrayModifiers); } void ArrayNameModifier( -#line 1935 "VBNET.ATG" +#line 1957 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1937 "VBNET.ATG" +#line 1959 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1939 "VBNET.ATG" +#line 1961 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1816 "VBNET.ATG" +#line 1810 "VBNET.ATG" out Expression oce) { -#line 1818 "VBNET.ATG" +#line 1812 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; ArrayList dimensions = null; oce = null; + bool canBeNormal; bool canBeReDim; Expect(127); NonArrayTypeName( -#line 1824 "VBNET.ATG" +#line 1819 "VBNET.ATG" out type, false); if (la.kind == 24) { lexer.NextToken(); - ArgumentList( -#line 1825 "VBNET.ATG" -out arguments); + NormalOrReDimArgumentList( +#line 1820 "VBNET.ATG" +out arguments, out canBeNormal, out canBeReDim); Expect(25); if (la.kind == 22 || -#line 1826 "VBNET.ATG" +#line 1821 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1826 "VBNET.ATG" +#line 1821 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1827 "VBNET.ATG" +#line 1822 "VBNET.ATG" out dimensions); ArrayInitializer( -#line 1828 "VBNET.ATG" +#line 1823 "VBNET.ATG" out initializer); } else { ArrayInitializer( -#line 1829 "VBNET.ATG" +#line 1824 "VBNET.ATG" out initializer); } } + +#line 1826 "VBNET.ATG" + if (canBeReDim && !canBeNormal && initializer == null) initializer = new ArrayInitializerExpression(); } -#line 1832 "VBNET.ATG" +#line 1829 "VBNET.ATG" if (type == null) type = new TypeReference("Object"); // fallback type on parser errors if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); @@ -3188,19 +3192,19 @@ out initializer); } void VariableInitializer( -#line 1415 "VBNET.ATG" +#line 1409 "VBNET.ATG" out Expression initializerExpression) { -#line 1417 "VBNET.ATG" +#line 1411 "VBNET.ATG" initializerExpression = null; if (StartOf(26)) { Expr( -#line 1419 "VBNET.ATG" +#line 1413 "VBNET.ATG" out initializerExpression); } else if (la.kind == 22) { ArrayInitializer( -#line 1420 "VBNET.ATG" +#line 1414 "VBNET.ATG" out initializerExpression); } else SynErr(235); } @@ -3219,89 +3223,85 @@ out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1396 "VBNET.ATG" - if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") - Error("lower bound of array must be zero"); - +#line 1395 "VBNET.ATG" + EnsureIsZero(expr); Expr( -#line 1399 "VBNET.ATG" +#line 1396 "VBNET.ATG" out expr); } -#line 1401 "VBNET.ATG" +#line 1398 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1403 "VBNET.ATG" +#line 1400 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1405 "VBNET.ATG" - if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") - Error("lower bound of array must be zero"); - +#line 1401 "VBNET.ATG" + EnsureIsZero(expr); Expr( -#line 1408 "VBNET.ATG" +#line 1402 "VBNET.ATG" out expr); } -#line 1410 "VBNET.ATG" +#line 1404 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1424 "VBNET.ATG" +#line 1418 "VBNET.ATG" out Expression outExpr) { -#line 1426 "VBNET.ATG" +#line 1420 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(22); if (StartOf(27)) { VariableInitializer( -#line 1431 "VBNET.ATG" +#line 1425 "VBNET.ATG" out expr); -#line 1433 "VBNET.ATG" +#line 1427 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1436 "VBNET.ATG" +#line 1430 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1436 "VBNET.ATG" +#line 1430 "VBNET.ATG" out expr); -#line 1437 "VBNET.ATG" +#line 1431 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(23); -#line 1440 "VBNET.ATG" +#line 1434 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1510 "VBNET.ATG" +#line 1504 "VBNET.ATG" out string name) { -#line 1511 "VBNET.ATG" +#line 1505 "VBNET.ATG" string type; name = String.Empty; if (StartOf(12)) { Identifier(); -#line 1512 "VBNET.ATG" +#line 1506 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1514 "VBNET.ATG" +#line 1508 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 124) { lexer.NextToken(); @@ -3309,128 +3309,128 @@ out string name) { if (StartOf(12)) { Identifier(); -#line 1517 "VBNET.ATG" +#line 1511 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 92) { lexer.NextToken(); -#line 1518 "VBNET.ATG" +#line 1512 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(236); } else SynErr(237); } void DisjunctionExpr( -#line 1660 "VBNET.ATG" +#line 1654 "VBNET.ATG" out Expression outExpr) { -#line 1662 "VBNET.ATG" +#line 1656 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1665 "VBNET.ATG" +#line 1659 "VBNET.ATG" out outExpr); while (la.kind == 138 || la.kind == 139 || la.kind == 185) { if (la.kind == 138) { lexer.NextToken(); -#line 1668 "VBNET.ATG" +#line 1662 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 139) { lexer.NextToken(); -#line 1669 "VBNET.ATG" +#line 1663 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1670 "VBNET.ATG" +#line 1664 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1672 "VBNET.ATG" +#line 1666 "VBNET.ATG" out expr); -#line 1672 "VBNET.ATG" +#line 1666 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1527 "VBNET.ATG" +#line 1521 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1528 "VBNET.ATG" +#line 1522 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1529 "VBNET.ATG" +#line 1523 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 41: { lexer.NextToken(); -#line 1530 "VBNET.ATG" +#line 1524 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 33: { lexer.NextToken(); -#line 1531 "VBNET.ATG" +#line 1525 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 35: { lexer.NextToken(); -#line 1532 "VBNET.ATG" +#line 1526 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 36: { lexer.NextToken(); -#line 1533 "VBNET.ATG" +#line 1527 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 37: { lexer.NextToken(); -#line 1534 "VBNET.ATG" +#line 1528 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 38: { lexer.NextToken(); -#line 1535 "VBNET.ATG" +#line 1529 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 34: { lexer.NextToken(); -#line 1536 "VBNET.ATG" +#line 1530 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 39: { lexer.NextToken(); -#line 1537 "VBNET.ATG" +#line 1531 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 40: { lexer.NextToken(); -#line 1538 "VBNET.ATG" +#line 1532 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3439,10 +3439,36 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1542 "VBNET.ATG" +#line 1536 "VBNET.ATG" +out Expression pexpr) { + SimpleNonInvocationExpression( +#line 1538 "VBNET.ATG" +out pexpr); + while (la.kind == 10 || la.kind == 24) { + if (la.kind == 10) { + +#line 1539 "VBNET.ATG" + string name; + lexer.NextToken(); + IdentifierOrKeyword( +#line 1540 "VBNET.ATG" +out name); + +#line 1540 "VBNET.ATG" + pexpr = new FieldReferenceExpression(pexpr, name); + } else { + InvocationExpression( +#line 1541 "VBNET.ATG" +ref pexpr); + } + } + } + + void SimpleNonInvocationExpression( +#line 1545 "VBNET.ATG" out Expression pexpr) { -#line 1544 "VBNET.ATG" +#line 1547 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -3453,143 +3479,143 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1552 "VBNET.ATG" +#line 1555 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1553 "VBNET.ATG" +#line 1556 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1554 "VBNET.ATG" +#line 1557 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1555 "VBNET.ATG" +#line 1558 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1556 "VBNET.ATG" +#line 1559 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1557 "VBNET.ATG" +#line 1560 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1558 "VBNET.ATG" +#line 1561 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 173: { lexer.NextToken(); -#line 1560 "VBNET.ATG" +#line 1563 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 96: { lexer.NextToken(); -#line 1561 "VBNET.ATG" +#line 1564 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 130: { lexer.NextToken(); -#line 1562 "VBNET.ATG" +#line 1565 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 24: { lexer.NextToken(); Expr( -#line 1563 "VBNET.ATG" +#line 1566 "VBNET.ATG" out expr); Expect(25); -#line 1563 "VBNET.ATG" +#line 1566 "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 1564 "VBNET.ATG" +#line 1567 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); 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 1565 "VBNET.ATG" +#line 1568 "VBNET.ATG" string val = String.Empty; if (StartOf(9)) { PrimitiveTypeName( -#line 1566 "VBNET.ATG" +#line 1569 "VBNET.ATG" out val); } else if (la.kind == 133) { lexer.NextToken(); -#line 1566 "VBNET.ATG" +#line 1569 "VBNET.ATG" val = "Object"; } else SynErr(239); Expect(10); -#line 1567 "VBNET.ATG" +#line 1570 "VBNET.ATG" t.val = ""; Identifier(); -#line 1567 "VBNET.ATG" +#line 1570 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 119: { lexer.NextToken(); -#line 1568 "VBNET.ATG" +#line 1571 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 124: case 125: { -#line 1569 "VBNET.ATG" +#line 1572 "VBNET.ATG" Expression retExpr = null; if (la.kind == 124) { lexer.NextToken(); -#line 1570 "VBNET.ATG" +#line 1573 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 125) { lexer.NextToken(); -#line 1571 "VBNET.ATG" +#line 1574 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(240); Expect(10); IdentifierOrKeyword( -#line 1573 "VBNET.ATG" +#line 1576 "VBNET.ATG" out name); -#line 1573 "VBNET.ATG" +#line 1576 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); break; } @@ -3598,77 +3624,77 @@ out name); Expect(10); Identifier(); -#line 1575 "VBNET.ATG" +#line 1578 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1577 "VBNET.ATG" +#line 1580 "VBNET.ATG" type.IsGlobal = true; -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 127: { ObjectCreateExpression( -#line 1579 "VBNET.ATG" +#line 1582 "VBNET.ATG" out expr); -#line 1579 "VBNET.ATG" +#line 1582 "VBNET.ATG" pexpr = expr; break; } case 75: case 82: case 199: { -#line 1581 "VBNET.ATG" +#line 1584 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 82) { lexer.NextToken(); } else if (la.kind == 75) { lexer.NextToken(); -#line 1583 "VBNET.ATG" +#line 1586 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 199) { lexer.NextToken(); -#line 1584 "VBNET.ATG" +#line 1587 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(241); Expect(24); Expr( -#line 1586 "VBNET.ATG" +#line 1589 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1586 "VBNET.ATG" +#line 1589 "VBNET.ATG" out type); Expect(25); -#line 1587 "VBNET.ATG" +#line 1590 "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 1588 "VBNET.ATG" +#line 1591 "VBNET.ATG" out type); Expect(24); Expr( -#line 1588 "VBNET.ATG" +#line 1591 "VBNET.ATG" out expr); Expect(25); -#line 1588 "VBNET.ATG" +#line 1591 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 43: { lexer.NextToken(); Expr( -#line 1589 "VBNET.ATG" +#line 1592 "VBNET.ATG" out expr); -#line 1589 "VBNET.ATG" +#line 1592 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3676,742 +3702,711 @@ out expr); lexer.NextToken(); Expect(24); GetTypeTypeName( -#line 1590 "VBNET.ATG" +#line 1593 "VBNET.ATG" out type); Expect(25); -#line 1590 "VBNET.ATG" +#line 1593 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 175: { lexer.NextToken(); SimpleExpr( -#line 1591 "VBNET.ATG" +#line 1594 "VBNET.ATG" out expr); Expect(113); TypeName( -#line 1591 "VBNET.ATG" +#line 1594 "VBNET.ATG" out type); -#line 1591 "VBNET.ATG" +#line 1594 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } } - while (la.kind == 10 || la.kind == 24) { - InvocationOrMemberReferenceExpression( -#line 1593 "VBNET.ATG" -ref pexpr); - } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1596 "VBNET.ATG" +#line 1598 "VBNET.ATG" out name); -#line 1596 "VBNET.ATG" - pexpr = new FieldReferenceExpression(pexpr, name); - while (la.kind == 10 || la.kind == 24) { - InvocationOrMemberReferenceExpression( -#line 1597 "VBNET.ATG" -ref pexpr); - } +#line 1598 "VBNET.ATG" + pexpr = new FieldReferenceExpression(null, name); } else SynErr(242); } - void PrimitiveTypeName( -#line 2749 "VBNET.ATG" -out string type) { + void IdentifierOrKeyword( +#line 2765 "VBNET.ATG" +out string name) { -#line 2750 "VBNET.ATG" - type = String.Empty; - switch (la.kind) { - case 52: { +#line 2767 "VBNET.ATG" + lexer.NextToken(); name = t.val; + } + + void InvocationExpression( +#line 1602 "VBNET.ATG" +ref Expression pexpr) { + +#line 1603 "VBNET.ATG" + List typeParameters = new List(); + List parameters = null; + TypeReference type; + Expect(24); + +#line 1607 "VBNET.ATG" + Location start = t.Location; + if (la.kind == 200) { + lexer.NextToken(); + TypeName( +#line 1609 "VBNET.ATG" +out type); + +#line 1609 "VBNET.ATG" + if (type != null) typeParameters.Add(type); + while (la.kind == 12) { + lexer.NextToken(); + TypeName( +#line 1612 "VBNET.ATG" +out type); + +#line 1612 "VBNET.ATG" + if (type != null) typeParameters.Add(type); + } + Expect(25); + if (la.kind == 10) { + lexer.NextToken(); + Identifier(); + +#line 1617 "VBNET.ATG" + pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); + } else if (la.kind == 24) { + lexer.NextToken(); + ArgumentList( +#line 1619 "VBNET.ATG" +out parameters); + Expect(25); + +#line 1621 "VBNET.ATG" + pexpr = new InvocationExpression(pexpr, parameters, typeParameters); + } else SynErr(243); + } else if (StartOf(29)) { + ArgumentList( +#line 1623 "VBNET.ATG" +out parameters); + Expect(25); + +#line 1625 "VBNET.ATG" + pexpr = new InvocationExpression(pexpr, parameters, typeParameters); + } else SynErr(244); + +#line 1627 "VBNET.ATG" + pexpr.StartLocation = start; pexpr.EndLocation = t.Location; + } + + void PrimitiveTypeName( +#line 2772 "VBNET.ATG" +out string type) { + +#line 2773 "VBNET.ATG" + type = String.Empty; + switch (la.kind) { + case 52: { lexer.NextToken(); -#line 2751 "VBNET.ATG" +#line 2774 "VBNET.ATG" type = "Boolean"; break; } case 76: { lexer.NextToken(); -#line 2752 "VBNET.ATG" +#line 2775 "VBNET.ATG" type = "Date"; break; } case 65: { lexer.NextToken(); -#line 2753 "VBNET.ATG" +#line 2776 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2754 "VBNET.ATG" +#line 2777 "VBNET.ATG" type = "String"; break; } case 77: { lexer.NextToken(); -#line 2755 "VBNET.ATG" +#line 2778 "VBNET.ATG" type = "Decimal"; break; } case 54: { lexer.NextToken(); -#line 2756 "VBNET.ATG" +#line 2779 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2757 "VBNET.ATG" +#line 2780 "VBNET.ATG" type = "Short"; break; } case 111: { lexer.NextToken(); -#line 2758 "VBNET.ATG" +#line 2781 "VBNET.ATG" type = "Integer"; break; } case 117: { lexer.NextToken(); -#line 2759 "VBNET.ATG" +#line 2782 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2760 "VBNET.ATG" +#line 2783 "VBNET.ATG" type = "Single"; break; } case 84: { lexer.NextToken(); -#line 2761 "VBNET.ATG" +#line 2784 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2762 "VBNET.ATG" +#line 2785 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2763 "VBNET.ATG" +#line 2786 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2764 "VBNET.ATG" +#line 2787 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2765 "VBNET.ATG" +#line 2788 "VBNET.ATG" type = "SByte"; break; } - default: SynErr(243); break; + default: SynErr(245); break; } } - void IdentifierOrKeyword( -#line 2742 "VBNET.ATG" -out string name) { - -#line 2744 "VBNET.ATG" - lexer.NextToken(); name = t.val; - } - void CastTarget( -#line 1638 "VBNET.ATG" +#line 1632 "VBNET.ATG" out TypeReference type) { -#line 1640 "VBNET.ATG" +#line 1634 "VBNET.ATG" type = null; switch (la.kind) { case 59: { lexer.NextToken(); -#line 1642 "VBNET.ATG" +#line 1636 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 60: { lexer.NextToken(); -#line 1643 "VBNET.ATG" +#line 1637 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 194: { lexer.NextToken(); -#line 1644 "VBNET.ATG" +#line 1638 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 61: { lexer.NextToken(); -#line 1645 "VBNET.ATG" +#line 1639 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 62: { lexer.NextToken(); -#line 1646 "VBNET.ATG" +#line 1640 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 64: { lexer.NextToken(); -#line 1647 "VBNET.ATG" +#line 1641 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 63: { lexer.NextToken(); -#line 1648 "VBNET.ATG" +#line 1642 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 72: { lexer.NextToken(); -#line 1649 "VBNET.ATG" +#line 1643 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 66: { lexer.NextToken(); -#line 1650 "VBNET.ATG" +#line 1644 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 68: { lexer.NextToken(); -#line 1651 "VBNET.ATG" +#line 1645 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 195: { lexer.NextToken(); -#line 1652 "VBNET.ATG" +#line 1646 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 196: { lexer.NextToken(); -#line 1653 "VBNET.ATG" +#line 1647 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 197: { lexer.NextToken(); -#line 1654 "VBNET.ATG" +#line 1648 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 69: { lexer.NextToken(); -#line 1655 "VBNET.ATG" +#line 1649 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 73: { lexer.NextToken(); -#line 1656 "VBNET.ATG" +#line 1650 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 74: { lexer.NextToken(); -#line 1657 "VBNET.ATG" +#line 1651 "VBNET.ATG" type = new TypeReference("System.String"); break; } - default: SynErr(244); break; + default: SynErr(246); break; } } void GetTypeTypeName( -#line 1887 "VBNET.ATG" +#line 1909 "VBNET.ATG" out TypeReference typeref) { -#line 1888 "VBNET.ATG" +#line 1910 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 1890 "VBNET.ATG" +#line 1912 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 1891 "VBNET.ATG" +#line 1913 "VBNET.ATG" out rank); -#line 1892 "VBNET.ATG" +#line 1914 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } } - void InvocationOrMemberReferenceExpression( -#line 1601 "VBNET.ATG" -ref Expression pexpr) { - -#line 1602 "VBNET.ATG" - string name; - if (la.kind == 10) { - lexer.NextToken(); - IdentifierOrKeyword( -#line 1604 "VBNET.ATG" -out name); - -#line 1604 "VBNET.ATG" - pexpr = new FieldReferenceExpression(pexpr, name); - } else if (la.kind == 24) { - InvocationExpression( -#line 1605 "VBNET.ATG" -ref pexpr); - } else SynErr(245); - } - - void InvocationExpression( -#line 1608 "VBNET.ATG" -ref Expression pexpr) { - -#line 1609 "VBNET.ATG" - List typeParameters = new List(); - List parameters = null; - TypeReference type; - Expect(24); - -#line 1613 "VBNET.ATG" - Location start = t.Location; - if (la.kind == 200) { - lexer.NextToken(); - TypeName( -#line 1615 "VBNET.ATG" -out type); - -#line 1615 "VBNET.ATG" - if (type != null) typeParameters.Add(type); - while (la.kind == 12) { - lexer.NextToken(); - TypeName( -#line 1618 "VBNET.ATG" -out type); - -#line 1618 "VBNET.ATG" - if (type != null) typeParameters.Add(type); - } - Expect(25); - if (la.kind == 10) { - lexer.NextToken(); - Identifier(); - -#line 1623 "VBNET.ATG" - pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); - } else if (la.kind == 24) { - lexer.NextToken(); - ArgumentList( -#line 1625 "VBNET.ATG" -out parameters); - Expect(25); - -#line 1627 "VBNET.ATG" - pexpr = new InvocationExpression(pexpr, parameters, typeParameters); - } else SynErr(246); - } else if (StartOf(29)) { - ArgumentList( -#line 1629 "VBNET.ATG" -out parameters); - Expect(25); - -#line 1631 "VBNET.ATG" - pexpr = new InvocationExpression(pexpr, parameters, typeParameters); - } else SynErr(247); - -#line 1633 "VBNET.ATG" - pexpr.StartLocation = start; pexpr.EndLocation = t.Location; - } - void ArgumentList( -#line 1847 "VBNET.ATG" +#line 1844 "VBNET.ATG" out List arguments) { -#line 1849 "VBNET.ATG" +#line 1846 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(26)) { Argument( -#line 1852 "VBNET.ATG" +#line 1849 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1853 "VBNET.ATG" +#line 1850 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(26)) { Argument( -#line 1854 "VBNET.ATG" +#line 1851 "VBNET.ATG" out expr); } -#line 1855 "VBNET.ATG" +#line 1852 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 1857 "VBNET.ATG" +#line 1854 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1676 "VBNET.ATG" +#line 1670 "VBNET.ATG" out Expression outExpr) { -#line 1678 "VBNET.ATG" +#line 1672 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1681 "VBNET.ATG" +#line 1675 "VBNET.ATG" out outExpr); while (la.kind == 45 || la.kind == 46) { if (la.kind == 45) { lexer.NextToken(); -#line 1684 "VBNET.ATG" +#line 1678 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1685 "VBNET.ATG" +#line 1679 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1687 "VBNET.ATG" +#line 1681 "VBNET.ATG" out expr); -#line 1687 "VBNET.ATG" +#line 1681 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1691 "VBNET.ATG" +#line 1685 "VBNET.ATG" out Expression outExpr) { -#line 1692 "VBNET.ATG" +#line 1686 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 129) { lexer.NextToken(); -#line 1693 "VBNET.ATG" +#line 1687 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1694 "VBNET.ATG" +#line 1688 "VBNET.ATG" out outExpr); -#line 1695 "VBNET.ATG" +#line 1689 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1700 "VBNET.ATG" +#line 1694 "VBNET.ATG" out Expression outExpr) { -#line 1702 "VBNET.ATG" +#line 1696 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1705 "VBNET.ATG" +#line 1699 "VBNET.ATG" out outExpr); while (StartOf(30)) { switch (la.kind) { case 27: { lexer.NextToken(); -#line 1708 "VBNET.ATG" +#line 1702 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 1709 "VBNET.ATG" +#line 1703 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1710 "VBNET.ATG" +#line 1704 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1711 "VBNET.ATG" +#line 1705 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 1712 "VBNET.ATG" +#line 1706 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 11: { lexer.NextToken(); -#line 1713 "VBNET.ATG" +#line 1707 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 116: { lexer.NextToken(); -#line 1714 "VBNET.ATG" +#line 1708 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 113: { lexer.NextToken(); -#line 1715 "VBNET.ATG" +#line 1709 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 189: { lexer.NextToken(); -#line 1716 "VBNET.ATG" +#line 1710 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(31)) { ShiftExpr( -#line 1719 "VBNET.ATG" +#line 1713 "VBNET.ATG" out expr); -#line 1719 "VBNET.ATG" +#line 1713 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 129) { lexer.NextToken(); ShiftExpr( -#line 1722 "VBNET.ATG" +#line 1716 "VBNET.ATG" out expr); -#line 1722 "VBNET.ATG" +#line 1716 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(248); + } else SynErr(247); } } void ShiftExpr( -#line 1727 "VBNET.ATG" +#line 1721 "VBNET.ATG" out Expression outExpr) { -#line 1729 "VBNET.ATG" +#line 1723 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1732 "VBNET.ATG" +#line 1726 "VBNET.ATG" out outExpr); while (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 1735 "VBNET.ATG" +#line 1729 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1736 "VBNET.ATG" +#line 1730 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1738 "VBNET.ATG" +#line 1732 "VBNET.ATG" out expr); -#line 1738 "VBNET.ATG" +#line 1732 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1742 "VBNET.ATG" +#line 1736 "VBNET.ATG" out Expression outExpr) { -#line 1743 "VBNET.ATG" +#line 1737 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1745 "VBNET.ATG" +#line 1739 "VBNET.ATG" out outExpr); while (la.kind == 19) { lexer.NextToken(); AdditiveExpr( -#line 1745 "VBNET.ATG" +#line 1739 "VBNET.ATG" out expr); -#line 1745 "VBNET.ATG" +#line 1739 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1748 "VBNET.ATG" +#line 1742 "VBNET.ATG" out Expression outExpr) { -#line 1750 "VBNET.ATG" +#line 1744 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1753 "VBNET.ATG" +#line 1747 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15) { if (la.kind == 14) { lexer.NextToken(); -#line 1756 "VBNET.ATG" +#line 1750 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1757 "VBNET.ATG" +#line 1751 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1759 "VBNET.ATG" +#line 1753 "VBNET.ATG" out expr); -#line 1759 "VBNET.ATG" +#line 1753 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1763 "VBNET.ATG" +#line 1757 "VBNET.ATG" out Expression outExpr) { -#line 1764 "VBNET.ATG" +#line 1758 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1766 "VBNET.ATG" +#line 1760 "VBNET.ATG" out outExpr); while (la.kind == 120) { lexer.NextToken(); IntegerDivisionExpr( -#line 1766 "VBNET.ATG" +#line 1760 "VBNET.ATG" out expr); -#line 1766 "VBNET.ATG" +#line 1760 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1769 "VBNET.ATG" +#line 1763 "VBNET.ATG" out Expression outExpr) { -#line 1770 "VBNET.ATG" +#line 1764 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1772 "VBNET.ATG" +#line 1766 "VBNET.ATG" out outExpr); while (la.kind == 18) { lexer.NextToken(); MultiplicativeExpr( -#line 1772 "VBNET.ATG" +#line 1766 "VBNET.ATG" out expr); -#line 1772 "VBNET.ATG" +#line 1766 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1775 "VBNET.ATG" +#line 1769 "VBNET.ATG" out Expression outExpr) { -#line 1777 "VBNET.ATG" +#line 1771 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1780 "VBNET.ATG" +#line 1774 "VBNET.ATG" out outExpr); while (la.kind == 16 || la.kind == 17) { if (la.kind == 16) { lexer.NextToken(); -#line 1783 "VBNET.ATG" +#line 1777 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1784 "VBNET.ATG" +#line 1778 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1786 "VBNET.ATG" +#line 1780 "VBNET.ATG" out expr); -#line 1786 "VBNET.ATG" +#line 1780 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1790 "VBNET.ATG" +#line 1784 "VBNET.ATG" out Expression uExpr) { -#line 1792 "VBNET.ATG" +#line 1786 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4420,25 +4415,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1796 "VBNET.ATG" +#line 1790 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1797 "VBNET.ATG" +#line 1791 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1798 "VBNET.ATG" +#line 1792 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } ExponentiationExpr( -#line 1800 "VBNET.ATG" +#line 1794 "VBNET.ATG" out expr); -#line 1802 "VBNET.ATG" +#line 1796 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4448,50 +4443,107 @@ out expr); } void ExponentiationExpr( -#line 1810 "VBNET.ATG" +#line 1804 "VBNET.ATG" out Expression outExpr) { -#line 1811 "VBNET.ATG" +#line 1805 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1813 "VBNET.ATG" +#line 1807 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1813 "VBNET.ATG" +#line 1807 "VBNET.ATG" out expr); -#line 1813 "VBNET.ATG" +#line 1807 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } + void NormalOrReDimArgumentList( +#line 1858 "VBNET.ATG" +out List arguments, out bool canBeNormal, out bool canBeRedim) { + +#line 1860 "VBNET.ATG" + arguments = new List(); + canBeNormal = true; canBeRedim = !IsNamedAssign(); + Expression expr = null; + + if (StartOf(26)) { + Argument( +#line 1865 "VBNET.ATG" +out expr); + if (la.kind == 172) { + lexer.NextToken(); + +#line 1866 "VBNET.ATG" + EnsureIsZero(expr); canBeNormal = false; + Expr( +#line 1867 "VBNET.ATG" +out expr); + } + } + while (la.kind == 12) { + lexer.NextToken(); + +#line 1870 "VBNET.ATG" + if (expr == null) canBeRedim = false; + +#line 1871 "VBNET.ATG" + arguments.Add(expr ?? Expression.Null); expr = null; + +#line 1872 "VBNET.ATG" + canBeRedim &= !IsNamedAssign(); + if (StartOf(26)) { + Argument( +#line 1873 "VBNET.ATG" +out expr); + if (la.kind == 172) { + lexer.NextToken(); + +#line 1874 "VBNET.ATG" + EnsureIsZero(expr); canBeNormal = false; + Expr( +#line 1875 "VBNET.ATG" +out expr); + } + } + +#line 1877 "VBNET.ATG" + if (expr == null) { canBeRedim = false; expr = Expression.Null; } + } + +#line 1879 "VBNET.ATG" + if (expr != null) arguments.Add(expr); else canBeRedim = false; + } + void ArrayTypeModifiers( -#line 1944 "VBNET.ATG" +#line 1966 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1946 "VBNET.ATG" +#line 1968 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1949 "VBNET.ATG" +#line 1971 "VBNET.ATG" IsDims()) { Expect(24); if (la.kind == 12 || la.kind == 25) { RankList( -#line 1951 "VBNET.ATG" +#line 1973 "VBNET.ATG" out i); } -#line 1953 "VBNET.ATG" +#line 1975 "VBNET.ATG" arrayModifiers.Add(i); Expect(25); } -#line 1958 "VBNET.ATG" +#line 1980 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4499,118 +4551,118 @@ out i); } void Argument( -#line 1861 "VBNET.ATG" +#line 1883 "VBNET.ATG" out Expression argumentexpr) { -#line 1863 "VBNET.ATG" +#line 1885 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1867 "VBNET.ATG" +#line 1889 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1867 "VBNET.ATG" +#line 1889 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1867 "VBNET.ATG" +#line 1889 "VBNET.ATG" out expr); -#line 1869 "VBNET.ATG" +#line 1891 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(26)) { Expr( -#line 1872 "VBNET.ATG" +#line 1894 "VBNET.ATG" out argumentexpr); - } else SynErr(249); + } else SynErr(248); } void QualIdentAndTypeArguments( -#line 1918 "VBNET.ATG" +#line 1940 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 1919 "VBNET.ATG" +#line 1941 "VBNET.ATG" string name; typeref = null; Qualident( -#line 1921 "VBNET.ATG" +#line 1943 "VBNET.ATG" out name); -#line 1922 "VBNET.ATG" +#line 1944 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1923 "VBNET.ATG" +#line 1945 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); if ( -#line 1925 "VBNET.ATG" +#line 1947 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 1926 "VBNET.ATG" +#line 1948 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 1927 "VBNET.ATG" +#line 1949 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(5)) { TypeArgumentList( -#line 1928 "VBNET.ATG" +#line 1950 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(250); + } else SynErr(249); Expect(25); } } void TypeArgumentList( -#line 1971 "VBNET.ATG" +#line 1993 "VBNET.ATG" List typeArguments) { -#line 1973 "VBNET.ATG" +#line 1995 "VBNET.ATG" TypeReference typeref; TypeName( -#line 1975 "VBNET.ATG" +#line 1997 "VBNET.ATG" out typeref); -#line 1975 "VBNET.ATG" +#line 1997 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1978 "VBNET.ATG" +#line 2000 "VBNET.ATG" out typeref); -#line 1978 "VBNET.ATG" +#line 2000 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 1965 "VBNET.ATG" +#line 1987 "VBNET.ATG" out int i) { -#line 1966 "VBNET.ATG" +#line 1988 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 1967 "VBNET.ATG" +#line 1989 "VBNET.ATG" ++i; } } void Attribute( -#line 2003 "VBNET.ATG" +#line 2025 "VBNET.ATG" out ASTAttribute attribute) { -#line 2004 "VBNET.ATG" +#line 2026 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4620,39 +4672,39 @@ out ASTAttribute attribute) { Expect(10); } Qualident( -#line 2009 "VBNET.ATG" +#line 2031 "VBNET.ATG" out name); if (la.kind == 24) { AttributeArguments( -#line 2010 "VBNET.ATG" +#line 2032 "VBNET.ATG" positional, named); } -#line 2011 "VBNET.ATG" +#line 2033 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2015 "VBNET.ATG" +#line 2037 "VBNET.ATG" List positional, List named) { -#line 2017 "VBNET.ATG" +#line 2039 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(24); if ( -#line 2023 "VBNET.ATG" +#line 2045 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2025 "VBNET.ATG" +#line 2047 "VBNET.ATG" IsNamedAssign()) { -#line 2025 "VBNET.ATG" +#line 2047 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2026 "VBNET.ATG" +#line 2048 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4660,10 +4712,10 @@ out name); Expect(11); } Expr( -#line 2028 "VBNET.ATG" +#line 2050 "VBNET.ATG" out expr); -#line 2030 "VBNET.ATG" +#line 2052 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -4672,13 +4724,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2038 "VBNET.ATG" +#line 2060 "VBNET.ATG" IsNamedAssign()) { -#line 2038 "VBNET.ATG" +#line 2060 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2039 "VBNET.ATG" +#line 2061 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4686,14 +4738,14 @@ out name); Expect(11); } else if (StartOf(26)) { -#line 2041 "VBNET.ATG" +#line 2063 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(251); + } else SynErr(250); Expr( -#line 2042 "VBNET.ATG" +#line 2064 "VBNET.ATG" out expr); -#line 2042 "VBNET.ATG" +#line 2064 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4704,10 +4756,10 @@ out expr); } void FormalParameter( -#line 2111 "VBNET.ATG" +#line 2133 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2113 "VBNET.ATG" +#line 2135 "VBNET.ATG" TypeReference type = null; ParamModifierList mod = new ParamModifierList(this); Expression expr = null; @@ -4715,28 +4767,28 @@ out ParameterDeclarationExpression p) { while (StartOf(32)) { ParameterModifier( -#line 2118 "VBNET.ATG" +#line 2140 "VBNET.ATG" mod); } Identifier(); -#line 2119 "VBNET.ATG" +#line 2141 "VBNET.ATG" string parameterName = t.val; if ( -#line 2120 "VBNET.ATG" +#line 2142 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2120 "VBNET.ATG" +#line 2142 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2121 "VBNET.ATG" +#line 2143 "VBNET.ATG" out type); } -#line 2123 "VBNET.ATG" +#line 2145 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4752,45 +4804,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2135 "VBNET.ATG" +#line 2157 "VBNET.ATG" out expr); } -#line 2137 "VBNET.ATG" +#line 2159 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2768 "VBNET.ATG" +#line 2791 "VBNET.ATG" ParamModifierList m) { if (la.kind == 55) { lexer.NextToken(); -#line 2769 "VBNET.ATG" +#line 2792 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 53) { lexer.NextToken(); -#line 2770 "VBNET.ATG" +#line 2793 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 137) { lexer.NextToken(); -#line 2771 "VBNET.ATG" +#line 2794 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2772 "VBNET.ATG" +#line 2795 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(252); + } else SynErr(251); } void Statement() { -#line 2164 "VBNET.ATG" +#line 2186 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -4798,34 +4850,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2170 "VBNET.ATG" +#line 2192 "VBNET.ATG" IsLabel()) { LabelName( -#line 2170 "VBNET.ATG" +#line 2192 "VBNET.ATG" out label); -#line 2172 "VBNET.ATG" +#line 2194 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(33)) { EmbeddedStatement( -#line 2175 "VBNET.ATG" +#line 2197 "VBNET.ATG" out stmt); -#line 2175 "VBNET.ATG" +#line 2197 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(34)) { LocalDeclarationStatement( -#line 2176 "VBNET.ATG" +#line 2198 "VBNET.ATG" out stmt); -#line 2176 "VBNET.ATG" +#line 2198 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else SynErr(253); + } else SynErr(252); -#line 2179 "VBNET.ATG" +#line 2201 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -4834,30 +4886,30 @@ out stmt); } void LabelName( -#line 2555 "VBNET.ATG" +#line 2577 "VBNET.ATG" out string name) { -#line 2557 "VBNET.ATG" +#line 2579 "VBNET.ATG" name = String.Empty; if (StartOf(12)) { Identifier(); -#line 2559 "VBNET.ATG" +#line 2581 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2560 "VBNET.ATG" +#line 2582 "VBNET.ATG" name = t.val; - } else SynErr(254); + } else SynErr(253); } void EmbeddedStatement( -#line 2218 "VBNET.ATG" +#line 2240 "VBNET.ATG" out Statement statement) { -#line 2220 "VBNET.ATG" +#line 2242 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -4868,103 +4920,103 @@ out Statement statement) { case 94: { lexer.NextToken(); -#line 2226 "VBNET.ATG" +#line 2248 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2228 "VBNET.ATG" +#line 2250 "VBNET.ATG" exitType = ExitType.Sub; break; } case 100: { lexer.NextToken(); -#line 2230 "VBNET.ATG" +#line 2252 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2232 "VBNET.ATG" +#line 2254 "VBNET.ATG" exitType = ExitType.Property; break; } case 83: { lexer.NextToken(); -#line 2234 "VBNET.ATG" +#line 2256 "VBNET.ATG" exitType = ExitType.Do; break; } case 98: { lexer.NextToken(); -#line 2236 "VBNET.ATG" +#line 2258 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2238 "VBNET.ATG" +#line 2260 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2240 "VBNET.ATG" +#line 2262 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2242 "VBNET.ATG" +#line 2264 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(255); break; + default: SynErr(254); break; } -#line 2244 "VBNET.ATG" +#line 2266 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2245 "VBNET.ATG" +#line 2267 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2246 "VBNET.ATG" +#line 2268 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 83 || la.kind == 98 || la.kind == 181) { if (la.kind == 83) { lexer.NextToken(); -#line 2246 "VBNET.ATG" +#line 2268 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 98) { lexer.NextToken(); -#line 2246 "VBNET.ATG" +#line 2268 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2246 "VBNET.ATG" +#line 2268 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2246 "VBNET.ATG" +#line 2268 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -4972,11 +5024,11 @@ out statement); lexer.NextToken(); if (StartOf(26)) { Expr( -#line 2248 "VBNET.ATG" +#line 2270 "VBNET.ATG" out expr); } -#line 2248 "VBNET.ATG" +#line 2270 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -4984,27 +5036,27 @@ out expr); lexer.NextToken(); if (StartOf(26)) { Expr( -#line 2250 "VBNET.ATG" +#line 2272 "VBNET.ATG" out expr); } -#line 2250 "VBNET.ATG" +#line 2272 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2252 "VBNET.ATG" +#line 2274 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2252 "VBNET.ATG" +#line 2274 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(168); -#line 2253 "VBNET.ATG" +#line 2275 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5012,42 +5064,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2255 "VBNET.ATG" +#line 2277 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(29)) { ArgumentList( -#line 2256 "VBNET.ATG" +#line 2278 "VBNET.ATG" out p); } Expect(25); } -#line 2257 "VBNET.ATG" +#line 2279 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2259 "VBNET.ATG" +#line 2281 "VBNET.ATG" out statement); break; } case 42: { lexer.NextToken(); -#line 2261 "VBNET.ATG" +#line 2283 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2262 "VBNET.ATG" +#line 2284 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2262 "VBNET.ATG" +#line 2284 "VBNET.ATG" out handlerExpr); -#line 2264 "VBNET.ATG" +#line 2286 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5055,17 +5107,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2267 "VBNET.ATG" +#line 2289 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2268 "VBNET.ATG" +#line 2290 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2268 "VBNET.ATG" +#line 2290 "VBNET.ATG" out handlerExpr); -#line 2270 "VBNET.ATG" +#line 2292 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5073,16 +5125,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2273 "VBNET.ATG" +#line 2295 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2274 "VBNET.ATG" +#line 2296 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(181); -#line 2276 "VBNET.ATG" +#line 2298 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5090,23 +5142,23 @@ out embeddedStatement); case 83: { lexer.NextToken(); -#line 2281 "VBNET.ATG" +#line 2303 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2284 "VBNET.ATG" +#line 2306 "VBNET.ATG" out conditionType); Expr( -#line 2284 "VBNET.ATG" +#line 2306 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2285 "VBNET.ATG" +#line 2307 "VBNET.ATG" out embeddedStatement); Expect(118); -#line 2288 "VBNET.ATG" +#line 2310 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5115,28 +5167,28 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2295 "VBNET.ATG" +#line 2317 "VBNET.ATG" out embeddedStatement); Expect(118); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2296 "VBNET.ATG" +#line 2318 "VBNET.ATG" out conditionType); Expr( -#line 2296 "VBNET.ATG" +#line 2318 "VBNET.ATG" out expr); } -#line 2298 "VBNET.ATG" +#line 2320 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(256); + } else SynErr(255); break; } case 98: { lexer.NextToken(); -#line 2303 "VBNET.ATG" +#line 2325 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5145,24 +5197,24 @@ out expr); if (la.kind == 85) { lexer.NextToken(); LoopControlVariable( -#line 2310 "VBNET.ATG" +#line 2332 "VBNET.ATG" out typeReference, out typeName); Expect(109); Expr( -#line 2311 "VBNET.ATG" +#line 2333 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2312 "VBNET.ATG" +#line 2334 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(26)) { Expr( -#line 2313 "VBNET.ATG" +#line 2335 "VBNET.ATG" out expr); } -#line 2315 "VBNET.ATG" +#line 2337 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5174,84 +5226,84 @@ out expr); } else if (StartOf(12)) { -#line 2326 "VBNET.ATG" +#line 2348 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2331 "VBNET.ATG" +#line 2353 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2332 "VBNET.ATG" +#line 2354 "VBNET.ATG" out start); Expect(172); Expr( -#line 2332 "VBNET.ATG" +#line 2354 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2332 "VBNET.ATG" +#line 2354 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2333 "VBNET.ATG" +#line 2355 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(26)) { Expr( -#line 2336 "VBNET.ATG" +#line 2358 "VBNET.ATG" out nextExpr); -#line 2336 "VBNET.ATG" +#line 2358 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2337 "VBNET.ATG" +#line 2359 "VBNET.ATG" out nextExpr); -#line 2337 "VBNET.ATG" +#line 2359 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2340 "VBNET.ATG" +#line 2362 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); - } else SynErr(257); + } else SynErr(256); break; } case 92: { lexer.NextToken(); Expr( -#line 2344 "VBNET.ATG" +#line 2366 "VBNET.ATG" out expr); -#line 2344 "VBNET.ATG" +#line 2366 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2346 "VBNET.ATG" +#line 2368 "VBNET.ATG" bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2346 "VBNET.ATG" +#line 2368 "VBNET.ATG" isPreserve = true; } - Expr( -#line 2347 "VBNET.ATG" + ReDimClause( +#line 2369 "VBNET.ATG" out expr); -#line 2349 "VBNET.ATG" +#line 2371 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; InvocationExpression redimClause = expr as InvocationExpression; @@ -5259,14 +5311,14 @@ out expr); while (la.kind == 12) { lexer.NextToken(); - Expr( -#line 2354 "VBNET.ATG" + ReDimClause( +#line 2376 "VBNET.ATG" out expr); -#line 2355 "VBNET.ATG" +#line 2377 "VBNET.ATG" redimClause = expr as InvocationExpression; -#line 2356 "VBNET.ATG" +#line 2378 "VBNET.ATG" if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } } break; @@ -5274,10 +5326,10 @@ out expr); case 91: { lexer.NextToken(); Expr( -#line 2360 "VBNET.ATG" +#line 2382 "VBNET.ATG" out expr); -#line 2361 "VBNET.ATG" +#line 2383 "VBNET.ATG" List arrays = new List(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5286,53 +5338,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2366 "VBNET.ATG" +#line 2388 "VBNET.ATG" out expr); -#line 2366 "VBNET.ATG" +#line 2388 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2367 "VBNET.ATG" +#line 2389 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2369 "VBNET.ATG" +#line 2391 "VBNET.ATG" statement = new StopStatement(); break; } case 106: { lexer.NextToken(); Expr( -#line 2371 "VBNET.ATG" +#line 2393 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2373 "VBNET.ATG" +#line 2395 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); -#line 2373 "VBNET.ATG" +#line 2395 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2376 "VBNET.ATG" +#line 2398 "VBNET.ATG" out embeddedStatement); -#line 2378 "VBNET.ATG" +#line 2400 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 87 || -#line 2382 "VBNET.ATG" +#line 2404 "VBNET.ATG" IsElseIf()) { if ( -#line 2382 "VBNET.ATG" +#line 2404 "VBNET.ATG" IsElseIf()) { Expect(86); Expect(106); @@ -5340,20 +5392,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2385 "VBNET.ATG" +#line 2407 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2386 "VBNET.ATG" +#line 2408 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2387 "VBNET.ATG" +#line 2409 "VBNET.ATG" out block); -#line 2389 "VBNET.ATG" +#line 2411 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5361,61 +5413,61 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2394 "VBNET.ATG" +#line 2416 "VBNET.ATG" out embeddedStatement); -#line 2396 "VBNET.ATG" +#line 2418 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(88); Expect(106); -#line 2400 "VBNET.ATG" +#line 2422 "VBNET.ATG" statement = ifStatement; } else if (StartOf(33)) { EmbeddedStatement( -#line 2403 "VBNET.ATG" +#line 2425 "VBNET.ATG" out embeddedStatement); -#line 2405 "VBNET.ATG" +#line 2427 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2407 "VBNET.ATG" +#line 2429 "VBNET.ATG" out embeddedStatement); -#line 2407 "VBNET.ATG" +#line 2429 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 86) { lexer.NextToken(); if (StartOf(33)) { EmbeddedStatement( -#line 2409 "VBNET.ATG" +#line 2431 "VBNET.ATG" out embeddedStatement); } -#line 2411 "VBNET.ATG" +#line 2433 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2414 "VBNET.ATG" +#line 2436 "VBNET.ATG" out embeddedStatement); -#line 2415 "VBNET.ATG" +#line 2437 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2418 "VBNET.ATG" +#line 2440 "VBNET.ATG" statement = ifStatement; - } else SynErr(258); + } else SynErr(257); break; } case 155: { @@ -5424,43 +5476,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2421 "VBNET.ATG" +#line 2443 "VBNET.ATG" out expr); EndOfStmt(); -#line 2422 "VBNET.ATG" +#line 2444 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 57) { -#line 2426 "VBNET.ATG" +#line 2448 "VBNET.ATG" List caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2427 "VBNET.ATG" +#line 2449 "VBNET.ATG" out caseClauses); if ( -#line 2427 "VBNET.ATG" +#line 2449 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2429 "VBNET.ATG" +#line 2451 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2431 "VBNET.ATG" +#line 2453 "VBNET.ATG" out block); -#line 2433 "VBNET.ATG" +#line 2455 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2437 "VBNET.ATG" +#line 2459 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(88); Expect(155); @@ -5468,43 +5520,43 @@ out block); } case 135: { -#line 2439 "VBNET.ATG" +#line 2461 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2440 "VBNET.ATG" +#line 2462 "VBNET.ATG" out onErrorStatement); -#line 2440 "VBNET.ATG" +#line 2462 "VBNET.ATG" statement = onErrorStatement; break; } case 104: { -#line 2441 "VBNET.ATG" +#line 2463 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2442 "VBNET.ATG" +#line 2464 "VBNET.ATG" out goToStatement); -#line 2442 "VBNET.ATG" +#line 2464 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2443 "VBNET.ATG" +#line 2465 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2444 "VBNET.ATG" +#line 2466 "VBNET.ATG" out resumeStatement); -#line 2444 "VBNET.ATG" +#line 2466 "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 2447 "VBNET.ATG" +#line 2469 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5512,25 +5564,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2453 "VBNET.ATG" +#line 2475 "VBNET.ATG" out expr); if (StartOf(35)) { AssignmentOperator( -#line 2455 "VBNET.ATG" +#line 2477 "VBNET.ATG" out op); Expr( -#line 2455 "VBNET.ATG" +#line 2477 "VBNET.ATG" out val); -#line 2455 "VBNET.ATG" +#line 2477 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 86) { -#line 2456 "VBNET.ATG" +#line 2478 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(259); + } else SynErr(258); -#line 2459 "VBNET.ATG" +#line 2481 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5543,63 +5595,63 @@ out val); case 56: { lexer.NextToken(); SimpleExpr( -#line 2466 "VBNET.ATG" +#line 2488 "VBNET.ATG" out expr); -#line 2466 "VBNET.ATG" +#line 2488 "VBNET.ATG" statement = new ExpressionStatement(expr); break; } case 188: { lexer.NextToken(); -#line 2468 "VBNET.ATG" +#line 2490 "VBNET.ATG" Statement block; if ( -#line 2469 "VBNET.ATG" +#line 2491 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2470 "VBNET.ATG" +#line 2492 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2471 "VBNET.ATG" +#line 2493 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2473 "VBNET.ATG" +#line 2495 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2475 "VBNET.ATG" +#line 2497 "VBNET.ATG" out block); -#line 2476 "VBNET.ATG" +#line 2498 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(26)) { Expr( -#line 2477 "VBNET.ATG" +#line 2499 "VBNET.ATG" out expr); Block( -#line 2478 "VBNET.ATG" +#line 2500 "VBNET.ATG" out block); -#line 2479 "VBNET.ATG" +#line 2501 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(260); + } else SynErr(259); Expect(88); Expect(188); break; } - default: SynErr(261); break; + default: SynErr(260); break; } } void LocalDeclarationStatement( -#line 2187 "VBNET.ATG" +#line 2209 "VBNET.ATG" out Statement statement) { -#line 2189 "VBNET.ATG" +#line 2211 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5608,22 +5660,22 @@ out Statement statement) { if (la.kind == 71) { lexer.NextToken(); -#line 2195 "VBNET.ATG" +#line 2217 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2196 "VBNET.ATG" +#line 2218 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2197 "VBNET.ATG" +#line 2219 "VBNET.ATG" dimfound = true; } } -#line 2200 "VBNET.ATG" +#line 2222 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5636,135 +5688,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2211 "VBNET.ATG" +#line 2233 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2212 "VBNET.ATG" +#line 2234 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2214 "VBNET.ATG" +#line 2236 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2665 "VBNET.ATG" +#line 2688 "VBNET.ATG" out Statement tryStatement) { -#line 2667 "VBNET.ATG" +#line 2690 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2670 "VBNET.ATG" +#line 2693 "VBNET.ATG" out blockStmt); if (la.kind == 58 || la.kind == 88 || la.kind == 97) { CatchClauses( -#line 2671 "VBNET.ATG" +#line 2694 "VBNET.ATG" out catchClauses); } if (la.kind == 97) { lexer.NextToken(); EndOfStmt(); Block( -#line 2672 "VBNET.ATG" +#line 2695 "VBNET.ATG" out finallyStmt); } Expect(88); Expect(174); -#line 2675 "VBNET.ATG" +#line 2698 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2645 "VBNET.ATG" +#line 2668 "VBNET.ATG" out Statement withStatement) { -#line 2647 "VBNET.ATG" +#line 2670 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2650 "VBNET.ATG" +#line 2673 "VBNET.ATG" Location start = t.Location; Expr( -#line 2651 "VBNET.ATG" +#line 2674 "VBNET.ATG" out expr); EndOfStmt(); -#line 2653 "VBNET.ATG" +#line 2676 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2656 "VBNET.ATG" +#line 2679 "VBNET.ATG" out blockStmt); -#line 2658 "VBNET.ATG" +#line 2681 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(88); Expect(182); -#line 2661 "VBNET.ATG" +#line 2684 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2638 "VBNET.ATG" +#line 2661 "VBNET.ATG" out ConditionType conditionType) { -#line 2639 "VBNET.ATG" +#line 2662 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2640 "VBNET.ATG" +#line 2663 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2641 "VBNET.ATG" +#line 2664 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(262); + } else SynErr(261); } void LoopControlVariable( -#line 2485 "VBNET.ATG" +#line 2507 "VBNET.ATG" out TypeReference type, out string name) { -#line 2486 "VBNET.ATG" +#line 2508 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2490 "VBNET.ATG" +#line 2512 "VBNET.ATG" out name); if ( -#line 2491 "VBNET.ATG" +#line 2513 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2491 "VBNET.ATG" +#line 2513 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2492 "VBNET.ATG" +#line 2514 "VBNET.ATG" out type); -#line 2492 "VBNET.ATG" +#line 2514 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2494 "VBNET.ATG" +#line 2516 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5775,49 +5827,60 @@ out type); } + void ReDimClause( +#line 2586 "VBNET.ATG" +out Expression expr) { + SimpleNonInvocationExpression( +#line 2588 "VBNET.ATG" +out expr); + ReDimClauseInternal( +#line 2589 "VBNET.ATG" +ref expr); + } + void CaseClauses( -#line 2598 "VBNET.ATG" +#line 2621 "VBNET.ATG" out List caseClauses) { -#line 2600 "VBNET.ATG" +#line 2623 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2603 "VBNET.ATG" +#line 2626 "VBNET.ATG" out caseClause); -#line 2603 "VBNET.ATG" +#line 2626 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2604 "VBNET.ATG" +#line 2627 "VBNET.ATG" out caseClause); -#line 2604 "VBNET.ATG" +#line 2627 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2505 "VBNET.ATG" +#line 2527 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2507 "VBNET.ATG" +#line 2529 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(135); Expect(92); if ( -#line 2513 "VBNET.ATG" +#line 2535 "VBNET.ATG" IsNegativeLabelName()) { Expect(104); Expect(15); Expect(5); -#line 2515 "VBNET.ATG" +#line 2537 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5826,10 +5889,10 @@ IsNegativeLabelName()) { } else if (la.kind == 104) { GotoStatement( -#line 2521 "VBNET.ATG" +#line 2543 "VBNET.ATG" out goToStatement); -#line 2523 "VBNET.ATG" +#line 2545 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -5846,63 +5909,100 @@ out goToStatement); lexer.NextToken(); Expect(128); -#line 2537 "VBNET.ATG" +#line 2559 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(263); + } else SynErr(262); } void GotoStatement( -#line 2543 "VBNET.ATG" +#line 2565 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2545 "VBNET.ATG" +#line 2567 "VBNET.ATG" string label = String.Empty; Expect(104); LabelName( -#line 2548 "VBNET.ATG" +#line 2570 "VBNET.ATG" out label); -#line 2550 "VBNET.ATG" +#line 2572 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2587 "VBNET.ATG" +#line 2610 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2589 "VBNET.ATG" +#line 2612 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2592 "VBNET.ATG" +#line 2615 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(128); -#line 2593 "VBNET.ATG" +#line 2616 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(36)) { LabelName( -#line 2594 "VBNET.ATG" +#line 2617 "VBNET.ATG" out label); } -#line 2594 "VBNET.ATG" +#line 2617 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(264); + } else SynErr(263); + } + + void ReDimClauseInternal( +#line 2592 "VBNET.ATG" +ref Expression expr) { + +#line 2593 "VBNET.ATG" + List arguments; bool canBeNormal; bool canBeRedim; string name; + while (la.kind == 10 || +#line 2596 "VBNET.ATG" +la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { + if (la.kind == 10) { + lexer.NextToken(); + IdentifierOrKeyword( +#line 2595 "VBNET.ATG" +out name); + +#line 2595 "VBNET.ATG" + expr = new FieldReferenceExpression(expr, name); + } else { + InvocationExpression( +#line 2597 "VBNET.ATG" +ref expr); + } + } + Expect(24); + NormalOrReDimArgumentList( +#line 2600 "VBNET.ATG" +out arguments, out canBeNormal, out canBeRedim); + Expect(25); + +#line 2602 "VBNET.ATG" + expr = new InvocationExpression(expr, arguments); + if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { + ReDimClauseInternal(ref expr); + } + } void CaseClause( -#line 2608 "VBNET.ATG" +#line 2631 "VBNET.ATG" out CaseLabel caseClause) { -#line 2610 "VBNET.ATG" +#line 2633 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -5911,7 +6011,7 @@ out CaseLabel caseClause) { if (la.kind == 86) { lexer.NextToken(); -#line 2616 "VBNET.ATG" +#line 2639 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(37)) { if (la.kind == 113) { @@ -5921,76 +6021,76 @@ out CaseLabel caseClause) { case 27: { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2643 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 2621 "VBNET.ATG" +#line 2644 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 2622 "VBNET.ATG" +#line 2645 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 2623 "VBNET.ATG" +#line 2646 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2624 "VBNET.ATG" +#line 2647 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 2625 "VBNET.ATG" +#line 2648 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(265); break; + default: SynErr(264); break; } Expr( -#line 2627 "VBNET.ATG" +#line 2650 "VBNET.ATG" out expr); -#line 2629 "VBNET.ATG" +#line 2652 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(26)) { Expr( -#line 2631 "VBNET.ATG" +#line 2654 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2631 "VBNET.ATG" +#line 2654 "VBNET.ATG" out sexpr); } -#line 2633 "VBNET.ATG" +#line 2656 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(266); + } else SynErr(265); } void CatchClauses( -#line 2680 "VBNET.ATG" +#line 2703 "VBNET.ATG" out List catchClauses) { -#line 2682 "VBNET.ATG" +#line 2705 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6002,27 +6102,27 @@ out List catchClauses) { if (StartOf(12)) { Identifier(); -#line 2690 "VBNET.ATG" +#line 2713 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2690 "VBNET.ATG" +#line 2713 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2691 "VBNET.ATG" +#line 2714 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2693 "VBNET.ATG" +#line 2716 "VBNET.ATG" out blockStmt); -#line 2694 "VBNET.ATG" +#line 2717 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6278,34 +6378,33 @@ out blockStmt); case 236: s = "invalid EventMemberSpecifier"; break; case 237: s = "invalid EventMemberSpecifier"; break; case 238: s = "invalid AssignmentOperator"; break; - case 239: s = "invalid SimpleExpr"; break; - case 240: s = "invalid SimpleExpr"; break; - case 241: s = "invalid SimpleExpr"; break; - case 242: s = "invalid SimpleExpr"; break; - case 243: s = "invalid PrimitiveTypeName"; break; - case 244: s = "invalid CastTarget"; break; - case 245: s = "invalid InvocationOrMemberReferenceExpression"; break; - case 246: s = "invalid InvocationExpression"; break; - case 247: s = "invalid InvocationExpression"; break; - case 248: s = "invalid ComparisonExpr"; break; - case 249: s = "invalid Argument"; break; - case 250: s = "invalid QualIdentAndTypeArguments"; break; - case 251: s = "invalid AttributeArguments"; break; - case 252: s = "invalid ParameterModifier"; break; - case 253: s = "invalid Statement"; break; - case 254: s = "invalid LabelName"; break; + case 239: s = "invalid SimpleNonInvocationExpression"; break; + case 240: s = "invalid SimpleNonInvocationExpression"; break; + case 241: s = "invalid SimpleNonInvocationExpression"; break; + case 242: s = "invalid SimpleNonInvocationExpression"; break; + case 243: s = "invalid InvocationExpression"; break; + case 244: s = "invalid InvocationExpression"; break; + case 245: s = "invalid PrimitiveTypeName"; break; + case 246: s = "invalid CastTarget"; break; + case 247: s = "invalid ComparisonExpr"; break; + case 248: s = "invalid Argument"; break; + case 249: s = "invalid QualIdentAndTypeArguments"; break; + case 250: s = "invalid AttributeArguments"; break; + case 251: s = "invalid ParameterModifier"; break; + case 252: s = "invalid Statement"; break; + case 253: s = "invalid LabelName"; break; + case 254: s = "invalid EmbeddedStatement"; break; case 255: s = "invalid EmbeddedStatement"; break; case 256: s = "invalid EmbeddedStatement"; break; case 257: s = "invalid EmbeddedStatement"; break; case 258: s = "invalid EmbeddedStatement"; break; case 259: s = "invalid EmbeddedStatement"; break; case 260: s = "invalid EmbeddedStatement"; break; - case 261: s = "invalid EmbeddedStatement"; break; - case 262: s = "invalid WhileOrUntil"; break; - case 263: s = "invalid OnErrorStatement"; break; - case 264: s = "invalid ResumeStatement"; break; + case 261: s = "invalid WhileOrUntil"; break; + case 262: s = "invalid OnErrorStatement"; break; + case 263: s = "invalid ResumeStatement"; break; + case 264: s = "invalid CaseClause"; break; case 265: s = "invalid CaseClause"; break; - case 266: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index d02ca2048e..21571b2515 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1392,19 +1392,13 @@ InitializationRankList rank> Expression expr = null; .) = Expr - [ "To" - (. if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") - Error("lower bound of array must be zero"); - .) + [ "To" (. EnsureIsZero(expr); .) Expr ] (. if (expr != null) { rank.Add(expr); } .) { "," Expr - [ "To" - (. if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") - Error("lower bound of array must be zero"); - .) + [ "To" (. EnsureIsZero(expr); .) Expr ] (. if (expr != null) { rank.Add(expr); } .) @@ -1540,6 +1534,15 @@ AssignmentOperator /* 11.4 */ SimpleExpr += + SimpleNonInvocationExpression + { (. string name; .) + "." IdentifierOrKeyword (. pexpr = new FieldReferenceExpression(pexpr, name); .) + | InvocationExpression + } +. + +SimpleNonInvocationExpression (. Expression expr; TypeReference type = null; @@ -1590,21 +1593,12 @@ SimpleExpr | /* 11.5.1 */ "GetType" "(" GetTypeTypeName ")" (. pexpr = new TypeOfExpression(type); .) | /* 11.5.2 */ "TypeOf" SimpleExpr "Is" TypeName (. pexpr = new TypeOfIsExpression(expr, type); .) ) - { InvocationOrMemberReferenceExpression } | /* this form only occurs in WithStatements*/ - "." IdentifierOrKeyword (. pexpr = new FieldReferenceExpression(pexpr, name);.) - { InvocationOrMemberReferenceExpression } + "." IdentifierOrKeyword (. pexpr = new FieldReferenceExpression(null, name);.) ) . -InvocationOrMemberReferenceExpression -(. string name; .) -= - "." IdentifierOrKeyword (. pexpr = new FieldReferenceExpression(pexpr, name); .) -| InvocationExpression -. - InvocationExpression (. List typeParameters = new List(); List parameters = null; @@ -1820,13 +1814,16 @@ ObjectCreateExpression List arguments = null; ArrayList dimensions = null; oce = null; + bool canBeNormal; bool canBeReDim; .) = "New" NonArrayTypeName - ["(" ArgumentList ")" + ["(" NormalOrReDimArgumentList ")" [ IF (la.kind == Tokens.OpenParenthesis) - ArrayTypeModifiers - ArrayInitializer - | ArrayInitializer ] + ArrayTypeModifiers + ArrayInitializer + | ArrayInitializer + ] + (. if (canBeReDim && !canBeNormal && initializer == null) initializer = new ArrayInitializerExpression(); .) ] (. if (type == null) type = new TypeReference("Object"); // fallback type on parser errors @@ -1857,6 +1854,31 @@ ArgumentList arguments> (. if (expr != null) arguments.Add(expr); .) . +/* argument list that hasn't decided if it is method call or array initialisation */ +NormalOrReDimArgumentList arguments, out bool canBeNormal, out bool canBeRedim> + (. + arguments = new List(); + canBeNormal = true; canBeRedim = !IsNamedAssign(); + Expression expr = null; + .) += + [ Argument + [ "To" (. EnsureIsZero(expr); canBeNormal = false; .) + Expr + ] ] + { "," + (. if (expr == null) canBeRedim = false; .) + (. arguments.Add(expr ?? Expression.Null); expr = null; .) + (. canBeRedim &= !IsNamedAssign(); .) + [ Argument + [ "To" (. EnsureIsZero(expr); canBeNormal = false; .) + Expr + ] ] + (. if (expr == null) { canBeRedim = false; expr = Expression.Null; } .) + } + (. if (expr != null) arguments.Add(expr); else canBeRedim = false; .) +. + /* Spec, 11.8 */ Argument (. @@ -2344,14 +2366,14 @@ EmbeddedStatement "Error" Expr (. statement = new ErrorStatement(expr); .) | /* 10.12.1 */ "ReDim" (. bool isPreserve = false; .) [ "Preserve" (. isPreserve = true; .) ] - Expr + ReDimClause (. ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; InvocationExpression redimClause = expr as InvocationExpression; if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } .) - { "," Expr + { "," ReDimClause (. redimClause = expr as InvocationExpression; .) (. if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } .) } @@ -2561,27 +2583,28 @@ LabelName . /* 12.12.1 */ -/* -ReDimClause - (. - Expression initializer = null; - Expression arrayInitializer = null; - string name; - .) = - [Expr "." ] - Qualident - (. - clause = new ReDimClause(name); - .) - "(" Expr - (. - clause.Initializers.Add(initializer); - .) - { "," Expr (. clause.Initializers.Add(initializer); .) } +ReDimClause += + SimpleNonInvocationExpression + ReDimClauseInternal +. + +ReDimClauseInternal +(. List arguments; bool canBeNormal; bool canBeRedim; string name; .) += + { "." IdentifierOrKeyword (. expr = new FieldReferenceExpression(expr, name); .) + | IF (la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) + InvocationExpression + } + "(" + NormalOrReDimArgumentList ")" - [ ArrayInitializer ] - . -*/ + (. expr = new InvocationExpression(expr, arguments); + if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { + ReDimClauseInternal(ref expr); + } + .) +. /* 10.10.2.3 */ ResumeStatement diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs index 09e097e6df..43066d80e0 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs @@ -238,5 +238,11 @@ namespace ICSharpCode.NRefactory.Parser.VB // TODO return false; } + + void EnsureIsZero(Expression expr) + { + if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") + Error("lower bound of array must be zero"); + } } } diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs index ed29cdcccd..82b5c11c5e 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ArrayCreateExpressionTests.cs @@ -38,6 +38,17 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.AreEqual(0, ace.Arguments.Count); Assert.AreEqual(new int[] {0}, ace.CreateType.RankSpecifier); } + + [Test] + public void VBNetArrayCreateExpressionTest2() + { + ArrayCreateExpression ace = ParseUtilVBNet.ParseExpression("New Integer(0 To 5){0, 1, 2, 3, 4, 5}"); + + Assert.AreEqual("Integer", ace.CreateType.Type); + Assert.AreEqual(1, ace.Arguments.Count); + Assert.AreEqual(5, (ace.Arguments[0] as PrimitiveExpression).Value); + Assert.AreEqual(new int[] {0}, ace.CreateType.RankSpecifier); + } #endregion } diff --git a/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs b/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs index 7edb2bc2c1..67d88d31dc 100644 --- a/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Statements/ReDimStatementTests.cs @@ -16,11 +16,6 @@ namespace ICSharpCode.NRefactory.Tests.Ast [TestFixture] public class ReDimStatementTests { - #region C# - // No C# representation - #endregion - - #region VB.NET [Test] public void VBNetReDimStatementTest() { @@ -51,10 +46,8 @@ Class X ReDim sTransform(2, iTransformType - 1) ReDim Preserve _Items(_Count) ReDim Preserve _Items(nCapacity) - ReDim Preserve _Items(_Count) - ReDim Preserve _Items(nCapacity) - ReDim Preserve _Items(_Count) - ReDim Preserve _Items(nCapacity) + ReDim Preserve _Items(0 To _Count) + ReDim Preserve _Items(0 To nCapacity) ReDim sU(m - 1, n - 1) ReDim sW(n - 1) ReDim sV(n - 1, n - 1) @@ -65,30 +58,22 @@ Class X If (IsNothing(ColLengths)) Then ReDim ColLengths(0) If (ColLengths.Length = (SubItem + 1)) Then ReDim Preserve ColLengths(SubItem + 1) ReDim sTransform(2, iTransformType - 1) - ReDim Preserve _Items(_Count) - ReDim Preserve _Items(nCapacity) - ReDim Preserve _Items(_Count) - ReDim Preserve _Items(nCapacity) - ReDim Preserve _Items(_Count) - ReDim Preserve _Items(nCapacity) ReDim Preserve Samples(Samples.GetUpperBound(0) + 1) ReDim Samples(0) ReDim BaseCssContent(BaseCssContentRows - 1) ReDim mabtRxBuf(Bytes2Read - 1) - ReDim mabtRxBuf(Bytes2Read - 1) ReDim Preserve primarykey(primarykey.Length) - ReDim Preserve primarykey(primarykey.Length) - ReDim Preserve IntArray(10, 10, 20) ReDim Preserve IntArray(10, 10, 15) ReDim X(10, 10) - ReDim Preserve IntArray(10, 10, 20) + ReDim Preserve IntArray(0 To 10, 10, 0 To 20) ReDim Preserve IntArray(10, 10, 15) - ReDim X(10, 10) + ReDim X(0 To 10, 0 To 10) + ReDim GetMe().IntArray(0 To 10, 10, 0 To 20) + ReDim GetMe(ExplicitParameter := 3).IntArray(0 To 10, 10, 0 To 20) + ReDim SomeType(Of Integer).IntArray(0 To 10, 10, 0 To 20) End Sub End Class"; TypeDeclaration typeDeclaration = ParseUtilVBNet.ParseGlobal(program); } - - #endregion } }