From d4f282572159a45444096bf32a9b5e8ca2fb9c4e Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 18 Aug 2005 14:08:27 +0000 Subject: [PATCH] Added support for accessor modifiers to C# parser (public int Property { get {} protected set {}}) git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@391 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- data/options/TextLib/SharpDevelop.xml | 46 - .../Project/Src/Parser/CSharp/Parser.cs | 1764 +++++++++-------- .../Project/Src/Parser/CSharp/cs.ATG | 26 +- .../TypeLevel/PropertyDeclarationTests.cs | 11 +- 4 files changed, 947 insertions(+), 900 deletions(-) delete mode 100644 data/options/TextLib/SharpDevelop.xml diff --git a/data/options/TextLib/SharpDevelop.xml b/data/options/TextLib/SharpDevelop.xml deleted file mode 100644 index 870ad55733..0000000000 --- a/data/options/TextLib/SharpDevelop.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 7928adf61b..82160716df 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -753,52 +753,52 @@ out expr); } void Expr( -#line 1900 "cs.ATG" +#line 1918 "cs.ATG" out Expression expr) { -#line 1901 "cs.ATG" +#line 1919 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; UnaryExpr( -#line 1903 "cs.ATG" +#line 1921 "cs.ATG" out expr); if (StartOf(6)) { ConditionalOrExpr( -#line 1906 "cs.ATG" +#line 1924 "cs.ATG" ref expr); if (la.kind == 13) { lexer.NextToken(); Expr( -#line 1907 "cs.ATG" +#line 1925 "cs.ATG" out expr1); -#line 1907 "cs.ATG" +#line 1925 "cs.ATG" expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); } if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1908 "cs.ATG" +#line 1926 "cs.ATG" out expr1); Expect(9); Expr( -#line 1908 "cs.ATG" +#line 1926 "cs.ATG" out expr2); -#line 1908 "cs.ATG" +#line 1926 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else if (StartOf(7)) { -#line 1910 "cs.ATG" +#line 1928 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1910 "cs.ATG" +#line 1928 "cs.ATG" out op); Expr( -#line 1910 "cs.ATG" +#line 1928 "cs.ATG" out val); -#line 1910 "cs.ATG" +#line 1928 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else SynErr(129); } @@ -874,76 +874,76 @@ out attribute); } void TypeModifier( -#line 1005 "cs.ATG" +#line 1015 "cs.ATG" Modifiers m) { switch (la.kind) { case 88: { lexer.NextToken(); -#line 1007 "cs.ATG" +#line 1017 "cs.ATG" m.Add(Modifier.New, t.Location); break; } case 97: { lexer.NextToken(); -#line 1008 "cs.ATG" +#line 1018 "cs.ATG" m.Add(Modifier.Public, t.Location); break; } case 96: { lexer.NextToken(); -#line 1009 "cs.ATG" +#line 1019 "cs.ATG" m.Add(Modifier.Protected, t.Location); break; } case 83: { lexer.NextToken(); -#line 1010 "cs.ATG" +#line 1020 "cs.ATG" m.Add(Modifier.Internal, t.Location); break; } case 95: { lexer.NextToken(); -#line 1011 "cs.ATG" +#line 1021 "cs.ATG" m.Add(Modifier.Private, t.Location); break; } case 118: { lexer.NextToken(); -#line 1012 "cs.ATG" +#line 1022 "cs.ATG" m.Add(Modifier.Unsafe, t.Location); break; } case 48: { lexer.NextToken(); -#line 1013 "cs.ATG" +#line 1023 "cs.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 1014 "cs.ATG" +#line 1024 "cs.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 106: { lexer.NextToken(); -#line 1015 "cs.ATG" +#line 1025 "cs.ATG" m.Add(Modifier.Static, t.Location); break; } case 1: { lexer.NextToken(); -#line 1016 "cs.ATG" +#line 1026 "cs.ATG" if (t.val == "partial") { m.Add(Modifier.Partial, t.Location); } break; } @@ -1194,39 +1194,39 @@ templates); } void TypeParameterList( -#line 2298 "cs.ATG" +#line 2316 "cs.ATG" List templates) { -#line 2300 "cs.ATG" +#line 2318 "cs.ATG" AttributeSection section; List attributes = new List(); Expect(23); while (la.kind == 18) { AttributeSection( -#line 2304 "cs.ATG" +#line 2322 "cs.ATG" out section); -#line 2304 "cs.ATG" +#line 2322 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2305 "cs.ATG" +#line 2323 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); while (la.kind == 14) { lexer.NextToken(); while (la.kind == 18) { AttributeSection( -#line 2306 "cs.ATG" +#line 2324 "cs.ATG" out section); -#line 2306 "cs.ATG" +#line 2324 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2307 "cs.ATG" +#line 2325 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); } Expect(22); @@ -1259,25 +1259,25 @@ out typeRef); } void TypeParameterConstraintsClause( -#line 2311 "cs.ATG" +#line 2329 "cs.ATG" List templates) { -#line 2312 "cs.ATG" +#line 2330 "cs.ATG" string name = ""; TypeReference type; Expect(1); -#line 2314 "cs.ATG" +#line 2332 "cs.ATG" if (t.val != "where") Error("where expected"); Expect(1); -#line 2315 "cs.ATG" +#line 2333 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2317 "cs.ATG" +#line 2335 "cs.ATG" out type); -#line 2318 "cs.ATG" +#line 2336 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1290,10 +1290,10 @@ out type); while (la.kind == 14) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2327 "cs.ATG" +#line 2345 "cs.ATG" out type); -#line 2328 "cs.ATG" +#line 2346 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1429,72 +1429,72 @@ out typeRef); } void IntegralType( -#line 1027 "cs.ATG" +#line 1037 "cs.ATG" out string name) { -#line 1027 "cs.ATG" +#line 1037 "cs.ATG" name = ""; switch (la.kind) { case 101: { lexer.NextToken(); -#line 1029 "cs.ATG" +#line 1039 "cs.ATG" name = "sbyte"; break; } case 53: { lexer.NextToken(); -#line 1030 "cs.ATG" +#line 1040 "cs.ATG" name = "byte"; break; } case 103: { lexer.NextToken(); -#line 1031 "cs.ATG" +#line 1041 "cs.ATG" name = "short"; break; } case 119: { lexer.NextToken(); -#line 1032 "cs.ATG" +#line 1042 "cs.ATG" name = "ushort"; break; } case 81: { lexer.NextToken(); -#line 1033 "cs.ATG" +#line 1043 "cs.ATG" name = "int"; break; } case 115: { lexer.NextToken(); -#line 1034 "cs.ATG" +#line 1044 "cs.ATG" name = "uint"; break; } case 86: { lexer.NextToken(); -#line 1035 "cs.ATG" +#line 1045 "cs.ATG" name = "long"; break; } case 116: { lexer.NextToken(); -#line 1036 "cs.ATG" +#line 1046 "cs.ATG" name = "ulong"; break; } case 56: { lexer.NextToken(); -#line 1037 "cs.ATG" +#line 1047 "cs.ATG" name = "char"; break; } @@ -1668,59 +1668,59 @@ out p); } void ClassType( -#line 1019 "cs.ATG" +#line 1029 "cs.ATG" out TypeReference typeRef) { -#line 1020 "cs.ATG" +#line 1030 "cs.ATG" TypeReference r; typeRef = null; if (la.kind == 1) { TypeName( -#line 1022 "cs.ATG" +#line 1032 "cs.ATG" out r); -#line 1022 "cs.ATG" +#line 1032 "cs.ATG" typeRef = r; } else if (la.kind == 90) { lexer.NextToken(); -#line 1023 "cs.ATG" +#line 1033 "cs.ATG" typeRef = new TypeReference("object"); } else if (la.kind == 107) { lexer.NextToken(); -#line 1024 "cs.ATG" +#line 1034 "cs.ATG" typeRef = new TypeReference("string"); } else SynErr(138); } void TypeName( -#line 2252 "cs.ATG" +#line 2270 "cs.ATG" out TypeReference typeRef) { -#line 2253 "cs.ATG" +#line 2271 "cs.ATG" List typeArguments = null; string alias = null; string qualident; if ( -#line 2258 "cs.ATG" +#line 2276 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { lexer.NextToken(); -#line 2259 "cs.ATG" +#line 2277 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2262 "cs.ATG" +#line 2280 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2263 "cs.ATG" +#line 2281 "cs.ATG" out typeArguments); } -#line 2265 "cs.ATG" +#line 2283 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1732,110 +1732,110 @@ out typeArguments); if (la.kind == 12) { NullableQuestionMark( -#line 2274 "cs.ATG" +#line 2292 "cs.ATG" ref typeRef); } } void MemberModifier( -#line 1040 "cs.ATG" +#line 1050 "cs.ATG" Modifiers m) { switch (la.kind) { case 48: { lexer.NextToken(); -#line 1042 "cs.ATG" +#line 1052 "cs.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 70: { lexer.NextToken(); -#line 1043 "cs.ATG" +#line 1053 "cs.ATG" m.Add(Modifier.Extern, t.Location); break; } case 83: { lexer.NextToken(); -#line 1044 "cs.ATG" +#line 1054 "cs.ATG" m.Add(Modifier.Internal, t.Location); break; } case 88: { lexer.NextToken(); -#line 1045 "cs.ATG" +#line 1055 "cs.ATG" m.Add(Modifier.New, t.Location); break; } case 93: { lexer.NextToken(); -#line 1046 "cs.ATG" +#line 1056 "cs.ATG" m.Add(Modifier.Override, t.Location); break; } case 95: { lexer.NextToken(); -#line 1047 "cs.ATG" +#line 1057 "cs.ATG" m.Add(Modifier.Private, t.Location); break; } case 96: { lexer.NextToken(); -#line 1048 "cs.ATG" +#line 1058 "cs.ATG" m.Add(Modifier.Protected, t.Location); break; } case 97: { lexer.NextToken(); -#line 1049 "cs.ATG" +#line 1059 "cs.ATG" m.Add(Modifier.Public, t.Location); break; } case 98: { lexer.NextToken(); -#line 1050 "cs.ATG" +#line 1060 "cs.ATG" m.Add(Modifier.Readonly, t.Location); break; } case 102: { lexer.NextToken(); -#line 1051 "cs.ATG" +#line 1061 "cs.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 106: { lexer.NextToken(); -#line 1052 "cs.ATG" +#line 1062 "cs.ATG" m.Add(Modifier.Static, t.Location); break; } case 118: { lexer.NextToken(); -#line 1053 "cs.ATG" +#line 1063 "cs.ATG" m.Add(Modifier.Unsafe, t.Location); break; } case 121: { lexer.NextToken(); -#line 1054 "cs.ATG" +#line 1064 "cs.ATG" m.Add(Modifier.Virtual, t.Location); break; } case 123: { lexer.NextToken(); -#line 1055 "cs.ATG" +#line 1065 "cs.ATG" m.Add(Modifier.Volatile, t.Location); break; } @@ -1844,23 +1844,23 @@ Modifiers m) { } void ClassMemberDecl( -#line 1296 "cs.ATG" +#line 1306 "cs.ATG" Modifiers m, List attributes) { -#line 1297 "cs.ATG" +#line 1307 "cs.ATG" Statement stmt = null; if (StartOf(16)) { StructMemberDecl( -#line 1299 "cs.ATG" +#line 1309 "cs.ATG" m, attributes); } else if (la.kind == 27) { -#line 1300 "cs.ATG" +#line 1310 "cs.ATG" m.Check(Modifier.Destructors); Point startPos = t.Location; lexer.NextToken(); Expect(1); -#line 1301 "cs.ATG" +#line 1311 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1868,17 +1868,17 @@ m, attributes); Expect(20); Expect(21); -#line 1305 "cs.ATG" +#line 1315 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1305 "cs.ATG" +#line 1315 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(140); -#line 1306 "cs.ATG" +#line 1316 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -1886,10 +1886,10 @@ out stmt); } void StructMemberDecl( -#line 1058 "cs.ATG" +#line 1068 "cs.ATG" Modifiers m, List attributes) { -#line 1060 "cs.ATG" +#line 1070 "cs.ATG" string qualident = null; TypeReference type; Expression expr; @@ -1900,18 +1900,18 @@ Modifiers m, List attributes) { if (la.kind == 59) { -#line 1069 "cs.ATG" +#line 1079 "cs.ATG" m.Check(Modifier.Constants); lexer.NextToken(); -#line 1070 "cs.ATG" +#line 1080 "cs.ATG" Point startPos = t.Location; Type( -#line 1071 "cs.ATG" +#line 1081 "cs.ATG" out type); Expect(1); -#line 1071 "cs.ATG" +#line 1081 "cs.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier | Modifier.Const); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclaration f = new VariableDeclaration(t.val); @@ -1919,58 +1919,58 @@ out type); Expect(3); Expr( -#line 1076 "cs.ATG" +#line 1086 "cs.ATG" out expr); -#line 1076 "cs.ATG" +#line 1086 "cs.ATG" f.Initializer = expr; while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1077 "cs.ATG" +#line 1087 "cs.ATG" f = new VariableDeclaration(t.val); fd.Fields.Add(f); Expect(3); Expr( -#line 1080 "cs.ATG" +#line 1090 "cs.ATG" out expr); -#line 1080 "cs.ATG" +#line 1090 "cs.ATG" f.Initializer = expr; } Expect(11); -#line 1081 "cs.ATG" +#line 1091 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if ( -#line 1084 "cs.ATG" +#line 1094 "cs.ATG" NotVoidPointer()) { -#line 1084 "cs.ATG" +#line 1094 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); Expect(122); -#line 1085 "cs.ATG" +#line 1095 "cs.ATG" Point startPos = t.Location; Qualident( -#line 1086 "cs.ATG" +#line 1096 "cs.ATG" out qualident); if (la.kind == 23) { TypeParameterList( -#line 1088 "cs.ATG" +#line 1098 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1091 "cs.ATG" +#line 1101 "cs.ATG" p); } Expect(21); -#line 1091 "cs.ATG" +#line 1101 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, new TypeReference("void"), @@ -1983,31 +1983,31 @@ p); compilationUnit.BlockStart(methodDeclaration); while ( -#line 1104 "cs.ATG" +#line 1114 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1104 "cs.ATG" +#line 1114 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1106 "cs.ATG" +#line 1116 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(142); -#line 1106 "cs.ATG" +#line 1116 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 68) { -#line 1110 "cs.ATG" +#line 1120 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); lexer.NextToken(); -#line 1111 "cs.ATG" +#line 1121 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration(m.Modifier, attributes); eventDecl.StartLocation = t.Location; compilationUnit.AddChild(eventDecl); @@ -2016,103 +2016,103 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 1118 "cs.ATG" +#line 1128 "cs.ATG" out type); -#line 1118 "cs.ATG" +#line 1128 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 1120 "cs.ATG" +#line 1130 "cs.ATG" IsVarDecl()) { VariableDeclarator( -#line 1120 "cs.ATG" +#line 1130 "cs.ATG" variableDeclarators); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 1121 "cs.ATG" +#line 1131 "cs.ATG" variableDeclarators); } Expect(11); -#line 1121 "cs.ATG" +#line 1131 "cs.ATG" eventDecl.VariableDeclarators = variableDeclarators; eventDecl.EndLocation = t.EndLocation; } else if (la.kind == 1) { Qualident( -#line 1122 "cs.ATG" +#line 1132 "cs.ATG" out qualident); -#line 1122 "cs.ATG" +#line 1132 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; Expect(16); -#line 1123 "cs.ATG" +#line 1133 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 1124 "cs.ATG" +#line 1134 "cs.ATG" out addBlock, out removeBlock); Expect(17); -#line 1125 "cs.ATG" +#line 1135 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } else SynErr(143); -#line 1126 "cs.ATG" +#line 1136 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 1133 "cs.ATG" +#line 1143 "cs.ATG" IdentAndLPar()) { -#line 1133 "cs.ATG" +#line 1143 "cs.ATG" m.Check(Modifier.Constructors | Modifier.StaticConstructors); Expect(1); -#line 1134 "cs.ATG" +#line 1144 "cs.ATG" string name = t.val; Point startPos = t.Location; Expect(20); if (StartOf(10)) { -#line 1134 "cs.ATG" +#line 1144 "cs.ATG" m.Check(Modifier.Constructors); FormalParameterList( -#line 1135 "cs.ATG" +#line 1145 "cs.ATG" p); } Expect(21); -#line 1137 "cs.ATG" +#line 1147 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 1138 "cs.ATG" +#line 1148 "cs.ATG" m.Check(Modifier.Constructors); ConstructorInitializer( -#line 1139 "cs.ATG" +#line 1149 "cs.ATG" out init); } -#line 1141 "cs.ATG" +#line 1151 "cs.ATG" ConstructorDeclaration cd = new ConstructorDeclaration(name, m.Modifier, p, init, attributes); cd.StartLocation = startPos; cd.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1146 "cs.ATG" +#line 1156 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(144); -#line 1146 "cs.ATG" +#line 1156 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 69 || la.kind == 79) { -#line 1149 "cs.ATG" +#line 1159 "cs.ATG" m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -2121,45 +2121,45 @@ out stmt); if (la.kind == 79) { lexer.NextToken(); -#line 1154 "cs.ATG" +#line 1164 "cs.ATG" startPos = t.Location; } else { lexer.NextToken(); -#line 1154 "cs.ATG" +#line 1164 "cs.ATG" isImplicit = false; startPos = t.Location; } Expect(91); Type( -#line 1155 "cs.ATG" +#line 1165 "cs.ATG" out type); -#line 1155 "cs.ATG" +#line 1165 "cs.ATG" TypeReference operatorType = type; Expect(20); Type( -#line 1156 "cs.ATG" +#line 1166 "cs.ATG" out type); Expect(1); -#line 1156 "cs.ATG" +#line 1166 "cs.ATG" string varName = t.val; Expect(21); -#line 1157 "cs.ATG" +#line 1167 "cs.ATG" Point endPos = t.Location; if (la.kind == 16) { Block( -#line 1158 "cs.ATG" +#line 1168 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 1158 "cs.ATG" +#line 1168 "cs.ATG" stmt = null; } else SynErr(145); -#line 1161 "cs.ATG" +#line 1171 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, @@ -2175,61 +2175,61 @@ out stmt); } else if (StartOf(17)) { TypeDecl( -#line 1176 "cs.ATG" +#line 1186 "cs.ATG" m, attributes); } else if (StartOf(9)) { Type( -#line 1177 "cs.ATG" +#line 1187 "cs.ATG" out type); -#line 1177 "cs.ATG" +#line 1187 "cs.ATG" Point startPos = t.Location; if (la.kind == 91) { -#line 1179 "cs.ATG" +#line 1189 "cs.ATG" OverloadableOperatorType op; m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 1183 "cs.ATG" +#line 1193 "cs.ATG" out op); -#line 1183 "cs.ATG" +#line 1193 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(20); Type( -#line 1184 "cs.ATG" +#line 1194 "cs.ATG" out firstType); Expect(1); -#line 1184 "cs.ATG" +#line 1194 "cs.ATG" string firstName = t.val; if (la.kind == 14) { lexer.NextToken(); Type( -#line 1185 "cs.ATG" +#line 1195 "cs.ATG" out secondType); Expect(1); -#line 1185 "cs.ATG" +#line 1195 "cs.ATG" secondName = t.val; } else if (la.kind == 21) { } else SynErr(146); -#line 1193 "cs.ATG" +#line 1203 "cs.ATG" Point endPos = t.Location; Expect(21); if (la.kind == 16) { Block( -#line 1194 "cs.ATG" +#line 1204 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(147); -#line 1196 "cs.ATG" +#line 1206 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(firstType, firstName)); if (secondType != null) { @@ -2246,43 +2246,43 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 1213 "cs.ATG" +#line 1223 "cs.ATG" IsVarDecl()) { -#line 1213 "cs.ATG" +#line 1223 "cs.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclarator( -#line 1217 "cs.ATG" +#line 1227 "cs.ATG" variableDeclarators); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 1218 "cs.ATG" +#line 1228 "cs.ATG" variableDeclarators); } Expect(11); -#line 1219 "cs.ATG" +#line 1229 "cs.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); } else if (la.kind == 110) { -#line 1222 "cs.ATG" +#line 1232 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(18); FormalParameterList( -#line 1223 "cs.ATG" +#line 1233 "cs.ATG" p); Expect(19); -#line 1223 "cs.ATG" +#line 1233 "cs.ATG" Point endLocation = t.EndLocation; Expect(16); -#line 1224 "cs.ATG" +#line 1234 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2291,11 +2291,11 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 1231 "cs.ATG" +#line 1241 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1232 "cs.ATG" +#line 1242 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; @@ -2303,30 +2303,30 @@ out getRegion, out setRegion); } else if (la.kind == 1) { Qualident( -#line 1237 "cs.ATG" +#line 1247 "cs.ATG" out qualident); -#line 1237 "cs.ATG" +#line 1247 "cs.ATG" Point qualIdentEndLocation = t.EndLocation; if (la.kind == 16 || la.kind == 20 || la.kind == 23) { if (la.kind == 20 || la.kind == 23) { -#line 1240 "cs.ATG" +#line 1250 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); if (la.kind == 23) { TypeParameterList( -#line 1242 "cs.ATG" +#line 1252 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1243 "cs.ATG" +#line 1253 "cs.ATG" p); } Expect(21); -#line 1244 "cs.ATG" +#line 1254 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, type, @@ -2338,26 +2338,26 @@ p); compilationUnit.AddChild(methodDeclaration); while ( -#line 1254 "cs.ATG" +#line 1264 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1254 "cs.ATG" +#line 1264 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1255 "cs.ATG" +#line 1265 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(148); -#line 1255 "cs.ATG" +#line 1265 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1258 "cs.ATG" +#line 1268 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = qualIdentEndLocation; @@ -2366,11 +2366,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1265 "cs.ATG" +#line 1275 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1267 "cs.ATG" +#line 1277 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2379,17 +2379,17 @@ out getRegion, out setRegion); } } else if (la.kind == 15) { -#line 1275 "cs.ATG" +#line 1285 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(110); Expect(18); FormalParameterList( -#line 1276 "cs.ATG" +#line 1286 "cs.ATG" p); Expect(19); -#line 1277 "cs.ATG" +#line 1287 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2399,14 +2399,14 @@ p); Expect(16); -#line 1284 "cs.ATG" +#line 1294 "cs.ATG" Point bodyStart = t.Location; AccessorDecls( -#line 1285 "cs.ATG" +#line 1295 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1286 "cs.ATG" +#line 1296 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; @@ -2420,7 +2420,7 @@ out getRegion, out setRegion); void InterfaceMemberDecl() { -#line 1313 "cs.ATG" +#line 1323 "cs.ATG" TypeReference type; AttributeSection section; @@ -2435,51 +2435,51 @@ out getRegion, out setRegion); while (la.kind == 18) { AttributeSection( -#line 1326 "cs.ATG" +#line 1336 "cs.ATG" out section); -#line 1326 "cs.ATG" +#line 1336 "cs.ATG" attributes.Add(section); } if (la.kind == 88) { lexer.NextToken(); -#line 1327 "cs.ATG" +#line 1337 "cs.ATG" mod = Modifier.New; startLocation = t.Location; } if ( -#line 1330 "cs.ATG" +#line 1340 "cs.ATG" NotVoidPointer()) { Expect(122); -#line 1330 "cs.ATG" +#line 1340 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Expect(1); -#line 1330 "cs.ATG" +#line 1340 "cs.ATG" name = t.val; if (la.kind == 23) { TypeParameterList( -#line 1331 "cs.ATG" +#line 1341 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1332 "cs.ATG" +#line 1342 "cs.ATG" parameters); } Expect(21); while ( -#line 1333 "cs.ATG" +#line 1343 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1333 "cs.ATG" +#line 1343 "cs.ATG" templates); } Expect(11); -#line 1335 "cs.ATG" +#line 1345 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, new TypeReference("void"), parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2489,39 +2489,39 @@ templates); } else if (StartOf(18)) { if (StartOf(9)) { Type( -#line 1342 "cs.ATG" +#line 1352 "cs.ATG" out type); -#line 1342 "cs.ATG" +#line 1352 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; if (la.kind == 1) { lexer.NextToken(); -#line 1344 "cs.ATG" +#line 1354 "cs.ATG" name = t.val; Point qualIdentEndLocation = t.EndLocation; if (la.kind == 20 || la.kind == 23) { if (la.kind == 23) { TypeParameterList( -#line 1348 "cs.ATG" +#line 1358 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1349 "cs.ATG" +#line 1359 "cs.ATG" parameters); } Expect(21); while ( -#line 1351 "cs.ATG" +#line 1361 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1351 "cs.ATG" +#line 1361 "cs.ATG" templates); } Expect(11); -#line 1352 "cs.ATG" +#line 1362 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, type, parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2530,72 +2530,72 @@ templates); } else if (la.kind == 16) { -#line 1359 "cs.ATG" +#line 1369 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1360 "cs.ATG" +#line 1370 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1360 "cs.ATG" +#line 1370 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1360 "cs.ATG" +#line 1370 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; } else SynErr(152); } else if (la.kind == 110) { lexer.NextToken(); Expect(18); FormalParameterList( -#line 1363 "cs.ATG" +#line 1373 "cs.ATG" parameters); Expect(19); -#line 1363 "cs.ATG" +#line 1373 "cs.ATG" Point bracketEndLocation = t.EndLocation; -#line 1363 "cs.ATG" +#line 1373 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(16); -#line 1364 "cs.ATG" +#line 1374 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1364 "cs.ATG" +#line 1374 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1364 "cs.ATG" +#line 1374 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; } else SynErr(153); } else { lexer.NextToken(); -#line 1367 "cs.ATG" +#line 1377 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Type( -#line 1367 "cs.ATG" +#line 1377 "cs.ATG" out type); Expect(1); -#line 1367 "cs.ATG" +#line 1377 "cs.ATG" EventDeclaration ed = new EventDeclaration(type, t.val, mod, attributes); compilationUnit.AddChild(ed); Expect(11); -#line 1370 "cs.ATG" +#line 1380 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } } else SynErr(154); } void EnumMemberDecl( -#line 1375 "cs.ATG" +#line 1385 "cs.ATG" out FieldDeclaration f) { -#line 1377 "cs.ATG" +#line 1387 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2603,15 +2603,15 @@ out FieldDeclaration f) { while (la.kind == 18) { AttributeSection( -#line 1383 "cs.ATG" +#line 1393 "cs.ATG" out section); -#line 1383 "cs.ATG" +#line 1393 "cs.ATG" attributes.Add(section); } Expect(1); -#line 1384 "cs.ATG" +#line 1394 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2620,10 +2620,10 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1389 "cs.ATG" +#line 1399 "cs.ATG" out expr); -#line 1389 "cs.ATG" +#line 1399 "cs.ATG" varDecl.Initializer = expr; } } @@ -2662,14 +2662,14 @@ out name); } void NullableQuestionMark( -#line 2277 "cs.ATG" +#line 2295 "cs.ATG" ref TypeReference typeRef) { -#line 2278 "cs.ATG" +#line 2296 "cs.ATG" List typeArguments = new List(1); Expect(12); -#line 2282 "cs.ATG" +#line 2300 "cs.ATG" if (typeRef != null) typeArguments.Add(typeRef); typeRef = new TypeReference("System.Nullable", typeArguments); @@ -2722,12 +2722,48 @@ out type); p = new ParameterDeclarationExpression(type, t.val, ParamModifier.Params); } + void AccessorModifiers( +#line 1005 "cs.ATG" +out Modifiers m) { + +#line 1006 "cs.ATG" + m = new Modifiers(); + if (la.kind == 95) { + lexer.NextToken(); + +#line 1008 "cs.ATG" + m.Add(Modifier.Private, t.Location); + } else if (la.kind == 96) { + lexer.NextToken(); + +#line 1009 "cs.ATG" + m.Add(Modifier.Protected, t.Location); + if (la.kind == 83) { + lexer.NextToken(); + +#line 1010 "cs.ATG" + m.Add(Modifier.Internal, t.Location); + } + } else if (la.kind == 83) { + lexer.NextToken(); + +#line 1011 "cs.ATG" + m.Add(Modifier.Internal, t.Location); + if (la.kind == 96) { + lexer.NextToken(); + +#line 1012 "cs.ATG" + m.Add(Modifier.Protected, t.Location); + } + } else SynErr(156); + } + void Block( -#line 1506 "cs.ATG" +#line 1524 "cs.ATG" out Statement stmt) { Expect(16); -#line 1508 "cs.ATG" +#line 1526 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); @@ -2738,7 +2774,7 @@ out Statement stmt) { } Expect(17); -#line 1515 "cs.ATG" +#line 1533 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2746,34 +2782,34 @@ out Statement stmt) { } void VariableDeclarator( -#line 1499 "cs.ATG" +#line 1517 "cs.ATG" List fieldDeclaration) { -#line 1500 "cs.ATG" +#line 1518 "cs.ATG" Expression expr = null; Expect(1); -#line 1502 "cs.ATG" +#line 1520 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1503 "cs.ATG" +#line 1521 "cs.ATG" out expr); -#line 1503 "cs.ATG" +#line 1521 "cs.ATG" f.Initializer = expr; } -#line 1503 "cs.ATG" +#line 1521 "cs.ATG" fieldDeclaration.Add(f); } void EventAccessorDecls( -#line 1441 "cs.ATG" +#line 1459 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1442 "cs.ATG" +#line 1460 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2782,102 +2818,102 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 18) { AttributeSection( -#line 1449 "cs.ATG" +#line 1467 "cs.ATG" out section); -#line 1449 "cs.ATG" +#line 1467 "cs.ATG" attributes.Add(section); } if ( -#line 1451 "cs.ATG" +#line 1469 "cs.ATG" IdentIsAdd()) { -#line 1451 "cs.ATG" +#line 1469 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1452 "cs.ATG" +#line 1470 "cs.ATG" out stmt); -#line 1452 "cs.ATG" +#line 1470 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 18) { AttributeSection( -#line 1453 "cs.ATG" +#line 1471 "cs.ATG" out section); -#line 1453 "cs.ATG" +#line 1471 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1454 "cs.ATG" +#line 1472 "cs.ATG" out stmt); -#line 1454 "cs.ATG" +#line 1472 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if ( -#line 1455 "cs.ATG" +#line 1473 "cs.ATG" IdentIsRemove()) { RemoveAccessorDecl( -#line 1456 "cs.ATG" +#line 1474 "cs.ATG" out stmt); -#line 1456 "cs.ATG" +#line 1474 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 1457 "cs.ATG" +#line 1475 "cs.ATG" out section); -#line 1457 "cs.ATG" +#line 1475 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1458 "cs.ATG" +#line 1476 "cs.ATG" out stmt); -#line 1458 "cs.ATG" +#line 1476 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else if (la.kind == 1) { lexer.NextToken(); -#line 1459 "cs.ATG" +#line 1477 "cs.ATG" Error("add or remove accessor declaration expected"); - } else SynErr(156); + } else SynErr(157); } void ConstructorInitializer( -#line 1537 "cs.ATG" +#line 1555 "cs.ATG" out ConstructorInitializer ci) { -#line 1538 "cs.ATG" +#line 1556 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 50) { lexer.NextToken(); -#line 1542 "cs.ATG" +#line 1560 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 110) { lexer.NextToken(); -#line 1543 "cs.ATG" +#line 1561 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; - } else SynErr(157); + } else SynErr(158); Expect(20); if (StartOf(21)) { Argument( -#line 1546 "cs.ATG" +#line 1564 "cs.ATG" out expr); -#line 1546 "cs.ATG" +#line 1564 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1546 "cs.ATG" +#line 1564 "cs.ATG" out expr); -#line 1546 "cs.ATG" +#line 1564 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } } } @@ -2885,244 +2921,272 @@ out expr); } void OverloadableOperator( -#line 1558 "cs.ATG" +#line 1576 "cs.ATG" out OverloadableOperatorType op) { -#line 1559 "cs.ATG" +#line 1577 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1561 "cs.ATG" +#line 1579 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1562 "cs.ATG" +#line 1580 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 24: { lexer.NextToken(); -#line 1564 "cs.ATG" +#line 1582 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 27: { lexer.NextToken(); -#line 1565 "cs.ATG" +#line 1583 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 31: { lexer.NextToken(); -#line 1567 "cs.ATG" +#line 1585 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 32: { lexer.NextToken(); -#line 1568 "cs.ATG" +#line 1586 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 112: { lexer.NextToken(); -#line 1570 "cs.ATG" +#line 1588 "cs.ATG" op = OverloadableOperatorType.True; break; } case 71: { lexer.NextToken(); -#line 1571 "cs.ATG" +#line 1589 "cs.ATG" op = OverloadableOperatorType.False; break; } case 6: { lexer.NextToken(); -#line 1573 "cs.ATG" +#line 1591 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1574 "cs.ATG" +#line 1592 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1575 "cs.ATG" +#line 1593 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 28: { lexer.NextToken(); -#line 1577 "cs.ATG" +#line 1595 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 29: { lexer.NextToken(); -#line 1578 "cs.ATG" +#line 1596 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 30: { lexer.NextToken(); -#line 1579 "cs.ATG" +#line 1597 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 37: { lexer.NextToken(); -#line 1581 "cs.ATG" +#line 1599 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1582 "cs.ATG" +#line 1600 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 34: { lexer.NextToken(); -#line 1583 "cs.ATG" +#line 1601 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 23: { lexer.NextToken(); -#line 1584 "cs.ATG" +#line 1602 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 35: { lexer.NextToken(); -#line 1585 "cs.ATG" +#line 1603 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 36: { lexer.NextToken(); -#line 1586 "cs.ATG" +#line 1604 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 22: { lexer.NextToken(); -#line 1587 "cs.ATG" +#line 1605 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 22) { lexer.NextToken(); -#line 1587 "cs.ATG" +#line 1605 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; } - default: SynErr(158); break; + default: SynErr(159); break; } } void AccessorDecls( -#line 1393 "cs.ATG" +#line 1403 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1395 "cs.ATG" +#line 1405 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; setBlock = null; + Modifiers modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1401 "cs.ATG" +#line 1412 "cs.ATG" out section); -#line 1401 "cs.ATG" +#line 1412 "cs.ATG" attributes.Add(section); } + if (la.kind == 83 || la.kind == 95 || la.kind == 96) { + AccessorModifiers( +#line 1413 "cs.ATG" +out modifiers); + } if ( -#line 1403 "cs.ATG" +#line 1415 "cs.ATG" IdentIsGet()) { GetAccessorDecl( -#line 1404 "cs.ATG" +#line 1416 "cs.ATG" out getBlock, attributes); - if (la.kind == 1 || la.kind == 18) { -#line 1405 "cs.ATG" - attributes = new List(); +#line 1417 "cs.ATG" + if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } + if (StartOf(22)) { + +#line 1418 "cs.ATG" + attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1406 "cs.ATG" +#line 1419 "cs.ATG" out section); -#line 1406 "cs.ATG" +#line 1419 "cs.ATG" attributes.Add(section); } + if (la.kind == 83 || la.kind == 95 || la.kind == 96) { + AccessorModifiers( +#line 1420 "cs.ATG" +out modifiers); + } SetAccessorDecl( -#line 1407 "cs.ATG" +#line 1421 "cs.ATG" out setBlock, attributes); + +#line 1422 "cs.ATG" + if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } } } else if ( -#line 1409 "cs.ATG" +#line 1424 "cs.ATG" IdentIsSet()) { SetAccessorDecl( -#line 1410 "cs.ATG" +#line 1425 "cs.ATG" out setBlock, attributes); - if (la.kind == 1 || la.kind == 18) { -#line 1411 "cs.ATG" - attributes = new List(); +#line 1426 "cs.ATG" + if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } + if (StartOf(22)) { + +#line 1427 "cs.ATG" + attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1412 "cs.ATG" +#line 1428 "cs.ATG" out section); -#line 1412 "cs.ATG" +#line 1428 "cs.ATG" attributes.Add(section); } + if (la.kind == 83 || la.kind == 95 || la.kind == 96) { + AccessorModifiers( +#line 1429 "cs.ATG" +out modifiers); + } GetAccessorDecl( -#line 1413 "cs.ATG" +#line 1430 "cs.ATG" out getBlock, attributes); + +#line 1431 "cs.ATG" + if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } } } else if (la.kind == 1) { lexer.NextToken(); -#line 1415 "cs.ATG" +#line 1433 "cs.ATG" Error("get or set accessor declaration expected"); - } else SynErr(159); + } else SynErr(160); } void InterfaceAccessors( -#line 1463 "cs.ATG" +#line 1481 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1465 "cs.ATG" +#line 1483 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; @@ -3130,274 +3194,274 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1471 "cs.ATG" +#line 1489 "cs.ATG" out section); -#line 1471 "cs.ATG" +#line 1489 "cs.ATG" attributes.Add(section); } -#line 1472 "cs.ATG" +#line 1490 "cs.ATG" Point startLocation = la.Location; if ( -#line 1474 "cs.ATG" +#line 1492 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1474 "cs.ATG" +#line 1492 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1475 "cs.ATG" +#line 1493 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1475 "cs.ATG" +#line 1493 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1476 "cs.ATG" +#line 1494 "cs.ATG" Error("set or get expected"); - } else SynErr(160); + } else SynErr(161); Expect(11); -#line 1479 "cs.ATG" +#line 1497 "cs.ATG" if (getBlock != null) { getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } if (setBlock != null) { setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } attributes = new List(); if (la.kind == 1 || la.kind == 18) { while (la.kind == 18) { AttributeSection( -#line 1483 "cs.ATG" +#line 1501 "cs.ATG" out section); -#line 1483 "cs.ATG" +#line 1501 "cs.ATG" attributes.Add(section); } -#line 1484 "cs.ATG" +#line 1502 "cs.ATG" startLocation = la.Location; if ( -#line 1486 "cs.ATG" +#line 1504 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1486 "cs.ATG" +#line 1504 "cs.ATG" if (getBlock != null) Error("get already declared"); else { getBlock = new PropertyGetRegion(null, attributes); lastBlock = getBlock; } } else if ( -#line 1489 "cs.ATG" +#line 1507 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1489 "cs.ATG" +#line 1507 "cs.ATG" if (setBlock != null) Error("set already declared"); else { setBlock = new PropertySetRegion(null, attributes); lastBlock = setBlock; } } else if (la.kind == 1) { lexer.NextToken(); -#line 1492 "cs.ATG" +#line 1510 "cs.ATG" Error("set or get expected"); - } else SynErr(161); + } else SynErr(162); Expect(11); -#line 1495 "cs.ATG" +#line 1513 "cs.ATG" if (lastBlock != null) { lastBlock.StartLocation = startLocation; lastBlock.EndLocation = t.EndLocation; } } } void GetAccessorDecl( -#line 1419 "cs.ATG" +#line 1437 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1420 "cs.ATG" +#line 1438 "cs.ATG" Statement stmt = null; Expect(1); -#line 1423 "cs.ATG" +#line 1441 "cs.ATG" if (t.val != "get") Error("get expected"); -#line 1424 "cs.ATG" +#line 1442 "cs.ATG" Point startLocation = t.Location; if (la.kind == 16) { Block( -#line 1425 "cs.ATG" +#line 1443 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(162); + } else SynErr(163); -#line 1426 "cs.ATG" +#line 1444 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); -#line 1427 "cs.ATG" +#line 1445 "cs.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } void SetAccessorDecl( -#line 1430 "cs.ATG" +#line 1448 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1431 "cs.ATG" +#line 1449 "cs.ATG" Statement stmt = null; Expect(1); -#line 1434 "cs.ATG" +#line 1452 "cs.ATG" if (t.val != "set") Error("set expected"); -#line 1435 "cs.ATG" +#line 1453 "cs.ATG" Point startLocation = t.Location; if (la.kind == 16) { Block( -#line 1436 "cs.ATG" +#line 1454 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(163); + } else SynErr(164); -#line 1437 "cs.ATG" +#line 1455 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); -#line 1438 "cs.ATG" +#line 1456 "cs.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } void AddAccessorDecl( -#line 1521 "cs.ATG" +#line 1539 "cs.ATG" out Statement stmt) { -#line 1522 "cs.ATG" +#line 1540 "cs.ATG" stmt = null; Expect(1); -#line 1525 "cs.ATG" +#line 1543 "cs.ATG" if (t.val != "add") Error("add expected"); Block( -#line 1526 "cs.ATG" +#line 1544 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1529 "cs.ATG" +#line 1547 "cs.ATG" out Statement stmt) { -#line 1530 "cs.ATG" +#line 1548 "cs.ATG" stmt = null; Expect(1); -#line 1533 "cs.ATG" +#line 1551 "cs.ATG" if (t.val != "remove") Error("remove expected"); Block( -#line 1534 "cs.ATG" +#line 1552 "cs.ATG" out stmt); } void VariableInitializer( -#line 1550 "cs.ATG" +#line 1568 "cs.ATG" out Expression initializerExpression) { -#line 1551 "cs.ATG" +#line 1569 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(5)) { Expr( -#line 1553 "cs.ATG" +#line 1571 "cs.ATG" out initializerExpression); } else if (la.kind == 16) { ArrayInitializer( -#line 1554 "cs.ATG" +#line 1572 "cs.ATG" out initializerExpression); } else if (la.kind == 105) { lexer.NextToken(); Type( -#line 1555 "cs.ATG" +#line 1573 "cs.ATG" out type); Expect(18); Expr( -#line 1555 "cs.ATG" +#line 1573 "cs.ATG" out expr); Expect(19); -#line 1555 "cs.ATG" +#line 1573 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); - } else SynErr(164); + } else SynErr(165); } void Statement() { -#line 1659 "cs.ATG" +#line 1677 "cs.ATG" TypeReference type; Expression expr; Statement stmt = null; Point startPos = la.Location; if ( -#line 1667 "cs.ATG" +#line 1685 "cs.ATG" IsLabel()) { Expect(1); -#line 1667 "cs.ATG" +#line 1685 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 59) { lexer.NextToken(); Type( -#line 1670 "cs.ATG" +#line 1688 "cs.ATG" out type); -#line 1670 "cs.ATG" +#line 1688 "cs.ATG" LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifier.Const); string ident = null; var.StartLocation = t.Location; Expect(1); -#line 1671 "cs.ATG" +#line 1689 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1672 "cs.ATG" +#line 1690 "cs.ATG" out expr); -#line 1672 "cs.ATG" +#line 1690 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1673 "cs.ATG" +#line 1691 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1673 "cs.ATG" +#line 1691 "cs.ATG" out expr); -#line 1673 "cs.ATG" +#line 1691 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); } Expect(11); -#line 1674 "cs.ATG" +#line 1692 "cs.ATG" compilationUnit.AddChild(var); } else if ( -#line 1676 "cs.ATG" +#line 1694 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1676 "cs.ATG" +#line 1694 "cs.ATG" out stmt); Expect(11); -#line 1676 "cs.ATG" +#line 1694 "cs.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(22)) { + } else if (StartOf(23)) { EmbeddedStatement( -#line 1677 "cs.ATG" +#line 1695 "cs.ATG" out stmt); -#line 1677 "cs.ATG" +#line 1695 "cs.ATG" compilationUnit.AddChild(stmt); - } else SynErr(165); + } else SynErr(166); -#line 1683 "cs.ATG" +#line 1701 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3406,10 +3470,10 @@ out stmt); } void Argument( -#line 1590 "cs.ATG" +#line 1608 "cs.ATG" out Expression argumentexpr) { -#line 1592 "cs.ATG" +#line 1610 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3417,48 +3481,48 @@ out Expression argumentexpr) { if (la.kind == 99) { lexer.NextToken(); -#line 1597 "cs.ATG" +#line 1615 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1598 "cs.ATG" +#line 1616 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1600 "cs.ATG" +#line 1618 "cs.ATG" out expr); -#line 1600 "cs.ATG" +#line 1618 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void ArrayInitializer( -#line 1619 "cs.ATG" +#line 1637 "cs.ATG" out Expression outExpr) { -#line 1621 "cs.ATG" +#line 1639 "cs.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(16); - if (StartOf(23)) { + if (StartOf(24)) { VariableInitializer( -#line 1626 "cs.ATG" +#line 1644 "cs.ATG" out expr); -#line 1626 "cs.ATG" +#line 1644 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1626 "cs.ATG" +#line 1644 "cs.ATG" NotFinalComma()) { Expect(14); VariableInitializer( -#line 1626 "cs.ATG" +#line 1644 "cs.ATG" out expr); -#line 1626 "cs.ATG" +#line 1644 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } if (la.kind == 14) { @@ -3467,84 +3531,84 @@ out expr); } Expect(17); -#line 1627 "cs.ATG" +#line 1645 "cs.ATG" outExpr = initializer; } void AssignmentOperator( -#line 1603 "cs.ATG" +#line 1621 "cs.ATG" out AssignmentOperatorType op) { -#line 1604 "cs.ATG" +#line 1622 "cs.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 3: { lexer.NextToken(); -#line 1606 "cs.ATG" +#line 1624 "cs.ATG" op = AssignmentOperatorType.Assign; break; } case 38: { lexer.NextToken(); -#line 1607 "cs.ATG" +#line 1625 "cs.ATG" op = AssignmentOperatorType.Add; break; } case 39: { lexer.NextToken(); -#line 1608 "cs.ATG" +#line 1626 "cs.ATG" op = AssignmentOperatorType.Subtract; break; } case 40: { lexer.NextToken(); -#line 1609 "cs.ATG" +#line 1627 "cs.ATG" op = AssignmentOperatorType.Multiply; break; } case 41: { lexer.NextToken(); -#line 1610 "cs.ATG" +#line 1628 "cs.ATG" op = AssignmentOperatorType.Divide; break; } case 42: { lexer.NextToken(); -#line 1611 "cs.ATG" +#line 1629 "cs.ATG" op = AssignmentOperatorType.Modulus; break; } case 43: { lexer.NextToken(); -#line 1612 "cs.ATG" +#line 1630 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; break; } case 44: { lexer.NextToken(); -#line 1613 "cs.ATG" +#line 1631 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; break; } case 45: { lexer.NextToken(); -#line 1614 "cs.ATG" +#line 1632 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; break; } case 46: { lexer.NextToken(); -#line 1615 "cs.ATG" +#line 1633 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; break; } @@ -3552,75 +3616,75 @@ out AssignmentOperatorType op) { lexer.NextToken(); Expect(35); -#line 1616 "cs.ATG" +#line 1634 "cs.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(166); break; + default: SynErr(167); break; } } void LocalVariableDecl( -#line 1630 "cs.ATG" +#line 1648 "cs.ATG" out Statement stmt) { -#line 1632 "cs.ATG" +#line 1650 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Type( -#line 1637 "cs.ATG" +#line 1655 "cs.ATG" out type); -#line 1637 "cs.ATG" +#line 1655 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; LocalVariableDeclarator( -#line 1638 "cs.ATG" +#line 1656 "cs.ATG" out var); -#line 1638 "cs.ATG" +#line 1656 "cs.ATG" localVariableDeclaration.Variables.Add(var); while (la.kind == 14) { lexer.NextToken(); LocalVariableDeclarator( -#line 1639 "cs.ATG" +#line 1657 "cs.ATG" out var); -#line 1639 "cs.ATG" +#line 1657 "cs.ATG" localVariableDeclaration.Variables.Add(var); } -#line 1640 "cs.ATG" +#line 1658 "cs.ATG" stmt = localVariableDeclaration; } void LocalVariableDeclarator( -#line 1643 "cs.ATG" +#line 1661 "cs.ATG" out VariableDeclaration var) { -#line 1644 "cs.ATG" +#line 1662 "cs.ATG" Expression expr = null; Expect(1); -#line 1647 "cs.ATG" +#line 1665 "cs.ATG" var = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1647 "cs.ATG" +#line 1665 "cs.ATG" out expr); -#line 1647 "cs.ATG" +#line 1665 "cs.ATG" var.Initializer = expr; } } void EmbeddedStatement( -#line 1690 "cs.ATG" +#line 1708 "cs.ATG" out Statement statement) { -#line 1692 "cs.ATG" +#line 1710 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; @@ -3628,156 +3692,156 @@ out Statement statement) { if (la.kind == 16) { Block( -#line 1698 "cs.ATG" +#line 1716 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1700 "cs.ATG" +#line 1718 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1702 "cs.ATG" +#line 1720 "cs.ATG" UnCheckedAndLBrace()) { -#line 1702 "cs.ATG" +#line 1720 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 57) { lexer.NextToken(); } else if (la.kind == 117) { lexer.NextToken(); -#line 1703 "cs.ATG" +#line 1721 "cs.ATG" isChecked = false; - } else SynErr(167); + } else SynErr(168); Block( -#line 1704 "cs.ATG" +#line 1722 "cs.ATG" out block); -#line 1704 "cs.ATG" +#line 1722 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 78) { lexer.NextToken(); -#line 1706 "cs.ATG" +#line 1724 "cs.ATG" Statement elseStatement = null; Expect(20); Expr( -#line 1707 "cs.ATG" +#line 1725 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1708 "cs.ATG" +#line 1726 "cs.ATG" out embeddedStatement); if (la.kind == 66) { lexer.NextToken(); EmbeddedStatement( -#line 1709 "cs.ATG" +#line 1727 "cs.ATG" out elseStatement); } -#line 1710 "cs.ATG" +#line 1728 "cs.ATG" statement = elseStatement != null ? (Statement)new IfElseStatement(expr, embeddedStatement, elseStatement) : (Statement)new IfElseStatement(expr, embeddedStatement); } else if (la.kind == 109) { lexer.NextToken(); -#line 1711 "cs.ATG" +#line 1729 "cs.ATG" ArrayList switchSections = new ArrayList(); SwitchSection switchSection; Expect(20); Expr( -#line 1712 "cs.ATG" +#line 1730 "cs.ATG" out expr); Expect(21); Expect(16); while (la.kind == 54 || la.kind == 62) { SwitchSection( -#line 1713 "cs.ATG" +#line 1731 "cs.ATG" out switchSection); -#line 1713 "cs.ATG" +#line 1731 "cs.ATG" switchSections.Add(switchSection); } Expect(17); -#line 1714 "cs.ATG" +#line 1732 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 124) { lexer.NextToken(); Expect(20); Expr( -#line 1716 "cs.ATG" +#line 1734 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1718 "cs.ATG" +#line 1736 "cs.ATG" out embeddedStatement); -#line 1718 "cs.ATG" +#line 1736 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 64) { lexer.NextToken(); EmbeddedStatement( -#line 1719 "cs.ATG" +#line 1737 "cs.ATG" out embeddedStatement); Expect(124); Expect(20); Expr( -#line 1720 "cs.ATG" +#line 1738 "cs.ATG" out expr); Expect(21); Expect(11); -#line 1720 "cs.ATG" +#line 1738 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 75) { lexer.NextToken(); -#line 1721 "cs.ATG" +#line 1739 "cs.ATG" ArrayList initializer = null; ArrayList iterator = null; Expect(20); if (StartOf(5)) { ForInitializer( -#line 1722 "cs.ATG" +#line 1740 "cs.ATG" out initializer); } Expect(11); if (StartOf(5)) { Expr( -#line 1723 "cs.ATG" +#line 1741 "cs.ATG" out expr); } Expect(11); if (StartOf(5)) { ForIterator( -#line 1724 "cs.ATG" +#line 1742 "cs.ATG" out iterator); } Expect(21); EmbeddedStatement( -#line 1725 "cs.ATG" +#line 1743 "cs.ATG" out embeddedStatement); -#line 1725 "cs.ATG" +#line 1743 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 76) { lexer.NextToken(); Expect(20); Type( -#line 1726 "cs.ATG" +#line 1744 "cs.ATG" out type); Expect(1); -#line 1726 "cs.ATG" +#line 1744 "cs.ATG" string varName = t.val; Point start = t.Location; Expect(80); Expr( -#line 1727 "cs.ATG" +#line 1745 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1728 "cs.ATG" +#line 1746 "cs.ATG" out embeddedStatement); -#line 1728 "cs.ATG" +#line 1746 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); statement.EndLocation = t.EndLocation; @@ -3785,545 +3849,545 @@ out embeddedStatement); lexer.NextToken(); Expect(11); -#line 1732 "cs.ATG" +#line 1750 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 60) { lexer.NextToken(); Expect(11); -#line 1733 "cs.ATG" +#line 1751 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 77) { GotoStatement( -#line 1734 "cs.ATG" +#line 1752 "cs.ATG" out statement); } else if ( -#line 1735 "cs.ATG" +#line 1753 "cs.ATG" IsYieldStatement()) { Expect(1); if (la.kind == 100) { lexer.NextToken(); Expr( -#line 1735 "cs.ATG" +#line 1753 "cs.ATG" out expr); -#line 1735 "cs.ATG" +#line 1753 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 52) { lexer.NextToken(); -#line 1736 "cs.ATG" +#line 1754 "cs.ATG" statement = new YieldStatement(new BreakStatement()); - } else SynErr(168); + } else SynErr(169); Expect(11); } else if (la.kind == 100) { lexer.NextToken(); if (StartOf(5)) { Expr( -#line 1737 "cs.ATG" +#line 1755 "cs.ATG" out expr); } Expect(11); -#line 1737 "cs.ATG" +#line 1755 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 111) { lexer.NextToken(); if (StartOf(5)) { Expr( -#line 1738 "cs.ATG" +#line 1756 "cs.ATG" out expr); } Expect(11); -#line 1738 "cs.ATG" +#line 1756 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(5)) { StatementExpr( -#line 1740 "cs.ATG" +#line 1758 "cs.ATG" out statement); Expect(11); } else if (la.kind == 113) { TryStatement( -#line 1742 "cs.ATG" +#line 1760 "cs.ATG" out statement); } else if (la.kind == 85) { lexer.NextToken(); Expect(20); Expr( -#line 1744 "cs.ATG" +#line 1762 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1745 "cs.ATG" +#line 1763 "cs.ATG" out embeddedStatement); -#line 1745 "cs.ATG" +#line 1763 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 120) { -#line 1747 "cs.ATG" +#line 1765 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1749 "cs.ATG" +#line 1767 "cs.ATG" out resourceAcquisitionStmt); Expect(21); EmbeddedStatement( -#line 1750 "cs.ATG" +#line 1768 "cs.ATG" out embeddedStatement); -#line 1750 "cs.ATG" +#line 1768 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 118) { lexer.NextToken(); Block( -#line 1752 "cs.ATG" +#line 1770 "cs.ATG" out embeddedStatement); -#line 1752 "cs.ATG" +#line 1770 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 73) { lexer.NextToken(); Expect(20); Type( -#line 1755 "cs.ATG" +#line 1773 "cs.ATG" out type); -#line 1755 "cs.ATG" +#line 1773 "cs.ATG" if (type.PointerNestingLevel == 0) Error("can only fix pointer types"); ArrayList pointerDeclarators = new ArrayList(1); Expect(1); -#line 1758 "cs.ATG" +#line 1776 "cs.ATG" string identifier = t.val; Expect(3); Expr( -#line 1759 "cs.ATG" +#line 1777 "cs.ATG" out expr); -#line 1759 "cs.ATG" +#line 1777 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1761 "cs.ATG" +#line 1779 "cs.ATG" identifier = t.val; Expect(3); Expr( -#line 1762 "cs.ATG" +#line 1780 "cs.ATG" out expr); -#line 1762 "cs.ATG" +#line 1780 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); } Expect(21); EmbeddedStatement( -#line 1764 "cs.ATG" +#line 1782 "cs.ATG" out embeddedStatement); -#line 1764 "cs.ATG" +#line 1782 "cs.ATG" statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); - } else SynErr(169); + } else SynErr(170); } void SwitchSection( -#line 1786 "cs.ATG" +#line 1804 "cs.ATG" out SwitchSection stmt) { -#line 1788 "cs.ATG" +#line 1806 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1792 "cs.ATG" +#line 1810 "cs.ATG" out label); -#line 1792 "cs.ATG" +#line 1810 "cs.ATG" switchSection.SwitchLabels.Add(label); while (la.kind == 54 || la.kind == 62) { SwitchLabel( -#line 1794 "cs.ATG" +#line 1812 "cs.ATG" out label); -#line 1794 "cs.ATG" +#line 1812 "cs.ATG" switchSection.SwitchLabels.Add(label); } -#line 1796 "cs.ATG" +#line 1814 "cs.ATG" compilationUnit.BlockStart(switchSection); Statement(); while (StartOf(20)) { Statement(); } -#line 1799 "cs.ATG" +#line 1817 "cs.ATG" compilationUnit.BlockEnd(); stmt = switchSection; } void ForInitializer( -#line 1767 "cs.ATG" +#line 1785 "cs.ATG" out ArrayList initializer) { -#line 1769 "cs.ATG" +#line 1787 "cs.ATG" Statement stmt; initializer = new ArrayList(); if ( -#line 1773 "cs.ATG" +#line 1791 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1773 "cs.ATG" +#line 1791 "cs.ATG" out stmt); -#line 1773 "cs.ATG" +#line 1791 "cs.ATG" initializer.Add(stmt); } else if (StartOf(5)) { StatementExpr( -#line 1774 "cs.ATG" +#line 1792 "cs.ATG" out stmt); -#line 1774 "cs.ATG" +#line 1792 "cs.ATG" initializer.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1774 "cs.ATG" +#line 1792 "cs.ATG" out stmt); -#line 1774 "cs.ATG" +#line 1792 "cs.ATG" initializer.Add(stmt); } - } else SynErr(170); + } else SynErr(171); } void ForIterator( -#line 1777 "cs.ATG" +#line 1795 "cs.ATG" out ArrayList iterator) { -#line 1779 "cs.ATG" +#line 1797 "cs.ATG" Statement stmt; iterator = new ArrayList(); StatementExpr( -#line 1783 "cs.ATG" +#line 1801 "cs.ATG" out stmt); -#line 1783 "cs.ATG" +#line 1801 "cs.ATG" iterator.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1783 "cs.ATG" +#line 1801 "cs.ATG" out stmt); -#line 1783 "cs.ATG" +#line 1801 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1854 "cs.ATG" +#line 1872 "cs.ATG" out Statement stmt) { -#line 1855 "cs.ATG" +#line 1873 "cs.ATG" Expression expr; stmt = null; Expect(77); if (la.kind == 1) { lexer.NextToken(); -#line 1859 "cs.ATG" +#line 1877 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 54) { lexer.NextToken(); Expr( -#line 1860 "cs.ATG" +#line 1878 "cs.ATG" out expr); Expect(11); -#line 1860 "cs.ATG" +#line 1878 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 62) { lexer.NextToken(); Expect(11); -#line 1861 "cs.ATG" +#line 1879 "cs.ATG" stmt = new GotoCaseStatement(null); - } else SynErr(171); + } else SynErr(172); } void StatementExpr( -#line 1881 "cs.ATG" +#line 1899 "cs.ATG" out Statement stmt) { -#line 1886 "cs.ATG" +#line 1904 "cs.ATG" bool mustBeAssignment = la.kind == Tokens.Plus || la.kind == Tokens.Minus || la.kind == Tokens.Not || la.kind == Tokens.BitwiseComplement || la.kind == Tokens.Times || la.kind == Tokens.BitwiseAnd || IsTypeCast(); Expression expr = null; UnaryExpr( -#line 1892 "cs.ATG" +#line 1910 "cs.ATG" out expr); if (StartOf(7)) { -#line 1895 "cs.ATG" +#line 1913 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1895 "cs.ATG" +#line 1913 "cs.ATG" out op); Expr( -#line 1895 "cs.ATG" +#line 1913 "cs.ATG" out val); -#line 1895 "cs.ATG" +#line 1913 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 11 || la.kind == 14 || la.kind == 21) { -#line 1896 "cs.ATG" +#line 1914 "cs.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(172); + } else SynErr(173); -#line 1897 "cs.ATG" +#line 1915 "cs.ATG" stmt = new StatementExpression(expr); } void TryStatement( -#line 1811 "cs.ATG" +#line 1829 "cs.ATG" out Statement tryStatement) { -#line 1813 "cs.ATG" +#line 1831 "cs.ATG" Statement blockStmt = null, finallyStmt = null; ArrayList catchClauses = null; Expect(113); Block( -#line 1817 "cs.ATG" +#line 1835 "cs.ATG" out blockStmt); if (la.kind == 55) { CatchClauses( -#line 1819 "cs.ATG" +#line 1837 "cs.ATG" out catchClauses); if (la.kind == 72) { lexer.NextToken(); Block( -#line 1819 "cs.ATG" +#line 1837 "cs.ATG" out finallyStmt); } } else if (la.kind == 72) { lexer.NextToken(); Block( -#line 1820 "cs.ATG" +#line 1838 "cs.ATG" out finallyStmt); - } else SynErr(173); + } else SynErr(174); -#line 1823 "cs.ATG" +#line 1841 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void ResourceAcquisition( -#line 1865 "cs.ATG" +#line 1883 "cs.ATG" out Statement stmt) { -#line 1867 "cs.ATG" +#line 1885 "cs.ATG" stmt = null; Expression expr; if ( -#line 1872 "cs.ATG" +#line 1890 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1872 "cs.ATG" +#line 1890 "cs.ATG" out stmt); } else if (StartOf(5)) { Expr( -#line 1873 "cs.ATG" +#line 1891 "cs.ATG" out expr); -#line 1877 "cs.ATG" +#line 1895 "cs.ATG" stmt = new StatementExpression(expr); - } else SynErr(174); + } else SynErr(175); } void SwitchLabel( -#line 1804 "cs.ATG" +#line 1822 "cs.ATG" out CaseLabel label) { -#line 1805 "cs.ATG" +#line 1823 "cs.ATG" Expression expr = null; label = null; if (la.kind == 54) { lexer.NextToken(); Expr( -#line 1807 "cs.ATG" +#line 1825 "cs.ATG" out expr); Expect(9); -#line 1807 "cs.ATG" +#line 1825 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 62) { lexer.NextToken(); Expect(9); -#line 1808 "cs.ATG" +#line 1826 "cs.ATG" label = new CaseLabel(); - } else SynErr(175); + } else SynErr(176); } void CatchClauses( -#line 1828 "cs.ATG" +#line 1846 "cs.ATG" out ArrayList catchClauses) { -#line 1830 "cs.ATG" +#line 1848 "cs.ATG" catchClauses = new ArrayList(); Expect(55); -#line 1833 "cs.ATG" +#line 1851 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; if (la.kind == 16) { Block( -#line 1839 "cs.ATG" +#line 1857 "cs.ATG" out stmt); -#line 1839 "cs.ATG" +#line 1857 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } else if (la.kind == 20) { lexer.NextToken(); ClassType( -#line 1841 "cs.ATG" +#line 1859 "cs.ATG" out typeRef); -#line 1841 "cs.ATG" +#line 1859 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1842 "cs.ATG" +#line 1860 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1843 "cs.ATG" +#line 1861 "cs.ATG" out stmt); -#line 1844 "cs.ATG" +#line 1862 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); while ( -#line 1845 "cs.ATG" +#line 1863 "cs.ATG" IsTypedCatch()) { Expect(55); Expect(20); ClassType( -#line 1845 "cs.ATG" +#line 1863 "cs.ATG" out typeRef); -#line 1845 "cs.ATG" +#line 1863 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1846 "cs.ATG" +#line 1864 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1847 "cs.ATG" +#line 1865 "cs.ATG" out stmt); -#line 1848 "cs.ATG" +#line 1866 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); } if (la.kind == 55) { lexer.NextToken(); Block( -#line 1850 "cs.ATG" +#line 1868 "cs.ATG" out stmt); -#line 1850 "cs.ATG" +#line 1868 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } - } else SynErr(176); + } else SynErr(177); } void UnaryExpr( -#line 1915 "cs.ATG" +#line 1933 "cs.ATG" out Expression uExpr) { -#line 1917 "cs.ATG" +#line 1935 "cs.ATG" TypeReference type = null; Expression expr; ArrayList expressions = new ArrayList(); uExpr = null; - while (StartOf(24) || -#line 1941 "cs.ATG" + while (StartOf(25) || +#line 1959 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1926 "cs.ATG" +#line 1944 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1927 "cs.ATG" +#line 1945 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 24) { lexer.NextToken(); -#line 1928 "cs.ATG" +#line 1946 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1929 "cs.ATG" +#line 1947 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1930 "cs.ATG" +#line 1948 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1931 "cs.ATG" +#line 1949 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 32) { lexer.NextToken(); -#line 1932 "cs.ATG" +#line 1950 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 28) { lexer.NextToken(); -#line 1933 "cs.ATG" +#line 1951 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); } else { Expect(20); Type( -#line 1941 "cs.ATG" +#line 1959 "cs.ATG" out type); Expect(21); -#line 1941 "cs.ATG" +#line 1959 "cs.ATG" expressions.Add(new CastExpression(type)); } } PrimaryExpr( -#line 1945 "cs.ATG" +#line 1963 "cs.ATG" out expr); -#line 1945 "cs.ATG" +#line 1963 "cs.ATG" for (int i = 0; i < expressions.Count; ++i) { Expression nextExpression = i + 1 < expressions.Count ? (Expression)expressions[i + 1] : expr; if (expressions[i] is CastExpression) { @@ -4341,33 +4405,33 @@ out expr); } void ConditionalOrExpr( -#line 2130 "cs.ATG" +#line 2148 "cs.ATG" ref Expression outExpr) { -#line 2131 "cs.ATG" +#line 2149 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2133 "cs.ATG" +#line 2151 "cs.ATG" ref outExpr); while (la.kind == 26) { lexer.NextToken(); UnaryExpr( -#line 2133 "cs.ATG" +#line 2151 "cs.ATG" out expr); ConditionalAndExpr( -#line 2133 "cs.ATG" +#line 2151 "cs.ATG" ref expr); -#line 2133 "cs.ATG" +#line 2151 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1962 "cs.ATG" +#line 1980 "cs.ATG" out Expression pexpr) { -#line 1964 "cs.ATG" +#line 1982 "cs.ATG" TypeReference type = null; List typeList = null; bool isArrayCreation = false; @@ -4377,533 +4441,533 @@ out Expression pexpr) { if (la.kind == 112) { lexer.NextToken(); -#line 1972 "cs.ATG" +#line 1990 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 71) { lexer.NextToken(); -#line 1973 "cs.ATG" +#line 1991 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 89) { lexer.NextToken(); -#line 1974 "cs.ATG" +#line 1992 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 1975 "cs.ATG" +#line 1993 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if ( -#line 1976 "cs.ATG" +#line 1994 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { TypeName( -#line 1977 "cs.ATG" +#line 1995 "cs.ATG" out type); -#line 1977 "cs.ATG" +#line 1995 "cs.ATG" pexpr = new TypeReferenceExpression(type); } else if (la.kind == 1) { lexer.NextToken(); -#line 1979 "cs.ATG" +#line 1997 "cs.ATG" pexpr = new IdentifierExpression(t.val); } else if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1981 "cs.ATG" +#line 1999 "cs.ATG" out expr); Expect(21); -#line 1981 "cs.ATG" +#line 1999 "cs.ATG" pexpr = new ParenthesizedExpression(expr); - } else if (StartOf(25)) { + } else if (StartOf(26)) { -#line 1983 "cs.ATG" +#line 2001 "cs.ATG" string val = null; switch (la.kind) { case 51: { lexer.NextToken(); -#line 1985 "cs.ATG" +#line 2003 "cs.ATG" val = "bool"; break; } case 53: { lexer.NextToken(); -#line 1986 "cs.ATG" +#line 2004 "cs.ATG" val = "byte"; break; } case 56: { lexer.NextToken(); -#line 1987 "cs.ATG" +#line 2005 "cs.ATG" val = "char"; break; } case 61: { lexer.NextToken(); -#line 1988 "cs.ATG" +#line 2006 "cs.ATG" val = "decimal"; break; } case 65: { lexer.NextToken(); -#line 1989 "cs.ATG" +#line 2007 "cs.ATG" val = "double"; break; } case 74: { lexer.NextToken(); -#line 1990 "cs.ATG" +#line 2008 "cs.ATG" val = "float"; break; } case 81: { lexer.NextToken(); -#line 1991 "cs.ATG" +#line 2009 "cs.ATG" val = "int"; break; } case 86: { lexer.NextToken(); -#line 1992 "cs.ATG" +#line 2010 "cs.ATG" val = "long"; break; } case 90: { lexer.NextToken(); -#line 1993 "cs.ATG" +#line 2011 "cs.ATG" val = "object"; break; } case 101: { lexer.NextToken(); -#line 1994 "cs.ATG" +#line 2012 "cs.ATG" val = "sbyte"; break; } case 103: { lexer.NextToken(); -#line 1995 "cs.ATG" +#line 2013 "cs.ATG" val = "short"; break; } case 107: { lexer.NextToken(); -#line 1996 "cs.ATG" +#line 2014 "cs.ATG" val = "string"; break; } case 115: { lexer.NextToken(); -#line 1997 "cs.ATG" +#line 2015 "cs.ATG" val = "uint"; break; } case 116: { lexer.NextToken(); -#line 1998 "cs.ATG" +#line 2016 "cs.ATG" val = "ulong"; break; } case 119: { lexer.NextToken(); -#line 1999 "cs.ATG" +#line 2017 "cs.ATG" val = "ushort"; break; } } -#line 2000 "cs.ATG" +#line 2018 "cs.ATG" t.val = ""; Expect(15); Expect(1); -#line 2000 "cs.ATG" +#line 2018 "cs.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 110) { lexer.NextToken(); -#line 2002 "cs.ATG" +#line 2020 "cs.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 50) { lexer.NextToken(); -#line 2004 "cs.ATG" +#line 2022 "cs.ATG" Expression retExpr = new BaseReferenceExpression(); if (la.kind == 15) { lexer.NextToken(); Expect(1); -#line 2006 "cs.ATG" +#line 2024 "cs.ATG" retExpr = new FieldReferenceExpression(retExpr, t.val); } else if (la.kind == 18) { lexer.NextToken(); Expr( -#line 2007 "cs.ATG" +#line 2025 "cs.ATG" out expr); -#line 2007 "cs.ATG" +#line 2025 "cs.ATG" ArrayList indices = new ArrayList(); if (expr != null) { indices.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Expr( -#line 2008 "cs.ATG" +#line 2026 "cs.ATG" out expr); -#line 2008 "cs.ATG" +#line 2026 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(19); -#line 2009 "cs.ATG" +#line 2027 "cs.ATG" retExpr = new IndexerExpression(retExpr, indices); - } else SynErr(177); + } else SynErr(178); -#line 2010 "cs.ATG" +#line 2028 "cs.ATG" pexpr = retExpr; } else if (la.kind == 88) { lexer.NextToken(); NonArrayType( -#line 2011 "cs.ATG" +#line 2029 "cs.ATG" out type); -#line 2011 "cs.ATG" +#line 2029 "cs.ATG" ArrayList parameters = new ArrayList(); if (la.kind == 20) { lexer.NextToken(); -#line 2016 "cs.ATG" +#line 2034 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); if (StartOf(21)) { Argument( -#line 2017 "cs.ATG" +#line 2035 "cs.ATG" out expr); -#line 2017 "cs.ATG" +#line 2035 "cs.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2018 "cs.ATG" +#line 2036 "cs.ATG" out expr); -#line 2018 "cs.ATG" +#line 2036 "cs.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(21); -#line 2020 "cs.ATG" +#line 2038 "cs.ATG" pexpr = oce; } else if (la.kind == 18) { -#line 2022 "cs.ATG" +#line 2040 "cs.ATG" isArrayCreation = true; ArrayCreateExpression ace = new ArrayCreateExpression(type); pexpr = ace; lexer.NextToken(); -#line 2023 "cs.ATG" +#line 2041 "cs.ATG" int dims = 0; ArrayList rank = new ArrayList(); ArrayList parameterExpression = new ArrayList(); if (StartOf(5)) { Expr( -#line 2027 "cs.ATG" +#line 2045 "cs.ATG" out expr); -#line 2027 "cs.ATG" +#line 2045 "cs.ATG" if (expr != null) { parameterExpression.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Expr( -#line 2029 "cs.ATG" +#line 2047 "cs.ATG" out expr); -#line 2029 "cs.ATG" +#line 2047 "cs.ATG" if (expr != null) { parameterExpression.Add(expr); } } Expect(19); -#line 2031 "cs.ATG" +#line 2049 "cs.ATG" parameters.Add(new ArrayCreationParameter(parameterExpression)); ace.Parameters = parameters; while ( -#line 2034 "cs.ATG" +#line 2052 "cs.ATG" IsDims()) { Expect(18); -#line 2034 "cs.ATG" +#line 2052 "cs.ATG" dims =0; while (la.kind == 14) { lexer.NextToken(); -#line 2035 "cs.ATG" +#line 2053 "cs.ATG" dims++; } -#line 2035 "cs.ATG" +#line 2053 "cs.ATG" rank.Add(dims); parameters.Add(new ArrayCreationParameter(dims)); Expect(19); } -#line 2039 "cs.ATG" +#line 2057 "cs.ATG" if (rank.Count > 0) { ace.Rank = (int[])rank.ToArray(typeof (int)); } if (la.kind == 16) { ArrayInitializer( -#line 2043 "cs.ATG" +#line 2061 "cs.ATG" out expr); -#line 2043 "cs.ATG" +#line 2061 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; } } else if (la.kind == 14 || la.kind == 19) { while (la.kind == 14) { lexer.NextToken(); -#line 2045 "cs.ATG" +#line 2063 "cs.ATG" dims++; } -#line 2046 "cs.ATG" +#line 2064 "cs.ATG" parameters.Add(new ArrayCreationParameter(dims)); Expect(19); while ( -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" IsDims()) { Expect(18); -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" dims =0; while (la.kind == 14) { lexer.NextToken(); -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" dims++; } -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" parameters.Add(new ArrayCreationParameter(dims)); Expect(19); } ArrayInitializer( -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" out expr); -#line 2048 "cs.ATG" +#line 2066 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; ace.Parameters = parameters; - } else SynErr(178); - } else SynErr(179); + } else SynErr(179); + } else SynErr(180); } else if (la.kind == 114) { lexer.NextToken(); Expect(20); if ( -#line 2054 "cs.ATG" +#line 2072 "cs.ATG" NotVoidPointer()) { Expect(122); -#line 2054 "cs.ATG" +#line 2072 "cs.ATG" type = new TypeReference("void"); } else if (StartOf(9)) { Type( -#line 2055 "cs.ATG" +#line 2073 "cs.ATG" out type); - } else SynErr(180); + } else SynErr(181); Expect(21); -#line 2056 "cs.ATG" +#line 2074 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 104) { lexer.NextToken(); Expect(20); Type( -#line 2057 "cs.ATG" +#line 2075 "cs.ATG" out type); Expect(21); -#line 2057 "cs.ATG" +#line 2075 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 57) { lexer.NextToken(); Expect(20); Expr( -#line 2058 "cs.ATG" +#line 2076 "cs.ATG" out expr); Expect(21); -#line 2058 "cs.ATG" +#line 2076 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 117) { lexer.NextToken(); Expect(20); Expr( -#line 2059 "cs.ATG" +#line 2077 "cs.ATG" out expr); Expect(21); -#line 2059 "cs.ATG" +#line 2077 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 63) { lexer.NextToken(); AnonymousMethodExpr( -#line 2060 "cs.ATG" +#line 2078 "cs.ATG" out expr); -#line 2060 "cs.ATG" +#line 2078 "cs.ATG" pexpr = expr; - } else SynErr(181); - while (StartOf(26) || -#line 2081 "cs.ATG" + } else SynErr(182); + while (StartOf(27) || +#line 2099 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || -#line 2089 "cs.ATG" +#line 2107 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { if (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 2064 "cs.ATG" +#line 2082 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); } else if (la.kind == 32) { lexer.NextToken(); -#line 2065 "cs.ATG" +#line 2083 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); - } else SynErr(182); + } else SynErr(183); } else if (la.kind == 47) { lexer.NextToken(); Expect(1); -#line 2068 "cs.ATG" +#line 2086 "cs.ATG" pexpr = new PointerReferenceExpression(pexpr, t.val); } else if (la.kind == 15) { lexer.NextToken(); Expect(1); -#line 2069 "cs.ATG" +#line 2087 "cs.ATG" pexpr = new FieldReferenceExpression(pexpr, t.val); } else if ( -#line 2081 "cs.ATG" +#line 2099 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) { TypeArgumentList( -#line 2082 "cs.ATG" +#line 2100 "cs.ATG" out typeList); Expect(15); Expect(1); -#line 2083 "cs.ATG" +#line 2101 "cs.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val); } else if (la.kind == 20) { lexer.NextToken(); -#line 2085 "cs.ATG" +#line 2103 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2086 "cs.ATG" +#line 2104 "cs.ATG" out expr); -#line 2086 "cs.ATG" +#line 2104 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2087 "cs.ATG" +#line 2105 "cs.ATG" out expr); -#line 2087 "cs.ATG" +#line 2105 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(21); -#line 2088 "cs.ATG" +#line 2106 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); } else if ( -#line 2089 "cs.ATG" +#line 2107 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { TypeArgumentList( -#line 2089 "cs.ATG" +#line 2107 "cs.ATG" out typeList); Expect(20); -#line 2090 "cs.ATG" +#line 2108 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2091 "cs.ATG" +#line 2109 "cs.ATG" out expr); -#line 2091 "cs.ATG" +#line 2109 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2092 "cs.ATG" +#line 2110 "cs.ATG" out expr); -#line 2092 "cs.ATG" +#line 2110 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(21); -#line 2093 "cs.ATG" +#line 2111 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeList); } else { -#line 2095 "cs.ATG" +#line 2113 "cs.ATG" if (isArrayCreation) Error("element access not allow on array creation"); ArrayList indices = new ArrayList(); lexer.NextToken(); Expr( -#line 2098 "cs.ATG" +#line 2116 "cs.ATG" out expr); -#line 2098 "cs.ATG" +#line 2116 "cs.ATG" if (expr != null) { indices.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Expr( -#line 2099 "cs.ATG" +#line 2117 "cs.ATG" out expr); -#line 2099 "cs.ATG" +#line 2117 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(19); -#line 2100 "cs.ATG" +#line 2118 "cs.ATG" pexpr = new IndexerExpression(pexpr, indices); } } } void AnonymousMethodExpr( -#line 2104 "cs.ATG" +#line 2122 "cs.ATG" out Expression outExpr) { -#line 2106 "cs.ATG" +#line 2124 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; Statement stmt; @@ -4914,337 +4978,337 @@ out Expression outExpr) { lexer.NextToken(); if (StartOf(10)) { FormalParameterList( -#line 2115 "cs.ATG" +#line 2133 "cs.ATG" p); -#line 2115 "cs.ATG" +#line 2133 "cs.ATG" expr.Parameters = p; } Expect(21); } -#line 2120 "cs.ATG" +#line 2138 "cs.ATG" if (compilationUnit != null) { Block( -#line 2121 "cs.ATG" +#line 2139 "cs.ATG" out stmt); -#line 2121 "cs.ATG" +#line 2139 "cs.ATG" expr.Body = (BlockStatement)stmt; -#line 2122 "cs.ATG" +#line 2140 "cs.ATG" } else { Expect(16); -#line 2124 "cs.ATG" +#line 2142 "cs.ATG" lexer.SkipCurrentBlock(); Expect(17); -#line 2126 "cs.ATG" +#line 2144 "cs.ATG" } -#line 2127 "cs.ATG" +#line 2145 "cs.ATG" expr.EndLocation = t.Location; } void TypeArgumentList( -#line 2287 "cs.ATG" +#line 2305 "cs.ATG" out List types) { -#line 2289 "cs.ATG" +#line 2307 "cs.ATG" types = new List(); TypeReference type = null; Expect(23); Type( -#line 2293 "cs.ATG" +#line 2311 "cs.ATG" out type); -#line 2293 "cs.ATG" +#line 2311 "cs.ATG" types.Add(type); while (la.kind == 14) { lexer.NextToken(); Type( -#line 2294 "cs.ATG" +#line 2312 "cs.ATG" out type); -#line 2294 "cs.ATG" +#line 2312 "cs.ATG" types.Add(type); } Expect(22); } void ConditionalAndExpr( -#line 2136 "cs.ATG" +#line 2154 "cs.ATG" ref Expression outExpr) { -#line 2137 "cs.ATG" +#line 2155 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2139 "cs.ATG" +#line 2157 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2139 "cs.ATG" +#line 2157 "cs.ATG" out expr); InclusiveOrExpr( -#line 2139 "cs.ATG" +#line 2157 "cs.ATG" ref expr); -#line 2139 "cs.ATG" +#line 2157 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2142 "cs.ATG" +#line 2160 "cs.ATG" ref Expression outExpr) { -#line 2143 "cs.ATG" +#line 2161 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2145 "cs.ATG" +#line 2163 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2145 "cs.ATG" +#line 2163 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2145 "cs.ATG" +#line 2163 "cs.ATG" ref expr); -#line 2145 "cs.ATG" +#line 2163 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2148 "cs.ATG" +#line 2166 "cs.ATG" ref Expression outExpr) { -#line 2149 "cs.ATG" +#line 2167 "cs.ATG" Expression expr; AndExpr( -#line 2151 "cs.ATG" +#line 2169 "cs.ATG" ref outExpr); while (la.kind == 30) { lexer.NextToken(); UnaryExpr( -#line 2151 "cs.ATG" +#line 2169 "cs.ATG" out expr); AndExpr( -#line 2151 "cs.ATG" +#line 2169 "cs.ATG" ref expr); -#line 2151 "cs.ATG" +#line 2169 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2154 "cs.ATG" +#line 2172 "cs.ATG" ref Expression outExpr) { -#line 2155 "cs.ATG" +#line 2173 "cs.ATG" Expression expr; EqualityExpr( -#line 2157 "cs.ATG" +#line 2175 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2157 "cs.ATG" +#line 2175 "cs.ATG" out expr); EqualityExpr( -#line 2157 "cs.ATG" +#line 2175 "cs.ATG" ref expr); -#line 2157 "cs.ATG" +#line 2175 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2160 "cs.ATG" +#line 2178 "cs.ATG" ref Expression outExpr) { -#line 2162 "cs.ATG" +#line 2180 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2166 "cs.ATG" +#line 2184 "cs.ATG" ref outExpr); while (la.kind == 33 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2169 "cs.ATG" +#line 2187 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2170 "cs.ATG" +#line 2188 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2172 "cs.ATG" +#line 2190 "cs.ATG" out expr); RelationalExpr( -#line 2172 "cs.ATG" +#line 2190 "cs.ATG" ref expr); -#line 2172 "cs.ATG" +#line 2190 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2176 "cs.ATG" +#line 2194 "cs.ATG" ref Expression outExpr) { -#line 2178 "cs.ATG" +#line 2196 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2183 "cs.ATG" +#line 2201 "cs.ATG" ref outExpr); - while (StartOf(27)) { - if (StartOf(28)) { + while (StartOf(28)) { + if (StartOf(29)) { if (la.kind == 23) { lexer.NextToken(); -#line 2186 "cs.ATG" +#line 2204 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 22) { lexer.NextToken(); -#line 2187 "cs.ATG" +#line 2205 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 36) { lexer.NextToken(); -#line 2188 "cs.ATG" +#line 2206 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 35) { lexer.NextToken(); -#line 2189 "cs.ATG" +#line 2207 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; - } else SynErr(183); + } else SynErr(184); UnaryExpr( -#line 2191 "cs.ATG" +#line 2209 "cs.ATG" out expr); ShiftExpr( -#line 2191 "cs.ATG" +#line 2209 "cs.ATG" ref expr); -#line 2191 "cs.ATG" +#line 2209 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 84) { lexer.NextToken(); -#line 2194 "cs.ATG" +#line 2212 "cs.ATG" op = BinaryOperatorType.TypeCheck; } else if (la.kind == 49) { lexer.NextToken(); -#line 2195 "cs.ATG" +#line 2213 "cs.ATG" op = BinaryOperatorType.AsCast; - } else SynErr(184); + } else SynErr(185); Type( -#line 2197 "cs.ATG" +#line 2215 "cs.ATG" out type); -#line 2197 "cs.ATG" +#line 2215 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new TypeReferenceExpression(type)); } } } void ShiftExpr( -#line 2201 "cs.ATG" +#line 2219 "cs.ATG" ref Expression outExpr) { -#line 2203 "cs.ATG" +#line 2221 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2207 "cs.ATG" +#line 2225 "cs.ATG" ref outExpr); while (la.kind == 37 || -#line 2210 "cs.ATG" +#line 2228 "cs.ATG" IsShiftRight()) { if (la.kind == 37) { lexer.NextToken(); -#line 2209 "cs.ATG" +#line 2227 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(22); Expect(22); -#line 2211 "cs.ATG" +#line 2229 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2214 "cs.ATG" +#line 2232 "cs.ATG" out expr); AdditiveExpr( -#line 2214 "cs.ATG" +#line 2232 "cs.ATG" ref expr); -#line 2214 "cs.ATG" +#line 2232 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2218 "cs.ATG" +#line 2236 "cs.ATG" ref Expression outExpr) { -#line 2220 "cs.ATG" +#line 2238 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2224 "cs.ATG" +#line 2242 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2227 "cs.ATG" +#line 2245 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2228 "cs.ATG" +#line 2246 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2230 "cs.ATG" +#line 2248 "cs.ATG" out expr); MultiplicativeExpr( -#line 2230 "cs.ATG" +#line 2248 "cs.ATG" ref expr); -#line 2230 "cs.ATG" +#line 2248 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2234 "cs.ATG" +#line 2252 "cs.ATG" ref Expression outExpr) { -#line 2236 "cs.ATG" +#line 2254 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5252,59 +5316,59 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2242 "cs.ATG" +#line 2260 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2243 "cs.ATG" +#line 2261 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2244 "cs.ATG" +#line 2262 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2246 "cs.ATG" +#line 2264 "cs.ATG" out expr); -#line 2246 "cs.ATG" +#line 2264 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void TypeParameterConstraintsClauseBase( -#line 2339 "cs.ATG" +#line 2357 "cs.ATG" out TypeReference type) { -#line 2340 "cs.ATG" +#line 2358 "cs.ATG" TypeReference t; type = null; if (la.kind == 108) { lexer.NextToken(); -#line 2342 "cs.ATG" +#line 2360 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 58) { lexer.NextToken(); -#line 2343 "cs.ATG" +#line 2361 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 88) { lexer.NextToken(); Expect(20); Expect(21); -#line 2344 "cs.ATG" +#line 2362 "cs.ATG" type = new TypeReference("struct"); } else if (StartOf(9)) { Type( -#line 2345 "cs.ATG" +#line 2363 "cs.ATG" out t); -#line 2345 "cs.ATG" +#line 2363 "cs.ATG" type = t; - } else SynErr(185); + } else SynErr(186); } @@ -5512,36 +5576,37 @@ out t); case 153: s = "invalid InterfaceMemberDecl"; break; case 154: s = "invalid InterfaceMemberDecl"; break; case 155: s = "invalid SimpleType"; break; - case 156: s = "invalid EventAccessorDecls"; break; - case 157: s = "invalid ConstructorInitializer"; break; - case 158: s = "invalid OverloadableOperator"; break; - case 159: s = "invalid AccessorDecls"; break; - case 160: s = "invalid InterfaceAccessors"; break; + case 156: s = "invalid AccessorModifiers"; break; + case 157: s = "invalid EventAccessorDecls"; break; + case 158: s = "invalid ConstructorInitializer"; break; + case 159: s = "invalid OverloadableOperator"; break; + case 160: s = "invalid AccessorDecls"; break; case 161: s = "invalid InterfaceAccessors"; break; - case 162: s = "invalid GetAccessorDecl"; break; - case 163: s = "invalid SetAccessorDecl"; break; - case 164: s = "invalid VariableInitializer"; break; - case 165: s = "invalid Statement"; break; - case 166: s = "invalid AssignmentOperator"; break; - case 167: s = "invalid EmbeddedStatement"; break; + case 162: s = "invalid InterfaceAccessors"; break; + case 163: s = "invalid GetAccessorDecl"; break; + case 164: s = "invalid SetAccessorDecl"; break; + case 165: s = "invalid VariableInitializer"; break; + case 166: s = "invalid Statement"; break; + case 167: s = "invalid AssignmentOperator"; break; case 168: s = "invalid EmbeddedStatement"; break; case 169: s = "invalid EmbeddedStatement"; break; - case 170: s = "invalid ForInitializer"; break; - case 171: s = "invalid GotoStatement"; break; - case 172: s = "invalid StatementExpr"; break; - case 173: s = "invalid TryStatement"; break; - case 174: s = "invalid ResourceAcquisition"; break; - case 175: s = "invalid SwitchLabel"; break; - case 176: s = "invalid CatchClauses"; break; - case 177: s = "invalid PrimaryExpr"; break; + case 170: s = "invalid EmbeddedStatement"; break; + case 171: s = "invalid ForInitializer"; break; + case 172: s = "invalid GotoStatement"; break; + case 173: s = "invalid StatementExpr"; break; + case 174: s = "invalid TryStatement"; break; + case 175: s = "invalid ResourceAcquisition"; break; + case 176: s = "invalid SwitchLabel"; break; + case 177: s = "invalid CatchClauses"; break; case 178: s = "invalid PrimaryExpr"; break; case 179: s = "invalid PrimaryExpr"; break; case 180: s = "invalid PrimaryExpr"; break; case 181: s = "invalid PrimaryExpr"; break; case 182: s = "invalid PrimaryExpr"; break; - case 183: s = "invalid RelationalExpr"; break; + case 183: s = "invalid PrimaryExpr"; break; case 184: s = "invalid RelationalExpr"; break; - case 185: s = "invalid TypeParameterConstraintsClauseBase"; break; + case 185: s = "invalid RelationalExpr"; break; + case 186: s = "invalid TypeParameterConstraintsClauseBase"; break; default: s = "error " + errorNumber; break; } @@ -5576,6 +5641,7 @@ out t); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x}, {x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,T, T,T,x,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x}, {x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,x,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, T,x,x,x, x,x,x,T, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, T,T,x,x, T,T,x,T, T,T,x,x, x,x,x,T, x,T,T,T, T,T,T,x, x,T,x,x, x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,T,x,T, T,x,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x}, {x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,x,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, {x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 4bd34b6092..9ca6c53d10 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -1002,6 +1002,16 @@ ParameterArray "params" Type ident (. p = new ParameterDeclarationExpression(type, t.val, ParamModifier.Params); .) . +AccessorModifiers +(. m = new Modifiers(); .) += + "private" (. m.Add(Modifier.Private, t.Location); .) + | "protected" (. m.Add(Modifier.Protected, t.Location); .) + ["internal" (. m.Add(Modifier.Internal, t.Location); .)] + | "internal" (. m.Add(Modifier.Internal, t.Location); .) + ["protected" (. m.Add(Modifier.Protected, t.Location); .)] +. + TypeModifier = "new" (. m.Add(Modifier.New, t.Location); .) @@ -1396,21 +1406,29 @@ AccessorDecls AttributeSection section; getBlock = null; setBlock = null; + Modifiers modifiers = null; .) = { AttributeSection (. attributes.Add(section); .) } + [ AccessorModifiers ] ( IF (IdentIsGet()) GetAccessorDecl - [ (. attributes = new List(); .) + (. if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } .) + [ (. attributes = new List(); modifiers = null; .) { AttributeSection (. attributes.Add(section); .) } + [ AccessorModifiers ] SetAccessorDecl + (. if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } .) ] | IF (IdentIsSet()) SetAccessorDecl - [ (. attributes = new List(); .) + (. if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } .) + [ (. attributes = new List(); modifiers = null; .) { AttributeSection (. attributes.Add(section); .) } + [ AccessorModifiers ] GetAccessorDecl + (. if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } .) ] | ident (. Error("get or set accessor declaration expected"); .) ) @@ -1419,7 +1437,7 @@ AccessorDecls GetAccessorDecl attributes> (. Statement stmt = null; .) = - ident /* "get" is not a keyword!? */ + ident /* "get" is not a keyword! */ (. if (t.val != "get") Error("get expected"); .) (. Point startLocation = t.Location; .) ( Block | ";" ) @@ -1430,7 +1448,7 @@ GetAccessorDecl attribute SetAccessorDecl attributes> (. Statement stmt = null; .) = - ident /* "set" is not a keyword!? */ + ident /* "set" is not a keyword! */ (. if (t.val != "set") Error("set expected"); .) (. Point startLocation = t.Location; .) ( Block | ";" ) diff --git a/src/Libraries/NRefactory/Test/Parser/TypeLevel/PropertyDeclarationTests.cs b/src/Libraries/NRefactory/Test/Parser/TypeLevel/PropertyDeclarationTests.cs index 2515a78dea..4e0578d9da 100644 --- a/src/Libraries/NRefactory/Test/Parser/TypeLevel/PropertyDeclarationTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/TypeLevel/PropertyDeclarationTests.cs @@ -29,6 +29,15 @@ namespace ICSharpCode.NRefactory.Tests.AST Assert.IsTrue(pd.HasSetRegion); } + [Test] + public void CSharpGetSetPropertyDeclarationWithAccessorModifiers() + { + PropertyDeclaration pd = (PropertyDeclaration)ParseUtilCSharp.ParseTypeMember("int MyProperty { private get {} protected internal set {} } ", typeof(PropertyDeclaration)); + Assert.AreEqual("MyProperty", pd.Name); + Assert.IsTrue(pd.HasGetRegion); + Assert.IsTrue(pd.HasSetRegion); + } + [Test] public void CSharpSimpleGetPropertyDeclarationTest() { @@ -75,6 +84,6 @@ namespace ICSharpCode.NRefactory.Tests.AST Assert.IsFalse(pd.HasGetRegion); Assert.IsTrue(pd.HasSetRegion); } - #endregion + #endregion } }