diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 0afbbe0aa7..2d4cb5b1ea 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -704,43 +704,43 @@ out expr); } void Expr( -#line 1869 "cs.ATG" +#line 1877 "cs.ATG" out Expression expr) { -#line 1870 "cs.ATG" +#line 1878 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; UnaryExpr( -#line 1872 "cs.ATG" +#line 1880 "cs.ATG" out expr); if (StartOf(5)) { ConditionalOrExpr( -#line 1875 "cs.ATG" +#line 1883 "cs.ATG" ref expr); if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1875 "cs.ATG" +#line 1883 "cs.ATG" out expr1); Expect(9); Expr( -#line 1875 "cs.ATG" +#line 1883 "cs.ATG" out expr2); -#line 1875 "cs.ATG" +#line 1883 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else if (StartOf(6)) { -#line 1877 "cs.ATG" +#line 1885 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1877 "cs.ATG" +#line 1885 "cs.ATG" out op); Expr( -#line 1877 "cs.ATG" +#line 1885 "cs.ATG" out val); -#line 1877 "cs.ATG" +#line 1885 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else SynErr(127); } @@ -1136,39 +1136,39 @@ templates); } void TypeParameterList( -#line 2252 "cs.ATG" +#line 2260 "cs.ATG" List templates) { -#line 2254 "cs.ATG" +#line 2262 "cs.ATG" AttributeSection section; List attributes = new List(); Expect(22); while (la.kind == 17) { AttributeSection( -#line 2258 "cs.ATG" +#line 2266 "cs.ATG" out section); -#line 2258 "cs.ATG" +#line 2266 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2259 "cs.ATG" +#line 2267 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); while (la.kind == 13) { lexer.NextToken(); while (la.kind == 17) { AttributeSection( -#line 2260 "cs.ATG" +#line 2268 "cs.ATG" out section); -#line 2260 "cs.ATG" +#line 2268 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2261 "cs.ATG" +#line 2269 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); } Expect(21); @@ -1201,25 +1201,25 @@ out typeRef); } void TypeParameterConstraintsClause( -#line 2265 "cs.ATG" +#line 2273 "cs.ATG" List templates) { -#line 2266 "cs.ATG" +#line 2274 "cs.ATG" string name = ""; TypeReference type; Expect(1); -#line 2268 "cs.ATG" +#line 2276 "cs.ATG" if (t.val != "where") Error("where expected"); Expect(1); -#line 2269 "cs.ATG" +#line 2277 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2271 "cs.ATG" +#line 2279 "cs.ATG" out type); -#line 2272 "cs.ATG" +#line 2280 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1232,10 +1232,10 @@ out type); while (la.kind == 13) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2281 "cs.ATG" +#line 2289 "cs.ATG" out type); -#line 2282 "cs.ATG" +#line 2290 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1631,33 +1631,33 @@ out r); } void TypeName( -#line 2217 "cs.ATG" +#line 2225 "cs.ATG" out TypeReference typeRef) { -#line 2218 "cs.ATG" +#line 2226 "cs.ATG" List typeArguments = null; string alias = null; string qualident; if ( -#line 2223 "cs.ATG" +#line 2231 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { lexer.NextToken(); -#line 2224 "cs.ATG" +#line 2232 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2227 "cs.ATG" +#line 2235 "cs.ATG" out qualident); if (la.kind == 22) { TypeArgumentList( -#line 2228 "cs.ATG" +#line 2236 "cs.ATG" out typeArguments); } -#line 2230 "cs.ATG" +#line 2238 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1776,23 +1776,23 @@ Modifiers m) { } void ClassMemberDecl( -#line 1278 "cs.ATG" +#line 1286 "cs.ATG" Modifiers m, List attributes) { -#line 1279 "cs.ATG" +#line 1287 "cs.ATG" Statement stmt = null; if (StartOf(16)) { StructMemberDecl( -#line 1281 "cs.ATG" +#line 1289 "cs.ATG" m, attributes); } else if (la.kind == 26) { -#line 1282 "cs.ATG" +#line 1290 "cs.ATG" m.Check(Modifier.Destructors); Point startPos = t.Location; lexer.NextToken(); Expect(1); -#line 1283 "cs.ATG" +#line 1291 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1800,17 +1800,17 @@ m, attributes); Expect(19); Expect(20); -#line 1287 "cs.ATG" +#line 1295 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 15) { Block( -#line 1287 "cs.ATG" +#line 1295 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(138); -#line 1288 "cs.ATG" +#line 1296 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -2048,43 +2048,50 @@ out stmt); m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; + Point startPos = Point.Empty; if (la.kind == 78) { lexer.NextToken(); + +#line 1144 "cs.ATG" + startPos = t.Location; } else { lexer.NextToken(); -#line 1143 "cs.ATG" - isImplicit = false; +#line 1144 "cs.ATG" + isImplicit = false; startPos = t.Location; } Expect(90); Type( -#line 1144 "cs.ATG" +#line 1145 "cs.ATG" out type); -#line 1144 "cs.ATG" +#line 1145 "cs.ATG" TypeReference operatorType = type; Expect(19); Type( -#line 1145 "cs.ATG" +#line 1146 "cs.ATG" out type); Expect(1); -#line 1145 "cs.ATG" +#line 1146 "cs.ATG" string varName = t.val; Expect(20); + +#line 1147 "cs.ATG" + Point endPos = t.Location; if (la.kind == 15) { Block( -#line 1145 "cs.ATG" +#line 1148 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 1145 "cs.ATG" +#line 1148 "cs.ATG" stmt = null; } else SynErr(143); -#line 1148 "cs.ATG" +#line 1151 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, @@ -2094,62 +2101,67 @@ out stmt); isImplicit ? ConversionType.Implicit : ConversionType.Explicit ); operatorDeclaration.Body = (BlockStatement)stmt; + operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); + operatorDeclaration.EndLocation = endPos; compilationUnit.AddChild(operatorDeclaration); } else if (StartOf(17)) { TypeDecl( -#line 1161 "cs.ATG" +#line 1166 "cs.ATG" m, attributes); } else if (StartOf(8)) { Type( -#line 1162 "cs.ATG" +#line 1167 "cs.ATG" out type); -#line 1162 "cs.ATG" +#line 1167 "cs.ATG" Point startPos = t.Location; if (la.kind == 90) { -#line 1164 "cs.ATG" +#line 1169 "cs.ATG" OverloadableOperatorType op; m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 1168 "cs.ATG" +#line 1173 "cs.ATG" out op); -#line 1168 "cs.ATG" +#line 1173 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(19); Type( -#line 1169 "cs.ATG" +#line 1174 "cs.ATG" out firstType); Expect(1); -#line 1169 "cs.ATG" +#line 1174 "cs.ATG" string firstName = t.val; if (la.kind == 13) { lexer.NextToken(); Type( -#line 1170 "cs.ATG" +#line 1175 "cs.ATG" out secondType); Expect(1); -#line 1170 "cs.ATG" +#line 1175 "cs.ATG" secondName = t.val; } else if (la.kind == 20) { } else SynErr(144); + +#line 1183 "cs.ATG" + Point endPos = t.Location; Expect(20); if (la.kind == 15) { Block( -#line 1178 "cs.ATG" +#line 1184 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(145); -#line 1180 "cs.ATG" +#line 1186 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(firstType, firstName)); if (secondType != null) { @@ -2161,46 +2173,48 @@ out stmt); type, op); operatorDeclaration.Body = (BlockStatement)stmt; + operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); + operatorDeclaration.EndLocation = endPos; compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 1195 "cs.ATG" +#line 1203 "cs.ATG" IsVarDecl()) { -#line 1195 "cs.ATG" +#line 1203 "cs.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclarator( -#line 1199 "cs.ATG" +#line 1207 "cs.ATG" variableDeclarators); while (la.kind == 13) { lexer.NextToken(); VariableDeclarator( -#line 1200 "cs.ATG" +#line 1208 "cs.ATG" variableDeclarators); } Expect(11); -#line 1201 "cs.ATG" +#line 1209 "cs.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); } else if (la.kind == 109) { -#line 1204 "cs.ATG" +#line 1212 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(17); FormalParameterList( -#line 1205 "cs.ATG" +#line 1213 "cs.ATG" p); Expect(18); -#line 1205 "cs.ATG" +#line 1213 "cs.ATG" Point endLocation = t.EndLocation; Expect(15); -#line 1206 "cs.ATG" +#line 1214 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2209,11 +2223,11 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 1213 "cs.ATG" +#line 1221 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1214 "cs.ATG" +#line 1222 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; @@ -2221,30 +2235,30 @@ out getRegion, out setRegion); } else if (la.kind == 1) { Qualident( -#line 1219 "cs.ATG" +#line 1227 "cs.ATG" out qualident); -#line 1219 "cs.ATG" +#line 1227 "cs.ATG" Point qualIdentEndLocation = t.EndLocation; if (la.kind == 15 || la.kind == 19 || la.kind == 22) { if (la.kind == 19 || la.kind == 22) { -#line 1222 "cs.ATG" +#line 1230 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); if (la.kind == 22) { TypeParameterList( -#line 1224 "cs.ATG" +#line 1232 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1225 "cs.ATG" +#line 1233 "cs.ATG" p); } Expect(20); -#line 1226 "cs.ATG" +#line 1234 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, type, @@ -2256,26 +2270,26 @@ p); compilationUnit.AddChild(methodDeclaration); while ( -#line 1236 "cs.ATG" +#line 1244 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1236 "cs.ATG" +#line 1244 "cs.ATG" templates); } if (la.kind == 15) { Block( -#line 1237 "cs.ATG" +#line 1245 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(146); -#line 1237 "cs.ATG" +#line 1245 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1240 "cs.ATG" +#line 1248 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = qualIdentEndLocation; @@ -2284,11 +2298,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1247 "cs.ATG" +#line 1255 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1249 "cs.ATG" +#line 1257 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2297,17 +2311,17 @@ out getRegion, out setRegion); } } else if (la.kind == 14) { -#line 1257 "cs.ATG" +#line 1265 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(109); Expect(17); FormalParameterList( -#line 1258 "cs.ATG" +#line 1266 "cs.ATG" p); Expect(18); -#line 1259 "cs.ATG" +#line 1267 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2317,14 +2331,14 @@ p); Expect(15); -#line 1266 "cs.ATG" +#line 1274 "cs.ATG" Point bodyStart = t.Location; AccessorDecls( -#line 1267 "cs.ATG" +#line 1275 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1268 "cs.ATG" +#line 1276 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; @@ -2338,7 +2352,7 @@ out getRegion, out setRegion); void InterfaceMemberDecl() { -#line 1295 "cs.ATG" +#line 1303 "cs.ATG" TypeReference type; AttributeSection section; @@ -2353,51 +2367,51 @@ out getRegion, out setRegion); while (la.kind == 17) { AttributeSection( -#line 1308 "cs.ATG" +#line 1316 "cs.ATG" out section); -#line 1308 "cs.ATG" +#line 1316 "cs.ATG" attributes.Add(section); } if (la.kind == 87) { lexer.NextToken(); -#line 1309 "cs.ATG" +#line 1317 "cs.ATG" mod = Modifier.New; startLocation = t.Location; } if ( -#line 1312 "cs.ATG" +#line 1320 "cs.ATG" NotVoidPointer()) { Expect(121); -#line 1312 "cs.ATG" +#line 1320 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Expect(1); -#line 1312 "cs.ATG" +#line 1320 "cs.ATG" name = t.val; if (la.kind == 22) { TypeParameterList( -#line 1313 "cs.ATG" +#line 1321 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1314 "cs.ATG" +#line 1322 "cs.ATG" parameters); } Expect(20); while ( -#line 1315 "cs.ATG" +#line 1323 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1315 "cs.ATG" +#line 1323 "cs.ATG" templates); } Expect(11); -#line 1317 "cs.ATG" +#line 1325 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, new TypeReference("void"), parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2407,39 +2421,39 @@ templates); } else if (StartOf(18)) { if (StartOf(8)) { Type( -#line 1324 "cs.ATG" +#line 1332 "cs.ATG" out type); -#line 1324 "cs.ATG" +#line 1332 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; if (la.kind == 1) { lexer.NextToken(); -#line 1326 "cs.ATG" +#line 1334 "cs.ATG" name = t.val; Point qualIdentEndLocation = t.EndLocation; if (la.kind == 19 || la.kind == 22) { if (la.kind == 22) { TypeParameterList( -#line 1330 "cs.ATG" +#line 1338 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1331 "cs.ATG" +#line 1339 "cs.ATG" parameters); } Expect(20); while ( -#line 1333 "cs.ATG" +#line 1341 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1333 "cs.ATG" +#line 1341 "cs.ATG" templates); } Expect(11); -#line 1334 "cs.ATG" +#line 1342 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, type, parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2448,72 +2462,72 @@ templates); } else if (la.kind == 15) { -#line 1341 "cs.ATG" +#line 1349 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1342 "cs.ATG" +#line 1350 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1342 "cs.ATG" +#line 1350 "cs.ATG" out getBlock, out setBlock); Expect(16); -#line 1342 "cs.ATG" +#line 1350 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; } else SynErr(150); } else if (la.kind == 109) { lexer.NextToken(); Expect(17); FormalParameterList( -#line 1345 "cs.ATG" +#line 1353 "cs.ATG" parameters); Expect(18); -#line 1345 "cs.ATG" +#line 1353 "cs.ATG" Point bracketEndLocation = t.EndLocation; -#line 1345 "cs.ATG" +#line 1353 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(15); -#line 1346 "cs.ATG" +#line 1354 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1346 "cs.ATG" +#line 1354 "cs.ATG" out getBlock, out setBlock); Expect(16); -#line 1346 "cs.ATG" +#line 1354 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; } else SynErr(151); } else { lexer.NextToken(); -#line 1349 "cs.ATG" +#line 1357 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Type( -#line 1349 "cs.ATG" +#line 1357 "cs.ATG" out type); Expect(1); -#line 1349 "cs.ATG" +#line 1357 "cs.ATG" EventDeclaration ed = new EventDeclaration(type, t.val, mod, attributes); compilationUnit.AddChild(ed); Expect(11); -#line 1352 "cs.ATG" +#line 1360 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } } else SynErr(152); } void EnumMemberDecl( -#line 1357 "cs.ATG" +#line 1365 "cs.ATG" out FieldDeclaration f) { -#line 1359 "cs.ATG" +#line 1367 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2521,15 +2535,15 @@ out FieldDeclaration f) { while (la.kind == 17) { AttributeSection( -#line 1365 "cs.ATG" +#line 1373 "cs.ATG" out section); -#line 1365 "cs.ATG" +#line 1373 "cs.ATG" attributes.Add(section); } Expect(1); -#line 1366 "cs.ATG" +#line 1374 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2538,10 +2552,10 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1371 "cs.ATG" +#line 1379 "cs.ATG" out expr); -#line 1371 "cs.ATG" +#line 1379 "cs.ATG" varDecl.Initializer = expr; } } @@ -2667,11 +2681,11 @@ out type); } void Block( -#line 1475 "cs.ATG" +#line 1483 "cs.ATG" out Statement stmt) { Expect(15); -#line 1477 "cs.ATG" +#line 1485 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); @@ -2682,7 +2696,7 @@ out Statement stmt) { } Expect(16); -#line 1484 "cs.ATG" +#line 1492 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2690,34 +2704,34 @@ out Statement stmt) { } void VariableDeclarator( -#line 1468 "cs.ATG" +#line 1476 "cs.ATG" List fieldDeclaration) { -#line 1469 "cs.ATG" +#line 1477 "cs.ATG" Expression expr = null; Expect(1); -#line 1471 "cs.ATG" +#line 1479 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1472 "cs.ATG" +#line 1480 "cs.ATG" out expr); -#line 1472 "cs.ATG" +#line 1480 "cs.ATG" f.Initializer = expr; } -#line 1472 "cs.ATG" +#line 1480 "cs.ATG" fieldDeclaration.Add(f); } void EventAccessorDecls( -#line 1417 "cs.ATG" +#line 1425 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1418 "cs.ATG" +#line 1426 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2726,102 +2740,102 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 17) { AttributeSection( -#line 1425 "cs.ATG" +#line 1433 "cs.ATG" out section); -#line 1425 "cs.ATG" +#line 1433 "cs.ATG" attributes.Add(section); } if ( -#line 1427 "cs.ATG" +#line 1435 "cs.ATG" IdentIsAdd()) { -#line 1427 "cs.ATG" +#line 1435 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1428 "cs.ATG" +#line 1436 "cs.ATG" out stmt); -#line 1428 "cs.ATG" +#line 1436 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 17) { AttributeSection( -#line 1429 "cs.ATG" +#line 1437 "cs.ATG" out section); -#line 1429 "cs.ATG" +#line 1437 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1430 "cs.ATG" +#line 1438 "cs.ATG" out stmt); -#line 1430 "cs.ATG" +#line 1438 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if ( -#line 1431 "cs.ATG" +#line 1439 "cs.ATG" IdentIsRemove()) { RemoveAccessorDecl( -#line 1432 "cs.ATG" +#line 1440 "cs.ATG" out stmt); -#line 1432 "cs.ATG" +#line 1440 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1433 "cs.ATG" +#line 1441 "cs.ATG" out section); -#line 1433 "cs.ATG" +#line 1441 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1434 "cs.ATG" +#line 1442 "cs.ATG" out stmt); -#line 1434 "cs.ATG" +#line 1442 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else if (la.kind == 1) { lexer.NextToken(); -#line 1435 "cs.ATG" +#line 1443 "cs.ATG" Error("add or remove accessor declaration expected"); } else SynErr(155); } void ConstructorInitializer( -#line 1506 "cs.ATG" +#line 1514 "cs.ATG" out ConstructorInitializer ci) { -#line 1507 "cs.ATG" +#line 1515 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 49) { lexer.NextToken(); -#line 1511 "cs.ATG" +#line 1519 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 109) { lexer.NextToken(); -#line 1512 "cs.ATG" +#line 1520 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; } else SynErr(156); Expect(19); if (StartOf(21)) { Argument( -#line 1515 "cs.ATG" +#line 1523 "cs.ATG" out expr); -#line 1515 "cs.ATG" +#line 1523 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Argument( -#line 1515 "cs.ATG" +#line 1523 "cs.ATG" out expr); -#line 1515 "cs.ATG" +#line 1523 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } } } @@ -2829,161 +2843,161 @@ out expr); } void OverloadableOperator( -#line 1527 "cs.ATG" +#line 1535 "cs.ATG" out OverloadableOperatorType op) { -#line 1528 "cs.ATG" +#line 1536 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1530 "cs.ATG" +#line 1538 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1531 "cs.ATG" +#line 1539 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 23: { lexer.NextToken(); -#line 1533 "cs.ATG" +#line 1541 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 26: { lexer.NextToken(); -#line 1534 "cs.ATG" +#line 1542 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 30: { lexer.NextToken(); -#line 1536 "cs.ATG" +#line 1544 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 31: { lexer.NextToken(); -#line 1537 "cs.ATG" +#line 1545 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 111: { lexer.NextToken(); -#line 1539 "cs.ATG" +#line 1547 "cs.ATG" op = OverloadableOperatorType.True; break; } case 70: { lexer.NextToken(); -#line 1540 "cs.ATG" +#line 1548 "cs.ATG" op = OverloadableOperatorType.False; break; } case 6: { lexer.NextToken(); -#line 1542 "cs.ATG" +#line 1550 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1543 "cs.ATG" +#line 1551 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1544 "cs.ATG" +#line 1552 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 27: { lexer.NextToken(); -#line 1546 "cs.ATG" +#line 1554 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 28: { lexer.NextToken(); -#line 1547 "cs.ATG" +#line 1555 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 29: { lexer.NextToken(); -#line 1548 "cs.ATG" +#line 1556 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 36: { lexer.NextToken(); -#line 1550 "cs.ATG" +#line 1558 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 32: { lexer.NextToken(); -#line 1551 "cs.ATG" +#line 1559 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 33: { lexer.NextToken(); -#line 1552 "cs.ATG" +#line 1560 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 22: { lexer.NextToken(); -#line 1553 "cs.ATG" +#line 1561 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 34: { lexer.NextToken(); -#line 1554 "cs.ATG" +#line 1562 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 35: { lexer.NextToken(); -#line 1555 "cs.ATG" +#line 1563 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 21: { lexer.NextToken(); -#line 1556 "cs.ATG" +#line 1564 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 21) { lexer.NextToken(); -#line 1556 "cs.ATG" +#line 1564 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; @@ -2993,10 +3007,10 @@ out OverloadableOperatorType op) { } void AccessorDecls( -#line 1375 "cs.ATG" +#line 1383 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1377 "cs.ATG" +#line 1385 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3004,136 +3018,136 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 17) { AttributeSection( -#line 1383 "cs.ATG" +#line 1391 "cs.ATG" out section); -#line 1383 "cs.ATG" +#line 1391 "cs.ATG" attributes.Add(section); } if ( -#line 1385 "cs.ATG" +#line 1393 "cs.ATG" IdentIsGet()) { GetAccessorDecl( -#line 1386 "cs.ATG" +#line 1394 "cs.ATG" out getBlock, attributes); if (la.kind == 1 || la.kind == 17) { -#line 1387 "cs.ATG" +#line 1395 "cs.ATG" attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1388 "cs.ATG" +#line 1396 "cs.ATG" out section); -#line 1388 "cs.ATG" +#line 1396 "cs.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1389 "cs.ATG" +#line 1397 "cs.ATG" out setBlock, attributes); } } else if ( -#line 1391 "cs.ATG" +#line 1399 "cs.ATG" IdentIsSet()) { SetAccessorDecl( -#line 1392 "cs.ATG" +#line 1400 "cs.ATG" out setBlock, attributes); if (la.kind == 1 || la.kind == 17) { -#line 1393 "cs.ATG" +#line 1401 "cs.ATG" attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1394 "cs.ATG" +#line 1402 "cs.ATG" out section); -#line 1394 "cs.ATG" +#line 1402 "cs.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1395 "cs.ATG" +#line 1403 "cs.ATG" out getBlock, attributes); } } else if (la.kind == 1) { lexer.NextToken(); -#line 1397 "cs.ATG" +#line 1405 "cs.ATG" Error("get or set accessor declaration expected"); } else SynErr(158); } void InterfaceAccessors( -#line 1439 "cs.ATG" +#line 1447 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1441 "cs.ATG" +#line 1449 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; while (la.kind == 17) { AttributeSection( -#line 1446 "cs.ATG" +#line 1454 "cs.ATG" out section); -#line 1446 "cs.ATG" +#line 1454 "cs.ATG" attributes.Add(section); } if ( -#line 1448 "cs.ATG" +#line 1456 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1448 "cs.ATG" +#line 1456 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1449 "cs.ATG" +#line 1457 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1449 "cs.ATG" +#line 1457 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1450 "cs.ATG" +#line 1458 "cs.ATG" Error("set or get expected"); } else SynErr(159); Expect(11); -#line 1452 "cs.ATG" +#line 1460 "cs.ATG" attributes = new List(); if (la.kind == 1 || la.kind == 17) { while (la.kind == 17) { AttributeSection( -#line 1454 "cs.ATG" +#line 1462 "cs.ATG" out section); -#line 1454 "cs.ATG" +#line 1462 "cs.ATG" attributes.Add(section); } if ( -#line 1456 "cs.ATG" +#line 1464 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1456 "cs.ATG" +#line 1464 "cs.ATG" if (getBlock != null) Error("get already declared"); else getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1459 "cs.ATG" +#line 1467 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1459 "cs.ATG" +#line 1467 "cs.ATG" if (setBlock != null) Error("set already declared"); else setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1462 "cs.ATG" +#line 1470 "cs.ATG" Error("set or get expected"); } else SynErr(160); Expect(11); @@ -3141,183 +3155,183 @@ IdentIsSet()) { } void GetAccessorDecl( -#line 1401 "cs.ATG" +#line 1409 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1402 "cs.ATG" +#line 1410 "cs.ATG" Statement stmt = null; Expect(1); -#line 1405 "cs.ATG" +#line 1413 "cs.ATG" if (t.val != "get") Error("get expected"); if (la.kind == 15) { Block( -#line 1406 "cs.ATG" +#line 1414 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(161); -#line 1406 "cs.ATG" +#line 1414 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); } void SetAccessorDecl( -#line 1409 "cs.ATG" +#line 1417 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1410 "cs.ATG" +#line 1418 "cs.ATG" Statement stmt = null; Expect(1); -#line 1413 "cs.ATG" +#line 1421 "cs.ATG" if (t.val != "set") Error("set expected"); if (la.kind == 15) { Block( -#line 1414 "cs.ATG" +#line 1422 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(162); -#line 1414 "cs.ATG" +#line 1422 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); } void AddAccessorDecl( -#line 1490 "cs.ATG" +#line 1498 "cs.ATG" out Statement stmt) { -#line 1491 "cs.ATG" +#line 1499 "cs.ATG" stmt = null; Expect(1); -#line 1494 "cs.ATG" +#line 1502 "cs.ATG" if (t.val != "add") Error("add expected"); Block( -#line 1495 "cs.ATG" +#line 1503 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1498 "cs.ATG" +#line 1506 "cs.ATG" out Statement stmt) { -#line 1499 "cs.ATG" +#line 1507 "cs.ATG" stmt = null; Expect(1); -#line 1502 "cs.ATG" +#line 1510 "cs.ATG" if (t.val != "remove") Error("remove expected"); Block( -#line 1503 "cs.ATG" +#line 1511 "cs.ATG" out stmt); } void VariableInitializer( -#line 1519 "cs.ATG" +#line 1527 "cs.ATG" out Expression initializerExpression) { -#line 1520 "cs.ATG" +#line 1528 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(4)) { Expr( -#line 1522 "cs.ATG" +#line 1530 "cs.ATG" out initializerExpression); } else if (la.kind == 15) { ArrayInitializer( -#line 1523 "cs.ATG" +#line 1531 "cs.ATG" out initializerExpression); } else if (la.kind == 104) { lexer.NextToken(); Type( -#line 1524 "cs.ATG" +#line 1532 "cs.ATG" out type); Expect(17); Expr( -#line 1524 "cs.ATG" +#line 1532 "cs.ATG" out expr); Expect(18); -#line 1524 "cs.ATG" +#line 1532 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); } else SynErr(163); } void Statement() { -#line 1628 "cs.ATG" +#line 1636 "cs.ATG" TypeReference type; Expression expr; Statement stmt = null; Point startPos = la.Location; if ( -#line 1636 "cs.ATG" +#line 1644 "cs.ATG" IsLabel()) { Expect(1); -#line 1636 "cs.ATG" +#line 1644 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 58) { lexer.NextToken(); Type( -#line 1639 "cs.ATG" +#line 1647 "cs.ATG" out type); -#line 1639 "cs.ATG" +#line 1647 "cs.ATG" LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifier.Const); string ident = null; var.StartLocation = t.Location; Expect(1); -#line 1640 "cs.ATG" +#line 1648 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1641 "cs.ATG" +#line 1649 "cs.ATG" out expr); -#line 1641 "cs.ATG" +#line 1649 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); while (la.kind == 13) { lexer.NextToken(); Expect(1); -#line 1642 "cs.ATG" +#line 1650 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1642 "cs.ATG" +#line 1650 "cs.ATG" out expr); -#line 1642 "cs.ATG" +#line 1650 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); } Expect(11); -#line 1643 "cs.ATG" +#line 1651 "cs.ATG" compilationUnit.AddChild(var); } else if ( -#line 1645 "cs.ATG" +#line 1653 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1645 "cs.ATG" +#line 1653 "cs.ATG" out stmt); Expect(11); -#line 1645 "cs.ATG" +#line 1653 "cs.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(22)) { EmbeddedStatement( -#line 1646 "cs.ATG" +#line 1654 "cs.ATG" out stmt); -#line 1646 "cs.ATG" +#line 1654 "cs.ATG" compilationUnit.AddChild(stmt); } else SynErr(164); -#line 1652 "cs.ATG" +#line 1660 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3326,10 +3340,10 @@ out stmt); } void Argument( -#line 1559 "cs.ATG" +#line 1567 "cs.ATG" out Expression argumentexpr) { -#line 1561 "cs.ATG" +#line 1569 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3337,48 +3351,48 @@ out Expression argumentexpr) { if (la.kind == 98) { lexer.NextToken(); -#line 1566 "cs.ATG" +#line 1574 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1567 "cs.ATG" +#line 1575 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1569 "cs.ATG" +#line 1577 "cs.ATG" out expr); -#line 1569 "cs.ATG" +#line 1577 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void ArrayInitializer( -#line 1588 "cs.ATG" +#line 1596 "cs.ATG" out Expression outExpr) { -#line 1590 "cs.ATG" +#line 1598 "cs.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(15); if (StartOf(23)) { VariableInitializer( -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" out expr); -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" NotFinalComma()) { Expect(13); VariableInitializer( -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" out expr); -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } if (la.kind == 13) { @@ -3387,84 +3401,84 @@ out expr); } Expect(16); -#line 1596 "cs.ATG" +#line 1604 "cs.ATG" outExpr = initializer; } void AssignmentOperator( -#line 1572 "cs.ATG" +#line 1580 "cs.ATG" out AssignmentOperatorType op) { -#line 1573 "cs.ATG" +#line 1581 "cs.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 3: { lexer.NextToken(); -#line 1575 "cs.ATG" +#line 1583 "cs.ATG" op = AssignmentOperatorType.Assign; break; } case 37: { lexer.NextToken(); -#line 1576 "cs.ATG" +#line 1584 "cs.ATG" op = AssignmentOperatorType.Add; break; } case 38: { lexer.NextToken(); -#line 1577 "cs.ATG" +#line 1585 "cs.ATG" op = AssignmentOperatorType.Subtract; break; } case 39: { lexer.NextToken(); -#line 1578 "cs.ATG" +#line 1586 "cs.ATG" op = AssignmentOperatorType.Multiply; break; } case 40: { lexer.NextToken(); -#line 1579 "cs.ATG" +#line 1587 "cs.ATG" op = AssignmentOperatorType.Divide; break; } case 41: { lexer.NextToken(); -#line 1580 "cs.ATG" +#line 1588 "cs.ATG" op = AssignmentOperatorType.Modulus; break; } case 42: { lexer.NextToken(); -#line 1581 "cs.ATG" +#line 1589 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; break; } case 43: { lexer.NextToken(); -#line 1582 "cs.ATG" +#line 1590 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; break; } case 44: { lexer.NextToken(); -#line 1583 "cs.ATG" +#line 1591 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; break; } case 45: { lexer.NextToken(); -#line 1584 "cs.ATG" +#line 1592 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; break; } @@ -3472,7 +3486,7 @@ out AssignmentOperatorType op) { lexer.NextToken(); Expect(34); -#line 1585 "cs.ATG" +#line 1593 "cs.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3481,66 +3495,66 @@ out AssignmentOperatorType op) { } void LocalVariableDecl( -#line 1599 "cs.ATG" +#line 1607 "cs.ATG" out Statement stmt) { -#line 1601 "cs.ATG" +#line 1609 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Type( -#line 1606 "cs.ATG" +#line 1614 "cs.ATG" out type); -#line 1606 "cs.ATG" +#line 1614 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; LocalVariableDeclarator( -#line 1607 "cs.ATG" +#line 1615 "cs.ATG" out var); -#line 1607 "cs.ATG" +#line 1615 "cs.ATG" localVariableDeclaration.Variables.Add(var); while (la.kind == 13) { lexer.NextToken(); LocalVariableDeclarator( -#line 1608 "cs.ATG" +#line 1616 "cs.ATG" out var); -#line 1608 "cs.ATG" +#line 1616 "cs.ATG" localVariableDeclaration.Variables.Add(var); } -#line 1609 "cs.ATG" +#line 1617 "cs.ATG" stmt = localVariableDeclaration; } void LocalVariableDeclarator( -#line 1612 "cs.ATG" +#line 1620 "cs.ATG" out VariableDeclaration var) { -#line 1613 "cs.ATG" +#line 1621 "cs.ATG" Expression expr = null; Expect(1); -#line 1616 "cs.ATG" +#line 1624 "cs.ATG" var = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1616 "cs.ATG" +#line 1624 "cs.ATG" out expr); -#line 1616 "cs.ATG" +#line 1624 "cs.ATG" var.Initializer = expr; } } void EmbeddedStatement( -#line 1659 "cs.ATG" +#line 1667 "cs.ATG" out Statement statement) { -#line 1661 "cs.ATG" +#line 1669 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; @@ -3548,156 +3562,156 @@ out Statement statement) { if (la.kind == 15) { Block( -#line 1667 "cs.ATG" +#line 1675 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1669 "cs.ATG" +#line 1677 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1671 "cs.ATG" +#line 1679 "cs.ATG" UnCheckedAndLBrace()) { -#line 1671 "cs.ATG" +#line 1679 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 56) { lexer.NextToken(); } else if (la.kind == 116) { lexer.NextToken(); -#line 1672 "cs.ATG" +#line 1680 "cs.ATG" isChecked = false; } else SynErr(166); Block( -#line 1673 "cs.ATG" +#line 1681 "cs.ATG" out block); -#line 1673 "cs.ATG" +#line 1681 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 77) { lexer.NextToken(); -#line 1675 "cs.ATG" +#line 1683 "cs.ATG" Statement elseStatement = null; Expect(19); Expr( -#line 1676 "cs.ATG" +#line 1684 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1677 "cs.ATG" +#line 1685 "cs.ATG" out embeddedStatement); if (la.kind == 65) { lexer.NextToken(); EmbeddedStatement( -#line 1678 "cs.ATG" +#line 1686 "cs.ATG" out elseStatement); } -#line 1679 "cs.ATG" +#line 1687 "cs.ATG" statement = elseStatement != null ? (Statement)new IfElseStatement(expr, embeddedStatement, elseStatement) : (Statement)new IfElseStatement(expr, embeddedStatement); } else if (la.kind == 108) { lexer.NextToken(); -#line 1680 "cs.ATG" +#line 1688 "cs.ATG" ArrayList switchSections = new ArrayList(); SwitchSection switchSection; Expect(19); Expr( -#line 1681 "cs.ATG" +#line 1689 "cs.ATG" out expr); Expect(20); Expect(15); while (la.kind == 53 || la.kind == 61) { SwitchSection( -#line 1682 "cs.ATG" +#line 1690 "cs.ATG" out switchSection); -#line 1682 "cs.ATG" +#line 1690 "cs.ATG" switchSections.Add(switchSection); } Expect(16); -#line 1683 "cs.ATG" +#line 1691 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 123) { lexer.NextToken(); Expect(19); Expr( -#line 1685 "cs.ATG" +#line 1693 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1687 "cs.ATG" +#line 1695 "cs.ATG" out embeddedStatement); -#line 1687 "cs.ATG" +#line 1695 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 63) { lexer.NextToken(); EmbeddedStatement( -#line 1688 "cs.ATG" +#line 1696 "cs.ATG" out embeddedStatement); Expect(123); Expect(19); Expr( -#line 1689 "cs.ATG" +#line 1697 "cs.ATG" out expr); Expect(20); Expect(11); -#line 1689 "cs.ATG" +#line 1697 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 74) { lexer.NextToken(); -#line 1690 "cs.ATG" +#line 1698 "cs.ATG" ArrayList initializer = null; ArrayList iterator = null; Expect(19); if (StartOf(4)) { ForInitializer( -#line 1691 "cs.ATG" +#line 1699 "cs.ATG" out initializer); } Expect(11); if (StartOf(4)) { Expr( -#line 1692 "cs.ATG" +#line 1700 "cs.ATG" out expr); } Expect(11); if (StartOf(4)) { ForIterator( -#line 1693 "cs.ATG" +#line 1701 "cs.ATG" out iterator); } Expect(20); EmbeddedStatement( -#line 1694 "cs.ATG" +#line 1702 "cs.ATG" out embeddedStatement); -#line 1694 "cs.ATG" +#line 1702 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 75) { lexer.NextToken(); Expect(19); Type( -#line 1695 "cs.ATG" +#line 1703 "cs.ATG" out type); Expect(1); -#line 1695 "cs.ATG" +#line 1703 "cs.ATG" string varName = t.val; Point start = t.Location; Expect(79); Expr( -#line 1696 "cs.ATG" +#line 1704 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1697 "cs.ATG" +#line 1705 "cs.ATG" out embeddedStatement); -#line 1697 "cs.ATG" +#line 1705 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); statement.EndLocation = t.EndLocation; @@ -3705,34 +3719,34 @@ out embeddedStatement); lexer.NextToken(); Expect(11); -#line 1701 "cs.ATG" +#line 1709 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 59) { lexer.NextToken(); Expect(11); -#line 1702 "cs.ATG" +#line 1710 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 76) { GotoStatement( -#line 1703 "cs.ATG" +#line 1711 "cs.ATG" out statement); } else if ( -#line 1704 "cs.ATG" +#line 1712 "cs.ATG" IsYieldStatement()) { Expect(1); if (la.kind == 99) { lexer.NextToken(); Expr( -#line 1704 "cs.ATG" +#line 1712 "cs.ATG" out expr); -#line 1704 "cs.ATG" +#line 1712 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 51) { lexer.NextToken(); -#line 1705 "cs.ATG" +#line 1713 "cs.ATG" statement = new YieldStatement(new BreakStatement()); } else SynErr(167); Expect(11); @@ -3740,513 +3754,513 @@ out expr); lexer.NextToken(); if (StartOf(4)) { Expr( -#line 1706 "cs.ATG" +#line 1714 "cs.ATG" out expr); } Expect(11); -#line 1706 "cs.ATG" +#line 1714 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 110) { lexer.NextToken(); if (StartOf(4)) { Expr( -#line 1707 "cs.ATG" +#line 1715 "cs.ATG" out expr); } Expect(11); -#line 1707 "cs.ATG" +#line 1715 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(4)) { StatementExpr( -#line 1709 "cs.ATG" +#line 1717 "cs.ATG" out statement); Expect(11); } else if (la.kind == 112) { TryStatement( -#line 1711 "cs.ATG" +#line 1719 "cs.ATG" out statement); } else if (la.kind == 84) { lexer.NextToken(); Expect(19); Expr( -#line 1713 "cs.ATG" +#line 1721 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1714 "cs.ATG" +#line 1722 "cs.ATG" out embeddedStatement); -#line 1714 "cs.ATG" +#line 1722 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 119) { -#line 1716 "cs.ATG" +#line 1724 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(19); ResourceAcquisition( -#line 1718 "cs.ATG" +#line 1726 "cs.ATG" out resourceAcquisitionStmt); Expect(20); EmbeddedStatement( -#line 1719 "cs.ATG" +#line 1727 "cs.ATG" out embeddedStatement); -#line 1719 "cs.ATG" +#line 1727 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 117) { lexer.NextToken(); Block( -#line 1721 "cs.ATG" +#line 1729 "cs.ATG" out embeddedStatement); -#line 1721 "cs.ATG" +#line 1729 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 72) { lexer.NextToken(); Expect(19); Type( -#line 1724 "cs.ATG" +#line 1732 "cs.ATG" out type); -#line 1724 "cs.ATG" +#line 1732 "cs.ATG" if (type.PointerNestingLevel == 0) Error("can only fix pointer types"); ArrayList pointerDeclarators = new ArrayList(1); Expect(1); -#line 1727 "cs.ATG" +#line 1735 "cs.ATG" string identifier = t.val; Expect(3); Expr( -#line 1728 "cs.ATG" +#line 1736 "cs.ATG" out expr); -#line 1728 "cs.ATG" +#line 1736 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); while (la.kind == 13) { lexer.NextToken(); Expect(1); -#line 1730 "cs.ATG" +#line 1738 "cs.ATG" identifier = t.val; Expect(3); Expr( -#line 1731 "cs.ATG" +#line 1739 "cs.ATG" out expr); -#line 1731 "cs.ATG" +#line 1739 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); } Expect(20); EmbeddedStatement( -#line 1733 "cs.ATG" +#line 1741 "cs.ATG" out embeddedStatement); -#line 1733 "cs.ATG" +#line 1741 "cs.ATG" statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); } else SynErr(168); } void SwitchSection( -#line 1755 "cs.ATG" +#line 1763 "cs.ATG" out SwitchSection stmt) { -#line 1757 "cs.ATG" +#line 1765 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1761 "cs.ATG" +#line 1769 "cs.ATG" out label); -#line 1761 "cs.ATG" +#line 1769 "cs.ATG" switchSection.SwitchLabels.Add(label); while (la.kind == 53 || la.kind == 61) { SwitchLabel( -#line 1763 "cs.ATG" +#line 1771 "cs.ATG" out label); -#line 1763 "cs.ATG" +#line 1771 "cs.ATG" switchSection.SwitchLabels.Add(label); } -#line 1765 "cs.ATG" +#line 1773 "cs.ATG" compilationUnit.BlockStart(switchSection); Statement(); while (StartOf(20)) { Statement(); } -#line 1768 "cs.ATG" +#line 1776 "cs.ATG" compilationUnit.BlockEnd(); stmt = switchSection; } void ForInitializer( -#line 1736 "cs.ATG" +#line 1744 "cs.ATG" out ArrayList initializer) { -#line 1738 "cs.ATG" +#line 1746 "cs.ATG" Statement stmt; initializer = new ArrayList(); if ( -#line 1742 "cs.ATG" +#line 1750 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1742 "cs.ATG" +#line 1750 "cs.ATG" out stmt); -#line 1742 "cs.ATG" +#line 1750 "cs.ATG" initializer.Add(stmt); } else if (StartOf(4)) { StatementExpr( -#line 1743 "cs.ATG" +#line 1751 "cs.ATG" out stmt); -#line 1743 "cs.ATG" +#line 1751 "cs.ATG" initializer.Add(stmt); while (la.kind == 13) { lexer.NextToken(); StatementExpr( -#line 1743 "cs.ATG" +#line 1751 "cs.ATG" out stmt); -#line 1743 "cs.ATG" +#line 1751 "cs.ATG" initializer.Add(stmt); } -#line 1743 "cs.ATG" +#line 1751 "cs.ATG" initializer.Add(stmt); } else SynErr(169); } void ForIterator( -#line 1746 "cs.ATG" +#line 1754 "cs.ATG" out ArrayList iterator) { -#line 1748 "cs.ATG" +#line 1756 "cs.ATG" Statement stmt; iterator = new ArrayList(); StatementExpr( -#line 1752 "cs.ATG" +#line 1760 "cs.ATG" out stmt); -#line 1752 "cs.ATG" +#line 1760 "cs.ATG" iterator.Add(stmt); while (la.kind == 13) { lexer.NextToken(); StatementExpr( -#line 1752 "cs.ATG" +#line 1760 "cs.ATG" out stmt); -#line 1752 "cs.ATG" +#line 1760 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1823 "cs.ATG" +#line 1831 "cs.ATG" out Statement stmt) { -#line 1824 "cs.ATG" +#line 1832 "cs.ATG" Expression expr; stmt = null; Expect(76); if (la.kind == 1) { lexer.NextToken(); -#line 1828 "cs.ATG" +#line 1836 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 53) { lexer.NextToken(); Expr( -#line 1829 "cs.ATG" +#line 1837 "cs.ATG" out expr); Expect(11); -#line 1829 "cs.ATG" +#line 1837 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 61) { lexer.NextToken(); Expect(11); -#line 1830 "cs.ATG" +#line 1838 "cs.ATG" stmt = new GotoCaseStatement(null); } else SynErr(170); } void StatementExpr( -#line 1850 "cs.ATG" +#line 1858 "cs.ATG" out Statement stmt) { -#line 1855 "cs.ATG" +#line 1863 "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 1861 "cs.ATG" +#line 1869 "cs.ATG" out expr); if (StartOf(6)) { -#line 1864 "cs.ATG" +#line 1872 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1864 "cs.ATG" +#line 1872 "cs.ATG" out op); Expr( -#line 1864 "cs.ATG" +#line 1872 "cs.ATG" out val); -#line 1864 "cs.ATG" +#line 1872 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 11 || la.kind == 13 || la.kind == 20) { -#line 1865 "cs.ATG" +#line 1873 "cs.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(171); -#line 1866 "cs.ATG" +#line 1874 "cs.ATG" stmt = new StatementExpression(expr); } void TryStatement( -#line 1780 "cs.ATG" +#line 1788 "cs.ATG" out Statement tryStatement) { -#line 1782 "cs.ATG" +#line 1790 "cs.ATG" Statement blockStmt = null, finallyStmt = null; ArrayList catchClauses = null; Expect(112); Block( -#line 1786 "cs.ATG" +#line 1794 "cs.ATG" out blockStmt); if (la.kind == 54) { CatchClauses( -#line 1788 "cs.ATG" +#line 1796 "cs.ATG" out catchClauses); if (la.kind == 71) { lexer.NextToken(); Block( -#line 1788 "cs.ATG" +#line 1796 "cs.ATG" out finallyStmt); } } else if (la.kind == 71) { lexer.NextToken(); Block( -#line 1789 "cs.ATG" +#line 1797 "cs.ATG" out finallyStmt); } else SynErr(172); -#line 1792 "cs.ATG" +#line 1800 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void ResourceAcquisition( -#line 1834 "cs.ATG" +#line 1842 "cs.ATG" out Statement stmt) { -#line 1836 "cs.ATG" +#line 1844 "cs.ATG" stmt = null; Expression expr; if ( -#line 1841 "cs.ATG" +#line 1849 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1841 "cs.ATG" +#line 1849 "cs.ATG" out stmt); } else if (StartOf(4)) { Expr( -#line 1842 "cs.ATG" +#line 1850 "cs.ATG" out expr); -#line 1846 "cs.ATG" +#line 1854 "cs.ATG" stmt = new StatementExpression(expr); } else SynErr(173); } void SwitchLabel( -#line 1773 "cs.ATG" +#line 1781 "cs.ATG" out CaseLabel label) { -#line 1774 "cs.ATG" +#line 1782 "cs.ATG" Expression expr = null; label = null; if (la.kind == 53) { lexer.NextToken(); Expr( -#line 1776 "cs.ATG" +#line 1784 "cs.ATG" out expr); Expect(9); -#line 1776 "cs.ATG" +#line 1784 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 61) { lexer.NextToken(); Expect(9); -#line 1777 "cs.ATG" +#line 1785 "cs.ATG" label = new CaseLabel(); } else SynErr(174); } void CatchClauses( -#line 1797 "cs.ATG" +#line 1805 "cs.ATG" out ArrayList catchClauses) { -#line 1799 "cs.ATG" +#line 1807 "cs.ATG" catchClauses = new ArrayList(); Expect(54); -#line 1802 "cs.ATG" +#line 1810 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; if (la.kind == 15) { Block( -#line 1808 "cs.ATG" +#line 1816 "cs.ATG" out stmt); -#line 1808 "cs.ATG" +#line 1816 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } else if (la.kind == 19) { lexer.NextToken(); ClassType( -#line 1810 "cs.ATG" +#line 1818 "cs.ATG" out typeRef); -#line 1810 "cs.ATG" +#line 1818 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1811 "cs.ATG" +#line 1819 "cs.ATG" identifier = t.val; } Expect(20); Block( -#line 1812 "cs.ATG" +#line 1820 "cs.ATG" out stmt); -#line 1813 "cs.ATG" +#line 1821 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); while ( -#line 1814 "cs.ATG" +#line 1822 "cs.ATG" IsTypedCatch()) { Expect(54); Expect(19); ClassType( -#line 1814 "cs.ATG" +#line 1822 "cs.ATG" out typeRef); -#line 1814 "cs.ATG" +#line 1822 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1815 "cs.ATG" +#line 1823 "cs.ATG" identifier = t.val; } Expect(20); Block( -#line 1816 "cs.ATG" +#line 1824 "cs.ATG" out stmt); -#line 1817 "cs.ATG" +#line 1825 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); } if (la.kind == 54) { lexer.NextToken(); Block( -#line 1819 "cs.ATG" +#line 1827 "cs.ATG" out stmt); -#line 1819 "cs.ATG" +#line 1827 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } } else SynErr(175); } void UnaryExpr( -#line 1882 "cs.ATG" +#line 1890 "cs.ATG" out Expression uExpr) { -#line 1884 "cs.ATG" +#line 1892 "cs.ATG" TypeReference type = null; Expression expr; ArrayList expressions = new ArrayList(); uExpr = null; while (StartOf(24) || -#line 1908 "cs.ATG" +#line 1916 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1893 "cs.ATG" +#line 1901 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1894 "cs.ATG" +#line 1902 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 23) { lexer.NextToken(); -#line 1895 "cs.ATG" +#line 1903 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 26) { lexer.NextToken(); -#line 1896 "cs.ATG" +#line 1904 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1897 "cs.ATG" +#line 1905 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); } else if (la.kind == 30) { lexer.NextToken(); -#line 1898 "cs.ATG" +#line 1906 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1899 "cs.ATG" +#line 1907 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1900 "cs.ATG" +#line 1908 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); } else { Expect(19); Type( -#line 1908 "cs.ATG" +#line 1916 "cs.ATG" out type); Expect(20); -#line 1908 "cs.ATG" +#line 1916 "cs.ATG" expressions.Add(new CastExpression(type)); } } PrimaryExpr( -#line 1912 "cs.ATG" +#line 1920 "cs.ATG" out expr); -#line 1912 "cs.ATG" +#line 1920 "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) { @@ -4264,33 +4278,33 @@ out expr); } void ConditionalOrExpr( -#line 2095 "cs.ATG" +#line 2103 "cs.ATG" ref Expression outExpr) { -#line 2096 "cs.ATG" +#line 2104 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2098 "cs.ATG" +#line 2106 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2098 "cs.ATG" +#line 2106 "cs.ATG" out expr); ConditionalAndExpr( -#line 2098 "cs.ATG" +#line 2106 "cs.ATG" ref expr); -#line 2098 "cs.ATG" +#line 2106 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1929 "cs.ATG" +#line 1937 "cs.ATG" out Expression pexpr) { -#line 1931 "cs.ATG" +#line 1939 "cs.ATG" TypeReference type = null; List typeList = null; bool isArrayCreation = false; @@ -4300,340 +4314,340 @@ out Expression pexpr) { if (la.kind == 111) { lexer.NextToken(); -#line 1939 "cs.ATG" +#line 1947 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 70) { lexer.NextToken(); -#line 1940 "cs.ATG" +#line 1948 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 88) { lexer.NextToken(); -#line 1941 "cs.ATG" +#line 1949 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 1942 "cs.ATG" +#line 1950 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if ( -#line 1943 "cs.ATG" +#line 1951 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { TypeName( -#line 1944 "cs.ATG" +#line 1952 "cs.ATG" out type); -#line 1944 "cs.ATG" +#line 1952 "cs.ATG" pexpr = new TypeReferenceExpression(type); } else if (la.kind == 1) { lexer.NextToken(); -#line 1946 "cs.ATG" +#line 1954 "cs.ATG" pexpr = new IdentifierExpression(t.val); } else if (la.kind == 19) { lexer.NextToken(); Expr( -#line 1948 "cs.ATG" +#line 1956 "cs.ATG" out expr); Expect(20); -#line 1948 "cs.ATG" +#line 1956 "cs.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(25)) { -#line 1950 "cs.ATG" +#line 1958 "cs.ATG" string val = null; switch (la.kind) { case 50: { lexer.NextToken(); -#line 1952 "cs.ATG" +#line 1960 "cs.ATG" val = "bool"; break; } case 52: { lexer.NextToken(); -#line 1953 "cs.ATG" +#line 1961 "cs.ATG" val = "byte"; break; } case 55: { lexer.NextToken(); -#line 1954 "cs.ATG" +#line 1962 "cs.ATG" val = "char"; break; } case 60: { lexer.NextToken(); -#line 1955 "cs.ATG" +#line 1963 "cs.ATG" val = "decimal"; break; } case 64: { lexer.NextToken(); -#line 1956 "cs.ATG" +#line 1964 "cs.ATG" val = "double"; break; } case 73: { lexer.NextToken(); -#line 1957 "cs.ATG" +#line 1965 "cs.ATG" val = "float"; break; } case 80: { lexer.NextToken(); -#line 1958 "cs.ATG" +#line 1966 "cs.ATG" val = "int"; break; } case 85: { lexer.NextToken(); -#line 1959 "cs.ATG" +#line 1967 "cs.ATG" val = "long"; break; } case 89: { lexer.NextToken(); -#line 1960 "cs.ATG" +#line 1968 "cs.ATG" val = "object"; break; } case 100: { lexer.NextToken(); -#line 1961 "cs.ATG" +#line 1969 "cs.ATG" val = "sbyte"; break; } case 102: { lexer.NextToken(); -#line 1962 "cs.ATG" +#line 1970 "cs.ATG" val = "short"; break; } case 106: { lexer.NextToken(); -#line 1963 "cs.ATG" +#line 1971 "cs.ATG" val = "string"; break; } case 114: { lexer.NextToken(); -#line 1964 "cs.ATG" +#line 1972 "cs.ATG" val = "uint"; break; } case 115: { lexer.NextToken(); -#line 1965 "cs.ATG" +#line 1973 "cs.ATG" val = "ulong"; break; } case 118: { lexer.NextToken(); -#line 1966 "cs.ATG" +#line 1974 "cs.ATG" val = "ushort"; break; } } -#line 1967 "cs.ATG" +#line 1975 "cs.ATG" t.val = ""; Expect(14); Expect(1); -#line 1967 "cs.ATG" +#line 1975 "cs.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 109) { lexer.NextToken(); -#line 1969 "cs.ATG" +#line 1977 "cs.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 49) { lexer.NextToken(); -#line 1971 "cs.ATG" +#line 1979 "cs.ATG" Expression retExpr = new BaseReferenceExpression(); if (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1973 "cs.ATG" +#line 1981 "cs.ATG" retExpr = new FieldReferenceExpression(retExpr, t.val); } else if (la.kind == 17) { lexer.NextToken(); Expr( -#line 1974 "cs.ATG" +#line 1982 "cs.ATG" out expr); -#line 1974 "cs.ATG" +#line 1982 "cs.ATG" ArrayList indices = new ArrayList(); if (expr != null) { indices.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Expr( -#line 1975 "cs.ATG" +#line 1983 "cs.ATG" out expr); -#line 1975 "cs.ATG" +#line 1983 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(18); -#line 1976 "cs.ATG" +#line 1984 "cs.ATG" retExpr = new IndexerExpression(retExpr, indices); } else SynErr(176); -#line 1977 "cs.ATG" +#line 1985 "cs.ATG" pexpr = retExpr; } else if (la.kind == 87) { lexer.NextToken(); NonArrayType( -#line 1978 "cs.ATG" +#line 1986 "cs.ATG" out type); -#line 1978 "cs.ATG" +#line 1986 "cs.ATG" ArrayList parameters = new ArrayList(); if (la.kind == 19) { lexer.NextToken(); -#line 1983 "cs.ATG" +#line 1991 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); if (StartOf(21)) { Argument( -#line 1984 "cs.ATG" +#line 1992 "cs.ATG" out expr); -#line 1984 "cs.ATG" +#line 1992 "cs.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Argument( -#line 1985 "cs.ATG" +#line 1993 "cs.ATG" out expr); -#line 1985 "cs.ATG" +#line 1993 "cs.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(20); -#line 1987 "cs.ATG" +#line 1995 "cs.ATG" pexpr = oce; } else if (la.kind == 17) { -#line 1989 "cs.ATG" +#line 1997 "cs.ATG" isArrayCreation = true; ArrayCreateExpression ace = new ArrayCreateExpression(type); pexpr = ace; lexer.NextToken(); -#line 1990 "cs.ATG" +#line 1998 "cs.ATG" int dims = 0; ArrayList rank = new ArrayList(); ArrayList parameterExpression = new ArrayList(); if (StartOf(4)) { Expr( -#line 1994 "cs.ATG" +#line 2002 "cs.ATG" out expr); -#line 1994 "cs.ATG" +#line 2002 "cs.ATG" if (expr != null) { parameterExpression.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Expr( -#line 1996 "cs.ATG" +#line 2004 "cs.ATG" out expr); -#line 1996 "cs.ATG" +#line 2004 "cs.ATG" if (expr != null) { parameterExpression.Add(expr); } } Expect(18); -#line 1998 "cs.ATG" +#line 2006 "cs.ATG" parameters.Add(new ArrayCreationParameter(parameterExpression)); ace.Parameters = parameters; while ( -#line 2001 "cs.ATG" +#line 2009 "cs.ATG" IsDims()) { Expect(17); -#line 2001 "cs.ATG" +#line 2009 "cs.ATG" dims =0; while (la.kind == 13) { lexer.NextToken(); -#line 2002 "cs.ATG" +#line 2010 "cs.ATG" dims++; } -#line 2002 "cs.ATG" +#line 2010 "cs.ATG" rank.Add(dims); parameters.Add(new ArrayCreationParameter(dims)); Expect(18); } -#line 2006 "cs.ATG" +#line 2014 "cs.ATG" if (rank.Count > 0) { ace.Rank = (int[])rank.ToArray(typeof (int)); } if (la.kind == 15) { ArrayInitializer( -#line 2010 "cs.ATG" +#line 2018 "cs.ATG" out expr); -#line 2010 "cs.ATG" +#line 2018 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; } } else if (la.kind == 13 || la.kind == 18) { while (la.kind == 13) { lexer.NextToken(); -#line 2012 "cs.ATG" +#line 2020 "cs.ATG" dims++; } -#line 2013 "cs.ATG" +#line 2021 "cs.ATG" parameters.Add(new ArrayCreationParameter(dims)); Expect(18); while ( -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" IsDims()) { Expect(17); -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" dims =0; while (la.kind == 13) { lexer.NextToken(); -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" dims++; } -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" parameters.Add(new ArrayCreationParameter(dims)); Expect(18); } ArrayInitializer( -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" out expr); -#line 2015 "cs.ATG" +#line 2023 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; ace.Parameters = parameters; } else SynErr(177); } else SynErr(178); @@ -4641,192 +4655,192 @@ out expr); lexer.NextToken(); Expect(19); if ( -#line 2021 "cs.ATG" +#line 2029 "cs.ATG" NotVoidPointer()) { Expect(121); -#line 2021 "cs.ATG" +#line 2029 "cs.ATG" type = new TypeReference("void"); } else if (StartOf(8)) { Type( -#line 2022 "cs.ATG" +#line 2030 "cs.ATG" out type); } else SynErr(179); Expect(20); -#line 2023 "cs.ATG" +#line 2031 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 103) { lexer.NextToken(); Expect(19); Type( -#line 2024 "cs.ATG" +#line 2032 "cs.ATG" out type); Expect(20); -#line 2024 "cs.ATG" +#line 2032 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 56) { lexer.NextToken(); Expect(19); Expr( -#line 2025 "cs.ATG" +#line 2033 "cs.ATG" out expr); Expect(20); -#line 2025 "cs.ATG" +#line 2033 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 116) { lexer.NextToken(); Expect(19); Expr( -#line 2026 "cs.ATG" +#line 2034 "cs.ATG" out expr); Expect(20); -#line 2026 "cs.ATG" +#line 2034 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 62) { lexer.NextToken(); AnonymousMethodExpr( -#line 2027 "cs.ATG" +#line 2035 "cs.ATG" out expr); -#line 2027 "cs.ATG" +#line 2035 "cs.ATG" pexpr = expr; } else SynErr(180); while (StartOf(26) || -#line 2048 "cs.ATG" -IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || #line 2056 "cs.ATG" +IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || +#line 2064 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { if (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { lexer.NextToken(); -#line 2031 "cs.ATG" +#line 2039 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); } else if (la.kind == 31) { lexer.NextToken(); -#line 2032 "cs.ATG" +#line 2040 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); } else SynErr(181); } else if (la.kind == 46) { lexer.NextToken(); Expect(1); -#line 2035 "cs.ATG" +#line 2043 "cs.ATG" pexpr = new PointerReferenceExpression(pexpr, t.val); } else if (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 2036 "cs.ATG" +#line 2044 "cs.ATG" pexpr = new FieldReferenceExpression(pexpr, t.val); } else if ( -#line 2048 "cs.ATG" +#line 2056 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) { TypeArgumentList( -#line 2049 "cs.ATG" +#line 2057 "cs.ATG" out typeList); Expect(14); Expect(1); -#line 2050 "cs.ATG" +#line 2058 "cs.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val); } else if (la.kind == 19) { lexer.NextToken(); -#line 2052 "cs.ATG" +#line 2060 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2053 "cs.ATG" +#line 2061 "cs.ATG" out expr); -#line 2053 "cs.ATG" +#line 2061 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 13) { lexer.NextToken(); Argument( -#line 2054 "cs.ATG" +#line 2062 "cs.ATG" out expr); -#line 2054 "cs.ATG" +#line 2062 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(20); -#line 2055 "cs.ATG" +#line 2063 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); } else if ( -#line 2056 "cs.ATG" +#line 2064 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { TypeArgumentList( -#line 2056 "cs.ATG" +#line 2064 "cs.ATG" out typeList); Expect(19); -#line 2057 "cs.ATG" +#line 2065 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2058 "cs.ATG" +#line 2066 "cs.ATG" out expr); -#line 2058 "cs.ATG" +#line 2066 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 13) { lexer.NextToken(); Argument( -#line 2059 "cs.ATG" +#line 2067 "cs.ATG" out expr); -#line 2059 "cs.ATG" +#line 2067 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(20); -#line 2060 "cs.ATG" +#line 2068 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeList); } else { -#line 2062 "cs.ATG" +#line 2070 "cs.ATG" if (isArrayCreation) Error("element access not allow on array creation"); ArrayList indices = new ArrayList(); lexer.NextToken(); Expr( -#line 2065 "cs.ATG" +#line 2073 "cs.ATG" out expr); -#line 2065 "cs.ATG" +#line 2073 "cs.ATG" if (expr != null) { indices.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Expr( -#line 2066 "cs.ATG" +#line 2074 "cs.ATG" out expr); -#line 2066 "cs.ATG" +#line 2074 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(18); -#line 2067 "cs.ATG" +#line 2075 "cs.ATG" pexpr = new IndexerExpression(pexpr, indices); } } } void AnonymousMethodExpr( -#line 2071 "cs.ATG" +#line 2079 "cs.ATG" out Expression outExpr) { -#line 2073 "cs.ATG" +#line 2081 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; Statement stmt; @@ -4836,336 +4850,336 @@ out Expression outExpr) { Expect(19); if (StartOf(9)) { FormalParameterList( -#line 2081 "cs.ATG" +#line 2089 "cs.ATG" p); -#line 2081 "cs.ATG" +#line 2089 "cs.ATG" expr.Parameters = p; } Expect(20); -#line 2085 "cs.ATG" +#line 2093 "cs.ATG" if (compilationUnit != null) { Block( -#line 2086 "cs.ATG" +#line 2094 "cs.ATG" out stmt); -#line 2086 "cs.ATG" +#line 2094 "cs.ATG" expr.Body = (BlockStatement)stmt; -#line 2087 "cs.ATG" +#line 2095 "cs.ATG" } else { Expect(15); -#line 2089 "cs.ATG" +#line 2097 "cs.ATG" lexer.SkipCurrentBlock(); Expect(16); -#line 2091 "cs.ATG" +#line 2099 "cs.ATG" } -#line 2092 "cs.ATG" +#line 2100 "cs.ATG" expr.EndLocation = t.Location; } void TypeArgumentList( -#line 2241 "cs.ATG" +#line 2249 "cs.ATG" out List types) { -#line 2243 "cs.ATG" +#line 2251 "cs.ATG" types = new List(); TypeReference type = null; Expect(22); Type( -#line 2247 "cs.ATG" +#line 2255 "cs.ATG" out type); -#line 2247 "cs.ATG" +#line 2255 "cs.ATG" types.Add(type); while (la.kind == 13) { lexer.NextToken(); Type( -#line 2248 "cs.ATG" +#line 2256 "cs.ATG" out type); -#line 2248 "cs.ATG" +#line 2256 "cs.ATG" types.Add(type); } Expect(21); } void ConditionalAndExpr( -#line 2101 "cs.ATG" +#line 2109 "cs.ATG" ref Expression outExpr) { -#line 2102 "cs.ATG" +#line 2110 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2104 "cs.ATG" +#line 2112 "cs.ATG" ref outExpr); while (la.kind == 24) { lexer.NextToken(); UnaryExpr( -#line 2104 "cs.ATG" +#line 2112 "cs.ATG" out expr); InclusiveOrExpr( -#line 2104 "cs.ATG" +#line 2112 "cs.ATG" ref expr); -#line 2104 "cs.ATG" +#line 2112 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2107 "cs.ATG" +#line 2115 "cs.ATG" ref Expression outExpr) { -#line 2108 "cs.ATG" +#line 2116 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2110 "cs.ATG" +#line 2118 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2110 "cs.ATG" +#line 2118 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2110 "cs.ATG" +#line 2118 "cs.ATG" ref expr); -#line 2110 "cs.ATG" +#line 2118 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2113 "cs.ATG" +#line 2121 "cs.ATG" ref Expression outExpr) { -#line 2114 "cs.ATG" +#line 2122 "cs.ATG" Expression expr; AndExpr( -#line 2116 "cs.ATG" +#line 2124 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2116 "cs.ATG" +#line 2124 "cs.ATG" out expr); AndExpr( -#line 2116 "cs.ATG" +#line 2124 "cs.ATG" ref expr); -#line 2116 "cs.ATG" +#line 2124 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2119 "cs.ATG" +#line 2127 "cs.ATG" ref Expression outExpr) { -#line 2120 "cs.ATG" +#line 2128 "cs.ATG" Expression expr; EqualityExpr( -#line 2122 "cs.ATG" +#line 2130 "cs.ATG" ref outExpr); while (la.kind == 27) { lexer.NextToken(); UnaryExpr( -#line 2122 "cs.ATG" +#line 2130 "cs.ATG" out expr); EqualityExpr( -#line 2122 "cs.ATG" +#line 2130 "cs.ATG" ref expr); -#line 2122 "cs.ATG" +#line 2130 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2125 "cs.ATG" +#line 2133 "cs.ATG" ref Expression outExpr) { -#line 2127 "cs.ATG" +#line 2135 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2131 "cs.ATG" +#line 2139 "cs.ATG" ref outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 33) { lexer.NextToken(); -#line 2134 "cs.ATG" +#line 2142 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2135 "cs.ATG" +#line 2143 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2137 "cs.ATG" +#line 2145 "cs.ATG" out expr); RelationalExpr( -#line 2137 "cs.ATG" +#line 2145 "cs.ATG" ref expr); -#line 2137 "cs.ATG" +#line 2145 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2141 "cs.ATG" +#line 2149 "cs.ATG" ref Expression outExpr) { -#line 2143 "cs.ATG" +#line 2151 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2148 "cs.ATG" +#line 2156 "cs.ATG" ref outExpr); while (StartOf(27)) { if (StartOf(28)) { if (la.kind == 22) { lexer.NextToken(); -#line 2151 "cs.ATG" +#line 2159 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 21) { lexer.NextToken(); -#line 2152 "cs.ATG" +#line 2160 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 35) { lexer.NextToken(); -#line 2153 "cs.ATG" +#line 2161 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 34) { lexer.NextToken(); -#line 2154 "cs.ATG" +#line 2162 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(182); UnaryExpr( -#line 2156 "cs.ATG" +#line 2164 "cs.ATG" out expr); ShiftExpr( -#line 2156 "cs.ATG" +#line 2164 "cs.ATG" ref expr); -#line 2156 "cs.ATG" +#line 2164 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 83) { lexer.NextToken(); -#line 2159 "cs.ATG" +#line 2167 "cs.ATG" op = BinaryOperatorType.TypeCheck; } else if (la.kind == 48) { lexer.NextToken(); -#line 2160 "cs.ATG" +#line 2168 "cs.ATG" op = BinaryOperatorType.AsCast; } else SynErr(183); Type( -#line 2162 "cs.ATG" +#line 2170 "cs.ATG" out type); -#line 2162 "cs.ATG" +#line 2170 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new TypeReferenceExpression(type)); } } } void ShiftExpr( -#line 2166 "cs.ATG" +#line 2174 "cs.ATG" ref Expression outExpr) { -#line 2168 "cs.ATG" +#line 2176 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2172 "cs.ATG" +#line 2180 "cs.ATG" ref outExpr); while (la.kind == 36 || -#line 2175 "cs.ATG" +#line 2183 "cs.ATG" IsShiftRight()) { if (la.kind == 36) { lexer.NextToken(); -#line 2174 "cs.ATG" +#line 2182 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(21); Expect(21); -#line 2176 "cs.ATG" +#line 2184 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" out expr); AdditiveExpr( -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" ref expr); -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2183 "cs.ATG" +#line 2191 "cs.ATG" ref Expression outExpr) { -#line 2185 "cs.ATG" +#line 2193 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2189 "cs.ATG" +#line 2197 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2192 "cs.ATG" +#line 2200 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2193 "cs.ATG" +#line 2201 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2195 "cs.ATG" +#line 2203 "cs.ATG" out expr); MultiplicativeExpr( -#line 2195 "cs.ATG" +#line 2203 "cs.ATG" ref expr); -#line 2195 "cs.ATG" +#line 2203 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2199 "cs.ATG" +#line 2207 "cs.ATG" ref Expression outExpr) { -#line 2201 "cs.ATG" +#line 2209 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5173,57 +5187,57 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2207 "cs.ATG" +#line 2215 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2208 "cs.ATG" +#line 2216 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2209 "cs.ATG" +#line 2217 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2211 "cs.ATG" +#line 2219 "cs.ATG" out expr); -#line 2211 "cs.ATG" +#line 2219 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void TypeParameterConstraintsClauseBase( -#line 2293 "cs.ATG" +#line 2301 "cs.ATG" out TypeReference type) { -#line 2294 "cs.ATG" +#line 2302 "cs.ATG" TypeReference t; type = null; if (la.kind == 107) { lexer.NextToken(); -#line 2296 "cs.ATG" +#line 2304 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 57) { lexer.NextToken(); -#line 2297 "cs.ATG" +#line 2305 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 87) { lexer.NextToken(); Expect(19); Expect(20); -#line 2298 "cs.ATG" +#line 2306 "cs.ATG" type = new TypeReference("struct"); } else if (StartOf(8)) { Type( -#line 2299 "cs.ATG" +#line 2307 "cs.ATG" out t); -#line 2299 "cs.ATG" +#line 2307 "cs.ATG" type = t; } else SynErr(184); } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index c3fded6cec..3dc40eebe6 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -1139,10 +1139,13 @@ StructMemberDecl attributes> | (. m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; + Point startPos = Point.Empty; .) - ( "implicit" | "explicit" (. isImplicit = false; .) ) + ( "implicit" (. startPos = t.Location; .) | "explicit" (. isImplicit = false; startPos = t.Location; .) ) "operator" Type (. TypeReference operatorType = type; .) - "(" Type ident (. string varName = t.val; .) ")" ( Block | ";" (. stmt = null; .) ) + "(" Type ident (. string varName = t.val; .) ")" + (. Point endPos = t.Location; .) + ( Block | ";" (. stmt = null; .) ) (. List parameters = new List(); @@ -1154,6 +1157,8 @@ StructMemberDecl attributes> isImplicit ? ConversionType.Implicit : ConversionType.Explicit ); operatorDeclaration.Body = (BlockStatement)stmt; + operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); + operatorDeclaration.EndLocation = endPos; compilationUnit.AddChild(operatorDeclaration); .) @@ -1175,6 +1180,7 @@ StructMemberDecl attributes> } .)*/ ) + (. Point endPos = t.Location; .) ")" ( Block | ";" ) (. List parameters = new List(); @@ -1188,6 +1194,8 @@ StructMemberDecl attributes> type, op); operatorDeclaration.Body = (BlockStatement)stmt; + operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); + operatorDeclaration.EndLocation = endPos; compilationUnit.AddChild(operatorDeclaration); .) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 95a848b5e9..98c8b201e4 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -350,7 +350,7 @@ out u); void GlobalAttributeSection() { -#line 2005 "VBNET.ATG" +#line 2008 "VBNET.ATG" Point startPos = t.Location; Expect(26); if (la.kind == 48) { @@ -359,20 +359,20 @@ out u); lexer.NextToken(); } else SynErr(204); -#line 2007 "VBNET.ATG" +#line 2010 "VBNET.ATG" string attributeTarget = t.val.ToLower(); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2011 "VBNET.ATG" +#line 2014 "VBNET.ATG" out attribute); -#line 2011 "VBNET.ATG" +#line 2014 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2012 "VBNET.ATG" +#line 2015 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -384,10 +384,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2012 "VBNET.ATG" +#line 2015 "VBNET.ATG" out attribute); -#line 2012 "VBNET.ATG" +#line 2015 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -396,7 +396,7 @@ out attribute); Expect(25); EndOfStmt(); -#line 2017 "VBNET.ATG" +#line 2020 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -528,30 +528,30 @@ out qualident); } void Qualident( -#line 2729 "VBNET.ATG" +#line 2732 "VBNET.ATG" out string qualident) { -#line 2731 "VBNET.ATG" +#line 2734 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2735 "VBNET.ATG" +#line 2738 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2736 "VBNET.ATG" +#line 2739 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2736 "VBNET.ATG" +#line 2739 "VBNET.ATG" out name); -#line 2736 "VBNET.ATG" +#line 2739 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2738 "VBNET.ATG" +#line 2741 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } @@ -565,35 +565,35 @@ out name); } void AttributeSection( -#line 2075 "VBNET.ATG" +#line 2078 "VBNET.ATG" out AttributeSection section) { -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(26); -#line 2081 "VBNET.ATG" +#line 2084 "VBNET.ATG" Point startPos = t.Location; if ( -#line 2082 "VBNET.ATG" +#line 2085 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 92) { lexer.NextToken(); -#line 2083 "VBNET.ATG" +#line 2086 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2084 "VBNET.ATG" +#line 2087 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2087 "VBNET.ATG" +#line 2090 "VBNET.ATG" string val = t.val.ToLower(); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -606,20 +606,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2097 "VBNET.ATG" +#line 2100 "VBNET.ATG" out attribute); -#line 2097 "VBNET.ATG" +#line 2100 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" out attribute); -#line 2098 "VBNET.ATG" +#line 2101 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -627,7 +627,7 @@ out attribute); } Expect(25); -#line 2102 "VBNET.ATG" +#line 2105 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -635,62 +635,62 @@ out attribute); } void TypeModifier( -#line 2938 "VBNET.ATG" +#line 2940 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2939 "VBNET.ATG" +#line 2941 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2940 "VBNET.ATG" +#line 2942 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 98: { lexer.NextToken(); -#line 2941 "VBNET.ATG" +#line 2943 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2942 "VBNET.ATG" +#line 2944 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2943 "VBNET.ATG" +#line 2945 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2944 "VBNET.ATG" +#line 2946 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 121: { lexer.NextToken(); -#line 2945 "VBNET.ATG" +#line 2947 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 130: { lexer.NextToken(); -#line 2946 "VBNET.ATG" +#line 2948 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } @@ -1056,19 +1056,19 @@ out constraint); } void TypeName( -#line 1925 "VBNET.ATG" +#line 1928 "VBNET.ATG" out TypeReference typeref) { -#line 1926 "VBNET.ATG" +#line 1929 "VBNET.ATG" ArrayList rank = null; typeref = null; NonArrayTypeName( -#line 1928 "VBNET.ATG" +#line 1931 "VBNET.ATG" out typeref); ArrayTypeModifiers( -#line 1929 "VBNET.ATG" +#line 1932 "VBNET.ATG" out rank); -#line 1931 "VBNET.ATG" +#line 1934 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -1090,28 +1090,28 @@ out typeRef); } void TypeImplementsClause( -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" out List baseInterfaces) { -#line 1580 "VBNET.ATG" +#line 1583 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(106); TypeName( -#line 1583 "VBNET.ATG" +#line 1586 "VBNET.ATG" out type); -#line 1585 "VBNET.ATG" +#line 1588 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1588 "VBNET.ATG" +#line 1591 "VBNET.ATG" out type); -#line 1589 "VBNET.ATG" +#line 1592 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1229,114 +1229,114 @@ m, attributes); } void PrimitiveTypeName( -#line 2911 "VBNET.ATG" +#line 2914 "VBNET.ATG" out string type) { -#line 2912 "VBNET.ATG" +#line 2915 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2916 "VBNET.ATG" type = "Boolean"; break; } case 75: { lexer.NextToken(); -#line 2914 "VBNET.ATG" +#line 2917 "VBNET.ATG" type = "Date"; break; } case 64: { lexer.NextToken(); -#line 2915 "VBNET.ATG" +#line 2918 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2916 "VBNET.ATG" +#line 2919 "VBNET.ATG" type = "String"; break; } case 76: { lexer.NextToken(); -#line 2917 "VBNET.ATG" +#line 2920 "VBNET.ATG" type = "Decimal"; break; } case 53: { lexer.NextToken(); -#line 2918 "VBNET.ATG" +#line 2921 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2919 "VBNET.ATG" +#line 2922 "VBNET.ATG" type = "Short"; break; } case 110: { lexer.NextToken(); -#line 2920 "VBNET.ATG" +#line 2923 "VBNET.ATG" type = "Integer"; break; } case 116: { lexer.NextToken(); -#line 2921 "VBNET.ATG" +#line 2924 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2922 "VBNET.ATG" +#line 2925 "VBNET.ATG" type = "Single"; break; } case 83: { lexer.NextToken(); -#line 2923 "VBNET.ATG" +#line 2926 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2924 "VBNET.ATG" +#line 2927 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2925 "VBNET.ATG" +#line 2928 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2926 "VBNET.ATG" +#line 2929 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2927 "VBNET.ATG" +#line 2930 "VBNET.ATG" type = "SByte"; break; } @@ -1367,27 +1367,27 @@ out f); } void InterfaceBase( -#line 1563 "VBNET.ATG" +#line 1566 "VBNET.ATG" out List bases) { -#line 1565 "VBNET.ATG" +#line 1568 "VBNET.ATG" TypeReference type; bases = new List(); Expect(109); TypeName( -#line 1569 "VBNET.ATG" +#line 1572 "VBNET.ATG" out type); -#line 1569 "VBNET.ATG" +#line 1572 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1572 "VBNET.ATG" +#line 1575 "VBNET.ATG" out type); -#line 1572 "VBNET.ATG" +#line 1575 "VBNET.ATG" bases.Add(type); } Expect(1); @@ -1408,27 +1408,27 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2109 "VBNET.ATG" +#line 2112 "VBNET.ATG" List parameter) { -#line 2111 "VBNET.ATG" +#line 2114 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 2115 "VBNET.ATG" +#line 2118 "VBNET.ATG" out section); -#line 2115 "VBNET.ATG" +#line 2118 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2117 "VBNET.ATG" +#line 2120 "VBNET.ATG" out p); -#line 2119 "VBNET.ATG" +#line 2122 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1436,166 +1436,166 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2124 "VBNET.ATG" +#line 2127 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 26) { AttributeSection( -#line 2125 "VBNET.ATG" +#line 2128 "VBNET.ATG" out section); -#line 2125 "VBNET.ATG" +#line 2128 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2127 "VBNET.ATG" +#line 2130 "VBNET.ATG" out p); -#line 2127 "VBNET.ATG" +#line 2130 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2949 "VBNET.ATG" +#line 2951 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 121: { lexer.NextToken(); -#line 2950 "VBNET.ATG" +#line 2952 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 78: { lexer.NextToken(); -#line 2951 "VBNET.ATG" +#line 2953 "VBNET.ATG" m.Add(Modifier.Default, t.Location); break; } case 98: { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2954 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2953 "VBNET.ATG" +#line 2955 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2954 "VBNET.ATG" +#line 2956 "VBNET.ATG" m.Add(Modifier.Override, t.Location); break; } case 122: { lexer.NextToken(); -#line 2955 "VBNET.ATG" +#line 2957 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 2956 "VBNET.ATG" +#line 2958 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 2957 "VBNET.ATG" +#line 2959 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 2958 "VBNET.ATG" +#line 2960 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 130: { lexer.NextToken(); -#line 2959 "VBNET.ATG" +#line 2961 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 131: { lexer.NextToken(); -#line 2960 "VBNET.ATG" +#line 2962 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 2961 "VBNET.ATG" +#line 2963 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 140: { lexer.NextToken(); -#line 2962 "VBNET.ATG" +#line 2964 "VBNET.ATG" m.Add(Modifier.Virtual, t.Location); break; } case 139: { lexer.NextToken(); -#line 2963 "VBNET.ATG" +#line 2965 "VBNET.ATG" m.Add(Modifier.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 2964 "VBNET.ATG" +#line 2966 "VBNET.ATG" break; } case 184: { lexer.NextToken(); -#line 2965 "VBNET.ATG" +#line 2967 "VBNET.ATG" break; } case 183: { lexer.NextToken(); -#line 2966 "VBNET.ATG" +#line 2968 "VBNET.ATG" m.Add(Modifier.WithEvents, t.Location); break; } case 80: { lexer.NextToken(); -#line 2967 "VBNET.ATG" +#line 2969 "VBNET.ATG" m.Add(Modifier.Dim, t.Location); break; } case 198: { lexer.NextToken(); -#line 2968 "VBNET.ATG" +#line 2970 "VBNET.ATG" m.Add(Modifier.Widening, t.Location); break; } case 197: { lexer.NextToken(); -#line 2969 "VBNET.ATG" +#line 2971 "VBNET.ATG" m.Add(Modifier.Narrowing, t.Location); break; } @@ -2277,29 +2277,35 @@ out operandType); parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); } Expect(24); + +#line 1272 "VBNET.ATG" + Point endPos = t.EndLocation; if (la.kind == 47) { lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 1272 "VBNET.ATG" +#line 1273 "VBNET.ATG" out section); -#line 1272 "VBNET.ATG" +#line 1273 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1272 "VBNET.ATG" +#line 1273 "VBNET.ATG" out returnType); + +#line 1273 "VBNET.ATG" + endPos = t.EndLocation; Expect(1); } Block( -#line 1273 "VBNET.ATG" +#line 1274 "VBNET.ATG" out stmt); Expect(87); Expect(187); Expect(1); -#line 1275 "VBNET.ATG" +#line 1276 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, attributes, parameters, @@ -2310,7 +2316,9 @@ out stmt); operatorDeclaration.ReturnTypeAttributes = returnTypeAttributes; operatorDeclaration.Body = (BlockStatement)stmt; operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); - operatorDeclaration.EndLocation = t.EndLocation; + operatorDeclaration.EndLocation = endPos; + operatorDeclaration.Body.StartLocation = startPos; + operatorDeclaration.Body.EndLocation = t.Location; compilationUnit.AddChild(operatorDeclaration); break; @@ -2533,18 +2541,18 @@ mod, attributes); } void Expr( -#line 1617 "VBNET.ATG" +#line 1620 "VBNET.ATG" out Expression expr) { ConditionalOrExpr( -#line 1619 "VBNET.ATG" +#line 1622 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1595 "VBNET.ATG" +#line 1598 "VBNET.ATG" out ArrayList baseInterfaces) { -#line 1597 "VBNET.ATG" +#line 1600 "VBNET.ATG" baseInterfaces = new ArrayList(); string typename = String.Empty; string first; @@ -2552,76 +2560,76 @@ out ArrayList baseInterfaces) { Expect(106); Identifier(); -#line 1601 "VBNET.ATG" +#line 1604 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1601 "VBNET.ATG" +#line 1604 "VBNET.ATG" out typename); -#line 1601 "VBNET.ATG" +#line 1604 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); while (la.kind == 12) { lexer.NextToken(); Identifier(); -#line 1602 "VBNET.ATG" +#line 1605 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1602 "VBNET.ATG" +#line 1605 "VBNET.ATG" out typename); -#line 1602 "VBNET.ATG" +#line 1605 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); } } void HandlesClause( -#line 1553 "VBNET.ATG" +#line 1556 "VBNET.ATG" out ArrayList handlesClause) { -#line 1555 "VBNET.ATG" +#line 1558 "VBNET.ATG" handlesClause = new ArrayList(); string name; Expect(104); EventMemberSpecifier( -#line 1558 "VBNET.ATG" +#line 1561 "VBNET.ATG" out name); -#line 1558 "VBNET.ATG" +#line 1561 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1559 "VBNET.ATG" +#line 1562 "VBNET.ATG" out name); -#line 1559 "VBNET.ATG" +#line 1562 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2165 "VBNET.ATG" +#line 2168 "VBNET.ATG" out Statement stmt) { -#line 2168 "VBNET.ATG" +#line 2171 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(16) || -#line 2173 "VBNET.ATG" +#line 2176 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2173 "VBNET.ATG" +#line 2176 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); EndOfStmt(); -#line 2173 "VBNET.ATG" +#line 2176 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2629,7 +2637,7 @@ IsEndStmtAhead()) { } } -#line 2179 "VBNET.ATG" +#line 2182 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2637,65 +2645,65 @@ IsEndStmtAhead()) { } void Charset( -#line 1545 "VBNET.ATG" +#line 1548 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1546 "VBNET.ATG" +#line 1549 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 99 || la.kind == 167) { } else if (la.kind == 46) { lexer.NextToken(); -#line 1547 "VBNET.ATG" +#line 1550 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 49) { lexer.NextToken(); -#line 1548 "VBNET.ATG" +#line 1551 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1549 "VBNET.ATG" +#line 1552 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(225); } void VariableDeclarator( -#line 1463 "VBNET.ATG" +#line 1466 "VBNET.ATG" List fieldDeclaration) { -#line 1465 "VBNET.ATG" +#line 1468 "VBNET.ATG" Expression expr = null; TypeReference type = null;ArrayList rank = null;ArrayList dimension = null; Identifier(); -#line 1468 "VBNET.ATG" +#line 1471 "VBNET.ATG" string name = t.val; if ( -#line 1469 "VBNET.ATG" +#line 1472 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1469 "VBNET.ATG" +#line 1472 "VBNET.ATG" out rank); } if ( -#line 1470 "VBNET.ATG" +#line 1473 "VBNET.ATG" IsSize()) { ArrayInitializationModifier( -#line 1470 "VBNET.ATG" +#line 1473 "VBNET.ATG" out dimension); } if ( -#line 1472 "VBNET.ATG" +#line 1475 "VBNET.ATG" IsObjectCreation()) { Expect(47); ObjectCreateExpression( -#line 1472 "VBNET.ATG" +#line 1475 "VBNET.ATG" out expr); -#line 1474 "VBNET.ATG" +#line 1477 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2706,11 +2714,11 @@ out expr); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1481 "VBNET.ATG" +#line 1484 "VBNET.ATG" out type); } -#line 1483 "VBNET.ATG" +#line 1486 "VBNET.ATG" if (type != null && rank != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2722,40 +2730,40 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1491 "VBNET.ATG" +#line 1494 "VBNET.ATG" out expr); } } else SynErr(226); -#line 1493 "VBNET.ATG" +#line 1496 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void ConstantDeclarator( -#line 1446 "VBNET.ATG" +#line 1449 "VBNET.ATG" List constantDeclaration) { -#line 1448 "VBNET.ATG" +#line 1451 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1452 "VBNET.ATG" +#line 1455 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1453 "VBNET.ATG" +#line 1456 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1454 "VBNET.ATG" +#line 1457 "VBNET.ATG" out expr); -#line 1456 "VBNET.ATG" +#line 1459 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2763,10 +2771,10 @@ out expr); } void AccessorDecls( -#line 1390 "VBNET.ATG" +#line 1393 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1392 "VBNET.ATG" +#line 1395 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2774,60 +2782,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 26) { AttributeSection( -#line 1397 "VBNET.ATG" +#line 1400 "VBNET.ATG" out section); -#line 1397 "VBNET.ATG" +#line 1400 "VBNET.ATG" attributes.Add(section); } if (la.kind == 100) { GetAccessorDecl( -#line 1399 "VBNET.ATG" +#line 1402 "VBNET.ATG" out getBlock, attributes); if (la.kind == 26 || la.kind == 156) { -#line 1401 "VBNET.ATG" +#line 1404 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1402 "VBNET.ATG" +#line 1405 "VBNET.ATG" out section); -#line 1402 "VBNET.ATG" +#line 1405 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1403 "VBNET.ATG" +#line 1406 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1406 "VBNET.ATG" +#line 1409 "VBNET.ATG" out setBlock, attributes); if (la.kind == 26 || la.kind == 100) { -#line 1408 "VBNET.ATG" +#line 1411 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1409 "VBNET.ATG" +#line 1412 "VBNET.ATG" out section); -#line 1409 "VBNET.ATG" +#line 1412 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1410 "VBNET.ATG" +#line 1413 "VBNET.ATG" out getBlock, attributes); } } else SynErr(227); } void EventAccessorDeclaration( -#line 1353 "VBNET.ATG" +#line 1356 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1355 "VBNET.ATG" +#line 1358 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2836,10 +2844,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 26) { AttributeSection( -#line 1361 "VBNET.ATG" +#line 1364 "VBNET.ATG" out section); -#line 1361 "VBNET.ATG" +#line 1364 "VBNET.ATG" attributes.Add(section); } if (la.kind == 41) { @@ -2848,20 +2856,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1363 "VBNET.ATG" +#line 1366 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1364 "VBNET.ATG" +#line 1367 "VBNET.ATG" out stmt); Expect(87); Expect(41); Expect(1); -#line 1366 "VBNET.ATG" +#line 1369 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2872,20 +2880,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1371 "VBNET.ATG" +#line 1374 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1372 "VBNET.ATG" +#line 1375 "VBNET.ATG" out stmt); Expect(87); Expect(152); Expect(1); -#line 1374 "VBNET.ATG" +#line 1377 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2896,20 +2904,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1379 "VBNET.ATG" +#line 1382 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1380 "VBNET.ATG" +#line 1383 "VBNET.ATG" out stmt); Expect(87); Expect(149); Expect(1); -#line 1382 "VBNET.ATG" +#line 1385 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2918,163 +2926,163 @@ out stmt); } void OverloadableOperator( -#line 1290 "VBNET.ATG" +#line 1293 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1291 "VBNET.ATG" +#line 1294 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 14: { lexer.NextToken(); -#line 1293 "VBNET.ATG" +#line 1296 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 15: { lexer.NextToken(); -#line 1295 "VBNET.ATG" +#line 1298 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 16: { lexer.NextToken(); -#line 1297 "VBNET.ATG" +#line 1300 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 17: { lexer.NextToken(); -#line 1299 "VBNET.ATG" +#line 1302 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 18: { lexer.NextToken(); -#line 1301 "VBNET.ATG" +#line 1304 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 19: { lexer.NextToken(); -#line 1303 "VBNET.ATG" +#line 1306 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 115: { lexer.NextToken(); -#line 1305 "VBNET.ATG" +#line 1308 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 119: { lexer.NextToken(); -#line 1307 "VBNET.ATG" +#line 1310 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 44: { lexer.NextToken(); -#line 1309 "VBNET.ATG" +#line 1312 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 137: { lexer.NextToken(); -#line 1311 "VBNET.ATG" +#line 1314 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 185: { lexer.NextToken(); -#line 1313 "VBNET.ATG" +#line 1316 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1315 "VBNET.ATG" +#line 1318 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 30: { lexer.NextToken(); -#line 1317 "VBNET.ATG" +#line 1320 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 31: { lexer.NextToken(); -#line 1319 "VBNET.ATG" +#line 1322 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 11: { lexer.NextToken(); -#line 1321 "VBNET.ATG" +#line 1324 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 1323 "VBNET.ATG" +#line 1326 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 26: { lexer.NextToken(); -#line 1325 "VBNET.ATG" +#line 1328 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 29: { lexer.NextToken(); -#line 1327 "VBNET.ATG" +#line 1330 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 25: { lexer.NextToken(); -#line 1329 "VBNET.ATG" +#line 1332 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 28: { lexer.NextToken(); -#line 1331 "VBNET.ATG" +#line 1334 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 74: { lexer.NextToken(); -#line 1333 "VBNET.ATG" +#line 1336 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 50: case 69: case 169: { Identifier(); -#line 1337 "VBNET.ATG" +#line 1340 "VBNET.ATG" string opName = t.val; switch(opName.ToLower()) { @@ -3096,18 +3104,18 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1416 "VBNET.ATG" +#line 1419 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1417 "VBNET.ATG" +#line 1420 "VBNET.ATG" Statement stmt = null; Expect(100); Expect(1); Block( -#line 1420 "VBNET.ATG" +#line 1423 "VBNET.ATG" out stmt); -#line 1422 "VBNET.ATG" +#line 1425 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(87); @@ -3116,10 +3124,10 @@ out stmt); } void SetAccessorDecl( -#line 1429 "VBNET.ATG" +#line 1432 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1431 "VBNET.ATG" +#line 1434 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); @@ -3127,17 +3135,17 @@ out PropertySetRegion setBlock, List attributes) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1434 "VBNET.ATG" +#line 1437 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1436 "VBNET.ATG" +#line 1439 "VBNET.ATG" out stmt); -#line 1438 "VBNET.ATG" +#line 1441 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; @@ -3147,36 +3155,36 @@ out stmt); } void ArrayNameModifier( -#line 1957 "VBNET.ATG" +#line 1960 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1959 "VBNET.ATG" +#line 1962 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1961 "VBNET.ATG" +#line 1964 "VBNET.ATG" out arrayModifiers); } void ArrayInitializationModifier( -#line 1497 "VBNET.ATG" +#line 1500 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1499 "VBNET.ATG" +#line 1502 "VBNET.ATG" arrayModifiers = null; Expect(23); InitializationRankList( -#line 1501 "VBNET.ATG" +#line 1504 "VBNET.ATG" out arrayModifiers); Expect(24); } void ObjectCreateExpression( -#line 1873 "VBNET.ATG" +#line 1876 "VBNET.ATG" out Expression oce) { -#line 1875 "VBNET.ATG" +#line 1878 "VBNET.ATG" TypeReference type = null; Expression initializer = null; ArrayList arguments = null; @@ -3184,24 +3192,24 @@ out Expression oce) { Expect(126); NonArrayTypeName( -#line 1880 "VBNET.ATG" +#line 1883 "VBNET.ATG" out type); if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 1881 "VBNET.ATG" +#line 1884 "VBNET.ATG" out arguments); } Expect(24); } if (la.kind == 21) { ArrayInitializer( -#line 1882 "VBNET.ATG" +#line 1885 "VBNET.ATG" out initializer); } -#line 1884 "VBNET.ATG" +#line 1887 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -3213,98 +3221,98 @@ out initializer); } void VariableInitializer( -#line 1517 "VBNET.ATG" +#line 1520 "VBNET.ATG" out Expression initializerExpression) { -#line 1519 "VBNET.ATG" +#line 1522 "VBNET.ATG" initializerExpression = null; if (StartOf(19)) { Expr( -#line 1521 "VBNET.ATG" +#line 1524 "VBNET.ATG" out initializerExpression); } else if (la.kind == 21) { ArrayInitializer( -#line 1522 "VBNET.ATG" +#line 1525 "VBNET.ATG" out initializerExpression); } else SynErr(230); } void InitializationRankList( -#line 1505 "VBNET.ATG" +#line 1508 "VBNET.ATG" out ArrayList rank) { -#line 1507 "VBNET.ATG" +#line 1510 "VBNET.ATG" rank = null; Expression expr = null; Expr( -#line 1510 "VBNET.ATG" +#line 1513 "VBNET.ATG" out expr); -#line 1510 "VBNET.ATG" +#line 1513 "VBNET.ATG" rank = new ArrayList(); if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1512 "VBNET.ATG" +#line 1515 "VBNET.ATG" out expr); -#line 1512 "VBNET.ATG" +#line 1515 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1526 "VBNET.ATG" +#line 1529 "VBNET.ATG" out Expression outExpr) { -#line 1528 "VBNET.ATG" +#line 1531 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(21); if (StartOf(20)) { VariableInitializer( -#line 1533 "VBNET.ATG" +#line 1536 "VBNET.ATG" out expr); -#line 1535 "VBNET.ATG" +#line 1538 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1538 "VBNET.ATG" +#line 1541 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1538 "VBNET.ATG" +#line 1541 "VBNET.ATG" out expr); -#line 1539 "VBNET.ATG" +#line 1542 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(22); -#line 1542 "VBNET.ATG" +#line 1545 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1605 "VBNET.ATG" +#line 1608 "VBNET.ATG" out string name) { -#line 1606 "VBNET.ATG" +#line 1609 "VBNET.ATG" string type; name = String.Empty; if (StartOf(10)) { Identifier(); -#line 1607 "VBNET.ATG" +#line 1610 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1609 "VBNET.ATG" +#line 1612 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 123) { lexer.NextToken(); @@ -3312,42 +3320,42 @@ out string name) { if (StartOf(10)) { Identifier(); -#line 1612 "VBNET.ATG" +#line 1615 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 91) { lexer.NextToken(); -#line 1613 "VBNET.ATG" +#line 1616 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(231); } else SynErr(232); } void ConditionalOrExpr( -#line 1752 "VBNET.ATG" +#line 1755 "VBNET.ATG" out Expression outExpr) { -#line 1753 "VBNET.ATG" +#line 1756 "VBNET.ATG" Expression expr; ConditionalAndExpr( -#line 1754 "VBNET.ATG" +#line 1757 "VBNET.ATG" out outExpr); while (la.kind == 138) { lexer.NextToken(); ConditionalAndExpr( -#line 1754 "VBNET.ATG" +#line 1757 "VBNET.ATG" out expr); -#line 1754 "VBNET.ATG" +#line 1757 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void UnaryExpr( -#line 1626 "VBNET.ATG" +#line 1629 "VBNET.ATG" out Expression uExpr) { -#line 1628 "VBNET.ATG" +#line 1631 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -3356,25 +3364,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1632 "VBNET.ATG" +#line 1635 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1633 "VBNET.ATG" +#line 1636 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1635 "VBNET.ATG" +#line 1638 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } SimpleExpr( -#line 1637 "VBNET.ATG" +#line 1640 "VBNET.ATG" out expr); -#line 1639 "VBNET.ATG" +#line 1642 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -3384,139 +3392,139 @@ out expr); } void SimpleExpr( -#line 1662 "VBNET.ATG" +#line 1665 "VBNET.ATG" out Expression pexpr) { -#line 1664 "VBNET.ATG" +#line 1667 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; pexpr = null; if (StartOf(21) || -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" la.kind == Tokens.Global) { if (la.kind == 3) { lexer.NextToken(); -#line 1672 "VBNET.ATG" +#line 1675 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 4) { lexer.NextToken(); -#line 1673 "VBNET.ATG" +#line 1676 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 7) { lexer.NextToken(); -#line 1674 "VBNET.ATG" +#line 1677 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 6) { lexer.NextToken(); -#line 1675 "VBNET.ATG" +#line 1678 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 5) { lexer.NextToken(); -#line 1676 "VBNET.ATG" +#line 1679 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 9) { lexer.NextToken(); -#line 1677 "VBNET.ATG" +#line 1680 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 8) { lexer.NextToken(); -#line 1678 "VBNET.ATG" +#line 1681 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 173) { lexer.NextToken(); -#line 1680 "VBNET.ATG" +#line 1683 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 95) { lexer.NextToken(); -#line 1681 "VBNET.ATG" +#line 1684 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 129) { lexer.NextToken(); -#line 1682 "VBNET.ATG" +#line 1685 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 23) { lexer.NextToken(); Expr( -#line 1683 "VBNET.ATG" +#line 1686 "VBNET.ATG" out expr); Expect(24); -#line 1683 "VBNET.ATG" +#line 1686 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(10)) { Identifier(); -#line 1684 "VBNET.ATG" +#line 1687 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); } else if (StartOf(22)) { -#line 1685 "VBNET.ATG" +#line 1688 "VBNET.ATG" string val = String.Empty; PrimitiveTypeName( -#line 1685 "VBNET.ATG" +#line 1688 "VBNET.ATG" out val); Expect(10); -#line 1686 "VBNET.ATG" +#line 1689 "VBNET.ATG" t.val = ""; Identifier(); -#line 1686 "VBNET.ATG" +#line 1689 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 118) { lexer.NextToken(); -#line 1687 "VBNET.ATG" +#line 1690 "VBNET.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 123 || la.kind == 124) { -#line 1688 "VBNET.ATG" +#line 1691 "VBNET.ATG" Expression retExpr = null; if (la.kind == 123) { lexer.NextToken(); -#line 1689 "VBNET.ATG" +#line 1692 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 124) { lexer.NextToken(); -#line 1690 "VBNET.ATG" +#line 1693 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(233); Expect(10); IdentifierOrKeyword( -#line 1692 "VBNET.ATG" +#line 1695 "VBNET.ATG" out name); -#line 1692 "VBNET.ATG" +#line 1695 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); } else if ( -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" la.kind == Tokens.Global) { TypeName( -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" out type); -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); } else if (la.kind == 126) { ObjectCreateExpression( -#line 1694 "VBNET.ATG" +#line 1697 "VBNET.ATG" out expr); -#line 1694 "VBNET.ATG" +#line 1697 "VBNET.ATG" pexpr = expr; } else if (la.kind == 74 || la.kind == 81) { if (la.kind == 81) { @@ -3526,166 +3534,166 @@ out expr); } else SynErr(234); Expect(23); Expr( -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" out type); Expect(24); -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" pexpr = new CastExpression(type, expr); } else if (la.kind == 195) { lexer.NextToken(); Expect(23); Expr( -#line 1696 "VBNET.ATG" +#line 1699 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1696 "VBNET.ATG" +#line 1699 "VBNET.ATG" out type); Expect(24); -#line 1696 "VBNET.ATG" +#line 1699 "VBNET.ATG" pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); } else if (StartOf(23)) { CastTarget( -#line 1697 "VBNET.ATG" +#line 1700 "VBNET.ATG" out type); Expect(23); Expr( -#line 1697 "VBNET.ATG" +#line 1700 "VBNET.ATG" out expr); Expect(24); -#line 1697 "VBNET.ATG" +#line 1700 "VBNET.ATG" pexpr = new CastExpression(type, expr, true); } else if (la.kind == 42) { lexer.NextToken(); Expr( -#line 1698 "VBNET.ATG" +#line 1701 "VBNET.ATG" out expr); -#line 1698 "VBNET.ATG" +#line 1701 "VBNET.ATG" pexpr = new AddressOfExpression(expr); } else if (la.kind == 101) { lexer.NextToken(); Expect(23); TypeName( -#line 1699 "VBNET.ATG" +#line 1702 "VBNET.ATG" out type); Expect(24); -#line 1699 "VBNET.ATG" +#line 1702 "VBNET.ATG" pexpr = new TypeOfExpression(type); } else { lexer.NextToken(); SimpleExpr( -#line 1700 "VBNET.ATG" +#line 1703 "VBNET.ATG" out expr); Expect(112); TypeName( -#line 1700 "VBNET.ATG" +#line 1703 "VBNET.ATG" out type); -#line 1700 "VBNET.ATG" +#line 1703 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); } while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1703 "VBNET.ATG" +#line 1706 "VBNET.ATG" out name); -#line 1703 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1704 "VBNET.ATG" +#line 1707 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(24)) { if (StartOf(19)) { Argument( -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" out expr); -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } while (la.kind == 12) { lexer.NextToken(); if (StartOf(19)) { Argument( -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" out expr); -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } } Expect(24); -#line 1712 "VBNET.ATG" +#line 1715 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1716 "VBNET.ATG" +#line 1719 "VBNET.ATG" out name); -#line 1716 "VBNET.ATG" +#line 1719 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1718 "VBNET.ATG" +#line 1721 "VBNET.ATG" out name); -#line 1718 "VBNET.ATG" +#line 1721 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1719 "VBNET.ATG" +#line 1722 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(24)) { -#line 1721 "VBNET.ATG" +#line 1724 "VBNET.ATG" expr = null; if (StartOf(19)) { Argument( -#line 1721 "VBNET.ATG" +#line 1724 "VBNET.ATG" out expr); } -#line 1721 "VBNET.ATG" +#line 1724 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1723 "VBNET.ATG" +#line 1726 "VBNET.ATG" expr = null; if (StartOf(19)) { Argument( -#line 1724 "VBNET.ATG" +#line 1727 "VBNET.ATG" out expr); } -#line 1724 "VBNET.ATG" +#line 1727 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(24); -#line 1727 "VBNET.ATG" +#line 1730 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } @@ -3693,79 +3701,79 @@ out expr); } void AssignmentOperator( -#line 1647 "VBNET.ATG" +#line 1650 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1648 "VBNET.ATG" +#line 1651 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1649 "VBNET.ATG" +#line 1652 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 40: { lexer.NextToken(); -#line 1650 "VBNET.ATG" +#line 1653 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 32: { lexer.NextToken(); -#line 1651 "VBNET.ATG" +#line 1654 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 34: { lexer.NextToken(); -#line 1652 "VBNET.ATG" +#line 1655 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 35: { lexer.NextToken(); -#line 1653 "VBNET.ATG" +#line 1656 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 36: { lexer.NextToken(); -#line 1654 "VBNET.ATG" +#line 1657 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 37: { lexer.NextToken(); -#line 1655 "VBNET.ATG" +#line 1658 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 33: { lexer.NextToken(); -#line 1656 "VBNET.ATG" +#line 1659 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 38: { lexer.NextToken(); -#line 1657 "VBNET.ATG" +#line 1660 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 39: { lexer.NextToken(); -#line 1658 "VBNET.ATG" +#line 1661 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3774,1074 +3782,1074 @@ out AssignmentOperatorType op) { } void IdentifierOrKeyword( -#line 2750 "VBNET.ATG" +#line 2753 "VBNET.ATG" out string name) { -#line 2752 "VBNET.ATG" +#line 2755 "VBNET.ATG" name = String.Empty; switch (la.kind) { case 2: case 50: case 69: case 169: { Identifier(); -#line 2755 "VBNET.ATG" +#line 2758 "VBNET.ATG" name = t.val; break; } case 41: { lexer.NextToken(); -#line 2756 "VBNET.ATG" +#line 2759 "VBNET.ATG" name = t.val; break; } case 42: { lexer.NextToken(); -#line 2757 "VBNET.ATG" +#line 2760 "VBNET.ATG" name = t.val; break; } case 43: { lexer.NextToken(); -#line 2758 "VBNET.ATG" +#line 2761 "VBNET.ATG" name = t.val; break; } case 44: { lexer.NextToken(); -#line 2759 "VBNET.ATG" +#line 2762 "VBNET.ATG" name = t.val; break; } case 45: { lexer.NextToken(); -#line 2760 "VBNET.ATG" +#line 2763 "VBNET.ATG" name = t.val; break; } case 46: { lexer.NextToken(); -#line 2761 "VBNET.ATG" +#line 2764 "VBNET.ATG" name = t.val; break; } case 47: { lexer.NextToken(); -#line 2762 "VBNET.ATG" +#line 2765 "VBNET.ATG" name = t.val; break; } case 48: { lexer.NextToken(); -#line 2763 "VBNET.ATG" +#line 2766 "VBNET.ATG" name = t.val; break; } case 49: { lexer.NextToken(); -#line 2764 "VBNET.ATG" +#line 2767 "VBNET.ATG" name = t.val; break; } case 51: { lexer.NextToken(); -#line 2765 "VBNET.ATG" +#line 2768 "VBNET.ATG" name = t.val; break; } case 52: { lexer.NextToken(); -#line 2766 "VBNET.ATG" +#line 2769 "VBNET.ATG" name = t.val; break; } case 53: { lexer.NextToken(); -#line 2767 "VBNET.ATG" +#line 2770 "VBNET.ATG" name = t.val; break; } case 54: { lexer.NextToken(); -#line 2768 "VBNET.ATG" +#line 2771 "VBNET.ATG" name = t.val; break; } case 55: { lexer.NextToken(); -#line 2769 "VBNET.ATG" +#line 2772 "VBNET.ATG" name = t.val; break; } case 56: { lexer.NextToken(); -#line 2770 "VBNET.ATG" +#line 2773 "VBNET.ATG" name = t.val; break; } case 57: { lexer.NextToken(); -#line 2771 "VBNET.ATG" +#line 2774 "VBNET.ATG" name = t.val; break; } case 58: { lexer.NextToken(); -#line 2772 "VBNET.ATG" +#line 2775 "VBNET.ATG" name = t.val; break; } case 59: { lexer.NextToken(); -#line 2773 "VBNET.ATG" +#line 2776 "VBNET.ATG" name = t.val; break; } case 60: { lexer.NextToken(); -#line 2774 "VBNET.ATG" +#line 2777 "VBNET.ATG" name = t.val; break; } case 61: { lexer.NextToken(); -#line 2775 "VBNET.ATG" +#line 2778 "VBNET.ATG" name = t.val; break; } case 62: { lexer.NextToken(); -#line 2776 "VBNET.ATG" +#line 2779 "VBNET.ATG" name = t.val; break; } case 63: { lexer.NextToken(); -#line 2777 "VBNET.ATG" +#line 2780 "VBNET.ATG" name = t.val; break; } case 64: { lexer.NextToken(); -#line 2778 "VBNET.ATG" +#line 2781 "VBNET.ATG" name = t.val; break; } case 65: { lexer.NextToken(); -#line 2779 "VBNET.ATG" +#line 2782 "VBNET.ATG" name = t.val; break; } case 66: { lexer.NextToken(); -#line 2780 "VBNET.ATG" +#line 2783 "VBNET.ATG" name = t.val; break; } case 67: { lexer.NextToken(); -#line 2781 "VBNET.ATG" +#line 2784 "VBNET.ATG" name = t.val; break; } case 68: { lexer.NextToken(); -#line 2782 "VBNET.ATG" +#line 2785 "VBNET.ATG" name = t.val; break; } case 70: { lexer.NextToken(); -#line 2783 "VBNET.ATG" +#line 2786 "VBNET.ATG" name = t.val; break; } case 71: { lexer.NextToken(); -#line 2784 "VBNET.ATG" +#line 2787 "VBNET.ATG" name = t.val; break; } case 72: { lexer.NextToken(); -#line 2785 "VBNET.ATG" +#line 2788 "VBNET.ATG" name = t.val; break; } case 73: { lexer.NextToken(); -#line 2786 "VBNET.ATG" +#line 2789 "VBNET.ATG" name = t.val; break; } case 74: { lexer.NextToken(); -#line 2787 "VBNET.ATG" +#line 2790 "VBNET.ATG" name = t.val; break; } case 75: { lexer.NextToken(); -#line 2788 "VBNET.ATG" +#line 2791 "VBNET.ATG" name = t.val; break; } case 76: { lexer.NextToken(); -#line 2789 "VBNET.ATG" +#line 2792 "VBNET.ATG" name = t.val; break; } case 77: { lexer.NextToken(); -#line 2790 "VBNET.ATG" +#line 2793 "VBNET.ATG" name = t.val; break; } case 78: { lexer.NextToken(); -#line 2791 "VBNET.ATG" +#line 2794 "VBNET.ATG" name = t.val; break; } case 79: { lexer.NextToken(); -#line 2792 "VBNET.ATG" +#line 2795 "VBNET.ATG" name = t.val; break; } case 80: { lexer.NextToken(); -#line 2793 "VBNET.ATG" +#line 2796 "VBNET.ATG" name = t.val; break; } case 81: { lexer.NextToken(); -#line 2794 "VBNET.ATG" +#line 2797 "VBNET.ATG" name = t.val; break; } case 82: { lexer.NextToken(); -#line 2795 "VBNET.ATG" +#line 2798 "VBNET.ATG" name = t.val; break; } case 83: { lexer.NextToken(); -#line 2796 "VBNET.ATG" +#line 2799 "VBNET.ATG" name = t.val; break; } case 84: { lexer.NextToken(); -#line 2797 "VBNET.ATG" +#line 2800 "VBNET.ATG" name = t.val; break; } case 85: { lexer.NextToken(); -#line 2798 "VBNET.ATG" +#line 2801 "VBNET.ATG" name = t.val; break; } case 86: { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2802 "VBNET.ATG" name = t.val; break; } case 87: { lexer.NextToken(); -#line 2800 "VBNET.ATG" +#line 2803 "VBNET.ATG" name = t.val; break; } case 88: { lexer.NextToken(); -#line 2801 "VBNET.ATG" +#line 2804 "VBNET.ATG" name = t.val; break; } case 89: { lexer.NextToken(); -#line 2802 "VBNET.ATG" +#line 2805 "VBNET.ATG" name = t.val; break; } case 90: { lexer.NextToken(); -#line 2803 "VBNET.ATG" +#line 2806 "VBNET.ATG" name = t.val; break; } case 91: { lexer.NextToken(); -#line 2804 "VBNET.ATG" +#line 2807 "VBNET.ATG" name = t.val; break; } case 92: { lexer.NextToken(); -#line 2805 "VBNET.ATG" +#line 2808 "VBNET.ATG" name = t.val; break; } case 93: { lexer.NextToken(); -#line 2806 "VBNET.ATG" +#line 2809 "VBNET.ATG" name = t.val; break; } case 94: { lexer.NextToken(); -#line 2807 "VBNET.ATG" +#line 2810 "VBNET.ATG" name = t.val; break; } case 95: { lexer.NextToken(); -#line 2808 "VBNET.ATG" +#line 2811 "VBNET.ATG" name = t.val; break; } case 96: { lexer.NextToken(); -#line 2809 "VBNET.ATG" +#line 2812 "VBNET.ATG" name = t.val; break; } case 97: { lexer.NextToken(); -#line 2810 "VBNET.ATG" +#line 2813 "VBNET.ATG" name = t.val; break; } case 98: { lexer.NextToken(); -#line 2811 "VBNET.ATG" +#line 2814 "VBNET.ATG" name = t.val; break; } case 99: { lexer.NextToken(); -#line 2812 "VBNET.ATG" +#line 2815 "VBNET.ATG" name = t.val; break; } case 100: { lexer.NextToken(); -#line 2813 "VBNET.ATG" +#line 2816 "VBNET.ATG" name = t.val; break; } case 101: { lexer.NextToken(); -#line 2814 "VBNET.ATG" +#line 2817 "VBNET.ATG" name = t.val; break; } case 102: { lexer.NextToken(); -#line 2815 "VBNET.ATG" +#line 2818 "VBNET.ATG" name = t.val; break; } case 103: { lexer.NextToken(); -#line 2816 "VBNET.ATG" +#line 2819 "VBNET.ATG" name = t.val; break; } case 104: { lexer.NextToken(); -#line 2817 "VBNET.ATG" +#line 2820 "VBNET.ATG" name = t.val; break; } case 105: { lexer.NextToken(); -#line 2818 "VBNET.ATG" +#line 2821 "VBNET.ATG" name = t.val; break; } case 106: { lexer.NextToken(); -#line 2819 "VBNET.ATG" +#line 2822 "VBNET.ATG" name = t.val; break; } case 107: { lexer.NextToken(); -#line 2820 "VBNET.ATG" +#line 2823 "VBNET.ATG" name = t.val; break; } case 108: { lexer.NextToken(); -#line 2821 "VBNET.ATG" +#line 2824 "VBNET.ATG" name = t.val; break; } case 109: { lexer.NextToken(); -#line 2822 "VBNET.ATG" +#line 2825 "VBNET.ATG" name = t.val; break; } case 110: { lexer.NextToken(); -#line 2823 "VBNET.ATG" +#line 2826 "VBNET.ATG" name = t.val; break; } case 111: { lexer.NextToken(); -#line 2824 "VBNET.ATG" +#line 2827 "VBNET.ATG" name = t.val; break; } case 112: { lexer.NextToken(); -#line 2825 "VBNET.ATG" +#line 2828 "VBNET.ATG" name = t.val; break; } case 113: { lexer.NextToken(); -#line 2826 "VBNET.ATG" +#line 2829 "VBNET.ATG" name = t.val; break; } case 114: { lexer.NextToken(); -#line 2827 "VBNET.ATG" +#line 2830 "VBNET.ATG" name = t.val; break; } case 115: { lexer.NextToken(); -#line 2828 "VBNET.ATG" +#line 2831 "VBNET.ATG" name = t.val; break; } case 116: { lexer.NextToken(); -#line 2829 "VBNET.ATG" +#line 2832 "VBNET.ATG" name = t.val; break; } case 117: { lexer.NextToken(); -#line 2830 "VBNET.ATG" +#line 2833 "VBNET.ATG" name = t.val; break; } case 118: { lexer.NextToken(); -#line 2831 "VBNET.ATG" +#line 2834 "VBNET.ATG" name = t.val; break; } case 119: { lexer.NextToken(); -#line 2832 "VBNET.ATG" +#line 2835 "VBNET.ATG" name = t.val; break; } case 120: { lexer.NextToken(); -#line 2833 "VBNET.ATG" +#line 2836 "VBNET.ATG" name = t.val; break; } case 121: { lexer.NextToken(); -#line 2834 "VBNET.ATG" +#line 2837 "VBNET.ATG" name = t.val; break; } case 122: { lexer.NextToken(); -#line 2835 "VBNET.ATG" +#line 2838 "VBNET.ATG" name = t.val; break; } case 123: { lexer.NextToken(); -#line 2836 "VBNET.ATG" +#line 2839 "VBNET.ATG" name = t.val; break; } case 124: { lexer.NextToken(); -#line 2837 "VBNET.ATG" +#line 2840 "VBNET.ATG" name = t.val; break; } case 125: { lexer.NextToken(); -#line 2838 "VBNET.ATG" +#line 2841 "VBNET.ATG" name = t.val; break; } case 126: { lexer.NextToken(); -#line 2839 "VBNET.ATG" +#line 2842 "VBNET.ATG" name = t.val; break; } case 127: { lexer.NextToken(); -#line 2840 "VBNET.ATG" +#line 2843 "VBNET.ATG" name = t.val; break; } case 128: { lexer.NextToken(); -#line 2841 "VBNET.ATG" +#line 2844 "VBNET.ATG" name = t.val; break; } case 129: { lexer.NextToken(); -#line 2842 "VBNET.ATG" +#line 2845 "VBNET.ATG" name = t.val; break; } case 130: { lexer.NextToken(); -#line 2843 "VBNET.ATG" +#line 2846 "VBNET.ATG" name = t.val; break; } case 131: { lexer.NextToken(); -#line 2844 "VBNET.ATG" +#line 2847 "VBNET.ATG" name = t.val; break; } case 132: { lexer.NextToken(); -#line 2845 "VBNET.ATG" +#line 2848 "VBNET.ATG" name = t.val; break; } case 134: { lexer.NextToken(); -#line 2846 "VBNET.ATG" +#line 2849 "VBNET.ATG" name = t.val; break; } case 135: { lexer.NextToken(); -#line 2847 "VBNET.ATG" +#line 2850 "VBNET.ATG" name = t.val; break; } case 136: { lexer.NextToken(); -#line 2848 "VBNET.ATG" +#line 2851 "VBNET.ATG" name = t.val; break; } case 137: { lexer.NextToken(); -#line 2849 "VBNET.ATG" +#line 2852 "VBNET.ATG" name = t.val; break; } case 138: { lexer.NextToken(); -#line 2850 "VBNET.ATG" +#line 2853 "VBNET.ATG" name = t.val; break; } case 139: { lexer.NextToken(); -#line 2851 "VBNET.ATG" +#line 2854 "VBNET.ATG" name = t.val; break; } case 140: { lexer.NextToken(); -#line 2852 "VBNET.ATG" +#line 2855 "VBNET.ATG" name = t.val; break; } case 142: { lexer.NextToken(); -#line 2853 "VBNET.ATG" +#line 2856 "VBNET.ATG" name = t.val; break; } case 143: { lexer.NextToken(); -#line 2854 "VBNET.ATG" +#line 2857 "VBNET.ATG" name = t.val; break; } case 144: { lexer.NextToken(); -#line 2855 "VBNET.ATG" +#line 2858 "VBNET.ATG" name = t.val; break; } case 145: { lexer.NextToken(); -#line 2856 "VBNET.ATG" +#line 2859 "VBNET.ATG" name = t.val; break; } case 146: { lexer.NextToken(); -#line 2857 "VBNET.ATG" +#line 2860 "VBNET.ATG" name = t.val; break; } case 147: { lexer.NextToken(); -#line 2858 "VBNET.ATG" +#line 2861 "VBNET.ATG" name = t.val; break; } case 148: { lexer.NextToken(); -#line 2859 "VBNET.ATG" +#line 2862 "VBNET.ATG" name = t.val; break; } case 149: { lexer.NextToken(); -#line 2860 "VBNET.ATG" +#line 2863 "VBNET.ATG" name = t.val; break; } case 150: { lexer.NextToken(); -#line 2861 "VBNET.ATG" +#line 2864 "VBNET.ATG" name = t.val; break; } case 151: { lexer.NextToken(); -#line 2862 "VBNET.ATG" +#line 2865 "VBNET.ATG" name = t.val; break; } case 152: { lexer.NextToken(); -#line 2863 "VBNET.ATG" +#line 2866 "VBNET.ATG" name = t.val; break; } case 153: { lexer.NextToken(); -#line 2864 "VBNET.ATG" +#line 2867 "VBNET.ATG" name = t.val; break; } case 154: { lexer.NextToken(); -#line 2865 "VBNET.ATG" +#line 2868 "VBNET.ATG" name = t.val; break; } case 155: { lexer.NextToken(); -#line 2866 "VBNET.ATG" +#line 2869 "VBNET.ATG" name = t.val; break; } case 156: { lexer.NextToken(); -#line 2867 "VBNET.ATG" +#line 2870 "VBNET.ATG" name = t.val; break; } case 157: { lexer.NextToken(); -#line 2868 "VBNET.ATG" +#line 2871 "VBNET.ATG" name = t.val; break; } case 158: { lexer.NextToken(); -#line 2869 "VBNET.ATG" +#line 2872 "VBNET.ATG" name = t.val; break; } case 159: { lexer.NextToken(); -#line 2870 "VBNET.ATG" +#line 2873 "VBNET.ATG" name = t.val; break; } case 160: { lexer.NextToken(); -#line 2871 "VBNET.ATG" +#line 2874 "VBNET.ATG" name = t.val; break; } case 161: { lexer.NextToken(); -#line 2872 "VBNET.ATG" +#line 2875 "VBNET.ATG" name = t.val; break; } case 162: { lexer.NextToken(); -#line 2873 "VBNET.ATG" +#line 2876 "VBNET.ATG" name = t.val; break; } case 163: { lexer.NextToken(); -#line 2874 "VBNET.ATG" +#line 2877 "VBNET.ATG" name = t.val; break; } case 165: { lexer.NextToken(); -#line 2875 "VBNET.ATG" +#line 2878 "VBNET.ATG" name = t.val; break; } case 166: { lexer.NextToken(); -#line 2876 "VBNET.ATG" +#line 2879 "VBNET.ATG" name = t.val; break; } case 167: { lexer.NextToken(); -#line 2877 "VBNET.ATG" +#line 2880 "VBNET.ATG" name = t.val; break; } case 168: { lexer.NextToken(); -#line 2878 "VBNET.ATG" +#line 2881 "VBNET.ATG" name = t.val; break; } case 170: { lexer.NextToken(); -#line 2879 "VBNET.ATG" +#line 2882 "VBNET.ATG" name = t.val; break; } case 171: { lexer.NextToken(); -#line 2880 "VBNET.ATG" +#line 2883 "VBNET.ATG" name = t.val; break; } case 172: { lexer.NextToken(); -#line 2881 "VBNET.ATG" +#line 2884 "VBNET.ATG" name = t.val; break; } case 173: { lexer.NextToken(); -#line 2882 "VBNET.ATG" +#line 2885 "VBNET.ATG" name = t.val; break; } case 174: { lexer.NextToken(); -#line 2883 "VBNET.ATG" +#line 2886 "VBNET.ATG" name = t.val; break; } case 175: { lexer.NextToken(); -#line 2884 "VBNET.ATG" +#line 2887 "VBNET.ATG" name = t.val; break; } case 176: { lexer.NextToken(); -#line 2885 "VBNET.ATG" +#line 2888 "VBNET.ATG" name = t.val; break; } case 177: { lexer.NextToken(); -#line 2886 "VBNET.ATG" +#line 2889 "VBNET.ATG" name = t.val; break; } case 178: { lexer.NextToken(); -#line 2887 "VBNET.ATG" +#line 2890 "VBNET.ATG" name = t.val; break; } case 179: { lexer.NextToken(); -#line 2888 "VBNET.ATG" +#line 2891 "VBNET.ATG" name = t.val; break; } case 180: { lexer.NextToken(); -#line 2889 "VBNET.ATG" +#line 2892 "VBNET.ATG" name = t.val; break; } case 181: { lexer.NextToken(); -#line 2890 "VBNET.ATG" +#line 2893 "VBNET.ATG" name = t.val; break; } case 182: { lexer.NextToken(); -#line 2891 "VBNET.ATG" +#line 2894 "VBNET.ATG" name = t.val; break; } case 183: { lexer.NextToken(); -#line 2892 "VBNET.ATG" +#line 2895 "VBNET.ATG" name = t.val; break; } case 184: { lexer.NextToken(); -#line 2893 "VBNET.ATG" +#line 2896 "VBNET.ATG" name = t.val; break; } case 185: { lexer.NextToken(); -#line 2894 "VBNET.ATG" +#line 2897 "VBNET.ATG" name = t.val; break; } case 186: { lexer.NextToken(); -#line 2895 "VBNET.ATG" +#line 2898 "VBNET.ATG" name = t.val; break; } case 187: { lexer.NextToken(); -#line 2896 "VBNET.ATG" +#line 2899 "VBNET.ATG" name = t.val; break; } case 188: { lexer.NextToken(); -#line 2897 "VBNET.ATG" +#line 2900 "VBNET.ATG" name = t.val; break; } case 189: { lexer.NextToken(); -#line 2898 "VBNET.ATG" +#line 2901 "VBNET.ATG" name = t.val; break; } case 190: { lexer.NextToken(); -#line 2899 "VBNET.ATG" +#line 2902 "VBNET.ATG" name = t.val; break; } case 191: { lexer.NextToken(); -#line 2900 "VBNET.ATG" +#line 2903 "VBNET.ATG" name = t.val; break; } case 192: { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2904 "VBNET.ATG" name = t.val; break; } case 193: { lexer.NextToken(); -#line 2902 "VBNET.ATG" +#line 2905 "VBNET.ATG" name = t.val; break; } case 196: { lexer.NextToken(); -#line 2903 "VBNET.ATG" +#line 2906 "VBNET.ATG" name = t.val; break; } case 197: { lexer.NextToken(); -#line 2904 "VBNET.ATG" +#line 2907 "VBNET.ATG" name = t.val; break; } case 198: { lexer.NextToken(); -#line 2905 "VBNET.ATG" +#line 2908 "VBNET.ATG" name = t.val; break; } case 199: { lexer.NextToken(); -#line 2906 "VBNET.ATG" +#line 2909 "VBNET.ATG" name = t.val; break; } @@ -4850,94 +4858,94 @@ out string name) { } void CastTarget( -#line 1734 "VBNET.ATG" +#line 1737 "VBNET.ATG" out TypeReference type) { -#line 1736 "VBNET.ATG" +#line 1739 "VBNET.ATG" type = null; switch (la.kind) { case 58: { lexer.NextToken(); -#line 1738 "VBNET.ATG" +#line 1741 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 59: { lexer.NextToken(); -#line 1739 "VBNET.ATG" +#line 1742 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 60: { lexer.NextToken(); -#line 1740 "VBNET.ATG" +#line 1743 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 61: { lexer.NextToken(); -#line 1741 "VBNET.ATG" +#line 1744 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 63: { lexer.NextToken(); -#line 1742 "VBNET.ATG" +#line 1745 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 62: { lexer.NextToken(); -#line 1743 "VBNET.ATG" +#line 1746 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 65: { lexer.NextToken(); -#line 1744 "VBNET.ATG" +#line 1747 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 67: { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1748 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 68: { lexer.NextToken(); -#line 1746 "VBNET.ATG" +#line 1749 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 71: { lexer.NextToken(); -#line 1747 "VBNET.ATG" +#line 1750 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 72: { lexer.NextToken(); -#line 1748 "VBNET.ATG" +#line 1751 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 73: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1752 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -4946,465 +4954,465 @@ out TypeReference type) { } void Argument( -#line 1910 "VBNET.ATG" +#line 1913 "VBNET.ATG" out Expression argumentexpr) { -#line 1912 "VBNET.ATG" +#line 1915 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1916 "VBNET.ATG" +#line 1919 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1916 "VBNET.ATG" +#line 1919 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1916 "VBNET.ATG" +#line 1919 "VBNET.ATG" out expr); -#line 1918 "VBNET.ATG" +#line 1921 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(19)) { Expr( -#line 1921 "VBNET.ATG" +#line 1924 "VBNET.ATG" out argumentexpr); } else SynErr(239); } void ConditionalAndExpr( -#line 1757 "VBNET.ATG" +#line 1760 "VBNET.ATG" out Expression outExpr) { -#line 1758 "VBNET.ATG" +#line 1761 "VBNET.ATG" Expression expr; InclusiveOrExpr( -#line 1759 "VBNET.ATG" +#line 1762 "VBNET.ATG" out outExpr); while (la.kind == 45) { lexer.NextToken(); InclusiveOrExpr( -#line 1759 "VBNET.ATG" +#line 1762 "VBNET.ATG" out expr); -#line 1759 "VBNET.ATG" +#line 1762 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 1762 "VBNET.ATG" +#line 1765 "VBNET.ATG" out Expression outExpr) { -#line 1763 "VBNET.ATG" +#line 1766 "VBNET.ATG" Expression expr; ExclusiveOrExpr( -#line 1764 "VBNET.ATG" +#line 1767 "VBNET.ATG" out outExpr); while (la.kind == 185) { lexer.NextToken(); ExclusiveOrExpr( -#line 1764 "VBNET.ATG" +#line 1767 "VBNET.ATG" out expr); -#line 1764 "VBNET.ATG" +#line 1767 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void ExclusiveOrExpr( -#line 1767 "VBNET.ATG" +#line 1770 "VBNET.ATG" out Expression outExpr) { -#line 1768 "VBNET.ATG" +#line 1771 "VBNET.ATG" Expression expr; AndExpr( -#line 1769 "VBNET.ATG" +#line 1772 "VBNET.ATG" out outExpr); while (la.kind == 137) { lexer.NextToken(); AndExpr( -#line 1769 "VBNET.ATG" +#line 1772 "VBNET.ATG" out expr); -#line 1769 "VBNET.ATG" +#line 1772 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void AndExpr( -#line 1772 "VBNET.ATG" +#line 1775 "VBNET.ATG" out Expression outExpr) { -#line 1773 "VBNET.ATG" +#line 1776 "VBNET.ATG" Expression expr; NotExpr( -#line 1774 "VBNET.ATG" +#line 1777 "VBNET.ATG" out outExpr); while (la.kind == 44) { lexer.NextToken(); NotExpr( -#line 1774 "VBNET.ATG" +#line 1777 "VBNET.ATG" out expr); -#line 1774 "VBNET.ATG" +#line 1777 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void NotExpr( -#line 1777 "VBNET.ATG" +#line 1780 "VBNET.ATG" out Expression outExpr) { -#line 1778 "VBNET.ATG" +#line 1781 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 128) { lexer.NextToken(); -#line 1779 "VBNET.ATG" +#line 1782 "VBNET.ATG" uop = UnaryOperatorType.Not; } EqualityExpr( -#line 1780 "VBNET.ATG" +#line 1783 "VBNET.ATG" out outExpr); -#line 1781 "VBNET.ATG" +#line 1784 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void EqualityExpr( -#line 1786 "VBNET.ATG" +#line 1789 "VBNET.ATG" out Expression outExpr) { -#line 1788 "VBNET.ATG" +#line 1791 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 1791 "VBNET.ATG" +#line 1794 "VBNET.ATG" out outExpr); while (la.kind == 11 || la.kind == 27 || la.kind == 115) { if (la.kind == 27) { lexer.NextToken(); -#line 1794 "VBNET.ATG" +#line 1797 "VBNET.ATG" op = BinaryOperatorType.InEquality; } else if (la.kind == 11) { lexer.NextToken(); -#line 1795 "VBNET.ATG" +#line 1798 "VBNET.ATG" op = BinaryOperatorType.Equality; } else { lexer.NextToken(); -#line 1796 "VBNET.ATG" +#line 1799 "VBNET.ATG" op = BinaryOperatorType.Like; } RelationalExpr( -#line 1798 "VBNET.ATG" +#line 1801 "VBNET.ATG" out expr); -#line 1798 "VBNET.ATG" +#line 1801 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 1802 "VBNET.ATG" +#line 1805 "VBNET.ATG" out Expression outExpr) { -#line 1804 "VBNET.ATG" +#line 1807 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1807 "VBNET.ATG" +#line 1810 "VBNET.ATG" out outExpr); while (StartOf(25)) { if (StartOf(26)) { if (la.kind == 26) { lexer.NextToken(); -#line 1810 "VBNET.ATG" +#line 1813 "VBNET.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 25) { lexer.NextToken(); -#line 1811 "VBNET.ATG" +#line 1814 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 29) { lexer.NextToken(); -#line 1812 "VBNET.ATG" +#line 1815 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 28) { lexer.NextToken(); -#line 1813 "VBNET.ATG" +#line 1816 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(240); ShiftExpr( -#line 1815 "VBNET.ATG" +#line 1818 "VBNET.ATG" out expr); -#line 1815 "VBNET.ATG" +#line 1818 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 112) { lexer.NextToken(); -#line 1818 "VBNET.ATG" +#line 1821 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; } else if (la.kind == 189) { lexer.NextToken(); -#line 1819 "VBNET.ATG" +#line 1822 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; } else SynErr(241); Expr( -#line 1820 "VBNET.ATG" +#line 1823 "VBNET.ATG" out expr); -#line 1820 "VBNET.ATG" +#line 1823 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } } void ShiftExpr( -#line 1824 "VBNET.ATG" +#line 1827 "VBNET.ATG" out Expression outExpr) { -#line 1826 "VBNET.ATG" +#line 1829 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 1829 "VBNET.ATG" +#line 1832 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { lexer.NextToken(); -#line 1832 "VBNET.ATG" +#line 1835 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1833 "VBNET.ATG" +#line 1836 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } AdditiveExpr( -#line 1835 "VBNET.ATG" +#line 1838 "VBNET.ATG" out expr); -#line 1835 "VBNET.ATG" +#line 1838 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 1839 "VBNET.ATG" +#line 1842 "VBNET.ATG" out Expression outExpr) { -#line 1841 "VBNET.ATG" +#line 1844 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 1844 "VBNET.ATG" +#line 1847 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15 || la.kind == 19) { if (la.kind == 14) { lexer.NextToken(); -#line 1847 "VBNET.ATG" +#line 1850 "VBNET.ATG" op = BinaryOperatorType.Add; } else if (la.kind == 15) { lexer.NextToken(); -#line 1848 "VBNET.ATG" +#line 1851 "VBNET.ATG" op = BinaryOperatorType.Subtract; } else { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1852 "VBNET.ATG" op = BinaryOperatorType.Concat; } MultiplicativeExpr( -#line 1851 "VBNET.ATG" +#line 1854 "VBNET.ATG" out expr); -#line 1851 "VBNET.ATG" +#line 1854 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 1855 "VBNET.ATG" +#line 1858 "VBNET.ATG" out Expression outExpr) { -#line 1857 "VBNET.ATG" +#line 1860 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1860 "VBNET.ATG" +#line 1863 "VBNET.ATG" out outExpr); while (StartOf(27)) { if (la.kind == 16) { lexer.NextToken(); -#line 1863 "VBNET.ATG" +#line 1866 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 17) { lexer.NextToken(); -#line 1864 "VBNET.ATG" +#line 1867 "VBNET.ATG" op = BinaryOperatorType.Divide; } else if (la.kind == 18) { lexer.NextToken(); -#line 1865 "VBNET.ATG" +#line 1868 "VBNET.ATG" op = BinaryOperatorType.DivideInteger; } else if (la.kind == 119) { lexer.NextToken(); -#line 1866 "VBNET.ATG" +#line 1869 "VBNET.ATG" op = BinaryOperatorType.Modulus; } else { lexer.NextToken(); -#line 1867 "VBNET.ATG" +#line 1870 "VBNET.ATG" op = BinaryOperatorType.Power; } UnaryExpr( -#line 1869 "VBNET.ATG" +#line 1872 "VBNET.ATG" out expr); -#line 1869 "VBNET.ATG" +#line 1872 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NonArrayTypeName( -#line 1938 "VBNET.ATG" +#line 1941 "VBNET.ATG" out TypeReference typeref) { -#line 1940 "VBNET.ATG" +#line 1943 "VBNET.ATG" string name; typeref = null; if (StartOf(10)) { Qualident( -#line 1943 "VBNET.ATG" +#line 1946 "VBNET.ATG" out name); -#line 1943 "VBNET.ATG" +#line 1946 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1944 "VBNET.ATG" +#line 1947 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeArgumentList( -#line 1945 "VBNET.ATG" +#line 1948 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (la.kind == 132) { lexer.NextToken(); -#line 1947 "VBNET.ATG" +#line 1950 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (la.kind == 194) { lexer.NextToken(); Expect(10); Qualident( -#line 1948 "VBNET.ATG" +#line 1951 "VBNET.ATG" out name); -#line 1949 "VBNET.ATG" +#line 1952 "VBNET.ATG" typeref = new TypeReference(name); typeref.IsGlobal = true; if ( -#line 1950 "VBNET.ATG" +#line 1953 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeArgumentList( -#line 1951 "VBNET.ATG" +#line 1954 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (StartOf(22)) { PrimitiveTypeName( -#line 1953 "VBNET.ATG" +#line 1956 "VBNET.ATG" out name); -#line 1953 "VBNET.ATG" +#line 1956 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(242); } void ArgumentList( -#line 1895 "VBNET.ATG" +#line 1898 "VBNET.ATG" out ArrayList arguments) { -#line 1897 "VBNET.ATG" +#line 1900 "VBNET.ATG" arguments = new ArrayList(); Expression expr = null; if (StartOf(19)) { Argument( -#line 1901 "VBNET.ATG" +#line 1904 "VBNET.ATG" out expr); -#line 1901 "VBNET.ATG" +#line 1904 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Argument( -#line 1904 "VBNET.ATG" +#line 1907 "VBNET.ATG" out expr); -#line 1904 "VBNET.ATG" +#line 1907 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } } } } void ArrayTypeModifiers( -#line 1966 "VBNET.ATG" +#line 1969 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1968 "VBNET.ATG" +#line 1971 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1971 "VBNET.ATG" +#line 1974 "VBNET.ATG" IsDims()) { Expect(23); if (la.kind == 12 || la.kind == 24) { RankList( -#line 1973 "VBNET.ATG" +#line 1976 "VBNET.ATG" out i); } -#line 1975 "VBNET.ATG" +#line 1978 "VBNET.ATG" arrayModifiers.Add(i); Expect(24); } -#line 1980 "VBNET.ATG" +#line 1983 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5412,89 +5420,89 @@ out i); } void TypeArgumentList( -#line 1993 "VBNET.ATG" +#line 1996 "VBNET.ATG" List typeArguments) { -#line 1995 "VBNET.ATG" +#line 1998 "VBNET.ATG" TypeReference typeref; TypeName( -#line 1997 "VBNET.ATG" +#line 2000 "VBNET.ATG" out typeref); -#line 1997 "VBNET.ATG" +#line 2000 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2000 "VBNET.ATG" +#line 2003 "VBNET.ATG" out typeref); -#line 2000 "VBNET.ATG" +#line 2003 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 1987 "VBNET.ATG" +#line 1990 "VBNET.ATG" out int i) { -#line 1988 "VBNET.ATG" +#line 1991 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 1989 "VBNET.ATG" +#line 1992 "VBNET.ATG" ++i; } } void Attribute( -#line 2025 "VBNET.ATG" +#line 2028 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 2026 "VBNET.ATG" +#line 2029 "VBNET.ATG" string name; Qualident( -#line 2027 "VBNET.ATG" +#line 2030 "VBNET.ATG" out name); -#line 2028 "VBNET.ATG" +#line 2031 "VBNET.ATG" List positional = new List(); List named = new List(); if (la.kind == 23) { AttributeArguments( -#line 2031 "VBNET.ATG" +#line 2034 "VBNET.ATG" positional, named); } -#line 2033 "VBNET.ATG" +#line 2036 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 2038 "VBNET.ATG" +#line 2041 "VBNET.ATG" List positional, List named) { -#line 2040 "VBNET.ATG" +#line 2043 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(23); if ( -#line 2046 "VBNET.ATG" +#line 2049 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2048 "VBNET.ATG" +#line 2051 "VBNET.ATG" IsNamedAssign()) { -#line 2048 "VBNET.ATG" +#line 2051 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2049 "VBNET.ATG" +#line 2052 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5502,10 +5510,10 @@ out name); Expect(11); } Expr( -#line 2051 "VBNET.ATG" +#line 2054 "VBNET.ATG" out expr); -#line 2053 "VBNET.ATG" +#line 2056 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5513,13 +5521,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2060 "VBNET.ATG" +#line 2063 "VBNET.ATG" IsNamedAssign()) { -#line 2060 "VBNET.ATG" +#line 2063 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2061 "VBNET.ATG" +#line 2064 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5527,14 +5535,14 @@ out name); Expect(11); } else if (StartOf(19)) { -#line 2063 "VBNET.ATG" +#line 2066 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(243); Expr( -#line 2064 "VBNET.ATG" +#line 2067 "VBNET.ATG" out expr); -#line 2064 "VBNET.ATG" +#line 2067 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5545,10 +5553,10 @@ out expr); } void FormalParameter( -#line 2133 "VBNET.ATG" +#line 2136 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2135 "VBNET.ATG" +#line 2138 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; @@ -5556,28 +5564,28 @@ out ParameterDeclarationExpression p) { while (StartOf(28)) { ParameterModifier( -#line 2140 "VBNET.ATG" +#line 2143 "VBNET.ATG" mod); } Identifier(); -#line 2141 "VBNET.ATG" +#line 2144 "VBNET.ATG" string parameterName = t.val; if ( -#line 2142 "VBNET.ATG" +#line 2145 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2142 "VBNET.ATG" +#line 2145 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2143 "VBNET.ATG" +#line 2146 "VBNET.ATG" out type); } -#line 2145 "VBNET.ATG" +#line 2148 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5593,45 +5601,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2157 "VBNET.ATG" +#line 2160 "VBNET.ATG" out expr); } -#line 2159 "VBNET.ATG" +#line 2162 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2931 "VBNET.ATG" +#line 2933 "VBNET.ATG" ParamModifiers m) { if (la.kind == 54) { lexer.NextToken(); -#line 2932 "VBNET.ATG" +#line 2934 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 52) { lexer.NextToken(); -#line 2933 "VBNET.ATG" +#line 2935 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 136) { lexer.NextToken(); -#line 2934 "VBNET.ATG" +#line 2936 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2935 "VBNET.ATG" +#line 2937 "VBNET.ATG" m.Add(ParamModifier.Params); } else SynErr(244); } void Statement() { -#line 2187 "VBNET.ATG" +#line 2190 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -5639,34 +5647,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2193 "VBNET.ATG" +#line 2196 "VBNET.ATG" IsLabel()) { LabelName( -#line 2193 "VBNET.ATG" +#line 2196 "VBNET.ATG" out label); -#line 2195 "VBNET.ATG" +#line 2198 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(29)) { EmbeddedStatement( -#line 2198 "VBNET.ATG" +#line 2201 "VBNET.ATG" out stmt); -#line 2198 "VBNET.ATG" +#line 2201 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(30)) { LocalDeclarationStatement( -#line 2199 "VBNET.ATG" +#line 2202 "VBNET.ATG" out stmt); -#line 2199 "VBNET.ATG" +#line 2202 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(245); -#line 2202 "VBNET.ATG" +#line 2205 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5675,30 +5683,30 @@ out stmt); } void LabelName( -#line 2583 "VBNET.ATG" +#line 2586 "VBNET.ATG" out string name) { -#line 2585 "VBNET.ATG" +#line 2588 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2587 "VBNET.ATG" +#line 2590 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2588 "VBNET.ATG" +#line 2591 "VBNET.ATG" name = t.val; } else SynErr(246); } void EmbeddedStatement( -#line 2241 "VBNET.ATG" +#line 2244 "VBNET.ATG" out Statement statement) { -#line 2243 "VBNET.ATG" +#line 2246 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5708,103 +5716,103 @@ out Statement statement) { case 93: { lexer.NextToken(); -#line 2248 "VBNET.ATG" +#line 2251 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2250 "VBNET.ATG" +#line 2253 "VBNET.ATG" exitType = ExitType.Sub; break; } case 99: { lexer.NextToken(); -#line 2252 "VBNET.ATG" +#line 2255 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2254 "VBNET.ATG" +#line 2257 "VBNET.ATG" exitType = ExitType.Property; break; } case 82: { lexer.NextToken(); -#line 2256 "VBNET.ATG" +#line 2259 "VBNET.ATG" exitType = ExitType.Do; break; } case 97: { lexer.NextToken(); -#line 2258 "VBNET.ATG" +#line 2261 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2260 "VBNET.ATG" +#line 2263 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2262 "VBNET.ATG" +#line 2265 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2264 "VBNET.ATG" +#line 2267 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(247); break; } -#line 2266 "VBNET.ATG" +#line 2269 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2267 "VBNET.ATG" +#line 2270 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 82 || la.kind == 97 || la.kind == 181) { if (la.kind == 82) { lexer.NextToken(); -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 97) { lexer.NextToken(); -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2268 "VBNET.ATG" +#line 2271 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5812,11 +5820,11 @@ out statement); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2270 "VBNET.ATG" +#line 2273 "VBNET.ATG" out expr); } -#line 2270 "VBNET.ATG" +#line 2273 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5824,27 +5832,27 @@ out expr); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2272 "VBNET.ATG" +#line 2275 "VBNET.ATG" out expr); } -#line 2272 "VBNET.ATG" +#line 2275 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2274 "VBNET.ATG" +#line 2277 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2274 "VBNET.ATG" +#line 2277 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(168); -#line 2275 "VBNET.ATG" +#line 2278 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5852,42 +5860,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2277 "VBNET.ATG" +#line 2280 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2278 "VBNET.ATG" +#line 2281 "VBNET.ATG" out p); } Expect(24); } -#line 2279 "VBNET.ATG" +#line 2282 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" out statement); break; } case 41: { lexer.NextToken(); -#line 2283 "VBNET.ATG" +#line 2286 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2284 "VBNET.ATG" +#line 2287 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2284 "VBNET.ATG" +#line 2287 "VBNET.ATG" out handlerExpr); -#line 2286 "VBNET.ATG" +#line 2289 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5895,17 +5903,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2289 "VBNET.ATG" +#line 2292 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2290 "VBNET.ATG" +#line 2293 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2290 "VBNET.ATG" +#line 2293 "VBNET.ATG" out handlerExpr); -#line 2292 "VBNET.ATG" +#line 2295 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5913,16 +5921,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2295 "VBNET.ATG" +#line 2298 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2296 "VBNET.ATG" +#line 2299 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(181); -#line 2298 "VBNET.ATG" +#line 2301 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5930,23 +5938,23 @@ out embeddedStatement); case 82: { lexer.NextToken(); -#line 2303 "VBNET.ATG" +#line 2306 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2306 "VBNET.ATG" +#line 2309 "VBNET.ATG" out conditionType); Expr( -#line 2306 "VBNET.ATG" +#line 2309 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2307 "VBNET.ATG" +#line 2310 "VBNET.ATG" out embeddedStatement); Expect(117); -#line 2310 "VBNET.ATG" +#line 2313 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5955,19 +5963,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2317 "VBNET.ATG" +#line 2320 "VBNET.ATG" out embeddedStatement); Expect(117); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2318 "VBNET.ATG" +#line 2321 "VBNET.ATG" out conditionType); Expr( -#line 2318 "VBNET.ATG" +#line 2321 "VBNET.ATG" out expr); } -#line 2320 "VBNET.ATG" +#line 2323 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(248); @@ -5976,7 +5984,7 @@ out expr); case 97: { lexer.NextToken(); -#line 2325 "VBNET.ATG" +#line 2328 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5985,24 +5993,24 @@ out expr); if (la.kind == 84) { lexer.NextToken(); LoopControlVariable( -#line 2332 "VBNET.ATG" +#line 2335 "VBNET.ATG" out typeReference, out typeName); Expect(108); Expr( -#line 2333 "VBNET.ATG" +#line 2336 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2334 "VBNET.ATG" +#line 2337 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(19)) { Expr( -#line 2335 "VBNET.ATG" +#line 2338 "VBNET.ATG" out expr); } -#line 2337 "VBNET.ATG" +#line 2340 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -6014,53 +6022,53 @@ out expr); } else if (StartOf(10)) { -#line 2348 "VBNET.ATG" +#line 2351 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2353 "VBNET.ATG" +#line 2356 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2354 "VBNET.ATG" +#line 2357 "VBNET.ATG" out start); Expect(172); Expr( -#line 2354 "VBNET.ATG" +#line 2357 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2354 "VBNET.ATG" +#line 2357 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2355 "VBNET.ATG" +#line 2358 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(19)) { Expr( -#line 2358 "VBNET.ATG" +#line 2361 "VBNET.ATG" out nextExpr); -#line 2358 "VBNET.ATG" +#line 2361 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2359 "VBNET.ATG" +#line 2362 "VBNET.ATG" out nextExpr); -#line 2359 "VBNET.ATG" +#line 2362 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2362 "VBNET.ATG" +#line 2365 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(249); @@ -6069,29 +6077,29 @@ out nextExpr); case 91: { lexer.NextToken(); Expr( -#line 2366 "VBNET.ATG" +#line 2369 "VBNET.ATG" out expr); -#line 2366 "VBNET.ATG" +#line 2369 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2368 "VBNET.ATG" +#line 2371 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2368 "VBNET.ATG" +#line 2371 "VBNET.ATG" isPreserve = true; } Expr( -#line 2369 "VBNET.ATG" +#line 2372 "VBNET.ATG" out redimclause); -#line 2371 "VBNET.ATG" +#line 2374 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -6099,10 +6107,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2375 "VBNET.ATG" +#line 2378 "VBNET.ATG" out redimclause); -#line 2375 "VBNET.ATG" +#line 2378 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -6110,10 +6118,10 @@ out redimclause); case 90: { lexer.NextToken(); Expr( -#line 2378 "VBNET.ATG" +#line 2381 "VBNET.ATG" out expr); -#line 2379 "VBNET.ATG" +#line 2382 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -6122,53 +6130,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2384 "VBNET.ATG" +#line 2387 "VBNET.ATG" out expr); -#line 2384 "VBNET.ATG" +#line 2387 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2385 "VBNET.ATG" +#line 2388 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2387 "VBNET.ATG" +#line 2390 "VBNET.ATG" statement = new StopStatement(); break; } case 105: { lexer.NextToken(); Expr( -#line 2389 "VBNET.ATG" +#line 2392 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2391 "VBNET.ATG" +#line 2394 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); -#line 2391 "VBNET.ATG" +#line 2394 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2394 "VBNET.ATG" +#line 2397 "VBNET.ATG" out embeddedStatement); -#line 2396 "VBNET.ATG" +#line 2399 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 86 || -#line 2400 "VBNET.ATG" +#line 2403 "VBNET.ATG" IsElseIf()) { if ( -#line 2400 "VBNET.ATG" +#line 2403 "VBNET.ATG" IsElseIf()) { Expect(85); Expect(105); @@ -6176,20 +6184,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2403 "VBNET.ATG" +#line 2406 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2404 "VBNET.ATG" +#line 2407 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2405 "VBNET.ATG" +#line 2408 "VBNET.ATG" out block); -#line 2407 "VBNET.ATG" +#line 2410 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -6197,59 +6205,59 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2412 "VBNET.ATG" +#line 2415 "VBNET.ATG" out embeddedStatement); -#line 2414 "VBNET.ATG" +#line 2417 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(87); Expect(105); -#line 2418 "VBNET.ATG" +#line 2421 "VBNET.ATG" statement = ifStatement; } else if (StartOf(29)) { EmbeddedStatement( -#line 2421 "VBNET.ATG" +#line 2424 "VBNET.ATG" out embeddedStatement); -#line 2423 "VBNET.ATG" +#line 2426 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2425 "VBNET.ATG" +#line 2428 "VBNET.ATG" out embeddedStatement); -#line 2425 "VBNET.ATG" +#line 2428 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 85) { lexer.NextToken(); if (StartOf(29)) { EmbeddedStatement( -#line 2427 "VBNET.ATG" +#line 2430 "VBNET.ATG" out embeddedStatement); } -#line 2429 "VBNET.ATG" +#line 2432 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2432 "VBNET.ATG" +#line 2435 "VBNET.ATG" out embeddedStatement); -#line 2433 "VBNET.ATG" +#line 2436 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2436 "VBNET.ATG" +#line 2439 "VBNET.ATG" statement = ifStatement; } else SynErr(250); break; @@ -6260,43 +6268,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2439 "VBNET.ATG" +#line 2442 "VBNET.ATG" out expr); EndOfStmt(); -#line 2440 "VBNET.ATG" +#line 2443 "VBNET.ATG" ArrayList selectSections = new ArrayList(); Statement block = null; while (la.kind == 56) { -#line 2444 "VBNET.ATG" +#line 2447 "VBNET.ATG" ArrayList caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2445 "VBNET.ATG" +#line 2448 "VBNET.ATG" out caseClauses); if ( -#line 2445 "VBNET.ATG" +#line 2448 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2447 "VBNET.ATG" +#line 2450 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2449 "VBNET.ATG" +#line 2452 "VBNET.ATG" out block); -#line 2451 "VBNET.ATG" +#line 2454 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2455 "VBNET.ATG" +#line 2458 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(87); Expect(155); @@ -6304,43 +6312,43 @@ out block); } case 134: { -#line 2457 "VBNET.ATG" +#line 2460 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2458 "VBNET.ATG" +#line 2461 "VBNET.ATG" out onErrorStatement); -#line 2458 "VBNET.ATG" +#line 2461 "VBNET.ATG" statement = onErrorStatement; break; } case 103: { -#line 2459 "VBNET.ATG" +#line 2462 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2460 "VBNET.ATG" +#line 2463 "VBNET.ATG" out goToStatement); -#line 2460 "VBNET.ATG" +#line 2463 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2461 "VBNET.ATG" +#line 2464 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2462 "VBNET.ATG" +#line 2465 "VBNET.ATG" out resumeStatement); -#line 2462 "VBNET.ATG" +#line 2465 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 195: { -#line 2465 "VBNET.ATG" +#line 2468 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6348,25 +6356,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2471 "VBNET.ATG" +#line 2474 "VBNET.ATG" out expr); if (StartOf(31)) { AssignmentOperator( -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" out op); Expr( -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" out val); -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 85) { -#line 2474 "VBNET.ATG" +#line 2477 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(251); -#line 2477 "VBNET.ATG" +#line 2480 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -6379,10 +6387,10 @@ out val); case 55: { lexer.NextToken(); UnaryExpr( -#line 2484 "VBNET.ATG" +#line 2487 "VBNET.ATG" out expr); -#line 2484 "VBNET.ATG" +#line 2487 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -6390,7 +6398,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2486 "VBNET.ATG" +#line 2489 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -6398,45 +6406,45 @@ out expr); if (la.kind == 126) { lexer.NextToken(); Qualident( -#line 2490 "VBNET.ATG" +#line 2493 "VBNET.ATG" out typeName); -#line 2490 "VBNET.ATG" +#line 2493 "VBNET.ATG" ArrayList initializer = null; if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2490 "VBNET.ATG" +#line 2493 "VBNET.ATG" out initializer); } Expect(24); } -#line 2492 "VBNET.ATG" +#line 2495 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2495 "VBNET.ATG" +#line 2498 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2495 "VBNET.ATG" +#line 2498 "VBNET.ATG" out expr); -#line 2497 "VBNET.ATG" +#line 2500 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); } else SynErr(252); Block( -#line 2500 "VBNET.ATG" +#line 2503 "VBNET.ATG" out block); Expect(87); Expect(188); -#line 2502 "VBNET.ATG" +#line 2505 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } @@ -6445,10 +6453,10 @@ out block); } void LocalDeclarationStatement( -#line 2210 "VBNET.ATG" +#line 2213 "VBNET.ATG" out Statement statement) { -#line 2212 "VBNET.ATG" +#line 2215 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6457,22 +6465,22 @@ out Statement statement) { if (la.kind == 70) { lexer.NextToken(); -#line 2218 "VBNET.ATG" +#line 2221 "VBNET.ATG" m.Add(Modifier.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2219 "VBNET.ATG" +#line 2222 "VBNET.ATG" m.Add(Modifier.Static, t.Location); } else { lexer.NextToken(); -#line 2220 "VBNET.ATG" +#line 2223 "VBNET.ATG" dimfound = true; } } -#line 2223 "VBNET.ATG" +#line 2226 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6485,137 +6493,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2234 "VBNET.ATG" +#line 2237 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2235 "VBNET.ATG" +#line 2238 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2237 "VBNET.ATG" +#line 2240 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2695 "VBNET.ATG" +#line 2698 "VBNET.ATG" out Statement tryStatement) { -#line 2697 "VBNET.ATG" +#line 2700 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;ArrayList catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2700 "VBNET.ATG" +#line 2703 "VBNET.ATG" out blockStmt); if (la.kind == 57 || la.kind == 87 || la.kind == 96) { CatchClauses( -#line 2701 "VBNET.ATG" +#line 2704 "VBNET.ATG" out catchClauses); } if (la.kind == 96) { lexer.NextToken(); EndOfStmt(); Block( -#line 2702 "VBNET.ATG" +#line 2705 "VBNET.ATG" out finallyStmt); } Expect(87); Expect(174); -#line 2705 "VBNET.ATG" +#line 2708 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2673 "VBNET.ATG" +#line 2676 "VBNET.ATG" out Statement withStatement) { -#line 2675 "VBNET.ATG" +#line 2678 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2678 "VBNET.ATG" +#line 2681 "VBNET.ATG" Point start = t.Location; Expr( -#line 2679 "VBNET.ATG" +#line 2682 "VBNET.ATG" out expr); EndOfStmt(); -#line 2681 "VBNET.ATG" +#line 2684 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2685 "VBNET.ATG" +#line 2688 "VBNET.ATG" out blockStmt); -#line 2687 "VBNET.ATG" +#line 2690 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(87); Expect(182); -#line 2691 "VBNET.ATG" +#line 2694 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2666 "VBNET.ATG" +#line 2669 "VBNET.ATG" out ConditionType conditionType) { -#line 2667 "VBNET.ATG" +#line 2670 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2668 "VBNET.ATG" +#line 2671 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2669 "VBNET.ATG" +#line 2672 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(254); } void LoopControlVariable( -#line 2507 "VBNET.ATG" +#line 2510 "VBNET.ATG" out TypeReference type, out string name) { -#line 2508 "VBNET.ATG" +#line 2511 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2512 "VBNET.ATG" +#line 2515 "VBNET.ATG" out name); if ( -#line 2513 "VBNET.ATG" +#line 2516 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2513 "VBNET.ATG" +#line 2516 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2514 "VBNET.ATG" +#line 2517 "VBNET.ATG" out type); -#line 2514 "VBNET.ATG" +#line 2517 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2516 "VBNET.ATG" +#line 2519 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6633,48 +6641,48 @@ out type); } void CaseClauses( -#line 2626 "VBNET.ATG" +#line 2629 "VBNET.ATG" out ArrayList caseClauses) { -#line 2628 "VBNET.ATG" +#line 2631 "VBNET.ATG" caseClauses = new ArrayList(); CaseLabel caseClause = null; CaseClause( -#line 2631 "VBNET.ATG" +#line 2634 "VBNET.ATG" out caseClause); -#line 2631 "VBNET.ATG" +#line 2634 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2632 "VBNET.ATG" +#line 2635 "VBNET.ATG" out caseClause); -#line 2632 "VBNET.ATG" +#line 2635 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2533 "VBNET.ATG" +#line 2536 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2535 "VBNET.ATG" +#line 2538 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(134); Expect(91); if ( -#line 2541 "VBNET.ATG" +#line 2544 "VBNET.ATG" IsNegativeLabelName()) { Expect(103); Expect(15); Expect(5); -#line 2543 "VBNET.ATG" +#line 2546 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6683,10 +6691,10 @@ IsNegativeLabelName()) { } else if (la.kind == 103) { GotoStatement( -#line 2549 "VBNET.ATG" +#line 2552 "VBNET.ATG" out goToStatement); -#line 2551 "VBNET.ATG" +#line 2554 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6703,63 +6711,63 @@ out goToStatement); lexer.NextToken(); Expect(127); -#line 2565 "VBNET.ATG" +#line 2568 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(255); } void GotoStatement( -#line 2571 "VBNET.ATG" +#line 2574 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2573 "VBNET.ATG" +#line 2576 "VBNET.ATG" string label = String.Empty; Expect(103); LabelName( -#line 2576 "VBNET.ATG" +#line 2579 "VBNET.ATG" out label); -#line 2578 "VBNET.ATG" +#line 2581 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2615 "VBNET.ATG" +#line 2618 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2617 "VBNET.ATG" +#line 2620 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2620 "VBNET.ATG" +#line 2623 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(127); -#line 2621 "VBNET.ATG" +#line 2624 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(32)) { LabelName( -#line 2622 "VBNET.ATG" +#line 2625 "VBNET.ATG" out label); } -#line 2622 "VBNET.ATG" +#line 2625 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(256); } void CaseClause( -#line 2636 "VBNET.ATG" +#line 2639 "VBNET.ATG" out CaseLabel caseClause) { -#line 2638 "VBNET.ATG" +#line 2641 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6768,7 +6776,7 @@ out CaseLabel caseClause) { if (la.kind == 85) { lexer.NextToken(); -#line 2644 "VBNET.ATG" +#line 2647 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(33)) { if (la.kind == 112) { @@ -6778,76 +6786,76 @@ out CaseLabel caseClause) { case 26: { lexer.NextToken(); -#line 2648 "VBNET.ATG" +#line 2651 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 25: { lexer.NextToken(); -#line 2649 "VBNET.ATG" +#line 2652 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 2650 "VBNET.ATG" +#line 2653 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 2651 "VBNET.ATG" +#line 2654 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2652 "VBNET.ATG" +#line 2655 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 2653 "VBNET.ATG" +#line 2656 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(257); break; } Expr( -#line 2655 "VBNET.ATG" +#line 2658 "VBNET.ATG" out expr); -#line 2657 "VBNET.ATG" +#line 2660 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(19)) { Expr( -#line 2659 "VBNET.ATG" +#line 2662 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2659 "VBNET.ATG" +#line 2662 "VBNET.ATG" out sexpr); } -#line 2661 "VBNET.ATG" +#line 2664 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(258); } void CatchClauses( -#line 2710 "VBNET.ATG" +#line 2713 "VBNET.ATG" out ArrayList catchClauses) { -#line 2712 "VBNET.ATG" +#line 2715 "VBNET.ATG" catchClauses = new ArrayList(); TypeReference type = null; Statement blockStmt = null; @@ -6859,27 +6867,27 @@ out ArrayList catchClauses) { if (StartOf(10)) { Identifier(); -#line 2720 "VBNET.ATG" +#line 2723 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2720 "VBNET.ATG" +#line 2723 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2721 "VBNET.ATG" +#line 2724 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2723 "VBNET.ATG" +#line 2726 "VBNET.ATG" out blockStmt); -#line 2724 "VBNET.ATG" +#line 2727 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 373f156603..489d9ea7db 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1244,7 +1244,7 @@ StructureMemberDecl attributes> decl.EndLocation = t.EndLocation; compilationUnit.AddChild(decl); .) - | /* UnaryOperatorDeclaration */ + | "Operator" (. m.Check(Modifier.VBOperators); @@ -1269,7 +1269,8 @@ StructureMemberDecl attributes> (. parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); .) } ")" - [ "As" { AttributeSection (. returnTypeAttributes.Add(section); .) } TypeName EOL ] + (. Point endPos = t.EndLocation; .) + [ "As" { AttributeSection (. returnTypeAttributes.Add(section); .) } TypeName (. endPos = t.EndLocation; .) EOL ] Block "End" "Operator" EOL (. OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, @@ -1282,7 +1283,9 @@ StructureMemberDecl attributes> operatorDeclaration.ReturnTypeAttributes = returnTypeAttributes; operatorDeclaration.Body = (BlockStatement)stmt; operatorDeclaration.StartLocation = m.GetDeclarationLocation(startPos); - operatorDeclaration.EndLocation = t.EndLocation; + operatorDeclaration.EndLocation = endPos; + operatorDeclaration.Body.StartLocation = startPos; + operatorDeclaration.Body.EndLocation = t.Location; compilationUnit.AddChild(operatorDeclaration); .) . diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs index 0ae3b39012..271141fe13 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs @@ -411,6 +411,23 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver return null; } + public override object Visit(AST.OperatorDeclaration operatorDeclaration, object data) + { + DefaultClass c = GetCurrentClass(); + DefaultRegion region = GetRegion(operatorDeclaration.StartLocation, operatorDeclaration.EndLocation); + DefaultRegion bodyRegion = GetRegion(operatorDeclaration.EndLocation, operatorDeclaration.Body != null ? operatorDeclaration.Body.EndLocation : new Point(-1, -1)); + + DefaultMethod method = new DefaultMethod(operatorDeclaration.Name, CreateReturnType(operatorDeclaration.ConvertToType), ConvertModifier(operatorDeclaration.Modifier), region, bodyRegion, c); + if(operatorDeclaration.Parameters != null) + { + foreach (AST.ParameterDeclarationExpression par in operatorDeclaration.Parameters) { + method.Parameters.Add(CreateParameter(par, method)); + } + } + c.Methods.Add(method); + return null; + } + public override object Visit(AST.ConstructorDeclaration constructorDeclaration, object data) { DefaultRegion region = GetRegion(constructorDeclaration.StartLocation, constructorDeclaration.EndLocation);