diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs index 2f29369507..c015895b0a 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs @@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.Parser.AST Overloads = 0x10000, // VB specific WithEvents = 0x20000, // VB specific Default = 0x40000, // VB specific - + Fixed = 0x80000, Synthetic = 0x200000, /// Only for VB properties. @@ -70,7 +70,7 @@ namespace ICSharpCode.NRefactory.Parser.AST VBInterfaceProperties = New | Overloads | ReadOnly | WriteOnly | Default, VBInterfaceEnums = New, - Fields = New | Visibility | Static | ReadOnly | Volatile, + Fields = New | Visibility | Static | ReadOnly | Volatile | Fixed, PropertysEventsMethods = New | Visibility | Static | Virtual | Sealed | Override | Abstract | Extern, Indexers = New | Visibility | Virtual | Sealed | Override | Abstract | Extern, Operators = Public | Static | Extern, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 347ae50baa..947ee39f05 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -847,60 +847,60 @@ out expr); } void Expr( -#line 2076 "cs.ATG" +#line 2091 "cs.ATG" out Expression expr) { -#line 2077 "cs.ATG" +#line 2092 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; UnaryExpr( -#line 2079 "cs.ATG" +#line 2094 "cs.ATG" out expr); if (StartOf(6)) { AssignmentOperator( -#line 2082 "cs.ATG" +#line 2097 "cs.ATG" out op); Expr( -#line 2082 "cs.ATG" +#line 2097 "cs.ATG" out expr1); -#line 2082 "cs.ATG" +#line 2097 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if ( -#line 2083 "cs.ATG" +#line 2098 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { AssignmentOperator( -#line 2084 "cs.ATG" +#line 2099 "cs.ATG" out op); Expr( -#line 2084 "cs.ATG" +#line 2099 "cs.ATG" out expr1); -#line 2084 "cs.ATG" +#line 2099 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if (StartOf(7)) { ConditionalOrExpr( -#line 2086 "cs.ATG" +#line 2101 "cs.ATG" ref expr); if (la.kind == 13) { lexer.NextToken(); Expr( -#line 2087 "cs.ATG" +#line 2102 "cs.ATG" out expr1); -#line 2087 "cs.ATG" +#line 2102 "cs.ATG" expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); } if (la.kind == 12) { lexer.NextToken(); Expr( -#line 2088 "cs.ATG" +#line 2103 "cs.ATG" out expr1); Expect(9); Expr( -#line 2088 "cs.ATG" +#line 2103 "cs.ATG" out expr2); -#line 2088 "cs.ATG" +#line 2103 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else SynErr(129); @@ -1309,39 +1309,39 @@ templates); } void TypeParameterList( -#line 2477 "cs.ATG" +#line 2492 "cs.ATG" List templates) { -#line 2479 "cs.ATG" +#line 2494 "cs.ATG" AttributeSection section; List attributes = new List(); Expect(23); while (la.kind == 18) { AttributeSection( -#line 2483 "cs.ATG" +#line 2498 "cs.ATG" out section); -#line 2483 "cs.ATG" +#line 2498 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2484 "cs.ATG" +#line 2499 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); while (la.kind == 14) { lexer.NextToken(); while (la.kind == 18) { AttributeSection( -#line 2485 "cs.ATG" +#line 2500 "cs.ATG" out section); -#line 2485 "cs.ATG" +#line 2500 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2486 "cs.ATG" +#line 2501 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); } Expect(22); @@ -1374,25 +1374,25 @@ out typeRef, false); } void TypeParameterConstraintsClause( -#line 2490 "cs.ATG" +#line 2505 "cs.ATG" List templates) { -#line 2491 "cs.ATG" +#line 2506 "cs.ATG" string name = ""; TypeReference type; Expect(1); -#line 2493 "cs.ATG" +#line 2508 "cs.ATG" if (t.val != "where") Error("where expected"); Expect(1); -#line 2494 "cs.ATG" +#line 2509 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2496 "cs.ATG" +#line 2511 "cs.ATG" out type); -#line 2497 "cs.ATG" +#line 2512 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1405,10 +1405,10 @@ out type); while (la.kind == 14) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2506 "cs.ATG" +#line 2521 "cs.ATG" out type); -#line 2507 "cs.ATG" +#line 2522 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1744,33 +1744,33 @@ out r, canBeUnbound); } void TypeName( -#line 2420 "cs.ATG" +#line 2435 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 2421 "cs.ATG" +#line 2436 "cs.ATG" List typeArguments = null; string alias = null; string qualident; if ( -#line 2426 "cs.ATG" +#line 2441 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { lexer.NextToken(); -#line 2427 "cs.ATG" +#line 2442 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2430 "cs.ATG" +#line 2445 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2431 "cs.ATG" +#line 2446 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2433 "cs.ATG" +#line 2448 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1781,22 +1781,22 @@ out typeArguments, canBeUnbound); } while ( -#line 2442 "cs.ATG" +#line 2457 "cs.ATG" DotAndIdent()) { Expect(15); -#line 2443 "cs.ATG" +#line 2458 "cs.ATG" typeArguments = null; Qualident( -#line 2444 "cs.ATG" +#line 2459 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2445 "cs.ATG" +#line 2460 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2446 "cs.ATG" +#line 2461 "cs.ATG" typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); } } @@ -1805,7 +1805,7 @@ out typeArguments, canBeUnbound); #line 1157 "cs.ATG" Modifiers m) { while (StartOf(15) || -#line 1174 "cs.ATG" +#line 1175 "cs.ATG" la.kind == Tokens.Identifier && la.val == "partial") { if (la.kind == 48) { lexer.NextToken(); @@ -1862,48 +1862,53 @@ la.kind == Tokens.Identifier && la.val == "partial") { #line 1170 "cs.ATG" m.Add(Modifier.Static, t.Location); - } else if (la.kind == 118) { + } else if (la.kind == 73) { lexer.NextToken(); #line 1171 "cs.ATG" + m.Add(Modifier.Fixed, t.Location); + } else if (la.kind == 118) { + lexer.NextToken(); + +#line 1172 "cs.ATG" m.Add(Modifier.Unsafe, t.Location); } else if (la.kind == 121) { lexer.NextToken(); -#line 1172 "cs.ATG" +#line 1173 "cs.ATG" m.Add(Modifier.Virtual, t.Location); } else if (la.kind == 123) { lexer.NextToken(); -#line 1173 "cs.ATG" +#line 1174 "cs.ATG" m.Add(Modifier.Volatile, t.Location); } else { Expect(1); -#line 1175 "cs.ATG" +#line 1176 "cs.ATG" m.Add(Modifier.Partial, t.Location); } } } void ClassMemberDecl( -#line 1450 "cs.ATG" +#line 1465 "cs.ATG" Modifiers m, List attributes) { -#line 1451 "cs.ATG" +#line 1466 "cs.ATG" Statement stmt = null; if (StartOf(16)) { StructMemberDecl( -#line 1453 "cs.ATG" +#line 1468 "cs.ATG" m, attributes); } else if (la.kind == 27) { -#line 1454 "cs.ATG" +#line 1469 "cs.ATG" m.Check(Modifier.Destructors); Point startPos = t.Location; lexer.NextToken(); Expect(1); -#line 1455 "cs.ATG" +#line 1470 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1911,17 +1916,17 @@ m, attributes); Expect(20); Expect(21); -#line 1459 "cs.ATG" +#line 1474 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1459 "cs.ATG" +#line 1474 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(137); -#line 1460 "cs.ATG" +#line 1475 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -1929,10 +1934,10 @@ out stmt); } void StructMemberDecl( -#line 1180 "cs.ATG" +#line 1181 "cs.ATG" Modifiers m, List attributes) { -#line 1182 "cs.ATG" +#line 1183 "cs.ATG" string qualident = null; TypeReference type; Expression expr; @@ -1944,18 +1949,18 @@ Modifiers m, List attributes) { if (la.kind == 59) { -#line 1192 "cs.ATG" +#line 1193 "cs.ATG" m.Check(Modifier.Constants); lexer.NextToken(); -#line 1193 "cs.ATG" +#line 1194 "cs.ATG" Point startPos = t.Location; Type( -#line 1194 "cs.ATG" +#line 1195 "cs.ATG" out type); Expect(1); -#line 1194 "cs.ATG" +#line 1195 "cs.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier | Modifier.Const); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclaration f = new VariableDeclaration(t.val); @@ -1963,72 +1968,72 @@ out type); Expect(3); Expr( -#line 1199 "cs.ATG" +#line 1200 "cs.ATG" out expr); -#line 1199 "cs.ATG" +#line 1200 "cs.ATG" f.Initializer = expr; while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1200 "cs.ATG" +#line 1201 "cs.ATG" f = new VariableDeclaration(t.val); fd.Fields.Add(f); Expect(3); Expr( -#line 1203 "cs.ATG" +#line 1204 "cs.ATG" out expr); -#line 1203 "cs.ATG" +#line 1204 "cs.ATG" f.Initializer = expr; } Expect(11); -#line 1204 "cs.ATG" +#line 1205 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if ( -#line 1208 "cs.ATG" +#line 1209 "cs.ATG" NotVoidPointer()) { -#line 1208 "cs.ATG" +#line 1209 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); Expect(122); -#line 1209 "cs.ATG" +#line 1210 "cs.ATG" Point startPos = t.Location; if ( -#line 1210 "cs.ATG" +#line 1211 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 1211 "cs.ATG" +#line 1212 "cs.ATG" out explicitInterface, false); -#line 1212 "cs.ATG" +#line 1213 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } } else if (la.kind == 1) { lexer.NextToken(); -#line 1215 "cs.ATG" +#line 1216 "cs.ATG" qualident = t.val; } else SynErr(139); if (la.kind == 23) { TypeParameterList( -#line 1218 "cs.ATG" +#line 1219 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1221 "cs.ATG" +#line 1222 "cs.ATG" p); } Expect(21); -#line 1222 "cs.ATG" +#line 1223 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, new TypeReference("void"), @@ -2043,31 +2048,31 @@ p); compilationUnit.BlockStart(methodDeclaration); while ( -#line 1237 "cs.ATG" +#line 1238 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1237 "cs.ATG" +#line 1238 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1239 "cs.ATG" +#line 1240 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(140); -#line 1239 "cs.ATG" +#line 1240 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 68) { -#line 1243 "cs.ATG" +#line 1244 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); lexer.NextToken(); -#line 1244 "cs.ATG" +#line 1245 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration(null, null, m.Modifier, attributes, null); eventDecl.StartLocation = t.Location; compilationUnit.AddChild(eventDecl); @@ -2076,104 +2081,104 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 1251 "cs.ATG" +#line 1252 "cs.ATG" out type); -#line 1251 "cs.ATG" +#line 1252 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 1252 "cs.ATG" +#line 1253 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 1253 "cs.ATG" +#line 1254 "cs.ATG" out explicitInterface, false); -#line 1254 "cs.ATG" +#line 1255 "cs.ATG" qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); -#line 1255 "cs.ATG" +#line 1256 "cs.ATG" eventDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); } else if (la.kind == 1) { lexer.NextToken(); -#line 1257 "cs.ATG" +#line 1258 "cs.ATG" qualident = t.val; } else SynErr(141); -#line 1259 "cs.ATG" +#line 1260 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; if (la.kind == 16) { lexer.NextToken(); -#line 1260 "cs.ATG" +#line 1261 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 1261 "cs.ATG" +#line 1262 "cs.ATG" out addBlock, out removeBlock); Expect(17); -#line 1262 "cs.ATG" +#line 1263 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } if (la.kind == 11) { lexer.NextToken(); } -#line 1265 "cs.ATG" +#line 1266 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 1271 "cs.ATG" +#line 1272 "cs.ATG" IdentAndLPar()) { -#line 1271 "cs.ATG" +#line 1272 "cs.ATG" m.Check(Modifier.Constructors | Modifier.StaticConstructors); Expect(1); -#line 1272 "cs.ATG" +#line 1273 "cs.ATG" string name = t.val; Point startPos = t.Location; Expect(20); if (StartOf(10)) { -#line 1272 "cs.ATG" +#line 1273 "cs.ATG" m.Check(Modifier.Constructors); FormalParameterList( -#line 1273 "cs.ATG" +#line 1274 "cs.ATG" p); } Expect(21); -#line 1275 "cs.ATG" +#line 1276 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 1276 "cs.ATG" +#line 1277 "cs.ATG" m.Check(Modifier.Constructors); ConstructorInitializer( -#line 1277 "cs.ATG" +#line 1278 "cs.ATG" out init); } -#line 1279 "cs.ATG" +#line 1280 "cs.ATG" ConstructorDeclaration cd = new ConstructorDeclaration(name, m.Modifier, p, init, attributes); cd.StartLocation = startPos; cd.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1284 "cs.ATG" +#line 1285 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(142); -#line 1284 "cs.ATG" +#line 1285 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 69 || la.kind == 79) { -#line 1287 "cs.ATG" +#line 1288 "cs.ATG" m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -2182,45 +2187,45 @@ out stmt); if (la.kind == 79) { lexer.NextToken(); -#line 1292 "cs.ATG" +#line 1293 "cs.ATG" startPos = t.Location; } else { lexer.NextToken(); -#line 1292 "cs.ATG" +#line 1293 "cs.ATG" isImplicit = false; startPos = t.Location; } Expect(91); Type( -#line 1293 "cs.ATG" +#line 1294 "cs.ATG" out type); -#line 1293 "cs.ATG" +#line 1294 "cs.ATG" TypeReference operatorType = type; Expect(20); Type( -#line 1294 "cs.ATG" +#line 1295 "cs.ATG" out type); Expect(1); -#line 1294 "cs.ATG" +#line 1295 "cs.ATG" string varName = t.val; Expect(21); -#line 1295 "cs.ATG" +#line 1296 "cs.ATG" Point endPos = t.Location; if (la.kind == 16) { Block( -#line 1296 "cs.ATG" +#line 1297 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 1296 "cs.ATG" +#line 1297 "cs.ATG" stmt = null; } else SynErr(143); -#line 1299 "cs.ATG" +#line 1300 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, @@ -2236,61 +2241,61 @@ out stmt); } else if (StartOf(17)) { TypeDecl( -#line 1315 "cs.ATG" +#line 1316 "cs.ATG" m, attributes); } else if (StartOf(9)) { Type( -#line 1317 "cs.ATG" +#line 1318 "cs.ATG" out type); -#line 1317 "cs.ATG" +#line 1318 "cs.ATG" Point startPos = t.Location; if (la.kind == 91) { -#line 1319 "cs.ATG" +#line 1320 "cs.ATG" OverloadableOperatorType op; m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 1323 "cs.ATG" +#line 1324 "cs.ATG" out op); -#line 1323 "cs.ATG" +#line 1324 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(20); Type( -#line 1324 "cs.ATG" +#line 1325 "cs.ATG" out firstType); Expect(1); -#line 1324 "cs.ATG" +#line 1325 "cs.ATG" string firstName = t.val; if (la.kind == 14) { lexer.NextToken(); Type( -#line 1325 "cs.ATG" +#line 1326 "cs.ATG" out secondType); Expect(1); -#line 1325 "cs.ATG" +#line 1326 "cs.ATG" secondName = t.val; } else if (la.kind == 21) { } else SynErr(144); -#line 1333 "cs.ATG" +#line 1334 "cs.ATG" Point endPos = t.Location; Expect(21); if (la.kind == 16) { Block( -#line 1334 "cs.ATG" +#line 1335 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(145); -#line 1336 "cs.ATG" +#line 1337 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(firstType, firstName)); if (secondType != null) { @@ -2307,43 +2312,67 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 1353 "cs.ATG" +#line 1354 "cs.ATG" IsVarDecl()) { -#line 1353 "cs.ATG" - m.Check(Modifier.Fields); +#line 1355 "cs.ATG" + m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); - VariableDeclarator( -#line 1357 "cs.ATG" + if ( +#line 1359 "cs.ATG" +m.Contains(Modifier.Fixed)) { + VariableDeclarator( +#line 1360 "cs.ATG" variableDeclarators); - while (la.kind == 14) { - lexer.NextToken(); + Expect(18); + Expr( +#line 1362 "cs.ATG" +out expr); + Expect(19); + while (la.kind == 14) { + lexer.NextToken(); + VariableDeclarator( +#line 1365 "cs.ATG" +variableDeclarators); + Expect(18); + Expr( +#line 1367 "cs.ATG" +out expr); + Expect(19); + } + } else if (la.kind == 1) { VariableDeclarator( -#line 1358 "cs.ATG" +#line 1371 "cs.ATG" variableDeclarators); - } + while (la.kind == 14) { + lexer.NextToken(); + VariableDeclarator( +#line 1372 "cs.ATG" +variableDeclarators); + } + } else SynErr(146); Expect(11); -#line 1359 "cs.ATG" +#line 1374 "cs.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); } else if (la.kind == 110) { -#line 1362 "cs.ATG" +#line 1377 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(18); FormalParameterList( -#line 1363 "cs.ATG" +#line 1378 "cs.ATG" p); Expect(19); -#line 1363 "cs.ATG" +#line 1378 "cs.ATG" Point endLocation = t.EndLocation; Expect(16); -#line 1364 "cs.ATG" +#line 1379 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2352,58 +2381,58 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 1371 "cs.ATG" +#line 1386 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1372 "cs.ATG" +#line 1387 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); } else if ( -#line 1377 "cs.ATG" +#line 1392 "cs.ATG" la.kind == Tokens.Identifier) { if ( -#line 1378 "cs.ATG" +#line 1393 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 1379 "cs.ATG" +#line 1394 "cs.ATG" out explicitInterface, false); -#line 1380 "cs.ATG" +#line 1395 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } } else if (la.kind == 1) { lexer.NextToken(); -#line 1383 "cs.ATG" +#line 1398 "cs.ATG" qualident = t.val; - } else SynErr(146); + } else SynErr(147); -#line 1385 "cs.ATG" +#line 1400 "cs.ATG" Point qualIdentEndLocation = t.EndLocation; if (la.kind == 16 || la.kind == 20 || la.kind == 23) { if (la.kind == 20 || la.kind == 23) { -#line 1389 "cs.ATG" +#line 1404 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); if (la.kind == 23) { TypeParameterList( -#line 1391 "cs.ATG" +#line 1406 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1392 "cs.ATG" +#line 1407 "cs.ATG" p); } Expect(21); -#line 1393 "cs.ATG" +#line 1408 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, type, @@ -2417,26 +2446,26 @@ p); compilationUnit.AddChild(methodDeclaration); while ( -#line 1405 "cs.ATG" +#line 1420 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1405 "cs.ATG" +#line 1420 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1406 "cs.ATG" +#line 1421 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(147); + } else SynErr(148); -#line 1406 "cs.ATG" +#line 1421 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1409 "cs.ATG" +#line 1424 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); if (explicitInterface != null) pDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); @@ -2447,11 +2476,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1418 "cs.ATG" +#line 1433 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1420 "cs.ATG" +#line 1435 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2460,17 +2489,17 @@ out getRegion, out setRegion); } } else if (la.kind == 15) { -#line 1428 "cs.ATG" +#line 1443 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(110); Expect(18); FormalParameterList( -#line 1429 "cs.ATG" +#line 1444 "cs.ATG" p); Expect(19); -#line 1430 "cs.ATG" +#line 1445 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2481,28 +2510,28 @@ p); Expect(16); -#line 1438 "cs.ATG" +#line 1453 "cs.ATG" Point bodyStart = t.Location; AccessorDecls( -#line 1439 "cs.ATG" +#line 1454 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1440 "cs.ATG" +#line 1455 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); - } else SynErr(148); - } else SynErr(149); - } else SynErr(150); + } else SynErr(149); + } else SynErr(150); + } else SynErr(151); } void InterfaceMemberDecl() { -#line 1467 "cs.ATG" +#line 1482 "cs.ATG" TypeReference type; AttributeSection section; @@ -2517,51 +2546,51 @@ out getRegion, out setRegion); while (la.kind == 18) { AttributeSection( -#line 1480 "cs.ATG" +#line 1495 "cs.ATG" out section); -#line 1480 "cs.ATG" +#line 1495 "cs.ATG" attributes.Add(section); } if (la.kind == 88) { lexer.NextToken(); -#line 1481 "cs.ATG" +#line 1496 "cs.ATG" mod = Modifier.New; startLocation = t.Location; } if ( -#line 1484 "cs.ATG" +#line 1499 "cs.ATG" NotVoidPointer()) { Expect(122); -#line 1484 "cs.ATG" +#line 1499 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Expect(1); -#line 1484 "cs.ATG" +#line 1499 "cs.ATG" name = t.val; if (la.kind == 23) { TypeParameterList( -#line 1485 "cs.ATG" +#line 1500 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1486 "cs.ATG" +#line 1501 "cs.ATG" parameters); } Expect(21); while ( -#line 1487 "cs.ATG" +#line 1502 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1487 "cs.ATG" +#line 1502 "cs.ATG" templates); } Expect(11); -#line 1489 "cs.ATG" +#line 1504 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, new TypeReference("void"), parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2571,39 +2600,39 @@ templates); } else if (StartOf(18)) { if (StartOf(9)) { Type( -#line 1496 "cs.ATG" +#line 1511 "cs.ATG" out type); -#line 1496 "cs.ATG" +#line 1511 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; if (la.kind == 1) { lexer.NextToken(); -#line 1498 "cs.ATG" +#line 1513 "cs.ATG" name = t.val; Point qualIdentEndLocation = t.EndLocation; if (la.kind == 20 || la.kind == 23) { if (la.kind == 23) { TypeParameterList( -#line 1502 "cs.ATG" +#line 1517 "cs.ATG" templates); } Expect(20); if (StartOf(10)) { FormalParameterList( -#line 1503 "cs.ATG" +#line 1518 "cs.ATG" parameters); } Expect(21); while ( -#line 1505 "cs.ATG" +#line 1520 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1505 "cs.ATG" +#line 1520 "cs.ATG" templates); } Expect(11); -#line 1506 "cs.ATG" +#line 1521 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, type, parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2612,72 +2641,72 @@ templates); } else if (la.kind == 16) { -#line 1513 "cs.ATG" +#line 1528 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1514 "cs.ATG" +#line 1529 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1514 "cs.ATG" +#line 1529 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1514 "cs.ATG" +#line 1529 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; - } else SynErr(151); + } else SynErr(152); } else if (la.kind == 110) { lexer.NextToken(); Expect(18); FormalParameterList( -#line 1517 "cs.ATG" +#line 1532 "cs.ATG" parameters); Expect(19); -#line 1517 "cs.ATG" +#line 1532 "cs.ATG" Point bracketEndLocation = t.EndLocation; -#line 1517 "cs.ATG" +#line 1532 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(16); -#line 1518 "cs.ATG" +#line 1533 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1518 "cs.ATG" +#line 1533 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1518 "cs.ATG" +#line 1533 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; - } else SynErr(152); + } else SynErr(153); } else { lexer.NextToken(); -#line 1521 "cs.ATG" +#line 1536 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Type( -#line 1521 "cs.ATG" +#line 1536 "cs.ATG" out type); Expect(1); -#line 1521 "cs.ATG" +#line 1536 "cs.ATG" EventDeclaration ed = new EventDeclaration(type, t.val, mod, attributes, null); compilationUnit.AddChild(ed); Expect(11); -#line 1524 "cs.ATG" +#line 1539 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } - } else SynErr(153); + } else SynErr(154); } void EnumMemberDecl( -#line 1529 "cs.ATG" +#line 1544 "cs.ATG" out FieldDeclaration f) { -#line 1531 "cs.ATG" +#line 1546 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2685,15 +2714,15 @@ out FieldDeclaration f) { while (la.kind == 18) { AttributeSection( -#line 1537 "cs.ATG" +#line 1552 "cs.ATG" out section); -#line 1537 "cs.ATG" +#line 1552 "cs.ATG" attributes.Add(section); } Expect(1); -#line 1538 "cs.ATG" +#line 1553 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2702,10 +2731,10 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1543 "cs.ATG" +#line 1558 "cs.ATG" out expr); -#line 1543 "cs.ATG" +#line 1558 "cs.ATG" varDecl.Initializer = expr; } } @@ -2736,7 +2765,7 @@ out name); #line 1017 "cs.ATG" pointer = 1; type = new TypeReference("void"); - } else SynErr(154); + } else SynErr(155); #line 1018 "cs.ATG" List r = new List(); @@ -2770,7 +2799,7 @@ IsPointerOrDims()) { #line 1024 "cs.ATG" r.Add(i); - } else SynErr(155); + } else SynErr(156); } #line 1027 "cs.ATG" @@ -2811,18 +2840,18 @@ out name); #line 1062 "cs.ATG" name = "bool"; - } else SynErr(156); + } else SynErr(157); } void NullableQuestionMark( -#line 2451 "cs.ATG" +#line 2466 "cs.ATG" ref TypeReference typeRef) { -#line 2452 "cs.ATG" +#line 2467 "cs.ATG" List typeArguments = new List(1); Expect(12); -#line 2456 "cs.ATG" +#line 2471 "cs.ATG" if (typeRef != null) typeArguments.Add(typeRef); typeRef = new TypeReference("System.Nullable", typeArguments); @@ -2908,15 +2937,15 @@ out Modifiers m) { #line 1119 "cs.ATG" m.Add(Modifier.Protected, t.Location); } - } else SynErr(157); + } else SynErr(158); } void Block( -#line 1668 "cs.ATG" +#line 1683 "cs.ATG" out Statement stmt) { Expect(16); -#line 1670 "cs.ATG" +#line 1685 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); @@ -2927,7 +2956,7 @@ out Statement stmt) { } Expect(17); -#line 1677 "cs.ATG" +#line 1692 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2935,10 +2964,10 @@ out Statement stmt) { } void EventAccessorDecls( -#line 1603 "cs.ATG" +#line 1618 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1604 "cs.ATG" +#line 1619 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2947,102 +2976,102 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 18) { AttributeSection( -#line 1611 "cs.ATG" +#line 1626 "cs.ATG" out section); -#line 1611 "cs.ATG" +#line 1626 "cs.ATG" attributes.Add(section); } if ( -#line 1613 "cs.ATG" +#line 1628 "cs.ATG" IdentIsAdd()) { -#line 1613 "cs.ATG" +#line 1628 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1614 "cs.ATG" +#line 1629 "cs.ATG" out stmt); -#line 1614 "cs.ATG" +#line 1629 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 18) { AttributeSection( -#line 1615 "cs.ATG" +#line 1630 "cs.ATG" out section); -#line 1615 "cs.ATG" +#line 1630 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1616 "cs.ATG" +#line 1631 "cs.ATG" out stmt); -#line 1616 "cs.ATG" +#line 1631 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if ( -#line 1617 "cs.ATG" +#line 1632 "cs.ATG" IdentIsRemove()) { RemoveAccessorDecl( -#line 1618 "cs.ATG" +#line 1633 "cs.ATG" out stmt); -#line 1618 "cs.ATG" +#line 1633 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 1619 "cs.ATG" +#line 1634 "cs.ATG" out section); -#line 1619 "cs.ATG" +#line 1634 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1620 "cs.ATG" +#line 1635 "cs.ATG" out stmt); -#line 1620 "cs.ATG" +#line 1635 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else if (la.kind == 1) { lexer.NextToken(); -#line 1621 "cs.ATG" +#line 1636 "cs.ATG" Error("add or remove accessor declaration expected"); - } else SynErr(158); + } else SynErr(159); } void ConstructorInitializer( -#line 1699 "cs.ATG" +#line 1714 "cs.ATG" out ConstructorInitializer ci) { -#line 1700 "cs.ATG" +#line 1715 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 50) { lexer.NextToken(); -#line 1704 "cs.ATG" +#line 1719 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 110) { lexer.NextToken(); -#line 1705 "cs.ATG" +#line 1720 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; - } else SynErr(159); + } else SynErr(160); Expect(20); if (StartOf(21)) { Argument( -#line 1708 "cs.ATG" +#line 1723 "cs.ATG" out expr); -#line 1708 "cs.ATG" +#line 1723 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1708 "cs.ATG" +#line 1723 "cs.ATG" out expr); -#line 1708 "cs.ATG" +#line 1723 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } } } @@ -3050,198 +3079,198 @@ out expr); } void OverloadableOperator( -#line 1720 "cs.ATG" +#line 1735 "cs.ATG" out OverloadableOperatorType op) { -#line 1721 "cs.ATG" +#line 1736 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1723 "cs.ATG" +#line 1738 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1724 "cs.ATG" +#line 1739 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 24: { lexer.NextToken(); -#line 1726 "cs.ATG" +#line 1741 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 27: { lexer.NextToken(); -#line 1727 "cs.ATG" +#line 1742 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 31: { lexer.NextToken(); -#line 1729 "cs.ATG" +#line 1744 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 32: { lexer.NextToken(); -#line 1730 "cs.ATG" +#line 1745 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 112: { lexer.NextToken(); -#line 1732 "cs.ATG" +#line 1747 "cs.ATG" op = OverloadableOperatorType.IsTrue; break; } case 71: { lexer.NextToken(); -#line 1733 "cs.ATG" +#line 1748 "cs.ATG" op = OverloadableOperatorType.IsFalse; break; } case 6: { lexer.NextToken(); -#line 1735 "cs.ATG" +#line 1750 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1736 "cs.ATG" +#line 1751 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1737 "cs.ATG" +#line 1752 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 28: { lexer.NextToken(); -#line 1739 "cs.ATG" +#line 1754 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 29: { lexer.NextToken(); -#line 1740 "cs.ATG" +#line 1755 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 30: { lexer.NextToken(); -#line 1741 "cs.ATG" +#line 1756 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 37: { lexer.NextToken(); -#line 1743 "cs.ATG" +#line 1758 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1744 "cs.ATG" +#line 1759 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 34: { lexer.NextToken(); -#line 1745 "cs.ATG" +#line 1760 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 23: { lexer.NextToken(); -#line 1746 "cs.ATG" +#line 1761 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 35: { lexer.NextToken(); -#line 1747 "cs.ATG" +#line 1762 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 36: { lexer.NextToken(); -#line 1748 "cs.ATG" +#line 1763 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 22: { lexer.NextToken(); -#line 1749 "cs.ATG" +#line 1764 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 22) { lexer.NextToken(); -#line 1749 "cs.ATG" +#line 1764 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; } - default: SynErr(160); break; + default: SynErr(161); break; } } void VariableDeclarator( -#line 1661 "cs.ATG" +#line 1676 "cs.ATG" List fieldDeclaration) { -#line 1662 "cs.ATG" +#line 1677 "cs.ATG" Expression expr = null; Expect(1); -#line 1664 "cs.ATG" +#line 1679 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1665 "cs.ATG" +#line 1680 "cs.ATG" out expr); -#line 1665 "cs.ATG" +#line 1680 "cs.ATG" f.Initializer = expr; } -#line 1665 "cs.ATG" +#line 1680 "cs.ATG" fieldDeclaration.Add(f); } void AccessorDecls( -#line 1547 "cs.ATG" +#line 1562 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1549 "cs.ATG" +#line 1564 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3250,96 +3279,96 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1556 "cs.ATG" +#line 1571 "cs.ATG" out section); -#line 1556 "cs.ATG" +#line 1571 "cs.ATG" attributes.Add(section); } if (la.kind == 83 || la.kind == 95 || la.kind == 96) { AccessorModifiers( -#line 1557 "cs.ATG" +#line 1572 "cs.ATG" out modifiers); } if ( -#line 1559 "cs.ATG" +#line 1574 "cs.ATG" IdentIsGet()) { GetAccessorDecl( -#line 1560 "cs.ATG" +#line 1575 "cs.ATG" out getBlock, attributes); -#line 1561 "cs.ATG" +#line 1576 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } if (StartOf(22)) { -#line 1562 "cs.ATG" +#line 1577 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1563 "cs.ATG" +#line 1578 "cs.ATG" out section); -#line 1563 "cs.ATG" +#line 1578 "cs.ATG" attributes.Add(section); } if (la.kind == 83 || la.kind == 95 || la.kind == 96) { AccessorModifiers( -#line 1564 "cs.ATG" +#line 1579 "cs.ATG" out modifiers); } SetAccessorDecl( -#line 1565 "cs.ATG" +#line 1580 "cs.ATG" out setBlock, attributes); -#line 1566 "cs.ATG" +#line 1581 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } } } else if ( -#line 1568 "cs.ATG" +#line 1583 "cs.ATG" IdentIsSet()) { SetAccessorDecl( -#line 1569 "cs.ATG" +#line 1584 "cs.ATG" out setBlock, attributes); -#line 1570 "cs.ATG" +#line 1585 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } if (StartOf(22)) { -#line 1571 "cs.ATG" +#line 1586 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1572 "cs.ATG" +#line 1587 "cs.ATG" out section); -#line 1572 "cs.ATG" +#line 1587 "cs.ATG" attributes.Add(section); } if (la.kind == 83 || la.kind == 95 || la.kind == 96) { AccessorModifiers( -#line 1573 "cs.ATG" +#line 1588 "cs.ATG" out modifiers); } GetAccessorDecl( -#line 1574 "cs.ATG" +#line 1589 "cs.ATG" out getBlock, attributes); -#line 1575 "cs.ATG" +#line 1590 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } } } else if (la.kind == 1) { lexer.NextToken(); -#line 1577 "cs.ATG" +#line 1592 "cs.ATG" Error("get or set accessor declaration expected"); - } else SynErr(161); + } else SynErr(162); } void InterfaceAccessors( -#line 1625 "cs.ATG" +#line 1640 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1627 "cs.ATG" +#line 1642 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; @@ -3347,274 +3376,274 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1633 "cs.ATG" +#line 1648 "cs.ATG" out section); -#line 1633 "cs.ATG" +#line 1648 "cs.ATG" attributes.Add(section); } -#line 1634 "cs.ATG" +#line 1649 "cs.ATG" Point startLocation = la.Location; if ( -#line 1636 "cs.ATG" +#line 1651 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1636 "cs.ATG" +#line 1651 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1637 "cs.ATG" +#line 1652 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1637 "cs.ATG" +#line 1652 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1638 "cs.ATG" +#line 1653 "cs.ATG" Error("set or get expected"); - } else SynErr(162); + } else SynErr(163); Expect(11); -#line 1641 "cs.ATG" +#line 1656 "cs.ATG" if (getBlock != null) { getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } if (setBlock != null) { setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } attributes = new List(); if (la.kind == 1 || la.kind == 18) { while (la.kind == 18) { AttributeSection( -#line 1645 "cs.ATG" +#line 1660 "cs.ATG" out section); -#line 1645 "cs.ATG" +#line 1660 "cs.ATG" attributes.Add(section); } -#line 1646 "cs.ATG" +#line 1661 "cs.ATG" startLocation = la.Location; if ( -#line 1648 "cs.ATG" +#line 1663 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1648 "cs.ATG" +#line 1663 "cs.ATG" if (getBlock != null) Error("get already declared"); else { getBlock = new PropertyGetRegion(null, attributes); lastBlock = getBlock; } } else if ( -#line 1651 "cs.ATG" +#line 1666 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1651 "cs.ATG" +#line 1666 "cs.ATG" if (setBlock != null) Error("set already declared"); else { setBlock = new PropertySetRegion(null, attributes); lastBlock = setBlock; } } else if (la.kind == 1) { lexer.NextToken(); -#line 1654 "cs.ATG" +#line 1669 "cs.ATG" Error("set or get expected"); - } else SynErr(163); + } else SynErr(164); Expect(11); -#line 1657 "cs.ATG" +#line 1672 "cs.ATG" if (lastBlock != null) { lastBlock.StartLocation = startLocation; lastBlock.EndLocation = t.EndLocation; } } } void GetAccessorDecl( -#line 1581 "cs.ATG" +#line 1596 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1582 "cs.ATG" +#line 1597 "cs.ATG" Statement stmt = null; Expect(1); -#line 1585 "cs.ATG" +#line 1600 "cs.ATG" if (t.val != "get") Error("get expected"); -#line 1586 "cs.ATG" +#line 1601 "cs.ATG" Point startLocation = t.Location; if (la.kind == 16) { Block( -#line 1587 "cs.ATG" +#line 1602 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(164); + } else SynErr(165); -#line 1588 "cs.ATG" +#line 1603 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); -#line 1589 "cs.ATG" +#line 1604 "cs.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } void SetAccessorDecl( -#line 1592 "cs.ATG" +#line 1607 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1593 "cs.ATG" +#line 1608 "cs.ATG" Statement stmt = null; Expect(1); -#line 1596 "cs.ATG" +#line 1611 "cs.ATG" if (t.val != "set") Error("set expected"); -#line 1597 "cs.ATG" +#line 1612 "cs.ATG" Point startLocation = t.Location; if (la.kind == 16) { Block( -#line 1598 "cs.ATG" +#line 1613 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(165); + } else SynErr(166); -#line 1599 "cs.ATG" +#line 1614 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); -#line 1600 "cs.ATG" +#line 1615 "cs.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } void AddAccessorDecl( -#line 1683 "cs.ATG" +#line 1698 "cs.ATG" out Statement stmt) { -#line 1684 "cs.ATG" +#line 1699 "cs.ATG" stmt = null; Expect(1); -#line 1687 "cs.ATG" +#line 1702 "cs.ATG" if (t.val != "add") Error("add expected"); Block( -#line 1688 "cs.ATG" +#line 1703 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1691 "cs.ATG" +#line 1706 "cs.ATG" out Statement stmt) { -#line 1692 "cs.ATG" +#line 1707 "cs.ATG" stmt = null; Expect(1); -#line 1695 "cs.ATG" +#line 1710 "cs.ATG" if (t.val != "remove") Error("remove expected"); Block( -#line 1696 "cs.ATG" +#line 1711 "cs.ATG" out stmt); } void VariableInitializer( -#line 1712 "cs.ATG" +#line 1727 "cs.ATG" out Expression initializerExpression) { -#line 1713 "cs.ATG" +#line 1728 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(5)) { Expr( -#line 1715 "cs.ATG" +#line 1730 "cs.ATG" out initializerExpression); } else if (la.kind == 16) { ArrayInitializer( -#line 1716 "cs.ATG" +#line 1731 "cs.ATG" out initializerExpression); } else if (la.kind == 105) { lexer.NextToken(); Type( -#line 1717 "cs.ATG" +#line 1732 "cs.ATG" out type); Expect(18); Expr( -#line 1717 "cs.ATG" +#line 1732 "cs.ATG" out expr); Expect(19); -#line 1717 "cs.ATG" +#line 1732 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); - } else SynErr(166); + } else SynErr(167); } void Statement() { -#line 1829 "cs.ATG" +#line 1844 "cs.ATG" TypeReference type; Expression expr; Statement stmt = null; Point startPos = la.Location; if ( -#line 1837 "cs.ATG" +#line 1852 "cs.ATG" IsLabel()) { Expect(1); -#line 1837 "cs.ATG" +#line 1852 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 59) { lexer.NextToken(); Type( -#line 1840 "cs.ATG" +#line 1855 "cs.ATG" out type); -#line 1840 "cs.ATG" +#line 1855 "cs.ATG" LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifier.Const); string ident = null; var.StartLocation = t.Location; Expect(1); -#line 1841 "cs.ATG" +#line 1856 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1842 "cs.ATG" +#line 1857 "cs.ATG" out expr); -#line 1842 "cs.ATG" +#line 1857 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1843 "cs.ATG" +#line 1858 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1843 "cs.ATG" +#line 1858 "cs.ATG" out expr); -#line 1843 "cs.ATG" +#line 1858 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); } Expect(11); -#line 1844 "cs.ATG" +#line 1859 "cs.ATG" compilationUnit.AddChild(var); } else if ( -#line 1846 "cs.ATG" +#line 1861 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1846 "cs.ATG" +#line 1861 "cs.ATG" out stmt); Expect(11); -#line 1846 "cs.ATG" +#line 1861 "cs.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(23)) { EmbeddedStatement( -#line 1847 "cs.ATG" +#line 1862 "cs.ATG" out stmt); -#line 1847 "cs.ATG" +#line 1862 "cs.ATG" compilationUnit.AddChild(stmt); - } else SynErr(167); + } else SynErr(168); -#line 1853 "cs.ATG" +#line 1868 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3623,10 +3652,10 @@ out stmt); } void Argument( -#line 1752 "cs.ATG" +#line 1767 "cs.ATG" out Expression argumentexpr) { -#line 1754 "cs.ATG" +#line 1769 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3634,48 +3663,48 @@ out Expression argumentexpr) { if (la.kind == 99) { lexer.NextToken(); -#line 1759 "cs.ATG" +#line 1774 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1760 "cs.ATG" +#line 1775 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1762 "cs.ATG" +#line 1777 "cs.ATG" out expr); -#line 1762 "cs.ATG" +#line 1777 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void ArrayInitializer( -#line 1782 "cs.ATG" +#line 1797 "cs.ATG" out Expression outExpr) { -#line 1784 "cs.ATG" +#line 1799 "cs.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(16); if (StartOf(24)) { VariableInitializer( -#line 1789 "cs.ATG" +#line 1804 "cs.ATG" out expr); -#line 1790 "cs.ATG" +#line 1805 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1791 "cs.ATG" +#line 1806 "cs.ATG" NotFinalComma()) { Expect(14); VariableInitializer( -#line 1792 "cs.ATG" +#line 1807 "cs.ATG" out expr); -#line 1793 "cs.ATG" +#line 1808 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } if (la.kind == 14) { @@ -3684,138 +3713,138 @@ out expr); } Expect(17); -#line 1797 "cs.ATG" +#line 1812 "cs.ATG" outExpr = initializer; } void AssignmentOperator( -#line 1765 "cs.ATG" +#line 1780 "cs.ATG" out AssignmentOperatorType op) { -#line 1766 "cs.ATG" +#line 1781 "cs.ATG" op = AssignmentOperatorType.None; if (la.kind == 3) { lexer.NextToken(); -#line 1768 "cs.ATG" +#line 1783 "cs.ATG" op = AssignmentOperatorType.Assign; } else if (la.kind == 38) { lexer.NextToken(); -#line 1769 "cs.ATG" +#line 1784 "cs.ATG" op = AssignmentOperatorType.Add; } else if (la.kind == 39) { lexer.NextToken(); -#line 1770 "cs.ATG" +#line 1785 "cs.ATG" op = AssignmentOperatorType.Subtract; } else if (la.kind == 40) { lexer.NextToken(); -#line 1771 "cs.ATG" +#line 1786 "cs.ATG" op = AssignmentOperatorType.Multiply; } else if (la.kind == 41) { lexer.NextToken(); -#line 1772 "cs.ATG" +#line 1787 "cs.ATG" op = AssignmentOperatorType.Divide; } else if (la.kind == 42) { lexer.NextToken(); -#line 1773 "cs.ATG" +#line 1788 "cs.ATG" op = AssignmentOperatorType.Modulus; } else if (la.kind == 43) { lexer.NextToken(); -#line 1774 "cs.ATG" +#line 1789 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; } else if (la.kind == 44) { lexer.NextToken(); -#line 1775 "cs.ATG" +#line 1790 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; } else if (la.kind == 45) { lexer.NextToken(); -#line 1776 "cs.ATG" +#line 1791 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; } else if (la.kind == 46) { lexer.NextToken(); -#line 1777 "cs.ATG" +#line 1792 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; } else if ( -#line 1778 "cs.ATG" +#line 1793 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { Expect(22); Expect(35); -#line 1779 "cs.ATG" +#line 1794 "cs.ATG" op = AssignmentOperatorType.ShiftRight; - } else SynErr(168); + } else SynErr(169); } void LocalVariableDecl( -#line 1800 "cs.ATG" +#line 1815 "cs.ATG" out Statement stmt) { -#line 1802 "cs.ATG" +#line 1817 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Type( -#line 1807 "cs.ATG" +#line 1822 "cs.ATG" out type); -#line 1807 "cs.ATG" +#line 1822 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; LocalVariableDeclarator( -#line 1808 "cs.ATG" +#line 1823 "cs.ATG" out var); -#line 1808 "cs.ATG" +#line 1823 "cs.ATG" localVariableDeclaration.Variables.Add(var); while (la.kind == 14) { lexer.NextToken(); LocalVariableDeclarator( -#line 1809 "cs.ATG" +#line 1824 "cs.ATG" out var); -#line 1809 "cs.ATG" +#line 1824 "cs.ATG" localVariableDeclaration.Variables.Add(var); } -#line 1810 "cs.ATG" +#line 1825 "cs.ATG" stmt = localVariableDeclaration; } void LocalVariableDeclarator( -#line 1813 "cs.ATG" +#line 1828 "cs.ATG" out VariableDeclaration var) { -#line 1814 "cs.ATG" +#line 1829 "cs.ATG" Expression expr = null; Expect(1); -#line 1817 "cs.ATG" +#line 1832 "cs.ATG" var = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1817 "cs.ATG" +#line 1832 "cs.ATG" out expr); -#line 1817 "cs.ATG" +#line 1832 "cs.ATG" var.Initializer = expr; } } void EmbeddedStatement( -#line 1860 "cs.ATG" +#line 1875 "cs.ATG" out Statement statement) { -#line 1862 "cs.ATG" +#line 1877 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; @@ -3823,57 +3852,57 @@ out Statement statement) { if (la.kind == 16) { Block( -#line 1868 "cs.ATG" +#line 1883 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1870 "cs.ATG" +#line 1885 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1872 "cs.ATG" +#line 1887 "cs.ATG" UnCheckedAndLBrace()) { -#line 1872 "cs.ATG" +#line 1887 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 57) { lexer.NextToken(); } else if (la.kind == 117) { lexer.NextToken(); -#line 1873 "cs.ATG" +#line 1888 "cs.ATG" isChecked = false; - } else SynErr(169); + } else SynErr(170); Block( -#line 1874 "cs.ATG" +#line 1889 "cs.ATG" out block); -#line 1874 "cs.ATG" +#line 1889 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 78) { lexer.NextToken(); -#line 1876 "cs.ATG" +#line 1891 "cs.ATG" Statement elseStatement = null; Expect(20); Expr( -#line 1877 "cs.ATG" +#line 1892 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1878 "cs.ATG" +#line 1893 "cs.ATG" out embeddedStatement); if (la.kind == 66) { lexer.NextToken(); EmbeddedStatement( -#line 1879 "cs.ATG" +#line 1894 "cs.ATG" out elseStatement); } -#line 1880 "cs.ATG" +#line 1895 "cs.ATG" statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); -#line 1881 "cs.ATG" +#line 1896 "cs.ATG" if (elseStatement is IfElseStatement && (elseStatement as IfElseStatement).TrueStatement.Count == 1) { /* else if-section (otherwise we would have a BlockStatment) */ (statement as IfElseStatement).ElseIfSections.Add( @@ -3885,99 +3914,99 @@ out elseStatement); } else if (la.kind == 109) { lexer.NextToken(); -#line 1889 "cs.ATG" - List switchSections = new List(); SwitchSection switchSection; +#line 1904 "cs.ATG" + List switchSections = new List(); Expect(20); Expr( -#line 1890 "cs.ATG" +#line 1905 "cs.ATG" out expr); Expect(21); Expect(16); SwitchSections( -#line 1891 "cs.ATG" +#line 1906 "cs.ATG" switchSections); Expect(17); -#line 1892 "cs.ATG" +#line 1907 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 124) { lexer.NextToken(); Expect(20); Expr( -#line 1894 "cs.ATG" +#line 1909 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1896 "cs.ATG" +#line 1911 "cs.ATG" out embeddedStatement); -#line 1896 "cs.ATG" +#line 1911 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 64) { lexer.NextToken(); EmbeddedStatement( -#line 1897 "cs.ATG" +#line 1912 "cs.ATG" out embeddedStatement); Expect(124); Expect(20); Expr( -#line 1898 "cs.ATG" +#line 1913 "cs.ATG" out expr); Expect(21); Expect(11); -#line 1898 "cs.ATG" +#line 1913 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 75) { lexer.NextToken(); -#line 1899 "cs.ATG" +#line 1914 "cs.ATG" List initializer = null; List iterator = null; Expect(20); if (StartOf(5)) { ForInitializer( -#line 1900 "cs.ATG" +#line 1915 "cs.ATG" out initializer); } Expect(11); if (StartOf(5)) { Expr( -#line 1901 "cs.ATG" +#line 1916 "cs.ATG" out expr); } Expect(11); if (StartOf(5)) { ForIterator( -#line 1902 "cs.ATG" +#line 1917 "cs.ATG" out iterator); } Expect(21); EmbeddedStatement( -#line 1903 "cs.ATG" +#line 1918 "cs.ATG" out embeddedStatement); -#line 1903 "cs.ATG" +#line 1918 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 76) { lexer.NextToken(); Expect(20); Type( -#line 1904 "cs.ATG" +#line 1919 "cs.ATG" out type); Expect(1); -#line 1904 "cs.ATG" +#line 1919 "cs.ATG" string varName = t.val; Point start = t.Location; Expect(80); Expr( -#line 1905 "cs.ATG" +#line 1920 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1906 "cs.ATG" +#line 1921 "cs.ATG" out embeddedStatement); -#line 1906 "cs.ATG" +#line 1921 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); statement.EndLocation = t.EndLocation; @@ -3985,175 +4014,175 @@ out embeddedStatement); lexer.NextToken(); Expect(11); -#line 1910 "cs.ATG" +#line 1925 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 60) { lexer.NextToken(); Expect(11); -#line 1911 "cs.ATG" +#line 1926 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 77) { GotoStatement( -#line 1912 "cs.ATG" +#line 1927 "cs.ATG" out statement); } else if ( -#line 1913 "cs.ATG" +#line 1928 "cs.ATG" IsYieldStatement()) { Expect(1); if (la.kind == 100) { lexer.NextToken(); Expr( -#line 1913 "cs.ATG" +#line 1928 "cs.ATG" out expr); -#line 1913 "cs.ATG" +#line 1928 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 52) { lexer.NextToken(); -#line 1914 "cs.ATG" +#line 1929 "cs.ATG" statement = new YieldStatement(new BreakStatement()); - } else SynErr(170); + } else SynErr(171); Expect(11); } else if (la.kind == 100) { lexer.NextToken(); if (StartOf(5)) { Expr( -#line 1915 "cs.ATG" +#line 1930 "cs.ATG" out expr); } Expect(11); -#line 1915 "cs.ATG" +#line 1930 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 111) { lexer.NextToken(); if (StartOf(5)) { Expr( -#line 1916 "cs.ATG" +#line 1931 "cs.ATG" out expr); } Expect(11); -#line 1916 "cs.ATG" +#line 1931 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(5)) { StatementExpr( -#line 1919 "cs.ATG" +#line 1934 "cs.ATG" out statement); Expect(11); } else if (la.kind == 113) { TryStatement( -#line 1921 "cs.ATG" +#line 1936 "cs.ATG" out statement); } else if (la.kind == 85) { lexer.NextToken(); Expect(20); Expr( -#line 1923 "cs.ATG" +#line 1938 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1924 "cs.ATG" +#line 1939 "cs.ATG" out embeddedStatement); -#line 1924 "cs.ATG" +#line 1939 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 120) { -#line 1926 "cs.ATG" +#line 1941 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1928 "cs.ATG" +#line 1943 "cs.ATG" out resourceAcquisitionStmt); Expect(21); EmbeddedStatement( -#line 1929 "cs.ATG" +#line 1944 "cs.ATG" out embeddedStatement); -#line 1929 "cs.ATG" +#line 1944 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 118) { lexer.NextToken(); Block( -#line 1931 "cs.ATG" +#line 1946 "cs.ATG" out embeddedStatement); -#line 1931 "cs.ATG" +#line 1946 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 73) { lexer.NextToken(); Expect(20); Type( -#line 1934 "cs.ATG" +#line 1949 "cs.ATG" out type); -#line 1934 "cs.ATG" +#line 1949 "cs.ATG" if (type.PointerNestingLevel == 0) Error("can only fix pointer types"); List pointerDeclarators = new List(1); Expect(1); -#line 1937 "cs.ATG" +#line 1952 "cs.ATG" string identifier = t.val; Expect(3); Expr( -#line 1938 "cs.ATG" +#line 1953 "cs.ATG" out expr); -#line 1938 "cs.ATG" +#line 1953 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); while (la.kind == 14) { lexer.NextToken(); Expect(1); -#line 1940 "cs.ATG" +#line 1955 "cs.ATG" identifier = t.val; Expect(3); Expr( -#line 1941 "cs.ATG" +#line 1956 "cs.ATG" out expr); -#line 1941 "cs.ATG" +#line 1956 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); } Expect(21); EmbeddedStatement( -#line 1943 "cs.ATG" +#line 1958 "cs.ATG" out embeddedStatement); -#line 1943 "cs.ATG" +#line 1958 "cs.ATG" statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); - } else SynErr(171); + } else SynErr(172); } void SwitchSections( -#line 1965 "cs.ATG" +#line 1980 "cs.ATG" List switchSections) { -#line 1967 "cs.ATG" +#line 1982 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1971 "cs.ATG" +#line 1986 "cs.ATG" out label); -#line 1971 "cs.ATG" +#line 1986 "cs.ATG" if (label != null) { switchSection.SwitchLabels.Add(label); } -#line 1972 "cs.ATG" +#line 1987 "cs.ATG" compilationUnit.BlockStart(switchSection); while (StartOf(25)) { if (la.kind == 54 || la.kind == 62) { SwitchLabel( -#line 1974 "cs.ATG" +#line 1989 "cs.ATG" out label); -#line 1975 "cs.ATG" +#line 1990 "cs.ATG" if (label != null) { if (switchSection.Children.Count > 0) { // open new section @@ -4169,346 +4198,346 @@ out label); } } -#line 1987 "cs.ATG" +#line 2002 "cs.ATG" compilationUnit.BlockEnd(); switchSections.Add(switchSection); } void ForInitializer( -#line 1946 "cs.ATG" +#line 1961 "cs.ATG" out List initializer) { -#line 1948 "cs.ATG" +#line 1963 "cs.ATG" Statement stmt; initializer = new List(); if ( -#line 1952 "cs.ATG" +#line 1967 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1952 "cs.ATG" +#line 1967 "cs.ATG" out stmt); -#line 1952 "cs.ATG" +#line 1967 "cs.ATG" initializer.Add(stmt); } else if (StartOf(5)) { StatementExpr( -#line 1953 "cs.ATG" +#line 1968 "cs.ATG" out stmt); -#line 1953 "cs.ATG" +#line 1968 "cs.ATG" initializer.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1953 "cs.ATG" +#line 1968 "cs.ATG" out stmt); -#line 1953 "cs.ATG" +#line 1968 "cs.ATG" initializer.Add(stmt); } - } else SynErr(172); + } else SynErr(173); } void ForIterator( -#line 1956 "cs.ATG" +#line 1971 "cs.ATG" out List iterator) { -#line 1958 "cs.ATG" +#line 1973 "cs.ATG" Statement stmt; iterator = new List(); StatementExpr( -#line 1962 "cs.ATG" +#line 1977 "cs.ATG" out stmt); -#line 1962 "cs.ATG" +#line 1977 "cs.ATG" iterator.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1962 "cs.ATG" +#line 1977 "cs.ATG" out stmt); -#line 1962 "cs.ATG" +#line 1977 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 2040 "cs.ATG" +#line 2055 "cs.ATG" out Statement stmt) { -#line 2041 "cs.ATG" +#line 2056 "cs.ATG" Expression expr; stmt = null; Expect(77); if (la.kind == 1) { lexer.NextToken(); -#line 2045 "cs.ATG" +#line 2060 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 54) { lexer.NextToken(); Expr( -#line 2046 "cs.ATG" +#line 2061 "cs.ATG" out expr); Expect(11); -#line 2046 "cs.ATG" +#line 2061 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 62) { lexer.NextToken(); Expect(11); -#line 2047 "cs.ATG" +#line 2062 "cs.ATG" stmt = new GotoCaseStatement(null); - } else SynErr(173); + } else SynErr(174); } void StatementExpr( -#line 2067 "cs.ATG" +#line 2082 "cs.ATG" out Statement stmt) { -#line 2068 "cs.ATG" +#line 2083 "cs.ATG" Expression expr; Expr( -#line 2070 "cs.ATG" +#line 2085 "cs.ATG" out expr); -#line 2073 "cs.ATG" +#line 2088 "cs.ATG" stmt = new StatementExpression(expr); } void TryStatement( -#line 1997 "cs.ATG" +#line 2012 "cs.ATG" out Statement tryStatement) { -#line 1999 "cs.ATG" +#line 2014 "cs.ATG" Statement blockStmt = null, finallyStmt = null; List catchClauses = null; Expect(113); Block( -#line 2003 "cs.ATG" +#line 2018 "cs.ATG" out blockStmt); if (la.kind == 55) { CatchClauses( -#line 2005 "cs.ATG" +#line 2020 "cs.ATG" out catchClauses); if (la.kind == 72) { lexer.NextToken(); Block( -#line 2005 "cs.ATG" +#line 2020 "cs.ATG" out finallyStmt); } } else if (la.kind == 72) { lexer.NextToken(); Block( -#line 2006 "cs.ATG" +#line 2021 "cs.ATG" out finallyStmt); - } else SynErr(174); + } else SynErr(175); -#line 2009 "cs.ATG" +#line 2024 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void ResourceAcquisition( -#line 2051 "cs.ATG" +#line 2066 "cs.ATG" out Statement stmt) { -#line 2053 "cs.ATG" +#line 2068 "cs.ATG" stmt = null; Expression expr; if ( -#line 2058 "cs.ATG" +#line 2073 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 2058 "cs.ATG" +#line 2073 "cs.ATG" out stmt); } else if (StartOf(5)) { Expr( -#line 2059 "cs.ATG" +#line 2074 "cs.ATG" out expr); -#line 2063 "cs.ATG" +#line 2078 "cs.ATG" stmt = new StatementExpression(expr); - } else SynErr(175); + } else SynErr(176); } void SwitchLabel( -#line 1990 "cs.ATG" +#line 2005 "cs.ATG" out CaseLabel label) { -#line 1991 "cs.ATG" +#line 2006 "cs.ATG" Expression expr = null; label = null; if (la.kind == 54) { lexer.NextToken(); Expr( -#line 1993 "cs.ATG" +#line 2008 "cs.ATG" out expr); Expect(9); -#line 1993 "cs.ATG" +#line 2008 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 62) { lexer.NextToken(); Expect(9); -#line 1994 "cs.ATG" +#line 2009 "cs.ATG" label = new CaseLabel(); - } else SynErr(176); + } else SynErr(177); } void CatchClauses( -#line 2014 "cs.ATG" +#line 2029 "cs.ATG" out List catchClauses) { -#line 2016 "cs.ATG" +#line 2031 "cs.ATG" catchClauses = new List(); Expect(55); -#line 2019 "cs.ATG" +#line 2034 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; if (la.kind == 16) { Block( -#line 2025 "cs.ATG" +#line 2040 "cs.ATG" out stmt); -#line 2025 "cs.ATG" +#line 2040 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } else if (la.kind == 20) { lexer.NextToken(); ClassType( -#line 2027 "cs.ATG" +#line 2042 "cs.ATG" out typeRef, false); -#line 2027 "cs.ATG" +#line 2042 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 2028 "cs.ATG" +#line 2043 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 2029 "cs.ATG" +#line 2044 "cs.ATG" out stmt); -#line 2030 "cs.ATG" +#line 2045 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); while ( -#line 2031 "cs.ATG" +#line 2046 "cs.ATG" IsTypedCatch()) { Expect(55); Expect(20); ClassType( -#line 2031 "cs.ATG" +#line 2046 "cs.ATG" out typeRef, false); -#line 2031 "cs.ATG" +#line 2046 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 2032 "cs.ATG" +#line 2047 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 2033 "cs.ATG" +#line 2048 "cs.ATG" out stmt); -#line 2034 "cs.ATG" +#line 2049 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); } if (la.kind == 55) { lexer.NextToken(); Block( -#line 2036 "cs.ATG" +#line 2051 "cs.ATG" out stmt); -#line 2036 "cs.ATG" +#line 2051 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } - } else SynErr(177); + } else SynErr(178); } void UnaryExpr( -#line 2094 "cs.ATG" +#line 2109 "cs.ATG" out Expression uExpr) { -#line 2096 "cs.ATG" +#line 2111 "cs.ATG" TypeReference type = null; Expression expr; ArrayList expressions = new ArrayList(); uExpr = null; while (StartOf(26) || -#line 2118 "cs.ATG" +#line 2133 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 2105 "cs.ATG" +#line 2120 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 2106 "cs.ATG" +#line 2121 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 24) { lexer.NextToken(); -#line 2107 "cs.ATG" +#line 2122 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 27) { lexer.NextToken(); -#line 2108 "cs.ATG" +#line 2123 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 2109 "cs.ATG" +#line 2124 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); } else if (la.kind == 31) { lexer.NextToken(); -#line 2110 "cs.ATG" +#line 2125 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 32) { lexer.NextToken(); -#line 2111 "cs.ATG" +#line 2126 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 28) { lexer.NextToken(); -#line 2112 "cs.ATG" +#line 2127 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); } else { Expect(20); Type( -#line 2118 "cs.ATG" +#line 2133 "cs.ATG" out type); Expect(21); -#line 2118 "cs.ATG" +#line 2133 "cs.ATG" expressions.Add(new CastExpression(type)); } } PrimaryExpr( -#line 2122 "cs.ATG" +#line 2137 "cs.ATG" out expr); -#line 2122 "cs.ATG" +#line 2137 "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) { @@ -4526,33 +4555,33 @@ out expr); } void ConditionalOrExpr( -#line 2291 "cs.ATG" +#line 2306 "cs.ATG" ref Expression outExpr) { -#line 2292 "cs.ATG" +#line 2307 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2294 "cs.ATG" +#line 2309 "cs.ATG" ref outExpr); while (la.kind == 26) { lexer.NextToken(); UnaryExpr( -#line 2294 "cs.ATG" +#line 2309 "cs.ATG" out expr); ConditionalAndExpr( -#line 2294 "cs.ATG" +#line 2309 "cs.ATG" ref expr); -#line 2294 "cs.ATG" +#line 2309 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 2139 "cs.ATG" +#line 2154 "cs.ATG" out Expression pexpr) { -#line 2141 "cs.ATG" +#line 2156 "cs.ATG" TypeReference type = null; List typeList = null; bool isArrayCreation = false; @@ -4562,536 +4591,536 @@ out Expression pexpr) { if (la.kind == 112) { lexer.NextToken(); -#line 2149 "cs.ATG" +#line 2164 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 71) { lexer.NextToken(); -#line 2150 "cs.ATG" +#line 2165 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 89) { lexer.NextToken(); -#line 2151 "cs.ATG" +#line 2166 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 2152 "cs.ATG" +#line 2167 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if ( -#line 2153 "cs.ATG" +#line 2168 "cs.ATG" la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { Expect(1); -#line 2154 "cs.ATG" +#line 2169 "cs.ATG" type = new TypeReference(t.val); Expect(10); -#line 2155 "cs.ATG" +#line 2170 "cs.ATG" pexpr = new TypeReferenceExpression(type); Expect(1); -#line 2156 "cs.ATG" +#line 2171 "cs.ATG" if (type.Type == "global") { type.IsGlobal = true; type.Type = (t.val ?? "?"); } else type.Type += "." + (t.val ?? "?"); } else if (la.kind == 1) { lexer.NextToken(); -#line 2158 "cs.ATG" +#line 2173 "cs.ATG" pexpr = new IdentifierExpression(t.val); } else if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2160 "cs.ATG" +#line 2175 "cs.ATG" out expr); Expect(21); -#line 2160 "cs.ATG" +#line 2175 "cs.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(27)) { -#line 2162 "cs.ATG" +#line 2177 "cs.ATG" string val = null; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2164 "cs.ATG" +#line 2179 "cs.ATG" val = "bool"; break; } case 53: { lexer.NextToken(); -#line 2165 "cs.ATG" +#line 2180 "cs.ATG" val = "byte"; break; } case 56: { lexer.NextToken(); -#line 2166 "cs.ATG" +#line 2181 "cs.ATG" val = "char"; break; } case 61: { lexer.NextToken(); -#line 2167 "cs.ATG" +#line 2182 "cs.ATG" val = "decimal"; break; } case 65: { lexer.NextToken(); -#line 2168 "cs.ATG" +#line 2183 "cs.ATG" val = "double"; break; } case 74: { lexer.NextToken(); -#line 2169 "cs.ATG" +#line 2184 "cs.ATG" val = "float"; break; } case 81: { lexer.NextToken(); -#line 2170 "cs.ATG" +#line 2185 "cs.ATG" val = "int"; break; } case 86: { lexer.NextToken(); -#line 2171 "cs.ATG" +#line 2186 "cs.ATG" val = "long"; break; } case 90: { lexer.NextToken(); -#line 2172 "cs.ATG" +#line 2187 "cs.ATG" val = "object"; break; } case 101: { lexer.NextToken(); -#line 2173 "cs.ATG" +#line 2188 "cs.ATG" val = "sbyte"; break; } case 103: { lexer.NextToken(); -#line 2174 "cs.ATG" +#line 2189 "cs.ATG" val = "short"; break; } case 107: { lexer.NextToken(); -#line 2175 "cs.ATG" +#line 2190 "cs.ATG" val = "string"; break; } case 115: { lexer.NextToken(); -#line 2176 "cs.ATG" +#line 2191 "cs.ATG" val = "uint"; break; } case 116: { lexer.NextToken(); -#line 2177 "cs.ATG" +#line 2192 "cs.ATG" val = "ulong"; break; } case 119: { lexer.NextToken(); -#line 2178 "cs.ATG" +#line 2193 "cs.ATG" val = "ushort"; break; } } -#line 2179 "cs.ATG" +#line 2194 "cs.ATG" t.val = ""; Expect(15); Expect(1); -#line 2179 "cs.ATG" +#line 2194 "cs.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 110) { lexer.NextToken(); -#line 2181 "cs.ATG" +#line 2196 "cs.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 50) { lexer.NextToken(); -#line 2183 "cs.ATG" +#line 2198 "cs.ATG" Expression retExpr = new BaseReferenceExpression(); if (la.kind == 15) { lexer.NextToken(); Expect(1); -#line 2185 "cs.ATG" +#line 2200 "cs.ATG" retExpr = new FieldReferenceExpression(retExpr, t.val); } else if (la.kind == 18) { lexer.NextToken(); Expr( -#line 2186 "cs.ATG" +#line 2201 "cs.ATG" out expr); -#line 2186 "cs.ATG" +#line 2201 "cs.ATG" List indices = new List(); if (expr != null) { indices.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Expr( -#line 2187 "cs.ATG" +#line 2202 "cs.ATG" out expr); -#line 2187 "cs.ATG" +#line 2202 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(19); -#line 2188 "cs.ATG" +#line 2203 "cs.ATG" retExpr = new IndexerExpression(retExpr, indices); - } else SynErr(178); + } else SynErr(179); -#line 2189 "cs.ATG" +#line 2204 "cs.ATG" pexpr = retExpr; } else if (la.kind == 88) { lexer.NextToken(); NonArrayType( -#line 2190 "cs.ATG" +#line 2205 "cs.ATG" out type); -#line 2191 "cs.ATG" +#line 2206 "cs.ATG" List parameters = new List(); if (la.kind == 20) { lexer.NextToken(); -#line 2196 "cs.ATG" +#line 2211 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); if (StartOf(21)) { Argument( -#line 2197 "cs.ATG" +#line 2212 "cs.ATG" out expr); -#line 2197 "cs.ATG" +#line 2212 "cs.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2198 "cs.ATG" +#line 2213 "cs.ATG" out expr); -#line 2198 "cs.ATG" +#line 2213 "cs.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(21); -#line 2200 "cs.ATG" +#line 2215 "cs.ATG" pexpr = oce; } else if (la.kind == 18) { lexer.NextToken(); -#line 2202 "cs.ATG" +#line 2217 "cs.ATG" isArrayCreation = true; ArrayCreateExpression ace = new ArrayCreateExpression(type); pexpr = ace; -#line 2203 "cs.ATG" +#line 2218 "cs.ATG" int dims = 0; List ranks = new List(); if (la.kind == 14 || la.kind == 19) { while (la.kind == 14) { lexer.NextToken(); -#line 2205 "cs.ATG" +#line 2220 "cs.ATG" dims += 1; } Expect(19); -#line 2206 "cs.ATG" +#line 2221 "cs.ATG" ranks.Add(dims); dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2207 "cs.ATG" +#line 2222 "cs.ATG" ++dims; } Expect(19); -#line 2207 "cs.ATG" +#line 2222 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2208 "cs.ATG" +#line 2223 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); ArrayInitializer( -#line 2209 "cs.ATG" +#line 2224 "cs.ATG" out expr); -#line 2209 "cs.ATG" +#line 2224 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; } else if (StartOf(5)) { Expr( -#line 2210 "cs.ATG" +#line 2225 "cs.ATG" out expr); -#line 2210 "cs.ATG" +#line 2225 "cs.ATG" if (expr != null) parameters.Add(expr); while (la.kind == 14) { lexer.NextToken(); -#line 2211 "cs.ATG" +#line 2226 "cs.ATG" dims += 1; Expr( -#line 2212 "cs.ATG" +#line 2227 "cs.ATG" out expr); -#line 2212 "cs.ATG" +#line 2227 "cs.ATG" if (expr != null) parameters.Add(expr); } Expect(19); -#line 2214 "cs.ATG" +#line 2229 "cs.ATG" ranks.Add(dims); ace.Arguments = parameters; dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2215 "cs.ATG" +#line 2230 "cs.ATG" ++dims; } Expect(19); -#line 2215 "cs.ATG" +#line 2230 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2216 "cs.ATG" +#line 2231 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); if (la.kind == 16) { ArrayInitializer( -#line 2217 "cs.ATG" +#line 2232 "cs.ATG" out expr); -#line 2217 "cs.ATG" +#line 2232 "cs.ATG" ace.ArrayInitializer = (ArrayInitializerExpression)expr; } - } else SynErr(179); - } else SynErr(180); + } else SynErr(180); + } else SynErr(181); } else if (la.kind == 114) { lexer.NextToken(); Expect(20); if ( -#line 2222 "cs.ATG" +#line 2237 "cs.ATG" NotVoidPointer()) { Expect(122); -#line 2222 "cs.ATG" +#line 2237 "cs.ATG" type = new TypeReference("void"); } else if (StartOf(9)) { TypeWithRestriction( -#line 2223 "cs.ATG" +#line 2238 "cs.ATG" out type, true, true); - } else SynErr(181); + } else SynErr(182); Expect(21); -#line 2224 "cs.ATG" +#line 2239 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 62) { lexer.NextToken(); Expect(20); Type( -#line 2226 "cs.ATG" +#line 2241 "cs.ATG" out type); Expect(21); -#line 2226 "cs.ATG" +#line 2241 "cs.ATG" pexpr = new DefaultValueExpression(type); } else if (la.kind == 104) { lexer.NextToken(); Expect(20); Type( -#line 2227 "cs.ATG" +#line 2242 "cs.ATG" out type); Expect(21); -#line 2227 "cs.ATG" +#line 2242 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 57) { lexer.NextToken(); Expect(20); Expr( -#line 2228 "cs.ATG" +#line 2243 "cs.ATG" out expr); Expect(21); -#line 2228 "cs.ATG" +#line 2243 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 117) { lexer.NextToken(); Expect(20); Expr( -#line 2229 "cs.ATG" +#line 2244 "cs.ATG" out expr); Expect(21); -#line 2229 "cs.ATG" +#line 2244 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 63) { lexer.NextToken(); AnonymousMethodExpr( -#line 2230 "cs.ATG" +#line 2245 "cs.ATG" out expr); -#line 2230 "cs.ATG" +#line 2245 "cs.ATG" pexpr = expr; - } else SynErr(182); + } else SynErr(183); while (StartOf(28) || -#line 2241 "cs.ATG" +#line 2256 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || -#line 2250 "cs.ATG" +#line 2265 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { if (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 2234 "cs.ATG" +#line 2249 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); } else if (la.kind == 32) { lexer.NextToken(); -#line 2235 "cs.ATG" +#line 2250 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); - } else SynErr(183); + } else SynErr(184); } else if (la.kind == 47) { lexer.NextToken(); Expect(1); -#line 2238 "cs.ATG" +#line 2253 "cs.ATG" pexpr = new PointerReferenceExpression(pexpr, t.val); } else if (la.kind == 15) { lexer.NextToken(); Expect(1); -#line 2239 "cs.ATG" +#line 2254 "cs.ATG" pexpr = new FieldReferenceExpression(pexpr, t.val); } else if ( -#line 2241 "cs.ATG" +#line 2256 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) { TypeArgumentList( -#line 2242 "cs.ATG" +#line 2257 "cs.ATG" out typeList, false); Expect(15); Expect(1); -#line 2244 "cs.ATG" +#line 2259 "cs.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val); } else if (la.kind == 20) { lexer.NextToken(); -#line 2246 "cs.ATG" +#line 2261 "cs.ATG" List parameters = new List(); if (StartOf(21)) { Argument( -#line 2247 "cs.ATG" +#line 2262 "cs.ATG" out expr); -#line 2247 "cs.ATG" +#line 2262 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2248 "cs.ATG" +#line 2263 "cs.ATG" out expr); -#line 2248 "cs.ATG" +#line 2263 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(21); -#line 2249 "cs.ATG" +#line 2264 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); } else if ( -#line 2250 "cs.ATG" +#line 2265 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { TypeArgumentList( -#line 2250 "cs.ATG" +#line 2265 "cs.ATG" out typeList, false); Expect(20); -#line 2251 "cs.ATG" +#line 2266 "cs.ATG" List parameters = new List(); if (StartOf(21)) { Argument( -#line 2252 "cs.ATG" +#line 2267 "cs.ATG" out expr); -#line 2252 "cs.ATG" +#line 2267 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2253 "cs.ATG" +#line 2268 "cs.ATG" out expr); -#line 2253 "cs.ATG" +#line 2268 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(21); -#line 2254 "cs.ATG" +#line 2269 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeList); } else { -#line 2256 "cs.ATG" +#line 2271 "cs.ATG" if (isArrayCreation) Error("element access not allow on array creation"); List indices = new List(); lexer.NextToken(); Expr( -#line 2259 "cs.ATG" +#line 2274 "cs.ATG" out expr); -#line 2259 "cs.ATG" +#line 2274 "cs.ATG" if (expr != null) { indices.Add(expr); } while (la.kind == 14) { lexer.NextToken(); Expr( -#line 2260 "cs.ATG" +#line 2275 "cs.ATG" out expr); -#line 2260 "cs.ATG" +#line 2275 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(19); -#line 2261 "cs.ATG" +#line 2276 "cs.ATG" pexpr = new IndexerExpression(pexpr, indices); } } } void AnonymousMethodExpr( -#line 2265 "cs.ATG" +#line 2280 "cs.ATG" out Expression outExpr) { -#line 2267 "cs.ATG" +#line 2282 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; Statement stmt; @@ -5102,365 +5131,365 @@ out Expression outExpr) { lexer.NextToken(); if (StartOf(10)) { FormalParameterList( -#line 2276 "cs.ATG" +#line 2291 "cs.ATG" p); -#line 2276 "cs.ATG" +#line 2291 "cs.ATG" expr.Parameters = p; } Expect(21); } -#line 2281 "cs.ATG" +#line 2296 "cs.ATG" if (compilationUnit != null) { Block( -#line 2282 "cs.ATG" +#line 2297 "cs.ATG" out stmt); -#line 2282 "cs.ATG" +#line 2297 "cs.ATG" expr.Body = (BlockStatement)stmt; -#line 2283 "cs.ATG" +#line 2298 "cs.ATG" } else { Expect(16); -#line 2285 "cs.ATG" +#line 2300 "cs.ATG" lexer.SkipCurrentBlock(); Expect(17); -#line 2287 "cs.ATG" +#line 2302 "cs.ATG" } -#line 2288 "cs.ATG" +#line 2303 "cs.ATG" expr.EndLocation = t.Location; } void TypeArgumentList( -#line 2461 "cs.ATG" +#line 2476 "cs.ATG" out List types, bool canBeUnbound) { -#line 2463 "cs.ATG" +#line 2478 "cs.ATG" types = new List(); TypeReference type = null; Expect(23); if ( -#line 2468 "cs.ATG" +#line 2483 "cs.ATG" canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) { -#line 2469 "cs.ATG" +#line 2484 "cs.ATG" types.Add(TypeReference.Null); while (la.kind == 14) { lexer.NextToken(); -#line 2470 "cs.ATG" +#line 2485 "cs.ATG" types.Add(TypeReference.Null); } } else if (StartOf(9)) { Type( -#line 2471 "cs.ATG" +#line 2486 "cs.ATG" out type); -#line 2471 "cs.ATG" +#line 2486 "cs.ATG" types.Add(type); while (la.kind == 14) { lexer.NextToken(); Type( -#line 2472 "cs.ATG" +#line 2487 "cs.ATG" out type); -#line 2472 "cs.ATG" +#line 2487 "cs.ATG" types.Add(type); } - } else SynErr(184); + } else SynErr(185); Expect(22); } void ConditionalAndExpr( -#line 2297 "cs.ATG" +#line 2312 "cs.ATG" ref Expression outExpr) { -#line 2298 "cs.ATG" +#line 2313 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2300 "cs.ATG" +#line 2315 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2300 "cs.ATG" +#line 2315 "cs.ATG" out expr); InclusiveOrExpr( -#line 2300 "cs.ATG" +#line 2315 "cs.ATG" ref expr); -#line 2300 "cs.ATG" +#line 2315 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2303 "cs.ATG" +#line 2318 "cs.ATG" ref Expression outExpr) { -#line 2304 "cs.ATG" +#line 2319 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2306 "cs.ATG" +#line 2321 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2306 "cs.ATG" +#line 2321 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2306 "cs.ATG" +#line 2321 "cs.ATG" ref expr); -#line 2306 "cs.ATG" +#line 2321 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2309 "cs.ATG" +#line 2324 "cs.ATG" ref Expression outExpr) { -#line 2310 "cs.ATG" +#line 2325 "cs.ATG" Expression expr; AndExpr( -#line 2312 "cs.ATG" +#line 2327 "cs.ATG" ref outExpr); while (la.kind == 30) { lexer.NextToken(); UnaryExpr( -#line 2312 "cs.ATG" +#line 2327 "cs.ATG" out expr); AndExpr( -#line 2312 "cs.ATG" +#line 2327 "cs.ATG" ref expr); -#line 2312 "cs.ATG" +#line 2327 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2315 "cs.ATG" +#line 2330 "cs.ATG" ref Expression outExpr) { -#line 2316 "cs.ATG" +#line 2331 "cs.ATG" Expression expr; EqualityExpr( -#line 2318 "cs.ATG" +#line 2333 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2318 "cs.ATG" +#line 2333 "cs.ATG" out expr); EqualityExpr( -#line 2318 "cs.ATG" +#line 2333 "cs.ATG" ref expr); -#line 2318 "cs.ATG" +#line 2333 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2321 "cs.ATG" +#line 2336 "cs.ATG" ref Expression outExpr) { -#line 2323 "cs.ATG" +#line 2338 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2327 "cs.ATG" +#line 2342 "cs.ATG" ref outExpr); while (la.kind == 33 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2330 "cs.ATG" +#line 2345 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2331 "cs.ATG" +#line 2346 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2333 "cs.ATG" +#line 2348 "cs.ATG" out expr); RelationalExpr( -#line 2333 "cs.ATG" +#line 2348 "cs.ATG" ref expr); -#line 2333 "cs.ATG" +#line 2348 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2337 "cs.ATG" +#line 2352 "cs.ATG" ref Expression outExpr) { -#line 2339 "cs.ATG" +#line 2354 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2344 "cs.ATG" +#line 2359 "cs.ATG" ref outExpr); while (StartOf(29)) { if (StartOf(30)) { if (la.kind == 23) { lexer.NextToken(); -#line 2346 "cs.ATG" +#line 2361 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 22) { lexer.NextToken(); -#line 2347 "cs.ATG" +#line 2362 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 36) { lexer.NextToken(); -#line 2348 "cs.ATG" +#line 2363 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 35) { lexer.NextToken(); -#line 2349 "cs.ATG" +#line 2364 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; - } else SynErr(185); + } else SynErr(186); UnaryExpr( -#line 2351 "cs.ATG" +#line 2366 "cs.ATG" out expr); ShiftExpr( -#line 2352 "cs.ATG" +#line 2367 "cs.ATG" ref expr); -#line 2353 "cs.ATG" +#line 2368 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 84) { lexer.NextToken(); TypeWithRestriction( -#line 2356 "cs.ATG" +#line 2371 "cs.ATG" out type, false, false); if ( -#line 2357 "cs.ATG" +#line 2372 "cs.ATG" la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) { NullableQuestionMark( -#line 2358 "cs.ATG" +#line 2373 "cs.ATG" ref type); } -#line 2359 "cs.ATG" +#line 2374 "cs.ATG" outExpr = new TypeOfIsExpression(outExpr, type); } else if (la.kind == 49) { lexer.NextToken(); TypeWithRestriction( -#line 2361 "cs.ATG" +#line 2376 "cs.ATG" out type, false, false); if ( -#line 2362 "cs.ATG" +#line 2377 "cs.ATG" la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) { NullableQuestionMark( -#line 2363 "cs.ATG" +#line 2378 "cs.ATG" ref type); } -#line 2364 "cs.ATG" +#line 2379 "cs.ATG" outExpr = new CastExpression(type, outExpr, CastType.TryCast); - } else SynErr(186); + } else SynErr(187); } } } void ShiftExpr( -#line 2369 "cs.ATG" +#line 2384 "cs.ATG" ref Expression outExpr) { -#line 2371 "cs.ATG" +#line 2386 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2375 "cs.ATG" +#line 2390 "cs.ATG" ref outExpr); while (la.kind == 37 || -#line 2378 "cs.ATG" +#line 2393 "cs.ATG" IsShiftRight()) { if (la.kind == 37) { lexer.NextToken(); -#line 2377 "cs.ATG" +#line 2392 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(22); Expect(22); -#line 2379 "cs.ATG" +#line 2394 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2382 "cs.ATG" +#line 2397 "cs.ATG" out expr); AdditiveExpr( -#line 2382 "cs.ATG" +#line 2397 "cs.ATG" ref expr); -#line 2382 "cs.ATG" +#line 2397 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2386 "cs.ATG" +#line 2401 "cs.ATG" ref Expression outExpr) { -#line 2388 "cs.ATG" +#line 2403 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2392 "cs.ATG" +#line 2407 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2395 "cs.ATG" +#line 2410 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2396 "cs.ATG" +#line 2411 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2398 "cs.ATG" +#line 2413 "cs.ATG" out expr); MultiplicativeExpr( -#line 2398 "cs.ATG" +#line 2413 "cs.ATG" ref expr); -#line 2398 "cs.ATG" +#line 2413 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2402 "cs.ATG" +#line 2417 "cs.ATG" ref Expression outExpr) { -#line 2404 "cs.ATG" +#line 2419 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5468,59 +5497,59 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2410 "cs.ATG" +#line 2425 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2411 "cs.ATG" +#line 2426 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2412 "cs.ATG" +#line 2427 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2414 "cs.ATG" +#line 2429 "cs.ATG" out expr); -#line 2414 "cs.ATG" +#line 2429 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void TypeParameterConstraintsClauseBase( -#line 2518 "cs.ATG" +#line 2533 "cs.ATG" out TypeReference type) { -#line 2519 "cs.ATG" +#line 2534 "cs.ATG" TypeReference t; type = null; if (la.kind == 108) { lexer.NextToken(); -#line 2521 "cs.ATG" +#line 2536 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 58) { lexer.NextToken(); -#line 2522 "cs.ATG" +#line 2537 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 88) { lexer.NextToken(); Expect(20); Expect(21); -#line 2523 "cs.ATG" +#line 2538 "cs.ATG" type = new TypeReference("struct"); } else if (StartOf(9)) { Type( -#line 2524 "cs.ATG" +#line 2539 "cs.ATG" out t); -#line 2524 "cs.ATG" +#line 2539 "cs.ATG" type = t; - } else SynErr(187); + } else SynErr(188); } @@ -5723,43 +5752,44 @@ out t); case 148: s = "invalid StructMemberDecl"; break; case 149: s = "invalid StructMemberDecl"; break; case 150: s = "invalid StructMemberDecl"; break; - case 151: s = "invalid InterfaceMemberDecl"; break; + case 151: s = "invalid StructMemberDecl"; break; case 152: s = "invalid InterfaceMemberDecl"; break; case 153: s = "invalid InterfaceMemberDecl"; break; - case 154: s = "invalid TypeWithRestriction"; break; + case 154: s = "invalid InterfaceMemberDecl"; break; case 155: s = "invalid TypeWithRestriction"; break; - case 156: s = "invalid SimpleType"; break; - case 157: s = "invalid AccessorModifiers"; break; - case 158: s = "invalid EventAccessorDecls"; break; - case 159: s = "invalid ConstructorInitializer"; break; - case 160: s = "invalid OverloadableOperator"; break; - case 161: s = "invalid AccessorDecls"; break; - case 162: s = "invalid InterfaceAccessors"; break; + case 156: s = "invalid TypeWithRestriction"; break; + case 157: s = "invalid SimpleType"; break; + case 158: s = "invalid AccessorModifiers"; break; + case 159: s = "invalid EventAccessorDecls"; break; + case 160: s = "invalid ConstructorInitializer"; break; + case 161: s = "invalid OverloadableOperator"; break; + case 162: s = "invalid AccessorDecls"; break; case 163: s = "invalid InterfaceAccessors"; break; - case 164: s = "invalid GetAccessorDecl"; break; - case 165: s = "invalid SetAccessorDecl"; break; - case 166: s = "invalid VariableInitializer"; break; - case 167: s = "invalid Statement"; break; - case 168: s = "invalid AssignmentOperator"; break; - case 169: s = "invalid EmbeddedStatement"; break; + case 164: s = "invalid InterfaceAccessors"; break; + case 165: s = "invalid GetAccessorDecl"; break; + case 166: s = "invalid SetAccessorDecl"; break; + case 167: s = "invalid VariableInitializer"; break; + case 168: s = "invalid Statement"; break; + case 169: s = "invalid AssignmentOperator"; break; case 170: s = "invalid EmbeddedStatement"; break; case 171: s = "invalid EmbeddedStatement"; break; - case 172: s = "invalid ForInitializer"; break; - case 173: s = "invalid GotoStatement"; break; - case 174: s = "invalid TryStatement"; break; - case 175: s = "invalid ResourceAcquisition"; break; - case 176: s = "invalid SwitchLabel"; break; - case 177: s = "invalid CatchClauses"; break; - case 178: s = "invalid PrimaryExpr"; break; + case 172: s = "invalid EmbeddedStatement"; break; + case 173: s = "invalid ForInitializer"; break; + case 174: s = "invalid GotoStatement"; break; + case 175: s = "invalid TryStatement"; break; + case 176: s = "invalid ResourceAcquisition"; break; + case 177: s = "invalid SwitchLabel"; break; + case 178: s = "invalid CatchClauses"; break; case 179: s = "invalid PrimaryExpr"; break; case 180: s = "invalid PrimaryExpr"; break; case 181: s = "invalid PrimaryExpr"; break; case 182: s = "invalid PrimaryExpr"; break; case 183: s = "invalid PrimaryExpr"; break; - case 184: s = "invalid TypeArgumentList"; break; - case 185: s = "invalid RelationalExpr"; break; + case 184: s = "invalid PrimaryExpr"; break; + case 185: s = "invalid TypeArgumentList"; break; case 186: s = "invalid RelationalExpr"; break; - case 187: s = "invalid TypeParameterConstraintsClauseBase"; break; + case 187: s = "invalid RelationalExpr"; break; + case 188: s = "invalid TypeParameterConstraintsClauseBase"; break; default: s = "error " + errorNumber; break; } @@ -5779,15 +5809,15 @@ out t); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x}, {x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,x,T, T,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,T,x,x, T,T,x,x, x,T,T,T, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,T, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x}, {x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, - {x,x,x,x, T,T,T,T, T,T,x,T, T,T,T,x, x,T,x,T, x,T,T,T, x,T,T,x, T,T,T,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, + {x,x,x,x, T,T,T,T, T,T,x,T, T,T,T,x, x,T,T,T, x,T,T,T, x,T,T,x, T,T,T,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, T,x,T,x, x,x,x,T, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, - {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,T,x,x, T,x,T,T, x,T,x,T, x,T,x,T, T,T,T,x, x,x,T,x, x,x,x,T, x,T,T,T, x,x,T,x, T,x,T,x, x,T,x,T, T,T,T,x, x,T,T,T, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,T, x,T,T,T, x,x,x}, - {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,T,x,x, T,x,T,T, x,T,x,T, x,T,x,T, T,T,T,x, x,x,T,x, x,x,x,T, x,T,T,T, x,x,T,x, T,x,T,x, x,T,x,T, T,T,T,x, x,T,T,T, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,T, x,T,T,T, x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,T,x,x, T,x,T,T, x,T,x,T, x,T,x,T, T,T,T,x, x,T,T,x, x,x,x,T, x,T,T,T, x,x,T,x, T,x,T,x, x,T,x,T, T,T,T,x, x,T,T,T, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,T, x,T,T,T, x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,T,x,x, T,x,T,T, x,T,x,T, x,T,x,T, T,T,T,x, x,T,T,x, x,x,x,T, x,T,T,T, x,x,T,x, T,x,T,x, x,T,x,T, T,T,T,x, x,T,T,T, x,x,T,T, T,x,x,x, x,x,x,T, T,x,T,T, x,T,T,T, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, T,x,x,x, x,x,x,T, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,x,T, x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,T, T,T,T,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,x,T, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,T,T, x,T,x,T, x,T,x,T, T,T,x,x, x,x,T,x, x,x,x,T, x,T,T,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, T,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,T, x,x,x,x, x,x,x,T, T,x,x,T, x,x,T,x, x,x,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 4fe3666c04..7b32241d1d 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -1168,6 +1168,7 @@ MemberModifiers | "readonly" (. m.Add(Modifier.ReadOnly, t.Location); .) | "sealed" (. m.Add(Modifier.Sealed, t.Location); .) | "static" (. m.Add(Modifier.Static, t.Location); .) + | "fixed" (. m.Add(Modifier.Fixed, t.Location); .) | "unsafe" (. m.Add(Modifier.Unsafe, t.Location); .) | "virtual" (. m.Add(Modifier.Virtual, t.Location); .) | "volatile" (. m.Add(Modifier.Volatile, t.Location); .) @@ -1350,12 +1351,26 @@ StructMemberDecl attributes> .) /*--- field declaration: */ - | IF (IsVarDecl()) (. m.Check(Modifier.Fields); - FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); - fd.StartLocation = m.GetDeclarationLocation(startPos); - .) - VariableDeclarator - { "," VariableDeclarator } + | IF (IsVarDecl()) + (. m.Check(Modifier.Fields); + FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); + fd.StartLocation = m.GetDeclarationLocation(startPos); + .) + ( IF (m.Contains(Modifier.Fixed)) + VariableDeclarator + "[" + Expr + "]" + { "," + VariableDeclarator + "[" + Expr + "]" + } + | /* non-fixed field */ + VariableDeclarator + { "," VariableDeclarator } + ) ";" (. fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); .) /*--- unqualified indexer declaration (without interface name): */ diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 5e3c045063..737dad4626 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -403,7 +403,7 @@ out u); void GlobalAttributeSection() { -#line 2194 "VBNET.ATG" +#line 2202 "VBNET.ATG" Point startPos = t.Location; Expect(27); if (la.kind == 49) { @@ -412,20 +412,20 @@ out u); lexer.NextToken(); } else SynErr(208); -#line 2196 "VBNET.ATG" +#line 2204 "VBNET.ATG" string attributeTarget = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2200 "VBNET.ATG" +#line 2208 "VBNET.ATG" out attribute); -#line 2200 "VBNET.ATG" +#line 2208 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2201 "VBNET.ATG" +#line 2209 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -437,10 +437,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2201 "VBNET.ATG" +#line 2209 "VBNET.ATG" out attribute); -#line 2201 "VBNET.ATG" +#line 2209 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -449,7 +449,7 @@ out attribute); Expect(26); EndOfStmt(); -#line 2206 "VBNET.ATG" +#line 2214 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -566,47 +566,47 @@ out aliasedType); } void Qualident( -#line 2906 "VBNET.ATG" +#line 2914 "VBNET.ATG" out string qualident) { -#line 2908 "VBNET.ATG" +#line 2916 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2912 "VBNET.ATG" +#line 2920 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2913 "VBNET.ATG" +#line 2921 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2913 "VBNET.ATG" +#line 2921 "VBNET.ATG" out name); -#line 2913 "VBNET.ATG" +#line 2921 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2915 "VBNET.ATG" +#line 2923 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2087 "VBNET.ATG" +#line 2095 "VBNET.ATG" out TypeReference typeref) { -#line 2088 "VBNET.ATG" +#line 2096 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2090 "VBNET.ATG" +#line 2098 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2091 "VBNET.ATG" +#line 2099 "VBNET.ATG" out rank); -#line 2092 "VBNET.ATG" +#line 2100 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -623,35 +623,35 @@ out rank); } void AttributeSection( -#line 2263 "VBNET.ATG" +#line 2271 "VBNET.ATG" out AttributeSection section) { -#line 2265 "VBNET.ATG" +#line 2273 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(27); -#line 2269 "VBNET.ATG" +#line 2277 "VBNET.ATG" Point startPos = t.Location; if ( -#line 2270 "VBNET.ATG" +#line 2278 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 93) { lexer.NextToken(); -#line 2271 "VBNET.ATG" +#line 2279 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2272 "VBNET.ATG" +#line 2280 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2275 "VBNET.ATG" +#line 2283 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -664,20 +664,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2285 "VBNET.ATG" +#line 2293 "VBNET.ATG" out attribute); -#line 2285 "VBNET.ATG" +#line 2293 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2286 "VBNET.ATG" +#line 2294 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2286 "VBNET.ATG" +#line 2294 "VBNET.ATG" out attribute); -#line 2286 "VBNET.ATG" +#line 2294 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -685,7 +685,7 @@ out attribute); } Expect(26); -#line 2290 "VBNET.ATG" +#line 2298 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -693,69 +693,69 @@ out attribute); } void TypeModifier( -#line 2982 "VBNET.ATG" +#line 2990 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2983 "VBNET.ATG" +#line 2991 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2984 "VBNET.ATG" +#line 2992 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 99: { lexer.NextToken(); -#line 2985 "VBNET.ATG" +#line 2993 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2986 "VBNET.ATG" +#line 2994 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2987 "VBNET.ATG" +#line 2995 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2988 "VBNET.ATG" +#line 2996 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 122: { lexer.NextToken(); -#line 2989 "VBNET.ATG" +#line 2997 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 131: { lexer.NextToken(); -#line 2990 "VBNET.ATG" +#line 2998 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 203: { lexer.NextToken(); -#line 2991 "VBNET.ATG" +#line 2999 "VBNET.ATG" m.Add(Modifier.Partial, t.Location); break; } @@ -764,21 +764,21 @@ Modifiers m) { } void NonModuleDeclaration( -#line 649 "VBNET.ATG" +#line 657 "VBNET.ATG" Modifiers m, List attributes) { -#line 651 "VBNET.ATG" +#line 659 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 67: { -#line 654 "VBNET.ATG" +#line 662 "VBNET.ATG" m.Check(Modifier.Classes); lexer.NextToken(); -#line 657 "VBNET.ATG" +#line 665 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; compilationUnit.AddChild(newType); @@ -788,36 +788,36 @@ Modifiers m, List attributes) { Identifier(); -#line 664 "VBNET.ATG" +#line 672 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 665 "VBNET.ATG" +#line 673 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 667 "VBNET.ATG" +#line 675 "VBNET.ATG" newType.BodyStartLocation = t.Location; if (la.kind == 110) { ClassBaseType( -#line 668 "VBNET.ATG" +#line 676 "VBNET.ATG" out typeRef); -#line 668 "VBNET.ATG" +#line 676 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } while (la.kind == 107) { TypeImplementsClause( -#line 669 "VBNET.ATG" +#line 677 "VBNET.ATG" out baseInterfaces); -#line 669 "VBNET.ATG" +#line 677 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 670 "VBNET.ATG" +#line 678 "VBNET.ATG" newType); -#line 672 "VBNET.ATG" +#line 680 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -825,7 +825,7 @@ newType); case 121: { lexer.NextToken(); -#line 676 "VBNET.ATG" +#line 684 "VBNET.ATG" m.Check(Modifier.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -835,17 +835,17 @@ newType); Identifier(); -#line 683 "VBNET.ATG" +#line 691 "VBNET.ATG" newType.Name = t.val; Expect(1); -#line 685 "VBNET.ATG" +#line 693 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 686 "VBNET.ATG" +#line 694 "VBNET.ATG" newType); -#line 688 "VBNET.ATG" +#line 696 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -853,7 +853,7 @@ newType); case 166: { lexer.NextToken(); -#line 692 "VBNET.ATG" +#line 700 "VBNET.ATG" m.Check(Modifier.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -863,28 +863,28 @@ newType); Identifier(); -#line 699 "VBNET.ATG" +#line 707 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 700 "VBNET.ATG" +#line 708 "VBNET.ATG" newType.Templates); Expect(1); -#line 702 "VBNET.ATG" +#line 710 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 107) { TypeImplementsClause( -#line 703 "VBNET.ATG" +#line 711 "VBNET.ATG" out baseInterfaces); -#line 703 "VBNET.ATG" +#line 711 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 704 "VBNET.ATG" +#line 712 "VBNET.ATG" newType); -#line 706 "VBNET.ATG" +#line 714 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -892,7 +892,7 @@ newType); case 90: { lexer.NextToken(); -#line 711 "VBNET.ATG" +#line 719 "VBNET.ATG" m.Check(Modifier.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -903,26 +903,26 @@ newType); Identifier(); -#line 719 "VBNET.ATG" +#line 727 "VBNET.ATG" newType.Name = t.val; if (la.kind == 48) { lexer.NextToken(); NonArrayTypeName( -#line 720 "VBNET.ATG" +#line 728 "VBNET.ATG" out typeRef, false); -#line 720 "VBNET.ATG" +#line 728 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } Expect(1); -#line 722 "VBNET.ATG" +#line 730 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 723 "VBNET.ATG" +#line 731 "VBNET.ATG" newType); -#line 725 "VBNET.ATG" +#line 733 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -930,7 +930,7 @@ newType); case 112: { lexer.NextToken(); -#line 730 "VBNET.ATG" +#line 738 "VBNET.ATG" m.Check(Modifier.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -940,28 +940,28 @@ newType); Identifier(); -#line 737 "VBNET.ATG" +#line 745 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 738 "VBNET.ATG" +#line 746 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 740 "VBNET.ATG" +#line 748 "VBNET.ATG" newType.BodyStartLocation = t.Location; while (la.kind == 110) { InterfaceBase( -#line 741 "VBNET.ATG" +#line 749 "VBNET.ATG" out baseInterfaces); -#line 741 "VBNET.ATG" +#line 749 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 742 "VBNET.ATG" +#line 750 "VBNET.ATG" newType); -#line 744 "VBNET.ATG" +#line 752 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -969,7 +969,7 @@ newType); case 80: { lexer.NextToken(); -#line 749 "VBNET.ATG" +#line 757 "VBNET.ATG" m.Check(Modifier.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); @@ -980,63 +980,63 @@ newType); lexer.NextToken(); Identifier(); -#line 756 "VBNET.ATG" +#line 764 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 757 "VBNET.ATG" +#line 765 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 758 "VBNET.ATG" +#line 766 "VBNET.ATG" p); } Expect(25); -#line 758 "VBNET.ATG" +#line 766 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 100) { lexer.NextToken(); Identifier(); -#line 760 "VBNET.ATG" +#line 768 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 761 "VBNET.ATG" +#line 769 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 762 "VBNET.ATG" +#line 770 "VBNET.ATG" p); } Expect(25); -#line 762 "VBNET.ATG" +#line 770 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 48) { lexer.NextToken(); -#line 763 "VBNET.ATG" +#line 771 "VBNET.ATG" TypeReference type; TypeName( -#line 763 "VBNET.ATG" +#line 771 "VBNET.ATG" out type); -#line 763 "VBNET.ATG" +#line 771 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(214); -#line 765 "VBNET.ATG" +#line 773 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; Expect(1); -#line 768 "VBNET.ATG" +#line 776 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; @@ -1152,7 +1152,7 @@ TemplateDefinition template) { Expect(48); if (la.kind == 22) { lexer.NextToken(); - TypeName( + TypeParameterConstraint( #line 638 "VBNET.ATG" out constraint); @@ -1160,7 +1160,7 @@ out constraint); if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); - TypeName( + TypeParameterConstraint( #line 641 "VBNET.ATG" out constraint); @@ -1169,7 +1169,7 @@ out constraint); } Expect(23); } else if (StartOf(5)) { - TypeName( + TypeParameterConstraint( #line 644 "VBNET.ATG" out constraint); @@ -1178,294 +1178,322 @@ out constraint); } else SynErr(217); } + void TypeParameterConstraint( +#line 648 "VBNET.ATG" +out TypeReference constraint) { + +#line 649 "VBNET.ATG" + constraint = null; + if (la.kind == 67) { + lexer.NextToken(); + +#line 650 "VBNET.ATG" + constraint = new TypeReference("class"); + } else if (la.kind == 166) { + lexer.NextToken(); + +#line 651 "VBNET.ATG" + constraint = new TypeReference("struct"); + } else if (la.kind == 127) { + lexer.NextToken(); + +#line 652 "VBNET.ATG" + constraint = new TypeReference("new"); + } else if (StartOf(6)) { + TypeName( +#line 653 "VBNET.ATG" +out constraint); + } else SynErr(218); + } + void ClassBaseType( -#line 945 "VBNET.ATG" +#line 953 "VBNET.ATG" out TypeReference typeRef) { -#line 947 "VBNET.ATG" +#line 955 "VBNET.ATG" typeRef = null; Expect(110); TypeName( -#line 950 "VBNET.ATG" +#line 958 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1692 "VBNET.ATG" +#line 1700 "VBNET.ATG" out List baseInterfaces) { -#line 1694 "VBNET.ATG" +#line 1702 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(107); TypeName( -#line 1697 "VBNET.ATG" +#line 1705 "VBNET.ATG" out type); -#line 1699 "VBNET.ATG" +#line 1707 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1702 "VBNET.ATG" +#line 1710 "VBNET.ATG" out type); -#line 1703 "VBNET.ATG" +#line 1711 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 778 "VBNET.ATG" +#line 786 "VBNET.ATG" TypeDeclaration newType) { -#line 779 "VBNET.ATG" +#line 787 "VBNET.ATG" AttributeSection section; - while (StartOf(6)) { + while (StartOf(7)) { -#line 781 "VBNET.ATG" +#line 789 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 27) { AttributeSection( -#line 784 "VBNET.ATG" +#line 792 "VBNET.ATG" out section); -#line 784 "VBNET.ATG" +#line 792 "VBNET.ATG" attributes.Add(section); } - while (StartOf(7)) { + while (StartOf(8)) { MemberModifier( -#line 785 "VBNET.ATG" +#line 793 "VBNET.ATG" m); } ClassMemberDecl( -#line 786 "VBNET.ATG" +#line 794 "VBNET.ATG" m, attributes); } Expect(88); Expect(67); -#line 788 "VBNET.ATG" +#line 796 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void ModuleBody( -#line 807 "VBNET.ATG" +#line 815 "VBNET.ATG" TypeDeclaration newType) { -#line 808 "VBNET.ATG" +#line 816 "VBNET.ATG" AttributeSection section; - while (StartOf(6)) { + while (StartOf(7)) { -#line 810 "VBNET.ATG" +#line 818 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 27) { AttributeSection( -#line 813 "VBNET.ATG" +#line 821 "VBNET.ATG" out section); -#line 813 "VBNET.ATG" +#line 821 "VBNET.ATG" attributes.Add(section); } - while (StartOf(7)) { + while (StartOf(8)) { MemberModifier( -#line 814 "VBNET.ATG" +#line 822 "VBNET.ATG" m); } ClassMemberDecl( -#line 815 "VBNET.ATG" +#line 823 "VBNET.ATG" m, attributes); } Expect(88); Expect(121); -#line 817 "VBNET.ATG" +#line 825 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void StructureBody( -#line 792 "VBNET.ATG" +#line 800 "VBNET.ATG" TypeDeclaration newType) { -#line 793 "VBNET.ATG" +#line 801 "VBNET.ATG" AttributeSection section; - while (StartOf(6)) { + while (StartOf(7)) { -#line 795 "VBNET.ATG" +#line 803 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 27) { AttributeSection( -#line 798 "VBNET.ATG" +#line 806 "VBNET.ATG" out section); -#line 798 "VBNET.ATG" +#line 806 "VBNET.ATG" attributes.Add(section); } - while (StartOf(7)) { + while (StartOf(8)) { MemberModifier( -#line 799 "VBNET.ATG" +#line 807 "VBNET.ATG" m); } StructureMemberDecl( -#line 800 "VBNET.ATG" +#line 808 "VBNET.ATG" m, attributes); } Expect(88); Expect(166); -#line 802 "VBNET.ATG" +#line 810 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void NonArrayTypeName( -#line 2110 "VBNET.ATG" +#line 2118 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2112 "VBNET.ATG" +#line 2120 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; - if (StartOf(8)) { + if (StartOf(9)) { if (la.kind == 198) { lexer.NextToken(); Expect(10); -#line 2117 "VBNET.ATG" +#line 2125 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2118 "VBNET.ATG" +#line 2126 "VBNET.ATG" out typeref, canBeUnbound); -#line 2119 "VBNET.ATG" +#line 2127 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 2120 "VBNET.ATG" +#line 2128 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2121 "VBNET.ATG" +#line 2129 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2122 "VBNET.ATG" +#line 2130 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 133) { lexer.NextToken(); -#line 2125 "VBNET.ATG" +#line 2133 "VBNET.ATG" typeref = new TypeReference("System.Object"); - } else if (StartOf(9)) { + } else if (StartOf(10)) { PrimitiveTypeName( -#line 2126 "VBNET.ATG" +#line 2134 "VBNET.ATG" out name); -#line 2126 "VBNET.ATG" +#line 2134 "VBNET.ATG" typeref = new TypeReference(name); - } else SynErr(218); + } else SynErr(219); } void EnumBody( -#line 821 "VBNET.ATG" +#line 829 "VBNET.ATG" TypeDeclaration newType) { -#line 822 "VBNET.ATG" +#line 830 "VBNET.ATG" FieldDeclaration f; - while (StartOf(10)) { + while (StartOf(11)) { EnumMemberDecl( -#line 824 "VBNET.ATG" +#line 832 "VBNET.ATG" out f); -#line 824 "VBNET.ATG" +#line 832 "VBNET.ATG" compilationUnit.AddChild(f); } Expect(88); Expect(90); -#line 826 "VBNET.ATG" +#line 834 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void InterfaceBase( -#line 1677 "VBNET.ATG" +#line 1685 "VBNET.ATG" out List bases) { -#line 1679 "VBNET.ATG" +#line 1687 "VBNET.ATG" TypeReference type; bases = new List(); Expect(110); TypeName( -#line 1683 "VBNET.ATG" +#line 1691 "VBNET.ATG" out type); -#line 1683 "VBNET.ATG" +#line 1691 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1686 "VBNET.ATG" +#line 1694 "VBNET.ATG" out type); -#line 1686 "VBNET.ATG" +#line 1694 "VBNET.ATG" bases.Add(type); } Expect(1); } void InterfaceBody( -#line 830 "VBNET.ATG" +#line 838 "VBNET.ATG" TypeDeclaration newType) { - while (StartOf(11)) { + while (StartOf(12)) { InterfaceMemberDecl(); } Expect(88); Expect(112); -#line 832 "VBNET.ATG" +#line 840 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void FormalParameterList( -#line 2297 "VBNET.ATG" +#line 2305 "VBNET.ATG" List parameter) { -#line 2299 "VBNET.ATG" +#line 2307 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 2303 "VBNET.ATG" +#line 2311 "VBNET.ATG" out section); -#line 2303 "VBNET.ATG" +#line 2311 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2305 "VBNET.ATG" +#line 2313 "VBNET.ATG" out p); -#line 2307 "VBNET.ATG" +#line 2315 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1473,172 +1501,172 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2312 "VBNET.ATG" +#line 2320 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 27) { AttributeSection( -#line 2313 "VBNET.ATG" +#line 2321 "VBNET.ATG" out section); -#line 2313 "VBNET.ATG" +#line 2321 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2315 "VBNET.ATG" +#line 2323 "VBNET.ATG" out p); -#line 2315 "VBNET.ATG" +#line 2323 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2994 "VBNET.ATG" +#line 3002 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 122: { lexer.NextToken(); -#line 2995 "VBNET.ATG" +#line 3003 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 79: { lexer.NextToken(); -#line 2996 "VBNET.ATG" +#line 3004 "VBNET.ATG" m.Add(Modifier.Default, t.Location); break; } case 99: { lexer.NextToken(); -#line 2997 "VBNET.ATG" +#line 3005 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2998 "VBNET.ATG" +#line 3006 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2999 "VBNET.ATG" +#line 3007 "VBNET.ATG" m.Add(Modifier.Override, t.Location); break; } case 123: { lexer.NextToken(); -#line 3000 "VBNET.ATG" +#line 3008 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 3001 "VBNET.ATG" +#line 3009 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 3002 "VBNET.ATG" +#line 3010 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 3003 "VBNET.ATG" +#line 3011 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 131: { lexer.NextToken(); -#line 3004 "VBNET.ATG" +#line 3012 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 132: { lexer.NextToken(); -#line 3005 "VBNET.ATG" +#line 3013 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 3006 "VBNET.ATG" +#line 3014 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 141: { lexer.NextToken(); -#line 3007 "VBNET.ATG" +#line 3015 "VBNET.ATG" m.Add(Modifier.Virtual, t.Location); break; } case 140: { lexer.NextToken(); -#line 3008 "VBNET.ATG" +#line 3016 "VBNET.ATG" m.Add(Modifier.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3017 "VBNET.ATG" m.Add(Modifier.ReadOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 3010 "VBNET.ATG" +#line 3018 "VBNET.ATG" m.Add(Modifier.WriteOnly, t.Location); break; } case 183: { lexer.NextToken(); -#line 3011 "VBNET.ATG" +#line 3019 "VBNET.ATG" m.Add(Modifier.WithEvents, t.Location); break; } case 81: { lexer.NextToken(); -#line 3012 "VBNET.ATG" +#line 3020 "VBNET.ATG" m.Add(Modifier.Dim, t.Location); break; } - default: SynErr(219); break; + default: SynErr(220); break; } } void ClassMemberDecl( -#line 941 "VBNET.ATG" +#line 949 "VBNET.ATG" Modifiers m, List attributes) { StructureMemberDecl( -#line 942 "VBNET.ATG" +#line 950 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 955 "VBNET.ATG" +#line 963 "VBNET.ATG" Modifiers m, List attributes) { -#line 957 "VBNET.ATG" +#line 965 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1648,37 +1676,37 @@ Modifiers m, List attributes) { switch (la.kind) { case 67: case 80: case 90: case 112: case 121: case 166: { NonModuleDeclaration( -#line 964 "VBNET.ATG" +#line 972 "VBNET.ATG" m, attributes); break; } case 167: { lexer.NextToken(); -#line 968 "VBNET.ATG" +#line 976 "VBNET.ATG" Point startPos = t.Location; - if (StartOf(12)) { + if (StartOf(13)) { -#line 972 "VBNET.ATG" +#line 980 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 978 "VBNET.ATG" +#line 986 "VBNET.ATG" name = t.val; m.Check(Modifier.VBMethods); TypeParameterList( -#line 981 "VBNET.ATG" +#line 989 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 982 "VBNET.ATG" +#line 990 "VBNET.ATG" p); } Expect(25); @@ -1686,23 +1714,23 @@ p); if (la.kind == 105 || la.kind == 107) { if (la.kind == 107) { ImplementsClause( -#line 985 "VBNET.ATG" +#line 993 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 987 "VBNET.ATG" +#line 995 "VBNET.ATG" out handlesClause); } } -#line 990 "VBNET.ATG" +#line 998 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); if ( -#line 994 "VBNET.ATG" +#line 1002 "VBNET.ATG" IsMustOverride(m)) { -#line 996 "VBNET.ATG" +#line 1004 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = endLocation; @@ -1714,9 +1742,9 @@ IsMustOverride(m)) { compilationUnit.AddChild(methodDeclaration); - } else if (StartOf(13)) { + } else if (StartOf(14)) { -#line 1009 "VBNET.ATG" +#line 1017 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = endLocation; @@ -1730,49 +1758,49 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1021 "VBNET.ATG" +#line 1029 "VBNET.ATG" out stmt); -#line 1023 "VBNET.ATG" +#line 1031 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(88); Expect(167); -#line 1026 "VBNET.ATG" +#line 1034 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); - } else SynErr(220); + } else SynErr(221); } else if (la.kind == 127) { lexer.NextToken(); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1029 "VBNET.ATG" +#line 1037 "VBNET.ATG" p); } Expect(25); } -#line 1030 "VBNET.ATG" +#line 1038 "VBNET.ATG" m.Check(Modifier.Constructors); -#line 1031 "VBNET.ATG" +#line 1039 "VBNET.ATG" Point constructorEndLocation = t.EndLocation; Expect(1); Block( -#line 1033 "VBNET.ATG" +#line 1041 "VBNET.ATG" out stmt); Expect(88); Expect(167); -#line 1034 "VBNET.ATG" +#line 1042 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); -#line 1036 "VBNET.ATG" +#line 1044 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1780,13 +1808,13 @@ out stmt); cd.Body.EndLocation = endLocation; compilationUnit.AddChild(cd); - } else SynErr(221); + } else SynErr(222); break; } case 100: { lexer.NextToken(); -#line 1048 "VBNET.ATG" +#line 1056 "VBNET.ATG" m.Check(Modifier.VBMethods); string name = String.Empty; Point startPos = t.Location; @@ -1796,16 +1824,16 @@ out stmt); Identifier(); -#line 1055 "VBNET.ATG" +#line 1063 "VBNET.ATG" name = t.val; TypeParameterList( -#line 1056 "VBNET.ATG" +#line 1064 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1057 "VBNET.ATG" +#line 1065 "VBNET.ATG" p); } Expect(25); @@ -1814,15 +1842,15 @@ p); lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 1058 "VBNET.ATG" +#line 1066 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 1058 "VBNET.ATG" +#line 1066 "VBNET.ATG" out type); } -#line 1060 "VBNET.ATG" +#line 1068 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -1830,20 +1858,20 @@ out type); if (la.kind == 105 || la.kind == 107) { if (la.kind == 107) { ImplementsClause( -#line 1066 "VBNET.ATG" +#line 1074 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 1068 "VBNET.ATG" +#line 1076 "VBNET.ATG" out handlesClause); } } Expect(1); if ( -#line 1074 "VBNET.ATG" +#line 1082 "VBNET.ATG" IsMustOverride(m)) { -#line 1076 "VBNET.ATG" +#line 1084 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = t.EndLocation; @@ -1857,9 +1885,9 @@ IsMustOverride(m)) { } compilationUnit.AddChild(methodDeclaration); - } else if (StartOf(13)) { + } else if (StartOf(14)) { -#line 1091 "VBNET.ATG" +#line 1099 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = t.EndLocation; @@ -1876,28 +1904,28 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1106 "VBNET.ATG" +#line 1114 "VBNET.ATG" out stmt); -#line 1108 "VBNET.ATG" +#line 1116 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(88); Expect(100); -#line 1113 "VBNET.ATG" +#line 1121 "VBNET.ATG" methodDeclaration.Body.StartLocation = methodDeclaration.EndLocation; methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); - } else SynErr(222); + } else SynErr(223); break; } case 78: { lexer.NextToken(); -#line 1122 "VBNET.ATG" +#line 1130 "VBNET.ATG" m.Check(Modifier.VBExternalMethods); Point startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1905,41 +1933,41 @@ out stmt); string alias = null; string name = String.Empty; - if (StartOf(14)) { + if (StartOf(15)) { Charset( -#line 1129 "VBNET.ATG" +#line 1137 "VBNET.ATG" out charsetModifer); } if (la.kind == 167) { lexer.NextToken(); Identifier(); -#line 1132 "VBNET.ATG" +#line 1140 "VBNET.ATG" name = t.val; Expect(115); Expect(3); -#line 1133 "VBNET.ATG" - library = t.literalValue.ToString(); +#line 1141 "VBNET.ATG" + library = t.literalValue as string; if (la.kind == 44) { lexer.NextToken(); Expect(3); -#line 1134 "VBNET.ATG" - alias = t.literalValue.ToString(); +#line 1142 "VBNET.ATG" + alias = t.literalValue as string; } if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1135 "VBNET.ATG" +#line 1143 "VBNET.ATG" p); } Expect(25); } Expect(1); -#line 1138 "VBNET.ATG" +#line 1146 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1949,25 +1977,25 @@ p); lexer.NextToken(); Identifier(); -#line 1145 "VBNET.ATG" +#line 1153 "VBNET.ATG" name = t.val; Expect(115); Expect(3); -#line 1146 "VBNET.ATG" - library = t.literalValue.ToString(); +#line 1154 "VBNET.ATG" + library = t.literalValue as string; if (la.kind == 44) { lexer.NextToken(); Expect(3); -#line 1147 "VBNET.ATG" - alias = t.literalValue.ToString(); +#line 1155 "VBNET.ATG" + alias = t.literalValue as string; } if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1148 "VBNET.ATG" +#line 1156 "VBNET.ATG" p); } Expect(25); @@ -1975,24 +2003,24 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1149 "VBNET.ATG" +#line 1157 "VBNET.ATG" out type); } Expect(1); -#line 1152 "VBNET.ATG" +#line 1160 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; compilationUnit.AddChild(declareDeclaration); - } else SynErr(223); + } else SynErr(224); break; } case 93: { lexer.NextToken(); -#line 1162 "VBNET.ATG" +#line 1170 "VBNET.ATG" m.Check(Modifier.VBEvents); Point startPos = t.Location; EventDeclaration eventDeclaration; @@ -2001,31 +2029,31 @@ out type); Identifier(); -#line 1168 "VBNET.ATG" +#line 1176 "VBNET.ATG" name= t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1170 "VBNET.ATG" +#line 1178 "VBNET.ATG" out type); } else if (la.kind == 1 || la.kind == 24 || la.kind == 107) { if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1172 "VBNET.ATG" +#line 1180 "VBNET.ATG" p); } Expect(25); } - } else SynErr(224); + } else SynErr(225); if (la.kind == 107) { ImplementsClause( -#line 1174 "VBNET.ATG" +#line 1182 "VBNET.ATG" out implementsClause); } -#line 1176 "VBNET.ATG" +#line 1184 "VBNET.ATG" eventDeclaration = new EventDeclaration(type, m.Modifier, p, attributes, name, implementsClause); eventDeclaration.StartLocation = m.GetDeclarationLocation(startPos); eventDeclaration.EndLocation = t.EndLocation; @@ -2036,30 +2064,30 @@ out implementsClause); } case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: { -#line 1183 "VBNET.ATG" +#line 1191 "VBNET.ATG" Point startPos = t.Location; -#line 1185 "VBNET.ATG" +#line 1193 "VBNET.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); IdentifierForFieldDeclaration(); -#line 1189 "VBNET.ATG" +#line 1197 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1190 "VBNET.ATG" +#line 1198 "VBNET.ATG" variableDeclarators, name); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1191 "VBNET.ATG" +#line 1199 "VBNET.ATG" variableDeclarators); } Expect(1); -#line 1194 "VBNET.ATG" +#line 1202 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -2068,35 +2096,35 @@ variableDeclarators); } case 71: { -#line 1199 "VBNET.ATG" +#line 1207 "VBNET.ATG" m.Check(Modifier.Fields); lexer.NextToken(); -#line 1200 "VBNET.ATG" +#line 1208 "VBNET.ATG" m.Add(Modifier.Const, t.Location); -#line 1202 "VBNET.ATG" +#line 1210 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1206 "VBNET.ATG" +#line 1214 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1207 "VBNET.ATG" +#line 1215 "VBNET.ATG" constantDeclarators); } -#line 1209 "VBNET.ATG" +#line 1217 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; Expect(1); -#line 1214 "VBNET.ATG" +#line 1222 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -2105,20 +2133,20 @@ constantDeclarators); case 146: { lexer.NextToken(); -#line 1220 "VBNET.ATG" +#line 1228 "VBNET.ATG" m.Check(Modifier.VBProperties); Point startPos = t.Location; List implementsClause = null; Identifier(); -#line 1224 "VBNET.ATG" +#line 1232 "VBNET.ATG" string propertyName = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1225 "VBNET.ATG" +#line 1233 "VBNET.ATG" p); } Expect(25); @@ -2126,26 +2154,26 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1226 "VBNET.ATG" +#line 1234 "VBNET.ATG" out type); } -#line 1228 "VBNET.ATG" +#line 1236 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } if (la.kind == 107) { ImplementsClause( -#line 1232 "VBNET.ATG" +#line 1240 "VBNET.ATG" out implementsClause); } Expect(1); if ( -#line 1236 "VBNET.ATG" +#line 1244 "VBNET.ATG" IsMustOverride(m)) { -#line 1238 "VBNET.ATG" +#line 1246 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2156,7 +2184,7 @@ IsMustOverride(m)) { } else if (la.kind == 27 || la.kind == 101 || la.kind == 156) { -#line 1248 "VBNET.ATG" +#line 1256 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2168,29 +2196,29 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1258 "VBNET.ATG" +#line 1266 "VBNET.ATG" out getRegion, out setRegion); Expect(88); Expect(146); Expect(1); -#line 1262 "VBNET.ATG" +#line 1270 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; compilationUnit.AddChild(pDecl); - } else SynErr(225); + } else SynErr(226); break; } case 204: { lexer.NextToken(); -#line 1269 "VBNET.ATG" +#line 1277 "VBNET.ATG" Point startPos = t.Location; Expect(93); -#line 1271 "VBNET.ATG" +#line 1279 "VBNET.ATG" m.Check(Modifier.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2200,24 +2228,24 @@ out getRegion, out setRegion); Identifier(); -#line 1278 "VBNET.ATG" +#line 1286 "VBNET.ATG" string customEventName = t.val; Expect(48); TypeName( -#line 1279 "VBNET.ATG" +#line 1287 "VBNET.ATG" out type); if (la.kind == 107) { ImplementsClause( -#line 1280 "VBNET.ATG" +#line 1288 "VBNET.ATG" out implementsClause); } Expect(1); - while (StartOf(15)) { + while (StartOf(16)) { EventAccessorDeclaration( -#line 1283 "VBNET.ATG" +#line 1291 "VBNET.ATG" out eventAccessorDeclaration); -#line 1285 "VBNET.ATG" +#line 1293 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2236,7 +2264,7 @@ out eventAccessorDeclaration); Expect(93); Expect(1); -#line 1301 "VBNET.ATG" +#line 1309 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2264,24 +2292,24 @@ out eventAccessorDeclaration); } case 187: case 201: case 202: { -#line 1324 "VBNET.ATG" +#line 1332 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 201 || la.kind == 202) { if (la.kind == 202) { lexer.NextToken(); -#line 1325 "VBNET.ATG" +#line 1333 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1326 "VBNET.ATG" +#line 1334 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(187); -#line 1329 "VBNET.ATG" +#line 1337 "VBNET.ATG" m.Check(Modifier.VBOperators); Point startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2293,7 +2321,7 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1339 "VBNET.ATG" +#line 1347 "VBNET.ATG" out operatorType); Expect(24); if (la.kind == 55) { @@ -2301,16 +2329,16 @@ out operatorType); } Identifier(); -#line 1340 "VBNET.ATG" +#line 1348 "VBNET.ATG" operandName = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1341 "VBNET.ATG" +#line 1349 "VBNET.ATG" out operandType); } -#line 1342 "VBNET.ATG" +#line 1350 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2319,48 +2347,48 @@ out operandType); } Identifier(); -#line 1346 "VBNET.ATG" +#line 1354 "VBNET.ATG" operandName = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1347 "VBNET.ATG" +#line 1355 "VBNET.ATG" out operandType); } -#line 1348 "VBNET.ATG" +#line 1356 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); } Expect(25); -#line 1351 "VBNET.ATG" +#line 1359 "VBNET.ATG" Point endPos = t.EndLocation; if (la.kind == 48) { lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 1352 "VBNET.ATG" +#line 1360 "VBNET.ATG" out section); -#line 1352 "VBNET.ATG" +#line 1360 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1352 "VBNET.ATG" +#line 1360 "VBNET.ATG" out returnType); -#line 1352 "VBNET.ATG" +#line 1360 "VBNET.ATG" endPos = t.EndLocation; Expect(1); } Block( -#line 1353 "VBNET.ATG" +#line 1361 "VBNET.ATG" out stmt); Expect(88); Expect(187); Expect(1); -#line 1355 "VBNET.ATG" +#line 1363 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, attributes, parameters, @@ -2378,30 +2406,30 @@ out stmt); break; } - default: SynErr(226); break; + default: SynErr(227); break; } } void EnumMemberDecl( -#line 923 "VBNET.ATG" +#line 931 "VBNET.ATG" out FieldDeclaration f) { -#line 925 "VBNET.ATG" +#line 933 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 27) { AttributeSection( -#line 929 "VBNET.ATG" +#line 937 "VBNET.ATG" out section); -#line 929 "VBNET.ATG" +#line 937 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 932 "VBNET.ATG" +#line 940 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2410,10 +2438,10 @@ out section); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 937 "VBNET.ATG" +#line 945 "VBNET.ATG" out expr); -#line 937 "VBNET.ATG" +#line 945 "VBNET.ATG" varDecl.Initializer = expr; } Expect(1); @@ -2421,7 +2449,7 @@ out expr); void InterfaceMemberDecl() { -#line 840 "VBNET.ATG" +#line 848 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2430,34 +2458,34 @@ out expr); List attributes = new List(); string name; - if (StartOf(16)) { + if (StartOf(17)) { while (la.kind == 27) { AttributeSection( -#line 848 "VBNET.ATG" +#line 856 "VBNET.ATG" out section); -#line 848 "VBNET.ATG" +#line 856 "VBNET.ATG" attributes.Add(section); } - while (StartOf(7)) { + while (StartOf(8)) { MemberModifier( -#line 851 "VBNET.ATG" +#line 859 "VBNET.ATG" mod); } if (la.kind == 93) { lexer.NextToken(); -#line 854 "VBNET.ATG" +#line 862 "VBNET.ATG" mod.Check(Modifier.VBInterfaceEvents); Identifier(); -#line 855 "VBNET.ATG" +#line 863 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 856 "VBNET.ATG" +#line 864 "VBNET.ATG" p); } Expect(25); @@ -2465,12 +2493,12 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 857 "VBNET.ATG" +#line 865 "VBNET.ATG" out type); } Expect(1); -#line 860 "VBNET.ATG" +#line 868 "VBNET.ATG" EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null); compilationUnit.AddChild(ed); ed.EndLocation = t.EndLocation; @@ -2478,27 +2506,27 @@ out type); } else if (la.kind == 167) { lexer.NextToken(); -#line 866 "VBNET.ATG" +#line 874 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 867 "VBNET.ATG" +#line 875 "VBNET.ATG" name = t.val; TypeParameterList( -#line 868 "VBNET.ATG" +#line 876 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 869 "VBNET.ATG" +#line 877 "VBNET.ATG" p); } Expect(25); } Expect(1); -#line 872 "VBNET.ATG" +#line 880 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; @@ -2508,20 +2536,20 @@ p); } else if (la.kind == 100) { lexer.NextToken(); -#line 880 "VBNET.ATG" +#line 888 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 881 "VBNET.ATG" +#line 889 "VBNET.ATG" name = t.val; TypeParameterList( -#line 882 "VBNET.ATG" +#line 890 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 883 "VBNET.ATG" +#line 891 "VBNET.ATG" p); } Expect(25); @@ -2530,15 +2558,15 @@ p); lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 884 "VBNET.ATG" +#line 892 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 884 "VBNET.ATG" +#line 892 "VBNET.ATG" out type); } -#line 886 "VBNET.ATG" +#line 894 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2555,17 +2583,17 @@ out type); } else if (la.kind == 146) { lexer.NextToken(); -#line 901 "VBNET.ATG" +#line 909 "VBNET.ATG" mod.Check(Modifier.VBInterfaceProperties); Identifier(); -#line 902 "VBNET.ATG" +#line 910 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 903 "VBNET.ATG" +#line 911 "VBNET.ATG" p); } Expect(25); @@ -2573,117 +2601,117 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 904 "VBNET.ATG" +#line 912 "VBNET.ATG" out type); } -#line 906 "VBNET.ATG" +#line 914 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } Expect(1); -#line 912 "VBNET.ATG" +#line 920 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; compilationUnit.AddChild(pd); - } else SynErr(227); - } else if (StartOf(17)) { + } else SynErr(228); + } else if (StartOf(18)) { NonModuleDeclaration( -#line 919 "VBNET.ATG" +#line 927 "VBNET.ATG" mod, attributes); - } else SynErr(228); + } else SynErr(229); } void Expr( -#line 1738 "VBNET.ATG" +#line 1746 "VBNET.ATG" out Expression expr) { DisjunctionExpr( -#line 1740 "VBNET.ATG" +#line 1748 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1709 "VBNET.ATG" +#line 1717 "VBNET.ATG" out List baseInterfaces) { -#line 1711 "VBNET.ATG" +#line 1719 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(107); NonArrayTypeName( -#line 1716 "VBNET.ATG" +#line 1724 "VBNET.ATG" out type, false); -#line 1717 "VBNET.ATG" +#line 1725 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1718 "VBNET.ATG" +#line 1726 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1720 "VBNET.ATG" +#line 1728 "VBNET.ATG" out type, false); -#line 1721 "VBNET.ATG" +#line 1729 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1722 "VBNET.ATG" +#line 1730 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1667 "VBNET.ATG" +#line 1675 "VBNET.ATG" out List handlesClause) { -#line 1669 "VBNET.ATG" +#line 1677 "VBNET.ATG" handlesClause = new List(); string name; Expect(105); EventMemberSpecifier( -#line 1672 "VBNET.ATG" +#line 1680 "VBNET.ATG" out name); -#line 1672 "VBNET.ATG" +#line 1680 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1673 "VBNET.ATG" +#line 1681 "VBNET.ATG" out name); -#line 1673 "VBNET.ATG" +#line 1681 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2353 "VBNET.ATG" +#line 2361 "VBNET.ATG" out Statement stmt) { -#line 2356 "VBNET.ATG" +#line 2364 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); - while (StartOf(18) || -#line 2361 "VBNET.ATG" + while (StartOf(19) || +#line 2369 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2361 "VBNET.ATG" +#line 2369 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); EndOfStmt(); -#line 2361 "VBNET.ATG" +#line 2369 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2691,7 +2719,7 @@ IsEndStmtAhead()) { } } -#line 2366 "VBNET.ATG" +#line 2374 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2699,28 +2727,28 @@ IsEndStmtAhead()) { } void Charset( -#line 1659 "VBNET.ATG" +#line 1667 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1660 "VBNET.ATG" +#line 1668 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 100 || la.kind == 167) { } else if (la.kind == 47) { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1669 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 50) { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1670 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1671 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; - } else SynErr(229); + } else SynErr(230); } void IdentifierForFieldDeclaration() { @@ -2765,58 +2793,58 @@ out CharsetModifier charsetModifier) { lexer.NextToken(); break; } - default: SynErr(230); break; + default: SynErr(231); break; } } void VariableDeclaratorPartAfterIdentifier( -#line 1548 "VBNET.ATG" +#line 1556 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1550 "VBNET.ATG" +#line 1558 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; List dimension = null; if ( -#line 1555 "VBNET.ATG" +#line 1563 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1555 "VBNET.ATG" +#line 1563 "VBNET.ATG" out dimension); } if ( -#line 1556 "VBNET.ATG" +#line 1564 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1556 "VBNET.ATG" +#line 1564 "VBNET.ATG" out rank); } if ( -#line 1558 "VBNET.ATG" +#line 1566 "VBNET.ATG" IsObjectCreation()) { Expect(48); ObjectCreateExpression( -#line 1558 "VBNET.ATG" +#line 1566 "VBNET.ATG" out expr); -#line 1560 "VBNET.ATG" +#line 1568 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { type = ((ArrayCreateExpression)expr).CreateType; } - } else if (StartOf(19)) { + } else if (StartOf(20)) { if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1567 "VBNET.ATG" +#line 1575 "VBNET.ATG" out type); } -#line 1569 "VBNET.ATG" +#line 1577 "VBNET.ATG" if (type != null && dimension != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2842,52 +2870,52 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1591 "VBNET.ATG" +#line 1599 "VBNET.ATG" out expr); } - } else SynErr(231); + } else SynErr(232); -#line 1593 "VBNET.ATG" +#line 1601 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void VariableDeclarator( -#line 1542 "VBNET.ATG" +#line 1550 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1544 "VBNET.ATG" +#line 1552 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1545 "VBNET.ATG" +#line 1553 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1525 "VBNET.ATG" +#line 1533 "VBNET.ATG" List constantDeclaration) { -#line 1527 "VBNET.ATG" +#line 1535 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1531 "VBNET.ATG" +#line 1539 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1532 "VBNET.ATG" +#line 1540 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1533 "VBNET.ATG" +#line 1541 "VBNET.ATG" out expr); -#line 1535 "VBNET.ATG" +#line 1543 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2895,10 +2923,10 @@ out expr); } void AccessorDecls( -#line 1467 "VBNET.ATG" +#line 1475 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1469 "VBNET.ATG" +#line 1477 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2906,60 +2934,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 27) { AttributeSection( -#line 1474 "VBNET.ATG" +#line 1482 "VBNET.ATG" out section); -#line 1474 "VBNET.ATG" +#line 1482 "VBNET.ATG" attributes.Add(section); } if (la.kind == 101) { GetAccessorDecl( -#line 1476 "VBNET.ATG" +#line 1484 "VBNET.ATG" out getBlock, attributes); if (la.kind == 27 || la.kind == 156) { -#line 1478 "VBNET.ATG" +#line 1486 "VBNET.ATG" attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 1479 "VBNET.ATG" +#line 1487 "VBNET.ATG" out section); -#line 1479 "VBNET.ATG" +#line 1487 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1480 "VBNET.ATG" +#line 1488 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1483 "VBNET.ATG" +#line 1491 "VBNET.ATG" out setBlock, attributes); if (la.kind == 27 || la.kind == 101) { -#line 1485 "VBNET.ATG" +#line 1493 "VBNET.ATG" attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 1486 "VBNET.ATG" +#line 1494 "VBNET.ATG" out section); -#line 1486 "VBNET.ATG" +#line 1494 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1487 "VBNET.ATG" +#line 1495 "VBNET.ATG" out getBlock, attributes); } - } else SynErr(232); + } else SynErr(233); } void EventAccessorDeclaration( -#line 1430 "VBNET.ATG" +#line 1438 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1432 "VBNET.ATG" +#line 1440 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2968,10 +2996,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 27) { AttributeSection( -#line 1438 "VBNET.ATG" +#line 1446 "VBNET.ATG" out section); -#line 1438 "VBNET.ATG" +#line 1446 "VBNET.ATG" attributes.Add(section); } if (la.kind == 42) { @@ -2980,20 +3008,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1440 "VBNET.ATG" +#line 1448 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1441 "VBNET.ATG" +#line 1449 "VBNET.ATG" out stmt); Expect(88); Expect(42); Expect(1); -#line 1443 "VBNET.ATG" +#line 1451 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3004,20 +3032,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1448 "VBNET.ATG" +#line 1456 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1449 "VBNET.ATG" +#line 1457 "VBNET.ATG" out stmt); Expect(88); Expect(152); Expect(1); -#line 1451 "VBNET.ATG" +#line 1459 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3028,185 +3056,185 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1456 "VBNET.ATG" +#line 1464 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1457 "VBNET.ATG" +#line 1465 "VBNET.ATG" out stmt); Expect(88); Expect(149); Expect(1); -#line 1459 "VBNET.ATG" +#line 1467 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else SynErr(233); + } else SynErr(234); } void OverloadableOperator( -#line 1372 "VBNET.ATG" +#line 1380 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1373 "VBNET.ATG" +#line 1381 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 14: { lexer.NextToken(); -#line 1375 "VBNET.ATG" +#line 1383 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 15: { lexer.NextToken(); -#line 1377 "VBNET.ATG" +#line 1385 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 16: { lexer.NextToken(); -#line 1379 "VBNET.ATG" +#line 1387 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 17: { lexer.NextToken(); -#line 1381 "VBNET.ATG" +#line 1389 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 18: { lexer.NextToken(); -#line 1383 "VBNET.ATG" +#line 1391 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 19: { lexer.NextToken(); -#line 1385 "VBNET.ATG" +#line 1393 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 116: { lexer.NextToken(); -#line 1387 "VBNET.ATG" +#line 1395 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 120: { lexer.NextToken(); -#line 1389 "VBNET.ATG" +#line 1397 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 45: { lexer.NextToken(); -#line 1391 "VBNET.ATG" +#line 1399 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 138: { lexer.NextToken(); -#line 1393 "VBNET.ATG" +#line 1401 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 185: { lexer.NextToken(); -#line 1395 "VBNET.ATG" +#line 1403 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1397 "VBNET.ATG" +#line 1405 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 31: { lexer.NextToken(); -#line 1399 "VBNET.ATG" +#line 1407 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 32: { lexer.NextToken(); -#line 1401 "VBNET.ATG" +#line 1409 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 11: { lexer.NextToken(); -#line 1403 "VBNET.ATG" +#line 1411 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 1405 "VBNET.ATG" +#line 1413 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 27: { lexer.NextToken(); -#line 1407 "VBNET.ATG" +#line 1415 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 30: { lexer.NextToken(); -#line 1409 "VBNET.ATG" +#line 1417 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 26: { lexer.NextToken(); -#line 1411 "VBNET.ATG" +#line 1419 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 1413 "VBNET.ATG" +#line 1421 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 75: { lexer.NextToken(); -#line 1415 "VBNET.ATG" +#line 1423 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: case 204: { Identifier(); -#line 1419 "VBNET.ATG" +#line 1427 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3218,103 +3246,103 @@ out OverloadableOperatorType operatorType) { break; } - default: SynErr(234); break; + default: SynErr(235); break; } } void GetAccessorDecl( -#line 1493 "VBNET.ATG" +#line 1501 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1494 "VBNET.ATG" +#line 1502 "VBNET.ATG" Statement stmt = null; Expect(101); -#line 1496 "VBNET.ATG" +#line 1504 "VBNET.ATG" Point startLocation = t.Location; Expect(1); Block( -#line 1498 "VBNET.ATG" +#line 1506 "VBNET.ATG" out stmt); -#line 1499 "VBNET.ATG" +#line 1507 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(88); Expect(101); -#line 1501 "VBNET.ATG" +#line 1509 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; Expect(1); } void SetAccessorDecl( -#line 1506 "VBNET.ATG" +#line 1514 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1508 "VBNET.ATG" +#line 1516 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); -#line 1511 "VBNET.ATG" +#line 1519 "VBNET.ATG" Point startLocation = t.Location; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1512 "VBNET.ATG" +#line 1520 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1514 "VBNET.ATG" +#line 1522 "VBNET.ATG" out stmt); -#line 1516 "VBNET.ATG" +#line 1524 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; Expect(88); Expect(156); -#line 1520 "VBNET.ATG" +#line 1528 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; Expect(1); } void ArrayInitializationModifier( -#line 1597 "VBNET.ATG" +#line 1605 "VBNET.ATG" out List arrayModifiers) { -#line 1599 "VBNET.ATG" +#line 1607 "VBNET.ATG" arrayModifiers = null; Expect(24); InitializationRankList( -#line 1601 "VBNET.ATG" +#line 1609 "VBNET.ATG" out arrayModifiers); Expect(25); } void ArrayNameModifier( -#line 2146 "VBNET.ATG" +#line 2154 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2148 "VBNET.ATG" +#line 2156 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2150 "VBNET.ATG" +#line 2158 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 2027 "VBNET.ATG" +#line 2035 "VBNET.ATG" out Expression oce) { -#line 2029 "VBNET.ATG" +#line 2037 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3323,35 +3351,35 @@ out Expression oce) { Expect(127); NonArrayTypeName( -#line 2035 "VBNET.ATG" +#line 2043 "VBNET.ATG" out type, false); if (la.kind == 24) { lexer.NextToken(); ArgumentList( -#line 2036 "VBNET.ATG" +#line 2044 "VBNET.ATG" out arguments); Expect(25); if (la.kind == 22 || -#line 2037 "VBNET.ATG" +#line 2045 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2037 "VBNET.ATG" +#line 2045 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2038 "VBNET.ATG" +#line 2046 "VBNET.ATG" out dimensions); ArrayInitializer( -#line 2039 "VBNET.ATG" +#line 2047 "VBNET.ATG" out initializer); } else { ArrayInitializer( -#line 2040 "VBNET.ATG" +#line 2048 "VBNET.ATG" out initializer); } } } -#line 2043 "VBNET.ATG" +#line 2051 "VBNET.ATG" if (type == null) type = new TypeReference("Object"); // fallback type on parser errors if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); @@ -3367,410 +3395,410 @@ out initializer); } void VariableInitializer( -#line 1631 "VBNET.ATG" +#line 1639 "VBNET.ATG" out Expression initializerExpression) { -#line 1633 "VBNET.ATG" +#line 1641 "VBNET.ATG" initializerExpression = null; - if (StartOf(20)) { + if (StartOf(21)) { Expr( -#line 1635 "VBNET.ATG" +#line 1643 "VBNET.ATG" out initializerExpression); } else if (la.kind == 22) { ArrayInitializer( -#line 1636 "VBNET.ATG" +#line 1644 "VBNET.ATG" out initializerExpression); - } else SynErr(235); + } else SynErr(236); } void InitializationRankList( -#line 1605 "VBNET.ATG" +#line 1613 "VBNET.ATG" out List rank) { -#line 1607 "VBNET.ATG" +#line 1615 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1610 "VBNET.ATG" +#line 1618 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1612 "VBNET.ATG" +#line 1620 "VBNET.ATG" if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") Error("lower bound of array must be zero"); Expr( -#line 1615 "VBNET.ATG" +#line 1623 "VBNET.ATG" out expr); } -#line 1617 "VBNET.ATG" +#line 1625 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1619 "VBNET.ATG" +#line 1627 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); -#line 1621 "VBNET.ATG" +#line 1629 "VBNET.ATG" if (!(expr is PrimitiveExpression) || (expr as PrimitiveExpression).StringValue != "0") Error("lower bound of array must be zero"); Expr( -#line 1624 "VBNET.ATG" +#line 1632 "VBNET.ATG" out expr); } -#line 1626 "VBNET.ATG" +#line 1634 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1640 "VBNET.ATG" +#line 1648 "VBNET.ATG" out Expression outExpr) { -#line 1642 "VBNET.ATG" +#line 1650 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(22); - if (StartOf(21)) { + if (StartOf(22)) { VariableInitializer( -#line 1647 "VBNET.ATG" +#line 1655 "VBNET.ATG" out expr); -#line 1649 "VBNET.ATG" +#line 1657 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1652 "VBNET.ATG" +#line 1660 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1652 "VBNET.ATG" +#line 1660 "VBNET.ATG" out expr); -#line 1653 "VBNET.ATG" +#line 1661 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(23); -#line 1656 "VBNET.ATG" +#line 1664 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1726 "VBNET.ATG" +#line 1734 "VBNET.ATG" out string name) { -#line 1727 "VBNET.ATG" +#line 1735 "VBNET.ATG" string type; name = String.Empty; - if (StartOf(12)) { + if (StartOf(13)) { Identifier(); -#line 1728 "VBNET.ATG" +#line 1736 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1730 "VBNET.ATG" +#line 1738 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 124) { lexer.NextToken(); Expect(10); - if (StartOf(12)) { + if (StartOf(13)) { Identifier(); -#line 1733 "VBNET.ATG" +#line 1741 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 92) { lexer.NextToken(); -#line 1734 "VBNET.ATG" +#line 1742 "VBNET.ATG" name = "MyBase.Error"; - } else SynErr(236); - } else SynErr(237); + } else SynErr(237); + } else SynErr(238); } void DisjunctionExpr( -#line 1876 "VBNET.ATG" +#line 1884 "VBNET.ATG" out Expression outExpr) { -#line 1878 "VBNET.ATG" +#line 1886 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1881 "VBNET.ATG" +#line 1889 "VBNET.ATG" out outExpr); while (la.kind == 138 || la.kind == 139 || la.kind == 185) { if (la.kind == 138) { lexer.NextToken(); -#line 1884 "VBNET.ATG" +#line 1892 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 139) { lexer.NextToken(); -#line 1885 "VBNET.ATG" +#line 1893 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1886 "VBNET.ATG" +#line 1894 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1888 "VBNET.ATG" +#line 1896 "VBNET.ATG" out expr); -#line 1888 "VBNET.ATG" +#line 1896 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1743 "VBNET.ATG" +#line 1751 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1744 "VBNET.ATG" +#line 1752 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1753 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 41: { lexer.NextToken(); -#line 1746 "VBNET.ATG" +#line 1754 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 33: { lexer.NextToken(); -#line 1747 "VBNET.ATG" +#line 1755 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 35: { lexer.NextToken(); -#line 1748 "VBNET.ATG" +#line 1756 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 36: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1757 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 37: { lexer.NextToken(); -#line 1750 "VBNET.ATG" +#line 1758 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 38: { lexer.NextToken(); -#line 1751 "VBNET.ATG" +#line 1759 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 34: { lexer.NextToken(); -#line 1752 "VBNET.ATG" +#line 1760 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 39: { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1761 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 40: { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1762 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(238); break; + default: SynErr(239); break; } } void SimpleExpr( -#line 1758 "VBNET.ATG" +#line 1766 "VBNET.ATG" out Expression pexpr) { -#line 1760 "VBNET.ATG" +#line 1768 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; pexpr = null; - if (StartOf(22)) { + if (StartOf(23)) { switch (la.kind) { case 3: { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1776 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1769 "VBNET.ATG" +#line 1777 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1770 "VBNET.ATG" +#line 1778 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1771 "VBNET.ATG" +#line 1779 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1772 "VBNET.ATG" +#line 1780 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1773 "VBNET.ATG" +#line 1781 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1774 "VBNET.ATG" +#line 1782 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 173: { lexer.NextToken(); -#line 1776 "VBNET.ATG" +#line 1784 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 96: { lexer.NextToken(); -#line 1777 "VBNET.ATG" +#line 1785 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 130: { lexer.NextToken(); -#line 1778 "VBNET.ATG" +#line 1786 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 24: { lexer.NextToken(); Expr( -#line 1779 "VBNET.ATG" +#line 1787 "VBNET.ATG" out expr); Expect(25); -#line 1779 "VBNET.ATG" +#line 1787 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: case 204: { Identifier(); -#line 1780 "VBNET.ATG" +#line 1788 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); break; } case 10: case 52: case 54: case 65: case 76: case 77: case 84: case 111: case 117: case 133: case 159: case 160: case 165: case 190: case 191: case 192: case 193: { -#line 1781 "VBNET.ATG" +#line 1789 "VBNET.ATG" string val = String.Empty; - if (StartOf(23)) { - if (StartOf(9)) { + if (StartOf(24)) { + if (StartOf(10)) { PrimitiveTypeName( -#line 1782 "VBNET.ATG" +#line 1790 "VBNET.ATG" out val); } else { lexer.NextToken(); -#line 1782 "VBNET.ATG" +#line 1790 "VBNET.ATG" val = "Object"; } } Expect(10); -#line 1783 "VBNET.ATG" +#line 1791 "VBNET.ATG" t.val = ""; Identifier(); -#line 1783 "VBNET.ATG" +#line 1791 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 119: { lexer.NextToken(); -#line 1784 "VBNET.ATG" +#line 1792 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 124: case 125: { -#line 1785 "VBNET.ATG" +#line 1793 "VBNET.ATG" Expression retExpr = null; if (la.kind == 124) { lexer.NextToken(); -#line 1786 "VBNET.ATG" +#line 1794 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 125) { lexer.NextToken(); -#line 1787 "VBNET.ATG" +#line 1795 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(239); + } else SynErr(240); Expect(10); IdentifierOrKeyword( -#line 1789 "VBNET.ATG" +#line 1797 "VBNET.ATG" out name); -#line 1789 "VBNET.ATG" +#line 1797 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); break; } @@ -3779,77 +3807,77 @@ out name); Expect(10); Identifier(); -#line 1791 "VBNET.ATG" +#line 1799 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1793 "VBNET.ATG" +#line 1801 "VBNET.ATG" type.IsGlobal = true; -#line 1794 "VBNET.ATG" +#line 1802 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 127: { ObjectCreateExpression( -#line 1795 "VBNET.ATG" +#line 1803 "VBNET.ATG" out expr); -#line 1795 "VBNET.ATG" +#line 1803 "VBNET.ATG" pexpr = expr; break; } case 75: case 82: case 199: { -#line 1797 "VBNET.ATG" +#line 1805 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 82) { lexer.NextToken(); } else if (la.kind == 75) { lexer.NextToken(); -#line 1799 "VBNET.ATG" +#line 1807 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 199) { lexer.NextToken(); -#line 1800 "VBNET.ATG" +#line 1808 "VBNET.ATG" castType = CastType.TryCast; - } else SynErr(240); + } else SynErr(241); Expect(24); Expr( -#line 1802 "VBNET.ATG" +#line 1810 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1802 "VBNET.ATG" +#line 1810 "VBNET.ATG" out type); Expect(25); -#line 1803 "VBNET.ATG" +#line 1811 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 59: case 60: case 61: case 62: case 63: case 64: case 66: case 68: case 69: case 72: case 73: case 74: case 194: case 195: case 196: case 197: { CastTarget( -#line 1804 "VBNET.ATG" +#line 1812 "VBNET.ATG" out type); Expect(24); Expr( -#line 1804 "VBNET.ATG" +#line 1812 "VBNET.ATG" out expr); Expect(25); -#line 1804 "VBNET.ATG" +#line 1812 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 43: { lexer.NextToken(); Expr( -#line 1805 "VBNET.ATG" +#line 1813 "VBNET.ATG" out expr); -#line 1805 "VBNET.ATG" +#line 1813 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3857,312 +3885,312 @@ out expr); lexer.NextToken(); Expect(24); GetTypeTypeName( -#line 1806 "VBNET.ATG" +#line 1814 "VBNET.ATG" out type); Expect(25); -#line 1806 "VBNET.ATG" +#line 1814 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 175: { lexer.NextToken(); SimpleExpr( -#line 1807 "VBNET.ATG" +#line 1815 "VBNET.ATG" out expr); Expect(113); TypeName( -#line 1807 "VBNET.ATG" +#line 1815 "VBNET.ATG" out type); -#line 1807 "VBNET.ATG" +#line 1815 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } } while (la.kind == 10 || la.kind == 24) { InvocationOrMemberReferenceExpression( -#line 1809 "VBNET.ATG" +#line 1817 "VBNET.ATG" ref pexpr); } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1812 "VBNET.ATG" +#line 1820 "VBNET.ATG" out name); -#line 1812 "VBNET.ATG" +#line 1820 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 24) { InvocationOrMemberReferenceExpression( -#line 1813 "VBNET.ATG" +#line 1821 "VBNET.ATG" ref pexpr); } - } else SynErr(241); + } else SynErr(242); } void PrimitiveTypeName( -#line 2956 "VBNET.ATG" +#line 2964 "VBNET.ATG" out string type) { -#line 2957 "VBNET.ATG" +#line 2965 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 52: { lexer.NextToken(); -#line 2958 "VBNET.ATG" +#line 2966 "VBNET.ATG" type = "Boolean"; break; } case 76: { lexer.NextToken(); -#line 2959 "VBNET.ATG" +#line 2967 "VBNET.ATG" type = "Date"; break; } case 65: { lexer.NextToken(); -#line 2960 "VBNET.ATG" +#line 2968 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2961 "VBNET.ATG" +#line 2969 "VBNET.ATG" type = "String"; break; } case 77: { lexer.NextToken(); -#line 2962 "VBNET.ATG" +#line 2970 "VBNET.ATG" type = "Decimal"; break; } case 54: { lexer.NextToken(); -#line 2963 "VBNET.ATG" +#line 2971 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2964 "VBNET.ATG" +#line 2972 "VBNET.ATG" type = "Short"; break; } case 111: { lexer.NextToken(); -#line 2965 "VBNET.ATG" +#line 2973 "VBNET.ATG" type = "Integer"; break; } case 117: { lexer.NextToken(); -#line 2966 "VBNET.ATG" +#line 2974 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2967 "VBNET.ATG" +#line 2975 "VBNET.ATG" type = "Single"; break; } case 84: { lexer.NextToken(); -#line 2968 "VBNET.ATG" +#line 2976 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2969 "VBNET.ATG" +#line 2977 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2970 "VBNET.ATG" +#line 2978 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2971 "VBNET.ATG" +#line 2979 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2972 "VBNET.ATG" +#line 2980 "VBNET.ATG" type = "SByte"; break; } - default: SynErr(242); break; + default: SynErr(243); break; } } void IdentifierOrKeyword( -#line 2949 "VBNET.ATG" +#line 2957 "VBNET.ATG" out string name) { -#line 2951 "VBNET.ATG" +#line 2959 "VBNET.ATG" lexer.NextToken(); name = t.val; } void CastTarget( -#line 1854 "VBNET.ATG" +#line 1862 "VBNET.ATG" out TypeReference type) { -#line 1856 "VBNET.ATG" +#line 1864 "VBNET.ATG" type = null; switch (la.kind) { case 59: { lexer.NextToken(); -#line 1858 "VBNET.ATG" +#line 1866 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 60: { lexer.NextToken(); -#line 1859 "VBNET.ATG" +#line 1867 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 194: { lexer.NextToken(); -#line 1860 "VBNET.ATG" +#line 1868 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 61: { lexer.NextToken(); -#line 1861 "VBNET.ATG" +#line 1869 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 62: { lexer.NextToken(); -#line 1862 "VBNET.ATG" +#line 1870 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 64: { lexer.NextToken(); -#line 1863 "VBNET.ATG" +#line 1871 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 63: { lexer.NextToken(); -#line 1864 "VBNET.ATG" +#line 1872 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 72: { lexer.NextToken(); -#line 1865 "VBNET.ATG" +#line 1873 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 66: { lexer.NextToken(); -#line 1866 "VBNET.ATG" +#line 1874 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 68: { lexer.NextToken(); -#line 1867 "VBNET.ATG" +#line 1875 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 195: { lexer.NextToken(); -#line 1868 "VBNET.ATG" +#line 1876 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 196: { lexer.NextToken(); -#line 1869 "VBNET.ATG" +#line 1877 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 197: { lexer.NextToken(); -#line 1870 "VBNET.ATG" +#line 1878 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 69: { lexer.NextToken(); -#line 1871 "VBNET.ATG" +#line 1879 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 73: { lexer.NextToken(); -#line 1872 "VBNET.ATG" +#line 1880 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 74: { lexer.NextToken(); -#line 1873 "VBNET.ATG" +#line 1881 "VBNET.ATG" type = new TypeReference("System.String"); break; } - default: SynErr(243); break; + default: SynErr(244); break; } } void GetTypeTypeName( -#line 2098 "VBNET.ATG" +#line 2106 "VBNET.ATG" out TypeReference typeref) { -#line 2099 "VBNET.ATG" +#line 2107 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2101 "VBNET.ATG" +#line 2109 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2102 "VBNET.ATG" +#line 2110 "VBNET.ATG" out rank); -#line 2103 "VBNET.ATG" +#line 2111 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4170,53 +4198,53 @@ out rank); } void InvocationOrMemberReferenceExpression( -#line 1817 "VBNET.ATG" +#line 1825 "VBNET.ATG" ref Expression pexpr) { -#line 1818 "VBNET.ATG" +#line 1826 "VBNET.ATG" string name; if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1820 "VBNET.ATG" +#line 1828 "VBNET.ATG" out name); -#line 1820 "VBNET.ATG" +#line 1828 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else if (la.kind == 24) { InvocationExpression( -#line 1821 "VBNET.ATG" +#line 1829 "VBNET.ATG" ref pexpr); - } else SynErr(244); + } else SynErr(245); } void InvocationExpression( -#line 1824 "VBNET.ATG" +#line 1832 "VBNET.ATG" ref Expression pexpr) { -#line 1825 "VBNET.ATG" +#line 1833 "VBNET.ATG" List typeParameters = new List(); List parameters = null; TypeReference type; Expect(24); -#line 1829 "VBNET.ATG" +#line 1837 "VBNET.ATG" Point start = t.Location; if (la.kind == 200) { lexer.NextToken(); TypeName( -#line 1831 "VBNET.ATG" +#line 1839 "VBNET.ATG" out type); -#line 1831 "VBNET.ATG" +#line 1839 "VBNET.ATG" if (type != null) typeParameters.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1834 "VBNET.ATG" +#line 1842 "VBNET.ATG" out type); -#line 1834 "VBNET.ATG" +#line 1842 "VBNET.ATG" if (type != null) typeParameters.Add(type); } Expect(25); @@ -4224,365 +4252,365 @@ out type); lexer.NextToken(); Identifier(); -#line 1839 "VBNET.ATG" +#line 1847 "VBNET.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); } else if (la.kind == 24) { lexer.NextToken(); ArgumentList( -#line 1841 "VBNET.ATG" +#line 1849 "VBNET.ATG" out parameters); Expect(25); -#line 1843 "VBNET.ATG" +#line 1851 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); - } else SynErr(245); - } else if (StartOf(24)) { + } else SynErr(246); + } else if (StartOf(25)) { ArgumentList( -#line 1845 "VBNET.ATG" +#line 1853 "VBNET.ATG" out parameters); Expect(25); -#line 1847 "VBNET.ATG" +#line 1855 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); - } else SynErr(246); + } else SynErr(247); -#line 1849 "VBNET.ATG" +#line 1857 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void ArgumentList( -#line 2058 "VBNET.ATG" +#line 2066 "VBNET.ATG" out List arguments) { -#line 2060 "VBNET.ATG" +#line 2068 "VBNET.ATG" arguments = new List(); Expression expr = null; - if (StartOf(20)) { + if (StartOf(21)) { Argument( -#line 2063 "VBNET.ATG" +#line 2071 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 2064 "VBNET.ATG" +#line 2072 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; - if (StartOf(20)) { + if (StartOf(21)) { Argument( -#line 2065 "VBNET.ATG" +#line 2073 "VBNET.ATG" out expr); } -#line 2066 "VBNET.ATG" +#line 2074 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2068 "VBNET.ATG" +#line 2076 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1892 "VBNET.ATG" +#line 1900 "VBNET.ATG" out Expression outExpr) { -#line 1894 "VBNET.ATG" +#line 1902 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1897 "VBNET.ATG" +#line 1905 "VBNET.ATG" out outExpr); while (la.kind == 45 || la.kind == 46) { if (la.kind == 45) { lexer.NextToken(); -#line 1900 "VBNET.ATG" +#line 1908 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1901 "VBNET.ATG" +#line 1909 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1903 "VBNET.ATG" +#line 1911 "VBNET.ATG" out expr); -#line 1903 "VBNET.ATG" +#line 1911 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1907 "VBNET.ATG" +#line 1915 "VBNET.ATG" out Expression outExpr) { -#line 1908 "VBNET.ATG" +#line 1916 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 129) { lexer.NextToken(); -#line 1909 "VBNET.ATG" +#line 1917 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1910 "VBNET.ATG" +#line 1918 "VBNET.ATG" out outExpr); -#line 1911 "VBNET.ATG" +#line 1919 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1916 "VBNET.ATG" +#line 1924 "VBNET.ATG" out Expression outExpr) { -#line 1918 "VBNET.ATG" +#line 1926 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1921 "VBNET.ATG" +#line 1929 "VBNET.ATG" out outExpr); - while (StartOf(25)) { + while (StartOf(26)) { switch (la.kind) { case 27: { lexer.NextToken(); -#line 1924 "VBNET.ATG" +#line 1932 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 1925 "VBNET.ATG" +#line 1933 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1926 "VBNET.ATG" +#line 1934 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1927 "VBNET.ATG" +#line 1935 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 1928 "VBNET.ATG" +#line 1936 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 11: { lexer.NextToken(); -#line 1929 "VBNET.ATG" +#line 1937 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 116: { lexer.NextToken(); -#line 1930 "VBNET.ATG" +#line 1938 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 113: { lexer.NextToken(); -#line 1931 "VBNET.ATG" +#line 1939 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 189: { lexer.NextToken(); -#line 1932 "VBNET.ATG" +#line 1940 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } ShiftExpr( -#line 1934 "VBNET.ATG" +#line 1942 "VBNET.ATG" out expr); -#line 1934 "VBNET.ATG" +#line 1942 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ShiftExpr( -#line 1938 "VBNET.ATG" +#line 1946 "VBNET.ATG" out Expression outExpr) { -#line 1940 "VBNET.ATG" +#line 1948 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1943 "VBNET.ATG" +#line 1951 "VBNET.ATG" out outExpr); while (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 1946 "VBNET.ATG" +#line 1954 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1947 "VBNET.ATG" +#line 1955 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1949 "VBNET.ATG" +#line 1957 "VBNET.ATG" out expr); -#line 1949 "VBNET.ATG" +#line 1957 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1953 "VBNET.ATG" +#line 1961 "VBNET.ATG" out Expression outExpr) { -#line 1954 "VBNET.ATG" +#line 1962 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1956 "VBNET.ATG" +#line 1964 "VBNET.ATG" out outExpr); while (la.kind == 19) { lexer.NextToken(); AdditiveExpr( -#line 1956 "VBNET.ATG" +#line 1964 "VBNET.ATG" out expr); -#line 1956 "VBNET.ATG" +#line 1964 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1959 "VBNET.ATG" +#line 1967 "VBNET.ATG" out Expression outExpr) { -#line 1961 "VBNET.ATG" +#line 1969 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1964 "VBNET.ATG" +#line 1972 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15) { if (la.kind == 14) { lexer.NextToken(); -#line 1967 "VBNET.ATG" +#line 1975 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1968 "VBNET.ATG" +#line 1976 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1970 "VBNET.ATG" +#line 1978 "VBNET.ATG" out expr); -#line 1970 "VBNET.ATG" +#line 1978 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1974 "VBNET.ATG" +#line 1982 "VBNET.ATG" out Expression outExpr) { -#line 1975 "VBNET.ATG" +#line 1983 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1977 "VBNET.ATG" +#line 1985 "VBNET.ATG" out outExpr); while (la.kind == 120) { lexer.NextToken(); IntegerDivisionExpr( -#line 1977 "VBNET.ATG" +#line 1985 "VBNET.ATG" out expr); -#line 1977 "VBNET.ATG" +#line 1985 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1980 "VBNET.ATG" +#line 1988 "VBNET.ATG" out Expression outExpr) { -#line 1981 "VBNET.ATG" +#line 1989 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1983 "VBNET.ATG" +#line 1991 "VBNET.ATG" out outExpr); while (la.kind == 18) { lexer.NextToken(); MultiplicativeExpr( -#line 1983 "VBNET.ATG" +#line 1991 "VBNET.ATG" out expr); -#line 1983 "VBNET.ATG" +#line 1991 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1986 "VBNET.ATG" +#line 1994 "VBNET.ATG" out Expression outExpr) { -#line 1988 "VBNET.ATG" +#line 1996 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1991 "VBNET.ATG" +#line 1999 "VBNET.ATG" out outExpr); while (la.kind == 16 || la.kind == 17) { if (la.kind == 16) { lexer.NextToken(); -#line 1994 "VBNET.ATG" +#line 2002 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1995 "VBNET.ATG" +#line 2003 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1997 "VBNET.ATG" +#line 2005 "VBNET.ATG" out expr); -#line 1997 "VBNET.ATG" +#line 2005 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 2001 "VBNET.ATG" +#line 2009 "VBNET.ATG" out Expression uExpr) { -#line 2003 "VBNET.ATG" +#line 2011 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4591,25 +4619,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 2007 "VBNET.ATG" +#line 2015 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 2008 "VBNET.ATG" +#line 2016 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2009 "VBNET.ATG" +#line 2017 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } ExponentiationExpr( -#line 2011 "VBNET.ATG" +#line 2019 "VBNET.ATG" out expr); -#line 2013 "VBNET.ATG" +#line 2021 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4619,50 +4647,50 @@ out expr); } void ExponentiationExpr( -#line 2021 "VBNET.ATG" +#line 2029 "VBNET.ATG" out Expression outExpr) { -#line 2022 "VBNET.ATG" +#line 2030 "VBNET.ATG" Expression expr; SimpleExpr( -#line 2024 "VBNET.ATG" +#line 2032 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 2024 "VBNET.ATG" +#line 2032 "VBNET.ATG" out expr); -#line 2024 "VBNET.ATG" +#line 2032 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void ArrayTypeModifiers( -#line 2155 "VBNET.ATG" +#line 2163 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2157 "VBNET.ATG" +#line 2165 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2160 "VBNET.ATG" +#line 2168 "VBNET.ATG" IsDims()) { Expect(24); if (la.kind == 12 || la.kind == 25) { RankList( -#line 2162 "VBNET.ATG" +#line 2170 "VBNET.ATG" out i); } -#line 2164 "VBNET.ATG" +#line 2172 "VBNET.ATG" arrayModifiers.Add(i); Expect(25); } -#line 2169 "VBNET.ATG" +#line 2177 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4670,118 +4698,118 @@ out i); } void Argument( -#line 2072 "VBNET.ATG" +#line 2080 "VBNET.ATG" out Expression argumentexpr) { -#line 2074 "VBNET.ATG" +#line 2082 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2078 "VBNET.ATG" +#line 2086 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2078 "VBNET.ATG" +#line 2086 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 2078 "VBNET.ATG" +#line 2086 "VBNET.ATG" out expr); -#line 2080 "VBNET.ATG" +#line 2088 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); - } else if (StartOf(20)) { + } else if (StartOf(21)) { Expr( -#line 2083 "VBNET.ATG" +#line 2091 "VBNET.ATG" out argumentexpr); - } else SynErr(247); + } else SynErr(248); } void QualIdentAndTypeArguments( -#line 2129 "VBNET.ATG" +#line 2137 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2130 "VBNET.ATG" +#line 2138 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2132 "VBNET.ATG" +#line 2140 "VBNET.ATG" out name); -#line 2133 "VBNET.ATG" +#line 2141 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2134 "VBNET.ATG" +#line 2142 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); if ( -#line 2136 "VBNET.ATG" +#line 2144 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2137 "VBNET.ATG" +#line 2145 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2138 "VBNET.ATG" +#line 2146 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } - } else if (StartOf(5)) { + } else if (StartOf(6)) { TypeArgumentList( -#line 2139 "VBNET.ATG" +#line 2147 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(248); + } else SynErr(249); Expect(25); } } void TypeArgumentList( -#line 2182 "VBNET.ATG" +#line 2190 "VBNET.ATG" List typeArguments) { -#line 2184 "VBNET.ATG" +#line 2192 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2186 "VBNET.ATG" +#line 2194 "VBNET.ATG" out typeref); -#line 2186 "VBNET.ATG" +#line 2194 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2189 "VBNET.ATG" +#line 2197 "VBNET.ATG" out typeref); -#line 2189 "VBNET.ATG" +#line 2197 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2176 "VBNET.ATG" +#line 2184 "VBNET.ATG" out int i) { -#line 2177 "VBNET.ATG" +#line 2185 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2178 "VBNET.ATG" +#line 2186 "VBNET.ATG" ++i; } } void Attribute( -#line 2214 "VBNET.ATG" +#line 2222 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 2215 "VBNET.ATG" +#line 2223 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4791,39 +4819,39 @@ out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { Expect(10); } Qualident( -#line 2220 "VBNET.ATG" +#line 2228 "VBNET.ATG" out name); if (la.kind == 24) { AttributeArguments( -#line 2221 "VBNET.ATG" +#line 2229 "VBNET.ATG" positional, named); } -#line 2222 "VBNET.ATG" +#line 2230 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 2226 "VBNET.ATG" +#line 2234 "VBNET.ATG" List positional, List named) { -#line 2228 "VBNET.ATG" +#line 2236 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(24); if ( -#line 2234 "VBNET.ATG" +#line 2242 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2236 "VBNET.ATG" +#line 2244 "VBNET.ATG" IsNamedAssign()) { -#line 2236 "VBNET.ATG" +#line 2244 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2237 "VBNET.ATG" +#line 2245 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4831,10 +4859,10 @@ out name); Expect(11); } Expr( -#line 2239 "VBNET.ATG" +#line 2247 "VBNET.ATG" out expr); -#line 2241 "VBNET.ATG" +#line 2249 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4842,28 +4870,28 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2248 "VBNET.ATG" +#line 2256 "VBNET.ATG" IsNamedAssign()) { -#line 2248 "VBNET.ATG" +#line 2256 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2249 "VBNET.ATG" +#line 2257 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); } Expect(11); - } else if (StartOf(20)) { + } else if (StartOf(21)) { -#line 2251 "VBNET.ATG" +#line 2259 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(249); + } else SynErr(250); Expr( -#line 2252 "VBNET.ATG" +#line 2260 "VBNET.ATG" out expr); -#line 2252 "VBNET.ATG" +#line 2260 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4874,39 +4902,39 @@ out expr); } void FormalParameter( -#line 2321 "VBNET.ATG" +#line 2329 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2323 "VBNET.ATG" +#line 2331 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; p = null;ArrayList arrayModifiers = null; - while (StartOf(26)) { + while (StartOf(27)) { ParameterModifier( -#line 2328 "VBNET.ATG" +#line 2336 "VBNET.ATG" mod); } Identifier(); -#line 2329 "VBNET.ATG" +#line 2337 "VBNET.ATG" string parameterName = t.val; if ( -#line 2330 "VBNET.ATG" +#line 2338 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2330 "VBNET.ATG" +#line 2338 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2331 "VBNET.ATG" +#line 2339 "VBNET.ATG" out type); } -#line 2333 "VBNET.ATG" +#line 2341 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4922,45 +4950,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2345 "VBNET.ATG" +#line 2353 "VBNET.ATG" out expr); } -#line 2347 "VBNET.ATG" +#line 2355 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2975 "VBNET.ATG" +#line 2983 "VBNET.ATG" ParamModifiers m) { if (la.kind == 55) { lexer.NextToken(); -#line 2976 "VBNET.ATG" +#line 2984 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 53) { lexer.NextToken(); -#line 2977 "VBNET.ATG" +#line 2985 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 137) { lexer.NextToken(); -#line 2978 "VBNET.ATG" +#line 2986 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2979 "VBNET.ATG" +#line 2987 "VBNET.ATG" m.Add(ParamModifier.Params); - } else SynErr(250); + } else SynErr(251); } void Statement() { -#line 2374 "VBNET.ATG" +#line 2382 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -4968,34 +4996,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2380 "VBNET.ATG" +#line 2388 "VBNET.ATG" IsLabel()) { LabelName( -#line 2380 "VBNET.ATG" +#line 2388 "VBNET.ATG" out label); -#line 2382 "VBNET.ATG" +#line 2390 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); - } else if (StartOf(27)) { + } else if (StartOf(28)) { EmbeddedStatement( -#line 2385 "VBNET.ATG" +#line 2393 "VBNET.ATG" out stmt); -#line 2385 "VBNET.ATG" +#line 2393 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(28)) { + } else if (StartOf(29)) { LocalDeclarationStatement( -#line 2386 "VBNET.ATG" +#line 2394 "VBNET.ATG" out stmt); -#line 2386 "VBNET.ATG" +#line 2394 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else SynErr(251); + } else SynErr(252); -#line 2389 "VBNET.ATG" +#line 2397 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5004,30 +5032,30 @@ out stmt); } void LabelName( -#line 2760 "VBNET.ATG" +#line 2768 "VBNET.ATG" out string name) { -#line 2762 "VBNET.ATG" +#line 2770 "VBNET.ATG" name = String.Empty; - if (StartOf(12)) { + if (StartOf(13)) { Identifier(); -#line 2764 "VBNET.ATG" +#line 2772 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2765 "VBNET.ATG" +#line 2773 "VBNET.ATG" name = t.val; - } else SynErr(252); + } else SynErr(253); } void EmbeddedStatement( -#line 2428 "VBNET.ATG" +#line 2436 "VBNET.ATG" out Statement statement) { -#line 2430 "VBNET.ATG" +#line 2438 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5038,143 +5066,143 @@ out Statement statement) { case 94: { lexer.NextToken(); -#line 2436 "VBNET.ATG" +#line 2444 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2438 "VBNET.ATG" +#line 2446 "VBNET.ATG" exitType = ExitType.Sub; break; } case 100: { lexer.NextToken(); -#line 2440 "VBNET.ATG" +#line 2448 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2442 "VBNET.ATG" +#line 2450 "VBNET.ATG" exitType = ExitType.Property; break; } case 83: { lexer.NextToken(); -#line 2444 "VBNET.ATG" +#line 2452 "VBNET.ATG" exitType = ExitType.Do; break; } case 98: { lexer.NextToken(); -#line 2446 "VBNET.ATG" +#line 2454 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2448 "VBNET.ATG" +#line 2456 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2450 "VBNET.ATG" +#line 2458 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2452 "VBNET.ATG" +#line 2460 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(253); break; + default: SynErr(254); break; } -#line 2454 "VBNET.ATG" +#line 2462 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2455 "VBNET.ATG" +#line 2463 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 83 || la.kind == 98 || la.kind == 181) { if (la.kind == 83) { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 98) { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2456 "VBNET.ATG" +#line 2464 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } case 171: { lexer.NextToken(); - if (StartOf(20)) { + if (StartOf(21)) { Expr( -#line 2458 "VBNET.ATG" +#line 2466 "VBNET.ATG" out expr); } -#line 2458 "VBNET.ATG" +#line 2466 "VBNET.ATG" statement = new ThrowStatement(expr); break; } case 154: { lexer.NextToken(); - if (StartOf(20)) { + if (StartOf(21)) { Expr( -#line 2460 "VBNET.ATG" +#line 2468 "VBNET.ATG" out expr); } -#line 2460 "VBNET.ATG" +#line 2468 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2462 "VBNET.ATG" +#line 2470 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2462 "VBNET.ATG" +#line 2470 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(168); -#line 2463 "VBNET.ATG" +#line 2471 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5182,42 +5210,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2465 "VBNET.ATG" +#line 2473 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); - if (StartOf(24)) { + if (StartOf(25)) { ArgumentList( -#line 2466 "VBNET.ATG" +#line 2474 "VBNET.ATG" out p); } Expect(25); } -#line 2467 "VBNET.ATG" +#line 2475 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2469 "VBNET.ATG" +#line 2477 "VBNET.ATG" out statement); break; } case 42: { lexer.NextToken(); -#line 2471 "VBNET.ATG" +#line 2479 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2472 "VBNET.ATG" +#line 2480 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2472 "VBNET.ATG" +#line 2480 "VBNET.ATG" out handlerExpr); -#line 2474 "VBNET.ATG" +#line 2482 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5225,17 +5253,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2477 "VBNET.ATG" +#line 2485 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2478 "VBNET.ATG" +#line 2486 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2478 "VBNET.ATG" +#line 2486 "VBNET.ATG" out handlerExpr); -#line 2480 "VBNET.ATG" +#line 2488 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5243,16 +5271,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2483 "VBNET.ATG" +#line 2491 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2484 "VBNET.ATG" +#line 2492 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(181); -#line 2486 "VBNET.ATG" +#line 2494 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5260,23 +5288,23 @@ out embeddedStatement); case 83: { lexer.NextToken(); -#line 2491 "VBNET.ATG" +#line 2499 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2494 "VBNET.ATG" +#line 2502 "VBNET.ATG" out conditionType); Expr( -#line 2494 "VBNET.ATG" +#line 2502 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2495 "VBNET.ATG" +#line 2503 "VBNET.ATG" out embeddedStatement); Expect(118); -#line 2498 "VBNET.ATG" +#line 2506 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5285,28 +5313,28 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2505 "VBNET.ATG" +#line 2513 "VBNET.ATG" out embeddedStatement); Expect(118); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2506 "VBNET.ATG" +#line 2514 "VBNET.ATG" out conditionType); Expr( -#line 2506 "VBNET.ATG" +#line 2514 "VBNET.ATG" out expr); } -#line 2508 "VBNET.ATG" +#line 2516 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(254); + } else SynErr(255); break; } case 98: { lexer.NextToken(); -#line 2513 "VBNET.ATG" +#line 2521 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5315,24 +5343,24 @@ out expr); if (la.kind == 85) { lexer.NextToken(); LoopControlVariable( -#line 2520 "VBNET.ATG" +#line 2528 "VBNET.ATG" out typeReference, out typeName); Expect(109); Expr( -#line 2521 "VBNET.ATG" +#line 2529 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2522 "VBNET.ATG" +#line 2530 "VBNET.ATG" out embeddedStatement); Expect(128); - if (StartOf(20)) { + if (StartOf(21)) { Expr( -#line 2523 "VBNET.ATG" +#line 2531 "VBNET.ATG" out expr); } -#line 2525 "VBNET.ATG" +#line 2533 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5342,86 +5370,86 @@ out expr); statement.EndLocation = t.EndLocation; - } else if (StartOf(12)) { + } else if (StartOf(13)) { -#line 2536 "VBNET.ATG" +#line 2544 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2541 "VBNET.ATG" +#line 2549 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2542 "VBNET.ATG" +#line 2550 "VBNET.ATG" out start); Expect(172); Expr( -#line 2542 "VBNET.ATG" +#line 2550 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2542 "VBNET.ATG" +#line 2550 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2543 "VBNET.ATG" +#line 2551 "VBNET.ATG" out embeddedStatement); Expect(128); - if (StartOf(20)) { + if (StartOf(21)) { Expr( -#line 2546 "VBNET.ATG" +#line 2554 "VBNET.ATG" out nextExpr); -#line 2546 "VBNET.ATG" +#line 2554 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2547 "VBNET.ATG" +#line 2555 "VBNET.ATG" out nextExpr); -#line 2547 "VBNET.ATG" +#line 2555 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2550 "VBNET.ATG" +#line 2558 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); - } else SynErr(255); + } else SynErr(256); break; } case 92: { lexer.NextToken(); Expr( -#line 2554 "VBNET.ATG" +#line 2562 "VBNET.ATG" out expr); -#line 2554 "VBNET.ATG" +#line 2562 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2556 "VBNET.ATG" +#line 2564 "VBNET.ATG" bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2556 "VBNET.ATG" +#line 2564 "VBNET.ATG" isPreserve = true; } Expr( -#line 2557 "VBNET.ATG" +#line 2565 "VBNET.ATG" out expr); -#line 2559 "VBNET.ATG" +#line 2567 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; InvocationExpression redimClause = expr as InvocationExpression; @@ -5430,13 +5458,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2564 "VBNET.ATG" +#line 2572 "VBNET.ATG" out expr); -#line 2565 "VBNET.ATG" +#line 2573 "VBNET.ATG" redimClause = expr as InvocationExpression; -#line 2566 "VBNET.ATG" +#line 2574 "VBNET.ATG" if (redimClause != null) { reDimStatement.ReDimClauses.Add(redimClause); } } break; @@ -5444,10 +5472,10 @@ out expr); case 91: { lexer.NextToken(); Expr( -#line 2570 "VBNET.ATG" +#line 2578 "VBNET.ATG" out expr); -#line 2571 "VBNET.ATG" +#line 2579 "VBNET.ATG" List arrays = new List(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5456,53 +5484,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2576 "VBNET.ATG" +#line 2584 "VBNET.ATG" out expr); -#line 2576 "VBNET.ATG" +#line 2584 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2577 "VBNET.ATG" +#line 2585 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2579 "VBNET.ATG" +#line 2587 "VBNET.ATG" statement = new StopStatement(); break; } case 106: { lexer.NextToken(); Expr( -#line 2581 "VBNET.ATG" +#line 2589 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2583 "VBNET.ATG" +#line 2591 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); -#line 2583 "VBNET.ATG" +#line 2591 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2586 "VBNET.ATG" +#line 2594 "VBNET.ATG" out embeddedStatement); -#line 2588 "VBNET.ATG" +#line 2596 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 87 || -#line 2592 "VBNET.ATG" +#line 2600 "VBNET.ATG" IsElseIf()) { if ( -#line 2592 "VBNET.ATG" +#line 2600 "VBNET.ATG" IsElseIf()) { Expect(86); Expect(106); @@ -5510,20 +5538,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2595 "VBNET.ATG" +#line 2603 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2596 "VBNET.ATG" +#line 2604 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2597 "VBNET.ATG" +#line 2605 "VBNET.ATG" out block); -#line 2599 "VBNET.ATG" +#line 2607 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5531,61 +5559,61 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2604 "VBNET.ATG" +#line 2612 "VBNET.ATG" out embeddedStatement); -#line 2606 "VBNET.ATG" +#line 2614 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(88); Expect(106); -#line 2610 "VBNET.ATG" +#line 2618 "VBNET.ATG" statement = ifStatement; - } else if (StartOf(27)) { + } else if (StartOf(28)) { EmbeddedStatement( -#line 2613 "VBNET.ATG" +#line 2621 "VBNET.ATG" out embeddedStatement); -#line 2615 "VBNET.ATG" +#line 2623 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2617 "VBNET.ATG" +#line 2625 "VBNET.ATG" out embeddedStatement); -#line 2617 "VBNET.ATG" +#line 2625 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 86) { lexer.NextToken(); - if (StartOf(27)) { + if (StartOf(28)) { EmbeddedStatement( -#line 2619 "VBNET.ATG" +#line 2627 "VBNET.ATG" out embeddedStatement); } -#line 2621 "VBNET.ATG" +#line 2629 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2624 "VBNET.ATG" +#line 2632 "VBNET.ATG" out embeddedStatement); -#line 2625 "VBNET.ATG" +#line 2633 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2628 "VBNET.ATG" +#line 2636 "VBNET.ATG" statement = ifStatement; - } else SynErr(256); + } else SynErr(257); break; } case 155: { @@ -5594,43 +5622,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2631 "VBNET.ATG" +#line 2639 "VBNET.ATG" out expr); EndOfStmt(); -#line 2632 "VBNET.ATG" +#line 2640 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 57) { -#line 2636 "VBNET.ATG" +#line 2644 "VBNET.ATG" List caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2637 "VBNET.ATG" +#line 2645 "VBNET.ATG" out caseClauses); if ( -#line 2637 "VBNET.ATG" +#line 2645 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2639 "VBNET.ATG" +#line 2647 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2641 "VBNET.ATG" +#line 2649 "VBNET.ATG" out block); -#line 2643 "VBNET.ATG" +#line 2651 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2647 "VBNET.ATG" +#line 2655 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(88); Expect(155); @@ -5638,43 +5666,43 @@ out block); } case 135: { -#line 2649 "VBNET.ATG" +#line 2657 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2650 "VBNET.ATG" +#line 2658 "VBNET.ATG" out onErrorStatement); -#line 2650 "VBNET.ATG" +#line 2658 "VBNET.ATG" statement = onErrorStatement; break; } case 104: { -#line 2651 "VBNET.ATG" +#line 2659 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2652 "VBNET.ATG" +#line 2660 "VBNET.ATG" out goToStatement); -#line 2652 "VBNET.ATG" +#line 2660 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2653 "VBNET.ATG" +#line 2661 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2654 "VBNET.ATG" +#line 2662 "VBNET.ATG" out resumeStatement); -#line 2654 "VBNET.ATG" +#line 2662 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 24: case 43: case 47: case 49: case 50: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: case 133: case 144: case 159: case 160: case 165: case 169: case 173: case 175: case 176: case 177: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: case 204: { -#line 2657 "VBNET.ATG" +#line 2665 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5682,25 +5710,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2663 "VBNET.ATG" +#line 2671 "VBNET.ATG" out expr); - if (StartOf(29)) { + if (StartOf(30)) { AssignmentOperator( -#line 2665 "VBNET.ATG" +#line 2673 "VBNET.ATG" out op); Expr( -#line 2665 "VBNET.ATG" +#line 2673 "VBNET.ATG" out val); -#line 2665 "VBNET.ATG" +#line 2673 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 86) { -#line 2666 "VBNET.ATG" +#line 2674 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(257); + } else SynErr(258); -#line 2669 "VBNET.ATG" +#line 2677 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5713,49 +5741,49 @@ out val); case 56: { lexer.NextToken(); SimpleExpr( -#line 2676 "VBNET.ATG" +#line 2684 "VBNET.ATG" out expr); -#line 2676 "VBNET.ATG" +#line 2684 "VBNET.ATG" statement = new StatementExpression(expr); break; } case 188: { lexer.NextToken(); -#line 2678 "VBNET.ATG" +#line 2686 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifier.None); -#line 2679 "VBNET.ATG" +#line 2687 "VBNET.ATG" Statement block; VariableDeclarator( -#line 2680 "VBNET.ATG" +#line 2688 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2682 "VBNET.ATG" +#line 2690 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2684 "VBNET.ATG" +#line 2692 "VBNET.ATG" out block); Expect(88); Expect(188); -#line 2686 "VBNET.ATG" +#line 2694 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } - default: SynErr(258); break; + default: SynErr(259); break; } } void LocalDeclarationStatement( -#line 2397 "VBNET.ATG" +#line 2405 "VBNET.ATG" out Statement statement) { -#line 2399 "VBNET.ATG" +#line 2407 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5764,22 +5792,22 @@ out Statement statement) { if (la.kind == 71) { lexer.NextToken(); -#line 2405 "VBNET.ATG" +#line 2413 "VBNET.ATG" m.Add(Modifier.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2414 "VBNET.ATG" m.Add(Modifier.Static, t.Location); } else { lexer.NextToken(); -#line 2407 "VBNET.ATG" +#line 2415 "VBNET.ATG" dimfound = true; } } -#line 2410 "VBNET.ATG" +#line 2418 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5792,137 +5820,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2421 "VBNET.ATG" +#line 2429 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2422 "VBNET.ATG" +#line 2430 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2424 "VBNET.ATG" +#line 2432 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2872 "VBNET.ATG" +#line 2880 "VBNET.ATG" out Statement tryStatement) { -#line 2874 "VBNET.ATG" +#line 2882 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2877 "VBNET.ATG" +#line 2885 "VBNET.ATG" out blockStmt); if (la.kind == 58 || la.kind == 88 || la.kind == 97) { CatchClauses( -#line 2878 "VBNET.ATG" +#line 2886 "VBNET.ATG" out catchClauses); } if (la.kind == 97) { lexer.NextToken(); EndOfStmt(); Block( -#line 2879 "VBNET.ATG" +#line 2887 "VBNET.ATG" out finallyStmt); } Expect(88); Expect(174); -#line 2882 "VBNET.ATG" +#line 2890 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2850 "VBNET.ATG" +#line 2858 "VBNET.ATG" out Statement withStatement) { -#line 2852 "VBNET.ATG" +#line 2860 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2855 "VBNET.ATG" +#line 2863 "VBNET.ATG" Point start = t.Location; Expr( -#line 2856 "VBNET.ATG" +#line 2864 "VBNET.ATG" out expr); EndOfStmt(); -#line 2858 "VBNET.ATG" +#line 2866 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2862 "VBNET.ATG" +#line 2870 "VBNET.ATG" out blockStmt); -#line 2864 "VBNET.ATG" +#line 2872 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(88); Expect(182); -#line 2868 "VBNET.ATG" +#line 2876 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2843 "VBNET.ATG" +#line 2851 "VBNET.ATG" out ConditionType conditionType) { -#line 2844 "VBNET.ATG" +#line 2852 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2845 "VBNET.ATG" +#line 2853 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2846 "VBNET.ATG" +#line 2854 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(259); + } else SynErr(260); } void LoopControlVariable( -#line 2690 "VBNET.ATG" +#line 2698 "VBNET.ATG" out TypeReference type, out string name) { -#line 2691 "VBNET.ATG" +#line 2699 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2695 "VBNET.ATG" +#line 2703 "VBNET.ATG" out name); if ( -#line 2696 "VBNET.ATG" +#line 2704 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2696 "VBNET.ATG" +#line 2704 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2697 "VBNET.ATG" +#line 2705 "VBNET.ATG" out type); -#line 2697 "VBNET.ATG" +#line 2705 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2699 "VBNET.ATG" +#line 2707 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5934,48 +5962,48 @@ out type); } void CaseClauses( -#line 2803 "VBNET.ATG" +#line 2811 "VBNET.ATG" out List caseClauses) { -#line 2805 "VBNET.ATG" +#line 2813 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2808 "VBNET.ATG" +#line 2816 "VBNET.ATG" out caseClause); -#line 2808 "VBNET.ATG" +#line 2816 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2809 "VBNET.ATG" +#line 2817 "VBNET.ATG" out caseClause); -#line 2809 "VBNET.ATG" +#line 2817 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2710 "VBNET.ATG" +#line 2718 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2712 "VBNET.ATG" +#line 2720 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(135); Expect(92); if ( -#line 2718 "VBNET.ATG" +#line 2726 "VBNET.ATG" IsNegativeLabelName()) { Expect(104); Expect(15); Expect(5); -#line 2720 "VBNET.ATG" +#line 2728 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5984,10 +6012,10 @@ IsNegativeLabelName()) { } else if (la.kind == 104) { GotoStatement( -#line 2726 "VBNET.ATG" +#line 2734 "VBNET.ATG" out goToStatement); -#line 2728 "VBNET.ATG" +#line 2736 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6004,63 +6032,63 @@ out goToStatement); lexer.NextToken(); Expect(128); -#line 2742 "VBNET.ATG" +#line 2750 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(260); + } else SynErr(261); } void GotoStatement( -#line 2748 "VBNET.ATG" +#line 2756 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2750 "VBNET.ATG" +#line 2758 "VBNET.ATG" string label = String.Empty; Expect(104); LabelName( -#line 2753 "VBNET.ATG" +#line 2761 "VBNET.ATG" out label); -#line 2755 "VBNET.ATG" +#line 2763 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2792 "VBNET.ATG" +#line 2800 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2794 "VBNET.ATG" +#line 2802 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2797 "VBNET.ATG" +#line 2805 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(128); -#line 2798 "VBNET.ATG" +#line 2806 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); - if (StartOf(30)) { + if (StartOf(31)) { LabelName( -#line 2799 "VBNET.ATG" +#line 2807 "VBNET.ATG" out label); } -#line 2799 "VBNET.ATG" +#line 2807 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(261); + } else SynErr(262); } void CaseClause( -#line 2813 "VBNET.ATG" +#line 2821 "VBNET.ATG" out CaseLabel caseClause) { -#line 2815 "VBNET.ATG" +#line 2823 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6069,9 +6097,9 @@ out CaseLabel caseClause) { if (la.kind == 86) { lexer.NextToken(); -#line 2821 "VBNET.ATG" +#line 2829 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(31)) { + } else if (StartOf(32)) { if (la.kind == 113) { lexer.NextToken(); } @@ -6079,76 +6107,76 @@ out CaseLabel caseClause) { case 27: { lexer.NextToken(); -#line 2825 "VBNET.ATG" +#line 2833 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 2826 "VBNET.ATG" +#line 2834 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 2827 "VBNET.ATG" +#line 2835 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 2828 "VBNET.ATG" +#line 2836 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2829 "VBNET.ATG" +#line 2837 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 2830 "VBNET.ATG" +#line 2838 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(262); break; + default: SynErr(263); break; } Expr( -#line 2832 "VBNET.ATG" +#line 2840 "VBNET.ATG" out expr); -#line 2834 "VBNET.ATG" +#line 2842 "VBNET.ATG" caseClause = new CaseLabel(op, expr); - } else if (StartOf(20)) { + } else if (StartOf(21)) { Expr( -#line 2836 "VBNET.ATG" +#line 2844 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2836 "VBNET.ATG" +#line 2844 "VBNET.ATG" out sexpr); } -#line 2838 "VBNET.ATG" +#line 2846 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(263); + } else SynErr(264); } void CatchClauses( -#line 2887 "VBNET.ATG" +#line 2895 "VBNET.ATG" out List catchClauses) { -#line 2889 "VBNET.ATG" +#line 2897 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6157,30 +6185,30 @@ out List catchClauses) { while (la.kind == 58) { lexer.NextToken(); - if (StartOf(12)) { + if (StartOf(13)) { Identifier(); -#line 2897 "VBNET.ATG" +#line 2905 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2897 "VBNET.ATG" +#line 2905 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2898 "VBNET.ATG" +#line 2906 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2900 "VBNET.ATG" +#line 2908 "VBNET.ATG" out blockStmt); -#line 2901 "VBNET.ATG" +#line 2909 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6452,52 +6480,53 @@ out blockStmt); case 215: s = "invalid NonModuleDeclaration"; break; case 216: s = "invalid Identifier"; break; case 217: s = "invalid TypeParameterConstraints"; break; - case 218: s = "invalid NonArrayTypeName"; break; - case 219: s = "invalid MemberModifier"; break; - case 220: s = "invalid StructureMemberDecl"; break; + case 218: s = "invalid TypeParameterConstraint"; break; + case 219: s = "invalid NonArrayTypeName"; break; + case 220: s = "invalid MemberModifier"; break; case 221: s = "invalid StructureMemberDecl"; break; case 222: s = "invalid StructureMemberDecl"; break; case 223: s = "invalid StructureMemberDecl"; break; case 224: s = "invalid StructureMemberDecl"; break; case 225: s = "invalid StructureMemberDecl"; break; case 226: s = "invalid StructureMemberDecl"; break; - case 227: s = "invalid InterfaceMemberDecl"; break; + case 227: s = "invalid StructureMemberDecl"; break; case 228: s = "invalid InterfaceMemberDecl"; break; - case 229: s = "invalid Charset"; break; - case 230: s = "invalid IdentifierForFieldDeclaration"; break; - case 231: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; - case 232: s = "invalid AccessorDecls"; break; - case 233: s = "invalid EventAccessorDeclaration"; break; - case 234: s = "invalid OverloadableOperator"; break; - case 235: s = "invalid VariableInitializer"; break; - case 236: s = "invalid EventMemberSpecifier"; break; + case 229: s = "invalid InterfaceMemberDecl"; break; + case 230: s = "invalid Charset"; break; + case 231: s = "invalid IdentifierForFieldDeclaration"; break; + case 232: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; + case 233: s = "invalid AccessorDecls"; break; + case 234: s = "invalid EventAccessorDeclaration"; break; + case 235: s = "invalid OverloadableOperator"; break; + case 236: s = "invalid VariableInitializer"; break; case 237: s = "invalid EventMemberSpecifier"; break; - case 238: s = "invalid AssignmentOperator"; break; - case 239: s = "invalid SimpleExpr"; break; + case 238: s = "invalid EventMemberSpecifier"; break; + case 239: s = "invalid AssignmentOperator"; break; case 240: s = "invalid SimpleExpr"; break; case 241: s = "invalid SimpleExpr"; break; - case 242: s = "invalid PrimitiveTypeName"; break; - case 243: s = "invalid CastTarget"; break; - case 244: s = "invalid InvocationOrMemberReferenceExpression"; break; - case 245: s = "invalid InvocationExpression"; break; + case 242: s = "invalid SimpleExpr"; break; + case 243: s = "invalid PrimitiveTypeName"; break; + case 244: s = "invalid CastTarget"; break; + case 245: s = "invalid InvocationOrMemberReferenceExpression"; break; case 246: s = "invalid InvocationExpression"; break; - case 247: s = "invalid Argument"; break; - case 248: s = "invalid QualIdentAndTypeArguments"; break; - case 249: s = "invalid AttributeArguments"; break; - case 250: s = "invalid ParameterModifier"; break; - case 251: s = "invalid Statement"; break; - case 252: s = "invalid LabelName"; break; - case 253: s = "invalid EmbeddedStatement"; break; + case 247: s = "invalid InvocationExpression"; break; + case 248: s = "invalid Argument"; break; + case 249: s = "invalid QualIdentAndTypeArguments"; break; + case 250: s = "invalid AttributeArguments"; break; + case 251: s = "invalid ParameterModifier"; break; + case 252: s = "invalid Statement"; break; + case 253: s = "invalid LabelName"; break; case 254: s = "invalid EmbeddedStatement"; break; case 255: s = "invalid EmbeddedStatement"; break; case 256: s = "invalid EmbeddedStatement"; break; case 257: s = "invalid EmbeddedStatement"; break; case 258: s = "invalid EmbeddedStatement"; break; - case 259: s = "invalid WhileOrUntil"; break; - case 260: s = "invalid OnErrorStatement"; break; - case 261: s = "invalid ResumeStatement"; break; - case 262: s = "invalid CaseClause"; break; + case 259: s = "invalid EmbeddedStatement"; break; + case 260: s = "invalid WhileOrUntil"; break; + case 261: s = "invalid OnErrorStatement"; break; + case 262: s = "invalid ResumeStatement"; break; case 263: s = "invalid CaseClause"; break; + case 264: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -6515,6 +6544,7 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,T,x, x,x,x,x, T,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,T,x, x,x,x,x, T,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,x,x, T,T,x,x, x,x,x,T, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, T,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,T,x, x,T,x,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index ea7291c436..ff368ca07b 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -635,16 +635,24 @@ TypeParameterConstraints "As" ( "{" - TypeName (. if (constraint != null) { template.Bases.Add(constraint); } .) + TypeParameterConstraint (. if (constraint != null) { template.Bases.Add(constraint); } .) { "," - TypeName (. if (constraint != null) { template.Bases.Add(constraint); } .) + TypeParameterConstraint (. if (constraint != null) { template.Bases.Add(constraint); } .) } "}" - | TypeName (. if (constraint != null) { template.Bases.Add(constraint); } .) + | TypeParameterConstraint (. if (constraint != null) { template.Bases.Add(constraint); } .) ) . +TypeParameterConstraint +(. constraint = null; .) += "Class" (. constraint = new TypeReference("class"); .) +| "Structure" (. constraint = new TypeReference("struct"); .) +| "New" (. constraint = new TypeReference("new"); .) +| TypeName +. + /* 6.4.2 */ NonModuleDeclaration attributes> (. @@ -1130,8 +1138,8 @@ StructureMemberDecl attributes> ( "Sub" Identifier (. name = t.val; .) - "Lib" LiteralString (. library = t.literalValue.ToString(); .) - ["Alias" LiteralString (. alias = t.literalValue.ToString(); .)] + "Lib" LiteralString (. library = t.literalValue as string; .) + ["Alias" LiteralString (. alias = t.literalValue as string; .)] [ "(" [ FormalParameterList

] ")" ] EOL (. @@ -1143,8 +1151,8 @@ StructureMemberDecl attributes> | "Function" Identifier (. name = t.val; .) - "Lib" LiteralString (. library = t.literalValue.ToString(); .) - ["Alias" LiteralString (. alias = t.literalValue.ToString(); .)] + "Lib" LiteralString (. library = t.literalValue as string; .) + ["Alias" LiteralString (. alias = t.literalValue as string; .)] [ "(" [ FormalParameterList

] ")" ] ["As" TypeName ] EOL