diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 64770dfc8e..482732510d 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -56,23 +56,23 @@ IsGlobalAttrTarget()) { void ExternAliasDirective() { -#line 345 "cs.ATG" +#line 353 "cs.ATG" ExternAliasDirective ead = new ExternAliasDirective { StartLocation = la.Location }; Expect(71); Identifier(); -#line 348 "cs.ATG" +#line 356 "cs.ATG" if (t.val != "alias") Error("Expected 'extern alias'."); Identifier(); -#line 349 "cs.ATG" +#line 357 "cs.ATG" ead.Name = t.val; Expect(11); -#line 350 "cs.ATG" +#line 358 "cs.ATG" ead.EndLocation = t.EndLocation; -#line 351 "cs.ATG" +#line 359 "cs.ATG" compilationUnit.AddChild(ead); } @@ -160,7 +160,7 @@ out attribute); void NamespaceMemberDecl() { -#line 318 "cs.ATG" +#line 326 "cs.ATG" AttributeSection section; List attributes = new List(); ModifierList m = new ModifierList(); @@ -169,13 +169,13 @@ out attribute); if (la.kind == 88) { lexer.NextToken(); -#line 324 "cs.ATG" +#line 332 "cs.ATG" Location startPos = t.Location; Qualident( -#line 325 "cs.ATG" +#line 333 "cs.ATG" out qualident); -#line 325 "cs.ATG" +#line 333 "cs.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; compilationUnit.AddChild(node); @@ -196,58 +196,58 @@ out qualident); lexer.NextToken(); } -#line 335 "cs.ATG" +#line 343 "cs.ATG" node.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); } else if (StartOf(2)) { while (la.kind == 18) { AttributeSection( -#line 339 "cs.ATG" +#line 347 "cs.ATG" out section); -#line 339 "cs.ATG" +#line 347 "cs.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 340 "cs.ATG" +#line 348 "cs.ATG" m); } TypeDecl( -#line 341 "cs.ATG" +#line 349 "cs.ATG" m, attributes); } else SynErr(146); } void Qualident( -#line 475 "cs.ATG" +#line 483 "cs.ATG" out string qualident) { Identifier(); -#line 477 "cs.ATG" +#line 485 "cs.ATG" qualidentBuilder.Length = 0; qualidentBuilder.Append(t.val); while ( -#line 478 "cs.ATG" +#line 486 "cs.ATG" DotAndIdent()) { Expect(15); Identifier(); -#line 478 "cs.ATG" +#line 486 "cs.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(t.val); } -#line 481 "cs.ATG" +#line 489 "cs.ATG" qualident = qualidentBuilder.ToString(); } void NonArrayType( -#line 593 "cs.ATG" +#line 601 "cs.ATG" out TypeReference type) { -#line 595 "cs.ATG" +#line 603 "cs.ATG" Location startPos = la.Location; string name; int pointer = 0; @@ -255,37 +255,37 @@ out TypeReference type) { if (StartOf(4)) { ClassType( -#line 601 "cs.ATG" +#line 609 "cs.ATG" out type, false); } else if (StartOf(5)) { SimpleType( -#line 602 "cs.ATG" +#line 610 "cs.ATG" out name); -#line 602 "cs.ATG" +#line 610 "cs.ATG" type = new TypeReference(name, true); } else if (la.kind == 123) { lexer.NextToken(); Expect(6); -#line 603 "cs.ATG" +#line 611 "cs.ATG" pointer = 1; type = new TypeReference("System.Void", true); } else SynErr(147); if (la.kind == 12) { NullableQuestionMark( -#line 606 "cs.ATG" +#line 614 "cs.ATG" ref type); } while ( -#line 608 "cs.ATG" +#line 616 "cs.ATG" IsPointer()) { Expect(6); -#line 609 "cs.ATG" +#line 617 "cs.ATG" ++pointer; } -#line 611 "cs.ATG" +#line 619 "cs.ATG" if (type != null) { type.PointerNestingLevel = pointer; type.EndLocation = t.EndLocation; @@ -425,130 +425,130 @@ positional, named); void AttributeArguments( #line 254 "cs.ATG" List positional, List named) { - -#line 256 "cs.ATG" - bool nameFound = false; - string name = ""; - Expression expr; - Expect(20); if (StartOf(6)) { - if ( -#line 264 "cs.ATG" -IsAssignment()) { - -#line 264 "cs.ATG" - nameFound = true; - Identifier(); - -#line 265 "cs.ATG" - name = t.val; - Expect(3); + AttributeArgument( +#line 258 "cs.ATG" +positional, named); + while (la.kind == 14) { + lexer.NextToken(); + AttributeArgument( +#line 261 "cs.ATG" +positional, named); } - Expr( -#line 267 "cs.ATG" -out expr); + } + Expect(21); + } + void AttributeArgument( #line 267 "cs.ATG" - if (expr != null) {if(name == "") positional.Add(expr); - else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } - } - - while (la.kind == 14) { - lexer.NextToken(); - if ( -#line 275 "cs.ATG" +List positional, List named) { + +#line 268 "cs.ATG" + string name = null; bool isNamed = false; Expression expr; + if ( +#line 271 "cs.ATG" IsAssignment()) { +#line 271 "cs.ATG" + isNamed = true; + Identifier(); + +#line 272 "cs.ATG" + name = t.val; + Expect(3); + } else if ( #line 275 "cs.ATG" - nameFound = true; - Identifier(); +IdentAndColon()) { + Identifier(); #line 276 "cs.ATG" - name = t.val; - Expect(3); - } else if (StartOf(6)) { - -#line 278 "cs.ATG" - if (nameFound) Error("no positional argument after named argument"); - } else SynErr(149); - Expr( -#line 279 "cs.ATG" + name = t.val; + Expect(9); + } else if (StartOf(6)) { + } else SynErr(149); + Expr( +#line 280 "cs.ATG" out expr); -#line 279 "cs.ATG" - if (expr != null) { if(name == "") positional.Add(expr); - else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } - } - - } +#line 282 "cs.ATG" + if (expr != null) { + if (isNamed) { + named.Add(new NamedArgumentExpression(name, expr)); + } else { + if (named.Count > 0) + Error("positional argument after named argument is not allowed"); + if (name != null) + expr = new NamedArgumentExpression(name, expr); + positional.Add(expr); } - Expect(21); + } + } void Expr( -#line 1771 "cs.ATG" +#line 1779 "cs.ATG" out Expression expr) { -#line 1772 "cs.ATG" +#line 1780 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; -#line 1774 "cs.ATG" +#line 1782 "cs.ATG" Location startLocation = la.Location; UnaryExpr( -#line 1775 "cs.ATG" +#line 1783 "cs.ATG" out expr); if (StartOf(7)) { AssignmentOperator( -#line 1778 "cs.ATG" +#line 1786 "cs.ATG" out op); Expr( -#line 1778 "cs.ATG" +#line 1786 "cs.ATG" out expr1); -#line 1778 "cs.ATG" +#line 1786 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if ( -#line 1779 "cs.ATG" +#line 1787 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { AssignmentOperator( -#line 1780 "cs.ATG" +#line 1788 "cs.ATG" out op); Expr( -#line 1780 "cs.ATG" +#line 1788 "cs.ATG" out expr1); -#line 1780 "cs.ATG" +#line 1788 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if (StartOf(8)) { ConditionalOrExpr( -#line 1782 "cs.ATG" +#line 1790 "cs.ATG" ref expr); if (la.kind == 13) { lexer.NextToken(); Expr( -#line 1783 "cs.ATG" +#line 1791 "cs.ATG" out expr1); -#line 1783 "cs.ATG" +#line 1791 "cs.ATG" expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); } if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1784 "cs.ATG" +#line 1792 "cs.ATG" out expr1); Expect(9); Expr( -#line 1784 "cs.ATG" +#line 1792 "cs.ATG" out expr2); -#line 1784 "cs.ATG" +#line 1792 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else SynErr(150); -#line 1787 "cs.ATG" +#line 1795 "cs.ATG" if (expr != null) { if (expr.StartLocation.IsEmpty) expr.StartLocation = startLocation; @@ -559,10 +559,10 @@ out expr2); } void AttributeSection( -#line 288 "cs.ATG" +#line 296 "cs.ATG" out AttributeSection section) { -#line 290 "cs.ATG" +#line 298 "cs.ATG" string attributeTarget = ""; List attributes = new List(); ASTAttribute attribute; @@ -570,44 +570,44 @@ out AttributeSection section) { Expect(18); -#line 296 "cs.ATG" +#line 304 "cs.ATG" Location startPos = t.Location; if ( -#line 297 "cs.ATG" +#line 305 "cs.ATG" IsLocalAttrTarget()) { if (la.kind == 69) { lexer.NextToken(); -#line 298 "cs.ATG" +#line 306 "cs.ATG" attributeTarget = "event"; } else if (la.kind == 101) { lexer.NextToken(); -#line 299 "cs.ATG" +#line 307 "cs.ATG" attributeTarget = "return"; } else { Identifier(); -#line 300 "cs.ATG" +#line 308 "cs.ATG" attributeTarget = t.val; } Expect(9); } Attribute( -#line 304 "cs.ATG" +#line 312 "cs.ATG" out attribute); -#line 304 "cs.ATG" +#line 312 "cs.ATG" attributes.Add(attribute); while ( -#line 305 "cs.ATG" +#line 313 "cs.ATG" NotFinalComma()) { Expect(14); Attribute( -#line 305 "cs.ATG" +#line 313 "cs.ATG" out attribute); -#line 305 "cs.ATG" +#line 313 "cs.ATG" attributes.Add(attribute); } if (la.kind == 14) { @@ -615,7 +615,7 @@ out attribute); } Expect(19); -#line 307 "cs.ATG" +#line 315 "cs.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -626,76 +626,76 @@ out attribute); } void TypeModifier( -#line 678 "cs.ATG" +#line 686 "cs.ATG" ModifierList m) { switch (la.kind) { case 89: { lexer.NextToken(); -#line 680 "cs.ATG" +#line 688 "cs.ATG" m.Add(Modifiers.New, t.Location); break; } case 98: { lexer.NextToken(); -#line 681 "cs.ATG" +#line 689 "cs.ATG" m.Add(Modifiers.Public, t.Location); break; } case 97: { lexer.NextToken(); -#line 682 "cs.ATG" +#line 690 "cs.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 84: { lexer.NextToken(); -#line 683 "cs.ATG" +#line 691 "cs.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 96: { lexer.NextToken(); -#line 684 "cs.ATG" +#line 692 "cs.ATG" m.Add(Modifiers.Private, t.Location); break; } case 119: { lexer.NextToken(); -#line 685 "cs.ATG" +#line 693 "cs.ATG" m.Add(Modifiers.Unsafe, t.Location); break; } case 49: { lexer.NextToken(); -#line 686 "cs.ATG" +#line 694 "cs.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 103: { lexer.NextToken(); -#line 687 "cs.ATG" +#line 695 "cs.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 107: { lexer.NextToken(); -#line 688 "cs.ATG" +#line 696 "cs.ATG" m.Add(Modifiers.Static, t.Location); break; } case 126: { lexer.NextToken(); -#line 689 "cs.ATG" +#line 697 "cs.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -704,10 +704,10 @@ ModifierList m) { } void TypeDecl( -#line 354 "cs.ATG" +#line 362 "cs.ATG" ModifierList m, List attributes) { -#line 356 "cs.ATG" +#line 364 "cs.ATG" TypeReference type; List names; List p = new List(); @@ -716,11 +716,11 @@ ModifierList m, List attributes) { if (la.kind == 59) { -#line 362 "cs.ATG" +#line 370 "cs.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 363 "cs.ATG" +#line 371 "cs.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); templates = newType.Templates; compilationUnit.AddChild(newType); @@ -731,28 +731,28 @@ ModifierList m, List attributes) { Identifier(); -#line 371 "cs.ATG" +#line 379 "cs.ATG" newType.Name = t.val; if (la.kind == 23) { TypeParameterList( -#line 374 "cs.ATG" +#line 382 "cs.ATG" templates); } if (la.kind == 9) { ClassBase( -#line 376 "cs.ATG" +#line 384 "cs.ATG" out names); -#line 376 "cs.ATG" +#line 384 "cs.ATG" newType.BaseTypes = names; } while (la.kind == 127) { TypeParameterConstraintsClause( -#line 379 "cs.ATG" +#line 387 "cs.ATG" templates); } -#line 381 "cs.ATG" +#line 389 "cs.ATG" newType.BodyStartLocation = t.EndLocation; Expect(16); ClassBody(); @@ -761,18 +761,18 @@ templates); lexer.NextToken(); } -#line 385 "cs.ATG" +#line 393 "cs.ATG" newType.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); } else if (StartOf(9)) { -#line 388 "cs.ATG" +#line 396 "cs.ATG" m.Check(Modifiers.StructsInterfacesEnumsDelegates); if (la.kind == 109) { lexer.NextToken(); -#line 389 "cs.ATG" +#line 397 "cs.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); templates = newType.Templates; newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -782,42 +782,42 @@ templates); Identifier(); -#line 396 "cs.ATG" +#line 404 "cs.ATG" newType.Name = t.val; if (la.kind == 23) { TypeParameterList( -#line 399 "cs.ATG" +#line 407 "cs.ATG" templates); } if (la.kind == 9) { StructInterfaces( -#line 401 "cs.ATG" +#line 409 "cs.ATG" out names); -#line 401 "cs.ATG" +#line 409 "cs.ATG" newType.BaseTypes = names; } while (la.kind == 127) { TypeParameterConstraintsClause( -#line 404 "cs.ATG" +#line 412 "cs.ATG" templates); } -#line 407 "cs.ATG" +#line 415 "cs.ATG" newType.BodyStartLocation = t.EndLocation; StructBody(); if (la.kind == 11) { lexer.NextToken(); } -#line 409 "cs.ATG" +#line 417 "cs.ATG" newType.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); } else if (la.kind == 83) { lexer.NextToken(); -#line 413 "cs.ATG" +#line 421 "cs.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); templates = newType.Templates; compilationUnit.AddChild(newType); @@ -827,42 +827,42 @@ templates); Identifier(); -#line 420 "cs.ATG" +#line 428 "cs.ATG" newType.Name = t.val; if (la.kind == 23) { TypeParameterList( -#line 423 "cs.ATG" +#line 431 "cs.ATG" templates); } if (la.kind == 9) { InterfaceBase( -#line 425 "cs.ATG" +#line 433 "cs.ATG" out names); -#line 425 "cs.ATG" +#line 433 "cs.ATG" newType.BaseTypes = names; } while (la.kind == 127) { TypeParameterConstraintsClause( -#line 428 "cs.ATG" +#line 436 "cs.ATG" templates); } -#line 430 "cs.ATG" +#line 438 "cs.ATG" newType.BodyStartLocation = t.EndLocation; InterfaceBody(); if (la.kind == 11) { lexer.NextToken(); } -#line 432 "cs.ATG" +#line 440 "cs.ATG" newType.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); } else if (la.kind == 68) { lexer.NextToken(); -#line 436 "cs.ATG" +#line 444 "cs.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); @@ -871,79 +871,79 @@ templates); Identifier(); -#line 442 "cs.ATG" +#line 450 "cs.ATG" newType.Name = t.val; if (la.kind == 9) { lexer.NextToken(); IntegralType( -#line 443 "cs.ATG" +#line 451 "cs.ATG" out name); -#line 443 "cs.ATG" +#line 451 "cs.ATG" newType.BaseTypes.Add(new TypeReference(name, true)); } -#line 445 "cs.ATG" +#line 453 "cs.ATG" newType.BodyStartLocation = t.EndLocation; EnumBody(); if (la.kind == 11) { lexer.NextToken(); } -#line 447 "cs.ATG" +#line 455 "cs.ATG" newType.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); } else { lexer.NextToken(); -#line 451 "cs.ATG" +#line 459 "cs.ATG" DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); templates = delegateDeclr.Templates; delegateDeclr.StartLocation = m.GetDeclarationLocation(t.Location); if ( -#line 455 "cs.ATG" +#line 463 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 455 "cs.ATG" +#line 463 "cs.ATG" delegateDeclr.ReturnType = new TypeReference("System.Void", true); } else if (StartOf(10)) { Type( -#line 456 "cs.ATG" +#line 464 "cs.ATG" out type); -#line 456 "cs.ATG" +#line 464 "cs.ATG" delegateDeclr.ReturnType = type; } else SynErr(152); Identifier(); -#line 458 "cs.ATG" +#line 466 "cs.ATG" delegateDeclr.Name = t.val; if (la.kind == 23) { TypeParameterList( -#line 461 "cs.ATG" +#line 469 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 463 "cs.ATG" +#line 471 "cs.ATG" p); -#line 463 "cs.ATG" +#line 471 "cs.ATG" delegateDeclr.Parameters = p; } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 467 "cs.ATG" +#line 475 "cs.ATG" templates); } Expect(11); -#line 469 "cs.ATG" +#line 477 "cs.ATG" delegateDeclr.EndLocation = t.EndLocation; compilationUnit.AddChild(delegateDeclr); @@ -952,74 +952,74 @@ templates); } void TypeParameterList( -#line 2352 "cs.ATG" +#line 2360 "cs.ATG" List templates) { -#line 2354 "cs.ATG" +#line 2362 "cs.ATG" TemplateDefinition template; Expect(23); VariantTypeParameter( -#line 2358 "cs.ATG" +#line 2366 "cs.ATG" out template); -#line 2358 "cs.ATG" +#line 2366 "cs.ATG" templates.Add(template); while (la.kind == 14) { lexer.NextToken(); VariantTypeParameter( -#line 2360 "cs.ATG" +#line 2368 "cs.ATG" out template); -#line 2360 "cs.ATG" +#line 2368 "cs.ATG" templates.Add(template); } Expect(22); } void ClassBase( -#line 484 "cs.ATG" +#line 492 "cs.ATG" out List names) { -#line 486 "cs.ATG" +#line 494 "cs.ATG" TypeReference typeRef; names = new List(); Expect(9); ClassType( -#line 490 "cs.ATG" +#line 498 "cs.ATG" out typeRef, false); -#line 490 "cs.ATG" +#line 498 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } while (la.kind == 14) { lexer.NextToken(); TypeName( -#line 491 "cs.ATG" +#line 499 "cs.ATG" out typeRef, false); -#line 491 "cs.ATG" +#line 499 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } } } void TypeParameterConstraintsClause( -#line 2380 "cs.ATG" +#line 2388 "cs.ATG" List templates) { -#line 2381 "cs.ATG" +#line 2389 "cs.ATG" string name = ""; TypeReference type; Expect(127); Identifier(); -#line 2384 "cs.ATG" +#line 2392 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2386 "cs.ATG" +#line 2394 "cs.ATG" out type); -#line 2387 "cs.ATG" +#line 2395 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1032,10 +1032,10 @@ out type); while (la.kind == 14) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2396 "cs.ATG" +#line 2404 "cs.ATG" out type); -#line 2397 "cs.ATG" +#line 2405 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1050,109 +1050,109 @@ out type); void ClassBody() { -#line 495 "cs.ATG" +#line 503 "cs.ATG" AttributeSection section; while (StartOf(12)) { -#line 497 "cs.ATG" +#line 505 "cs.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (!(StartOf(13))) {SynErr(154); lexer.NextToken(); } while (la.kind == 18) { AttributeSection( -#line 501 "cs.ATG" +#line 509 "cs.ATG" out section); -#line 501 "cs.ATG" +#line 509 "cs.ATG" attributes.Add(section); } MemberModifiers( -#line 502 "cs.ATG" +#line 510 "cs.ATG" m); ClassMemberDecl( -#line 503 "cs.ATG" +#line 511 "cs.ATG" m, attributes); } } void StructInterfaces( -#line 507 "cs.ATG" +#line 515 "cs.ATG" out List names) { -#line 509 "cs.ATG" +#line 517 "cs.ATG" TypeReference typeRef; names = new List(); Expect(9); TypeName( -#line 513 "cs.ATG" +#line 521 "cs.ATG" out typeRef, false); -#line 513 "cs.ATG" +#line 521 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } while (la.kind == 14) { lexer.NextToken(); TypeName( -#line 514 "cs.ATG" +#line 522 "cs.ATG" out typeRef, false); -#line 514 "cs.ATG" +#line 522 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } } } void StructBody() { -#line 518 "cs.ATG" +#line 526 "cs.ATG" AttributeSection section; Expect(16); while (StartOf(14)) { -#line 521 "cs.ATG" +#line 529 "cs.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 18) { AttributeSection( -#line 524 "cs.ATG" +#line 532 "cs.ATG" out section); -#line 524 "cs.ATG" +#line 532 "cs.ATG" attributes.Add(section); } MemberModifiers( -#line 525 "cs.ATG" +#line 533 "cs.ATG" m); StructMemberDecl( -#line 526 "cs.ATG" +#line 534 "cs.ATG" m, attributes); } Expect(17); } void InterfaceBase( -#line 531 "cs.ATG" +#line 539 "cs.ATG" out List names) { -#line 533 "cs.ATG" +#line 541 "cs.ATG" TypeReference typeRef; names = new List(); Expect(9); TypeName( -#line 537 "cs.ATG" +#line 545 "cs.ATG" out typeRef, false); -#line 537 "cs.ATG" +#line 545 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } while (la.kind == 14) { lexer.NextToken(); TypeName( -#line 538 "cs.ATG" +#line 546 "cs.ATG" out typeRef, false); -#line 538 "cs.ATG" +#line 546 "cs.ATG" if (typeRef != null) { names.Add(typeRef); } } } @@ -1167,72 +1167,72 @@ out typeRef, false); } void IntegralType( -#line 700 "cs.ATG" +#line 708 "cs.ATG" out string name) { -#line 700 "cs.ATG" +#line 708 "cs.ATG" name = ""; switch (la.kind) { case 102: { lexer.NextToken(); -#line 702 "cs.ATG" +#line 710 "cs.ATG" name = "System.SByte"; break; } case 54: { lexer.NextToken(); -#line 703 "cs.ATG" +#line 711 "cs.ATG" name = "System.Byte"; break; } case 104: { lexer.NextToken(); -#line 704 "cs.ATG" +#line 712 "cs.ATG" name = "System.Int16"; break; } case 120: { lexer.NextToken(); -#line 705 "cs.ATG" +#line 713 "cs.ATG" name = "System.UInt16"; break; } case 82: { lexer.NextToken(); -#line 706 "cs.ATG" +#line 714 "cs.ATG" name = "System.Int32"; break; } case 116: { lexer.NextToken(); -#line 707 "cs.ATG" +#line 715 "cs.ATG" name = "System.UInt32"; break; } case 87: { lexer.NextToken(); -#line 708 "cs.ATG" +#line 716 "cs.ATG" name = "System.Int64"; break; } case 117: { lexer.NextToken(); -#line 709 "cs.ATG" +#line 717 "cs.ATG" name = "System.UInt64"; break; } case 57: { lexer.NextToken(); -#line 710 "cs.ATG" +#line 718 "cs.ATG" name = "System.Char"; break; } @@ -1242,25 +1242,25 @@ out string name) { void EnumBody() { -#line 547 "cs.ATG" +#line 555 "cs.ATG" FieldDeclaration f; Expect(16); if (StartOf(17)) { EnumMemberDecl( -#line 550 "cs.ATG" +#line 558 "cs.ATG" out f); -#line 550 "cs.ATG" +#line 558 "cs.ATG" compilationUnit.AddChild(f); while ( -#line 551 "cs.ATG" +#line 559 "cs.ATG" NotFinalComma()) { Expect(14); EnumMemberDecl( -#line 552 "cs.ATG" +#line 560 "cs.ATG" out f); -#line 552 "cs.ATG" +#line 560 "cs.ATG" compilationUnit.AddChild(f); } if (la.kind == 14) { @@ -1271,115 +1271,115 @@ out f); } void Type( -#line 558 "cs.ATG" +#line 566 "cs.ATG" out TypeReference type) { TypeWithRestriction( -#line 560 "cs.ATG" +#line 568 "cs.ATG" out type, true, false); } void FormalParameterList( -#line 630 "cs.ATG" +#line 638 "cs.ATG" List parameter) { -#line 633 "cs.ATG" +#line 641 "cs.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 638 "cs.ATG" +#line 646 "cs.ATG" out section); -#line 638 "cs.ATG" +#line 646 "cs.ATG" attributes.Add(section); } FixedParameter( -#line 639 "cs.ATG" +#line 647 "cs.ATG" out p); -#line 639 "cs.ATG" +#line 647 "cs.ATG" p.Attributes = attributes; parameter.Add(p); while (la.kind == 14) { lexer.NextToken(); -#line 643 "cs.ATG" +#line 651 "cs.ATG" attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 644 "cs.ATG" +#line 652 "cs.ATG" out section); -#line 644 "cs.ATG" +#line 652 "cs.ATG" attributes.Add(section); } FixedParameter( -#line 645 "cs.ATG" +#line 653 "cs.ATG" out p); -#line 645 "cs.ATG" +#line 653 "cs.ATG" p.Attributes = attributes; parameter.Add(p); } } void ClassType( -#line 692 "cs.ATG" +#line 700 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 693 "cs.ATG" +#line 701 "cs.ATG" TypeReference r; typeRef = null; if (StartOf(18)) { TypeName( -#line 695 "cs.ATG" +#line 703 "cs.ATG" out r, canBeUnbound); -#line 695 "cs.ATG" +#line 703 "cs.ATG" typeRef = r; } else if (la.kind == 91) { lexer.NextToken(); -#line 696 "cs.ATG" +#line 704 "cs.ATG" typeRef = new TypeReference("System.Object", true); typeRef.StartLocation = t.Location; } else if (la.kind == 108) { lexer.NextToken(); -#line 697 "cs.ATG" +#line 705 "cs.ATG" typeRef = new TypeReference("System.String", true); typeRef.StartLocation = t.Location; } else SynErr(157); } void TypeName( -#line 2293 "cs.ATG" +#line 2301 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 2294 "cs.ATG" +#line 2302 "cs.ATG" List typeArguments = null; string alias = null; string qualident; Location startLocation = la.Location; if ( -#line 2300 "cs.ATG" +#line 2308 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 2301 "cs.ATG" +#line 2309 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2304 "cs.ATG" +#line 2312 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2305 "cs.ATG" +#line 2313 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2307 "cs.ATG" +#line 2315 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1390,143 +1390,143 @@ out typeArguments, canBeUnbound); } while ( -#line 2316 "cs.ATG" +#line 2324 "cs.ATG" DotAndIdent()) { Expect(15); -#line 2317 "cs.ATG" +#line 2325 "cs.ATG" typeArguments = null; Qualident( -#line 2318 "cs.ATG" +#line 2326 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2319 "cs.ATG" +#line 2327 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2320 "cs.ATG" +#line 2328 "cs.ATG" typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); } -#line 2322 "cs.ATG" +#line 2330 "cs.ATG" typeRef.StartLocation = startLocation; } void MemberModifiers( -#line 713 "cs.ATG" +#line 721 "cs.ATG" ModifierList m) { while (StartOf(19)) { switch (la.kind) { case 49: { lexer.NextToken(); -#line 716 "cs.ATG" +#line 724 "cs.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 71: { lexer.NextToken(); -#line 717 "cs.ATG" +#line 725 "cs.ATG" m.Add(Modifiers.Extern, t.Location); break; } case 84: { lexer.NextToken(); -#line 718 "cs.ATG" +#line 726 "cs.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 89: { lexer.NextToken(); -#line 719 "cs.ATG" +#line 727 "cs.ATG" m.Add(Modifiers.New, t.Location); break; } case 94: { lexer.NextToken(); -#line 720 "cs.ATG" +#line 728 "cs.ATG" m.Add(Modifiers.Override, t.Location); break; } case 96: { lexer.NextToken(); -#line 721 "cs.ATG" +#line 729 "cs.ATG" m.Add(Modifiers.Private, t.Location); break; } case 97: { lexer.NextToken(); -#line 722 "cs.ATG" +#line 730 "cs.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 98: { lexer.NextToken(); -#line 723 "cs.ATG" +#line 731 "cs.ATG" m.Add(Modifiers.Public, t.Location); break; } case 99: { lexer.NextToken(); -#line 724 "cs.ATG" +#line 732 "cs.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 103: { lexer.NextToken(); -#line 725 "cs.ATG" +#line 733 "cs.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 107: { lexer.NextToken(); -#line 726 "cs.ATG" +#line 734 "cs.ATG" m.Add(Modifiers.Static, t.Location); break; } case 74: { lexer.NextToken(); -#line 727 "cs.ATG" +#line 735 "cs.ATG" m.Add(Modifiers.Fixed, t.Location); break; } case 119: { lexer.NextToken(); -#line 728 "cs.ATG" +#line 736 "cs.ATG" m.Add(Modifiers.Unsafe, t.Location); break; } case 122: { lexer.NextToken(); -#line 729 "cs.ATG" +#line 737 "cs.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 124: { lexer.NextToken(); -#line 730 "cs.ATG" +#line 738 "cs.ATG" m.Add(Modifiers.Volatile, t.Location); break; } case 126: { lexer.NextToken(); -#line 731 "cs.ATG" +#line 739 "cs.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1535,23 +1535,23 @@ ModifierList m) { } void ClassMemberDecl( -#line 1049 "cs.ATG" +#line 1057 "cs.ATG" ModifierList m, List attributes) { -#line 1050 "cs.ATG" +#line 1058 "cs.ATG" Statement stmt = null; if (StartOf(20)) { StructMemberDecl( -#line 1052 "cs.ATG" +#line 1060 "cs.ATG" m, attributes); } else if (la.kind == 27) { -#line 1053 "cs.ATG" +#line 1061 "cs.ATG" m.Check(Modifiers.Destructors); Location startPos = la.Location; lexer.NextToken(); Identifier(); -#line 1054 "cs.ATG" +#line 1062 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1559,17 +1559,17 @@ m, attributes); Expect(20); Expect(21); -#line 1058 "cs.ATG" +#line 1066 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1058 "cs.ATG" +#line 1066 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(158); -#line 1059 "cs.ATG" +#line 1067 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -1577,10 +1577,10 @@ out stmt); } void StructMemberDecl( -#line 735 "cs.ATG" +#line 743 "cs.ATG" ModifierList m, List attributes) { -#line 737 "cs.ATG" +#line 745 "cs.ATG" string qualident = null; TypeReference type; Expression expr; @@ -1592,18 +1592,18 @@ ModifierList m, List attributes) { if (la.kind == 60) { -#line 747 "cs.ATG" +#line 755 "cs.ATG" m.Check(Modifiers.Constants); lexer.NextToken(); -#line 748 "cs.ATG" +#line 756 "cs.ATG" Location startPos = t.Location; Type( -#line 749 "cs.ATG" +#line 757 "cs.ATG" out type); Identifier(); -#line 749 "cs.ATG" +#line 757 "cs.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier | Modifiers.Const); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclaration f = new VariableDeclaration(t.val); @@ -1613,16 +1613,16 @@ out type); Expect(3); Expr( -#line 756 "cs.ATG" +#line 764 "cs.ATG" out expr); -#line 756 "cs.ATG" +#line 764 "cs.ATG" f.Initializer = expr; while (la.kind == 14) { lexer.NextToken(); Identifier(); -#line 757 "cs.ATG" +#line 765 "cs.ATG" f = new VariableDeclaration(t.val); f.StartLocation = t.Location; f.TypeReference = type; @@ -1630,63 +1630,63 @@ out expr); Expect(3); Expr( -#line 762 "cs.ATG" +#line 770 "cs.ATG" out expr); -#line 762 "cs.ATG" +#line 770 "cs.ATG" f.EndLocation = t.EndLocation; f.Initializer = expr; } Expect(11); -#line 763 "cs.ATG" +#line 771 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if ( -#line 767 "cs.ATG" +#line 775 "cs.ATG" NotVoidPointer()) { -#line 767 "cs.ATG" +#line 775 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); Expect(123); -#line 768 "cs.ATG" +#line 776 "cs.ATG" Location startPos = t.Location; if ( -#line 769 "cs.ATG" +#line 777 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 770 "cs.ATG" +#line 778 "cs.ATG" out explicitInterface, false); -#line 771 "cs.ATG" +#line 779 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } } else if (StartOf(18)) { Identifier(); -#line 774 "cs.ATG" +#line 782 "cs.ATG" qualident = t.val; } else SynErr(160); if (la.kind == 23) { TypeParameterList( -#line 777 "cs.ATG" +#line 785 "cs.ATG" templates); } Expect(20); if (la.kind == 111) { lexer.NextToken(); -#line 780 "cs.ATG" +#line 788 "cs.ATG" isExtensionMethod = true; /* C# 3.0 */ } if (StartOf(11)) { FormalParameterList( -#line 781 "cs.ATG" +#line 789 "cs.ATG" p); } Expect(21); -#line 782 "cs.ATG" +#line 790 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration { Name = qualident, Modifier = m.Modifier, @@ -1705,28 +1705,28 @@ p); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 800 "cs.ATG" +#line 808 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 802 "cs.ATG" +#line 810 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(161); -#line 802 "cs.ATG" +#line 810 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 69) { -#line 806 "cs.ATG" +#line 814 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); lexer.NextToken(); -#line 808 "cs.ATG" +#line 816 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -1738,113 +1738,113 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 818 "cs.ATG" +#line 826 "cs.ATG" out type); -#line 818 "cs.ATG" +#line 826 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 819 "cs.ATG" +#line 827 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 820 "cs.ATG" +#line 828 "cs.ATG" out explicitInterface, false); -#line 821 "cs.ATG" +#line 829 "cs.ATG" qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); -#line 822 "cs.ATG" +#line 830 "cs.ATG" eventDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); } else if (StartOf(18)) { Identifier(); -#line 824 "cs.ATG" +#line 832 "cs.ATG" qualident = t.val; } else SynErr(162); -#line 826 "cs.ATG" +#line 834 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; if (la.kind == 3) { lexer.NextToken(); Expr( -#line 827 "cs.ATG" +#line 835 "cs.ATG" out expr); -#line 827 "cs.ATG" +#line 835 "cs.ATG" eventDecl.Initializer = expr; } if (la.kind == 16) { lexer.NextToken(); -#line 828 "cs.ATG" +#line 836 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 829 "cs.ATG" +#line 837 "cs.ATG" out addBlock, out removeBlock); Expect(17); -#line 830 "cs.ATG" +#line 838 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } if (la.kind == 11) { lexer.NextToken(); } -#line 833 "cs.ATG" +#line 841 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 839 "cs.ATG" +#line 847 "cs.ATG" IdentAndLPar()) { -#line 839 "cs.ATG" +#line 847 "cs.ATG" m.Check(Modifiers.Constructors | Modifiers.StaticConstructors); Identifier(); -#line 840 "cs.ATG" +#line 848 "cs.ATG" string name = t.val; Location startPos = t.Location; Expect(20); if (StartOf(11)) { -#line 840 "cs.ATG" +#line 848 "cs.ATG" m.Check(Modifiers.Constructors); FormalParameterList( -#line 841 "cs.ATG" +#line 849 "cs.ATG" p); } Expect(21); -#line 843 "cs.ATG" +#line 851 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 844 "cs.ATG" +#line 852 "cs.ATG" m.Check(Modifiers.Constructors); ConstructorInitializer( -#line 845 "cs.ATG" +#line 853 "cs.ATG" out init); } -#line 847 "cs.ATG" +#line 855 "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 852 "cs.ATG" +#line 860 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(163); -#line 852 "cs.ATG" +#line 860 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 70 || la.kind == 80) { -#line 855 "cs.ATG" +#line 863 "cs.ATG" m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -1853,45 +1853,45 @@ out stmt); if (la.kind == 80) { lexer.NextToken(); -#line 860 "cs.ATG" +#line 868 "cs.ATG" startPos = t.Location; } else { lexer.NextToken(); -#line 860 "cs.ATG" +#line 868 "cs.ATG" isImplicit = false; startPos = t.Location; } Expect(92); Type( -#line 861 "cs.ATG" +#line 869 "cs.ATG" out type); -#line 861 "cs.ATG" +#line 869 "cs.ATG" TypeReference operatorType = type; Expect(20); Type( -#line 862 "cs.ATG" +#line 870 "cs.ATG" out type); Identifier(); -#line 862 "cs.ATG" +#line 870 "cs.ATG" string varName = t.val; Expect(21); -#line 863 "cs.ATG" +#line 871 "cs.ATG" Location endPos = t.Location; if (la.kind == 16) { Block( -#line 864 "cs.ATG" +#line 872 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 864 "cs.ATG" +#line 872 "cs.ATG" stmt = null; } else SynErr(164); -#line 867 "cs.ATG" +#line 875 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration { @@ -1909,61 +1909,61 @@ out stmt); } else if (StartOf(21)) { TypeDecl( -#line 885 "cs.ATG" +#line 893 "cs.ATG" m, attributes); } else if (StartOf(10)) { Type( -#line 887 "cs.ATG" +#line 895 "cs.ATG" out type); -#line 887 "cs.ATG" +#line 895 "cs.ATG" Location startPos = t.Location; if (la.kind == 92) { -#line 889 "cs.ATG" +#line 897 "cs.ATG" OverloadableOperatorType op; m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 893 "cs.ATG" +#line 901 "cs.ATG" out op); -#line 893 "cs.ATG" +#line 901 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(20); Type( -#line 894 "cs.ATG" +#line 902 "cs.ATG" out firstType); Identifier(); -#line 894 "cs.ATG" +#line 902 "cs.ATG" string firstName = t.val; if (la.kind == 14) { lexer.NextToken(); Type( -#line 895 "cs.ATG" +#line 903 "cs.ATG" out secondType); Identifier(); -#line 895 "cs.ATG" +#line 903 "cs.ATG" secondName = t.val; } else if (la.kind == 21) { } else SynErr(165); -#line 903 "cs.ATG" +#line 911 "cs.ATG" Location endPos = t.Location; Expect(21); if (la.kind == 16) { Block( -#line 904 "cs.ATG" +#line 912 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(166); -#line 906 "cs.ATG" +#line 914 "cs.ATG" if (op == OverloadableOperatorType.Add && secondType == null) op = OverloadableOperatorType.UnaryPlus; if (op == OverloadableOperatorType.Subtract && secondType == null) @@ -1985,75 +1985,75 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 928 "cs.ATG" +#line 936 "cs.ATG" IsVarDecl()) { -#line 929 "cs.ATG" +#line 937 "cs.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); if ( -#line 933 "cs.ATG" +#line 941 "cs.ATG" m.Contains(Modifiers.Fixed)) { VariableDeclarator( -#line 934 "cs.ATG" +#line 942 "cs.ATG" fd); Expect(18); Expr( -#line 936 "cs.ATG" +#line 944 "cs.ATG" out expr); -#line 936 "cs.ATG" +#line 944 "cs.ATG" if (fd.Fields.Count > 0) fd.Fields[fd.Fields.Count-1].FixedArrayInitialization = expr; Expect(19); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 940 "cs.ATG" +#line 948 "cs.ATG" fd); Expect(18); Expr( -#line 942 "cs.ATG" +#line 950 "cs.ATG" out expr); -#line 942 "cs.ATG" +#line 950 "cs.ATG" if (fd.Fields.Count > 0) fd.Fields[fd.Fields.Count-1].FixedArrayInitialization = expr; Expect(19); } } else if (StartOf(18)) { VariableDeclarator( -#line 947 "cs.ATG" +#line 955 "cs.ATG" fd); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 948 "cs.ATG" +#line 956 "cs.ATG" fd); } } else SynErr(167); Expect(11); -#line 950 "cs.ATG" +#line 958 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if (la.kind == 111) { -#line 953 "cs.ATG" +#line 961 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(18); FormalParameterList( -#line 954 "cs.ATG" +#line 962 "cs.ATG" p); Expect(19); -#line 954 "cs.ATG" +#line 962 "cs.ATG" Location endLocation = t.EndLocation; Expect(16); -#line 955 "cs.ATG" +#line 963 "cs.ATG" PropertyDeclaration indexer = new PropertyDeclaration(m.Modifier | Modifiers.Default, attributes, "Item", p); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2063,64 +2063,64 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 963 "cs.ATG" +#line 971 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 964 "cs.ATG" +#line 972 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); } else if ( -#line 969 "cs.ATG" +#line 977 "cs.ATG" IsIdentifierToken(la)) { if ( -#line 970 "cs.ATG" +#line 978 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 971 "cs.ATG" +#line 979 "cs.ATG" out explicitInterface, false); -#line 972 "cs.ATG" +#line 980 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } } else if (StartOf(18)) { Identifier(); -#line 975 "cs.ATG" +#line 983 "cs.ATG" qualident = t.val; } else SynErr(168); -#line 977 "cs.ATG" +#line 985 "cs.ATG" Location qualIdentEndLocation = t.EndLocation; if (la.kind == 16 || la.kind == 20 || la.kind == 23) { if (la.kind == 20 || la.kind == 23) { -#line 981 "cs.ATG" +#line 989 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); if (la.kind == 23) { TypeParameterList( -#line 983 "cs.ATG" +#line 991 "cs.ATG" templates); } Expect(20); if (la.kind == 111) { lexer.NextToken(); -#line 985 "cs.ATG" +#line 993 "cs.ATG" isExtensionMethod = true; } if (StartOf(11)) { FormalParameterList( -#line 986 "cs.ATG" +#line 994 "cs.ATG" p); } Expect(21); -#line 988 "cs.ATG" +#line 996 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration { Name = qualident, Modifier = m.Modifier, @@ -2138,23 +2138,23 @@ p); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1003 "cs.ATG" +#line 1011 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1004 "cs.ATG" +#line 1012 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(169); -#line 1004 "cs.ATG" +#line 1012 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1007 "cs.ATG" +#line 1015 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); if (explicitInterface != null) pDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); @@ -2165,11 +2165,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1016 "cs.ATG" +#line 1024 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1018 "cs.ATG" +#line 1026 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2178,17 +2178,17 @@ out getRegion, out setRegion); } } else if (la.kind == 15) { -#line 1026 "cs.ATG" +#line 1034 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(111); Expect(18); FormalParameterList( -#line 1027 "cs.ATG" +#line 1035 "cs.ATG" p); Expect(19); -#line 1028 "cs.ATG" +#line 1036 "cs.ATG" PropertyDeclaration indexer = new PropertyDeclaration(m.Modifier | Modifiers.Default, attributes, "Item", p); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2200,14 +2200,14 @@ p); Expect(16); -#line 1037 "cs.ATG" +#line 1045 "cs.ATG" Location bodyStart = t.Location; AccessorDecls( -#line 1038 "cs.ATG" +#line 1046 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1039 "cs.ATG" +#line 1047 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; @@ -2221,10 +2221,9 @@ out getRegion, out setRegion); void InterfaceMemberDecl() { -#line 1066 "cs.ATG" +#line 1074 "cs.ATG" TypeReference type; - - AttributeSection section; + AttributeSection section; Modifiers mod = Modifiers.None; List attributes = new List(); List parameters = new List(); @@ -2236,49 +2235,49 @@ out getRegion, out setRegion); while (la.kind == 18) { AttributeSection( -#line 1079 "cs.ATG" +#line 1087 "cs.ATG" out section); -#line 1079 "cs.ATG" +#line 1087 "cs.ATG" attributes.Add(section); } if (la.kind == 89) { lexer.NextToken(); -#line 1080 "cs.ATG" +#line 1088 "cs.ATG" mod = Modifiers.New; startLocation = t.Location; } if ( -#line 1083 "cs.ATG" +#line 1091 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1083 "cs.ATG" +#line 1091 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; Identifier(); -#line 1084 "cs.ATG" +#line 1092 "cs.ATG" name = t.val; if (la.kind == 23) { TypeParameterList( -#line 1085 "cs.ATG" +#line 1093 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1086 "cs.ATG" +#line 1094 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1087 "cs.ATG" +#line 1095 "cs.ATG" templates); } Expect(11); -#line 1089 "cs.ATG" +#line 1097 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = new TypeReference("System.Void", true), Parameters = parameters, Attributes = attributes, Templates = templates, @@ -2289,37 +2288,37 @@ templates); } else if (StartOf(22)) { if (StartOf(10)) { Type( -#line 1097 "cs.ATG" +#line 1105 "cs.ATG" out type); -#line 1097 "cs.ATG" +#line 1105 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; if (StartOf(18)) { Identifier(); -#line 1099 "cs.ATG" +#line 1107 "cs.ATG" name = t.val; Location qualIdentEndLocation = t.EndLocation; if (la.kind == 20 || la.kind == 23) { if (la.kind == 23) { TypeParameterList( -#line 1103 "cs.ATG" +#line 1111 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1104 "cs.ATG" +#line 1112 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1106 "cs.ATG" +#line 1114 "cs.ATG" templates); } Expect(11); -#line 1107 "cs.ATG" +#line 1115 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = type, Parameters = parameters, Attributes = attributes, Templates = templates, @@ -2329,59 +2328,59 @@ templates); } else if (la.kind == 16) { -#line 1116 "cs.ATG" +#line 1124 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1119 "cs.ATG" +#line 1127 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1120 "cs.ATG" +#line 1128 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1121 "cs.ATG" +#line 1129 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; } else SynErr(173); } else if (la.kind == 111) { lexer.NextToken(); Expect(18); FormalParameterList( -#line 1124 "cs.ATG" +#line 1132 "cs.ATG" parameters); Expect(19); -#line 1125 "cs.ATG" +#line 1133 "cs.ATG" Location bracketEndLocation = t.EndLocation; -#line 1126 "cs.ATG" +#line 1134 "cs.ATG" PropertyDeclaration id = new PropertyDeclaration(mod | Modifiers.Default, attributes, "Item", parameters); id.TypeReference = type; compilationUnit.AddChild(id); Expect(16); -#line 1129 "cs.ATG" +#line 1137 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1130 "cs.ATG" +#line 1138 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1132 "cs.ATG" +#line 1140 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; } else SynErr(174); } else { lexer.NextToken(); -#line 1135 "cs.ATG" +#line 1143 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; Type( -#line 1136 "cs.ATG" +#line 1144 "cs.ATG" out type); Identifier(); -#line 1137 "cs.ATG" +#line 1145 "cs.ATG" EventDeclaration ed = new EventDeclaration { TypeReference = type, Name = t.val, Modifier = mod, Attributes = attributes }; @@ -2389,17 +2388,17 @@ out type); Expect(11); -#line 1143 "cs.ATG" +#line 1151 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } } else SynErr(175); } void EnumMemberDecl( -#line 1148 "cs.ATG" +#line 1156 "cs.ATG" out FieldDeclaration f) { -#line 1150 "cs.ATG" +#line 1158 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2407,15 +2406,15 @@ out FieldDeclaration f) { while (la.kind == 18) { AttributeSection( -#line 1156 "cs.ATG" +#line 1164 "cs.ATG" out section); -#line 1156 "cs.ATG" +#line 1164 "cs.ATG" attributes.Add(section); } Identifier(); -#line 1157 "cs.ATG" +#line 1165 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2425,19 +2424,19 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1163 "cs.ATG" +#line 1171 "cs.ATG" out expr); -#line 1163 "cs.ATG" +#line 1171 "cs.ATG" varDecl.Initializer = expr; } } void TypeWithRestriction( -#line 563 "cs.ATG" +#line 571 "cs.ATG" out TypeReference type, bool allowNullable, bool canBeUnbound) { -#line 565 "cs.ATG" +#line 573 "cs.ATG" Location startPos = la.Location; string name; int pointer = 0; @@ -2445,59 +2444,59 @@ out TypeReference type, bool allowNullable, bool canBeUnbound) { if (StartOf(4)) { ClassType( -#line 571 "cs.ATG" +#line 579 "cs.ATG" out type, canBeUnbound); } else if (StartOf(5)) { SimpleType( -#line 572 "cs.ATG" +#line 580 "cs.ATG" out name); -#line 572 "cs.ATG" +#line 580 "cs.ATG" type = new TypeReference(name, true); } else if (la.kind == 123) { lexer.NextToken(); Expect(6); -#line 573 "cs.ATG" +#line 581 "cs.ATG" pointer = 1; type = new TypeReference("System.Void", true); } else SynErr(176); -#line 574 "cs.ATG" +#line 582 "cs.ATG" List r = new List(); if ( -#line 576 "cs.ATG" +#line 584 "cs.ATG" allowNullable && la.kind == Tokens.Question) { NullableQuestionMark( -#line 576 "cs.ATG" +#line 584 "cs.ATG" ref type); } while ( -#line 578 "cs.ATG" +#line 586 "cs.ATG" IsPointerOrDims()) { -#line 578 "cs.ATG" +#line 586 "cs.ATG" int i = 0; if (la.kind == 6) { lexer.NextToken(); -#line 579 "cs.ATG" +#line 587 "cs.ATG" ++pointer; } else if (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 580 "cs.ATG" +#line 588 "cs.ATG" ++i; } Expect(19); -#line 580 "cs.ATG" +#line 588 "cs.ATG" r.Add(i); } else SynErr(177); } -#line 583 "cs.ATG" +#line 591 "cs.ATG" if (type != null) { type.RankSpecifier = r.ToArray(); type.PointerNestingLevel = pointer; @@ -2508,57 +2507,57 @@ IsPointerOrDims()) { } void SimpleType( -#line 619 "cs.ATG" +#line 627 "cs.ATG" out string name) { -#line 620 "cs.ATG" +#line 628 "cs.ATG" name = String.Empty; if (StartOf(23)) { IntegralType( -#line 622 "cs.ATG" +#line 630 "cs.ATG" out name); } else if (la.kind == 75) { lexer.NextToken(); -#line 623 "cs.ATG" +#line 631 "cs.ATG" name = "System.Single"; } else if (la.kind == 66) { lexer.NextToken(); -#line 624 "cs.ATG" +#line 632 "cs.ATG" name = "System.Double"; } else if (la.kind == 62) { lexer.NextToken(); -#line 625 "cs.ATG" +#line 633 "cs.ATG" name = "System.Decimal"; } else if (la.kind == 52) { lexer.NextToken(); -#line 626 "cs.ATG" +#line 634 "cs.ATG" name = "System.Boolean"; } else SynErr(178); } void NullableQuestionMark( -#line 2326 "cs.ATG" +#line 2334 "cs.ATG" ref TypeReference typeRef) { -#line 2327 "cs.ATG" +#line 2335 "cs.ATG" List typeArguments = new List(1); Expect(12); -#line 2331 "cs.ATG" +#line 2339 "cs.ATG" if (typeRef != null) typeArguments.Add(typeRef); typeRef = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; } void FixedParameter( -#line 649 "cs.ATG" +#line 657 "cs.ATG" out ParameterDeclarationExpression p) { -#line 651 "cs.ATG" +#line 659 "cs.ATG" TypeReference type; ParameterModifiers mod = ParameterModifiers.In; Location start = la.Location; @@ -2568,83 +2567,83 @@ out ParameterDeclarationExpression p) { if (la.kind == 100) { lexer.NextToken(); -#line 658 "cs.ATG" +#line 666 "cs.ATG" mod = ParameterModifiers.Ref; } else if (la.kind == 93) { lexer.NextToken(); -#line 659 "cs.ATG" +#line 667 "cs.ATG" mod = ParameterModifiers.Out; } else { lexer.NextToken(); -#line 660 "cs.ATG" +#line 668 "cs.ATG" mod = ParameterModifiers.Params; } } Type( -#line 662 "cs.ATG" +#line 670 "cs.ATG" out type); Identifier(); -#line 663 "cs.ATG" +#line 671 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val, mod); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 664 "cs.ATG" +#line 672 "cs.ATG" out expr); -#line 664 "cs.ATG" +#line 672 "cs.ATG" p.DefaultValue = expr; p.ParamModifier |= ParameterModifiers.Optional; } -#line 665 "cs.ATG" +#line 673 "cs.ATG" p.StartLocation = start; p.EndLocation = t.EndLocation; } void AccessorModifiers( -#line 668 "cs.ATG" +#line 676 "cs.ATG" out ModifierList m) { -#line 669 "cs.ATG" +#line 677 "cs.ATG" m = new ModifierList(); if (la.kind == 96) { lexer.NextToken(); -#line 671 "cs.ATG" +#line 679 "cs.ATG" m.Add(Modifiers.Private, t.Location); } else if (la.kind == 97) { lexer.NextToken(); -#line 672 "cs.ATG" +#line 680 "cs.ATG" m.Add(Modifiers.Protected, t.Location); if (la.kind == 84) { lexer.NextToken(); -#line 673 "cs.ATG" +#line 681 "cs.ATG" m.Add(Modifiers.Internal, t.Location); } } else if (la.kind == 84) { lexer.NextToken(); -#line 674 "cs.ATG" +#line 682 "cs.ATG" m.Add(Modifiers.Internal, t.Location); if (la.kind == 97) { lexer.NextToken(); -#line 675 "cs.ATG" +#line 683 "cs.ATG" m.Add(Modifiers.Protected, t.Location); } } else SynErr(179); } void Block( -#line 1283 "cs.ATG" +#line 1291 "cs.ATG" out Statement stmt) { Expect(16); -#line 1285 "cs.ATG" +#line 1293 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); @@ -2656,7 +2655,7 @@ out Statement stmt) { while (!(la.kind == 0 || la.kind == 17)) {SynErr(180); lexer.NextToken(); } Expect(17); -#line 1293 "cs.ATG" +#line 1301 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2664,10 +2663,10 @@ out Statement stmt) { } void EventAccessorDecls( -#line 1220 "cs.ATG" +#line 1228 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1221 "cs.ATG" +#line 1229 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2676,93 +2675,93 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 18) { AttributeSection( -#line 1228 "cs.ATG" +#line 1236 "cs.ATG" out section); -#line 1228 "cs.ATG" +#line 1236 "cs.ATG" attributes.Add(section); } if (la.kind == 130) { -#line 1230 "cs.ATG" +#line 1238 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1231 "cs.ATG" +#line 1239 "cs.ATG" out stmt); -#line 1231 "cs.ATG" +#line 1239 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 18) { AttributeSection( -#line 1232 "cs.ATG" +#line 1240 "cs.ATG" out section); -#line 1232 "cs.ATG" +#line 1240 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1233 "cs.ATG" +#line 1241 "cs.ATG" out stmt); -#line 1233 "cs.ATG" +#line 1241 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if (la.kind == 131) { RemoveAccessorDecl( -#line 1235 "cs.ATG" +#line 1243 "cs.ATG" out stmt); -#line 1235 "cs.ATG" +#line 1243 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 1236 "cs.ATG" +#line 1244 "cs.ATG" out section); -#line 1236 "cs.ATG" +#line 1244 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1237 "cs.ATG" +#line 1245 "cs.ATG" out stmt); -#line 1237 "cs.ATG" +#line 1245 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else SynErr(181); } void ConstructorInitializer( -#line 1313 "cs.ATG" +#line 1321 "cs.ATG" out ConstructorInitializer ci) { -#line 1314 "cs.ATG" +#line 1322 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 51) { lexer.NextToken(); -#line 1318 "cs.ATG" +#line 1326 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 111) { lexer.NextToken(); -#line 1319 "cs.ATG" +#line 1327 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; } else SynErr(182); Expect(20); if (StartOf(25)) { Argument( -#line 1322 "cs.ATG" +#line 1330 "cs.ATG" out expr); -#line 1322 "cs.ATG" +#line 1330 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1323 "cs.ATG" +#line 1331 "cs.ATG" out expr); -#line 1323 "cs.ATG" +#line 1331 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); } } @@ -2770,161 +2769,161 @@ out expr); } void OverloadableOperator( -#line 1336 "cs.ATG" +#line 1344 "cs.ATG" out OverloadableOperatorType op) { -#line 1337 "cs.ATG" +#line 1345 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1339 "cs.ATG" +#line 1347 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1340 "cs.ATG" +#line 1348 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 24: { lexer.NextToken(); -#line 1342 "cs.ATG" +#line 1350 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 27: { lexer.NextToken(); -#line 1343 "cs.ATG" +#line 1351 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 31: { lexer.NextToken(); -#line 1345 "cs.ATG" +#line 1353 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 32: { lexer.NextToken(); -#line 1346 "cs.ATG" +#line 1354 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 113: { lexer.NextToken(); -#line 1348 "cs.ATG" +#line 1356 "cs.ATG" op = OverloadableOperatorType.IsTrue; break; } case 72: { lexer.NextToken(); -#line 1349 "cs.ATG" +#line 1357 "cs.ATG" op = OverloadableOperatorType.IsFalse; break; } case 6: { lexer.NextToken(); -#line 1351 "cs.ATG" +#line 1359 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1352 "cs.ATG" +#line 1360 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1353 "cs.ATG" +#line 1361 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 28: { lexer.NextToken(); -#line 1355 "cs.ATG" +#line 1363 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 29: { lexer.NextToken(); -#line 1356 "cs.ATG" +#line 1364 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 30: { lexer.NextToken(); -#line 1357 "cs.ATG" +#line 1365 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 37: { lexer.NextToken(); -#line 1359 "cs.ATG" +#line 1367 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1360 "cs.ATG" +#line 1368 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 34: { lexer.NextToken(); -#line 1361 "cs.ATG" +#line 1369 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 23: { lexer.NextToken(); -#line 1362 "cs.ATG" +#line 1370 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 35: { lexer.NextToken(); -#line 1363 "cs.ATG" +#line 1371 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 36: { lexer.NextToken(); -#line 1364 "cs.ATG" +#line 1372 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 22: { lexer.NextToken(); -#line 1365 "cs.ATG" +#line 1373 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 22) { lexer.NextToken(); -#line 1365 "cs.ATG" +#line 1373 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; @@ -2934,34 +2933,34 @@ out OverloadableOperatorType op) { } void VariableDeclarator( -#line 1275 "cs.ATG" +#line 1283 "cs.ATG" FieldDeclaration parentFieldDeclaration) { -#line 1276 "cs.ATG" +#line 1284 "cs.ATG" Expression expr = null; Identifier(); -#line 1278 "cs.ATG" +#line 1286 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); f.StartLocation = t.Location; if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1279 "cs.ATG" +#line 1287 "cs.ATG" out expr); -#line 1279 "cs.ATG" +#line 1287 "cs.ATG" f.Initializer = expr; } -#line 1280 "cs.ATG" +#line 1288 "cs.ATG" f.EndLocation = t.EndLocation; SafeAdd(parentFieldDeclaration, parentFieldDeclaration.Fields, f); } void AccessorDecls( -#line 1167 "cs.ATG" +#line 1175 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1169 "cs.ATG" +#line 1177 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2970,92 +2969,92 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1176 "cs.ATG" +#line 1184 "cs.ATG" out section); -#line 1176 "cs.ATG" +#line 1184 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1177 "cs.ATG" +#line 1185 "cs.ATG" out modifiers); } if (la.kind == 128) { GetAccessorDecl( -#line 1179 "cs.ATG" +#line 1187 "cs.ATG" out getBlock, attributes); -#line 1180 "cs.ATG" +#line 1188 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } if (StartOf(26)) { -#line 1181 "cs.ATG" +#line 1189 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1182 "cs.ATG" +#line 1190 "cs.ATG" out section); -#line 1182 "cs.ATG" +#line 1190 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1183 "cs.ATG" +#line 1191 "cs.ATG" out modifiers); } SetAccessorDecl( -#line 1184 "cs.ATG" +#line 1192 "cs.ATG" out setBlock, attributes); -#line 1185 "cs.ATG" +#line 1193 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } } } else if (la.kind == 129) { SetAccessorDecl( -#line 1188 "cs.ATG" +#line 1196 "cs.ATG" out setBlock, attributes); -#line 1189 "cs.ATG" +#line 1197 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } if (StartOf(27)) { -#line 1190 "cs.ATG" +#line 1198 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1191 "cs.ATG" +#line 1199 "cs.ATG" out section); -#line 1191 "cs.ATG" +#line 1199 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1192 "cs.ATG" +#line 1200 "cs.ATG" out modifiers); } GetAccessorDecl( -#line 1193 "cs.ATG" +#line 1201 "cs.ATG" out getBlock, attributes); -#line 1194 "cs.ATG" +#line 1202 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } } } else if (StartOf(18)) { Identifier(); -#line 1196 "cs.ATG" +#line 1204 "cs.ATG" Error("get or set accessor declaration expected"); } else SynErr(184); } void InterfaceAccessors( -#line 1241 "cs.ATG" +#line 1249 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1243 "cs.ATG" +#line 1251 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; @@ -3063,218 +3062,218 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1249 "cs.ATG" +#line 1257 "cs.ATG" out section); -#line 1249 "cs.ATG" +#line 1257 "cs.ATG" attributes.Add(section); } -#line 1250 "cs.ATG" +#line 1258 "cs.ATG" Location startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1252 "cs.ATG" +#line 1260 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if (la.kind == 129) { lexer.NextToken(); -#line 1253 "cs.ATG" +#line 1261 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else SynErr(185); Expect(11); -#line 1256 "cs.ATG" +#line 1264 "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 == 18 || la.kind == 128 || la.kind == 129) { while (la.kind == 18) { AttributeSection( -#line 1260 "cs.ATG" +#line 1268 "cs.ATG" out section); -#line 1260 "cs.ATG" +#line 1268 "cs.ATG" attributes.Add(section); } -#line 1261 "cs.ATG" +#line 1269 "cs.ATG" startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1263 "cs.ATG" +#line 1271 "cs.ATG" if (getBlock != null) Error("get already declared"); else { getBlock = new PropertyGetRegion(null, attributes); lastBlock = getBlock; } } else if (la.kind == 129) { lexer.NextToken(); -#line 1266 "cs.ATG" +#line 1274 "cs.ATG" if (setBlock != null) Error("set already declared"); else { setBlock = new PropertySetRegion(null, attributes); lastBlock = setBlock; } } else SynErr(186); Expect(11); -#line 1271 "cs.ATG" +#line 1279 "cs.ATG" if (lastBlock != null) { lastBlock.StartLocation = startLocation; lastBlock.EndLocation = t.EndLocation; } } } void GetAccessorDecl( -#line 1200 "cs.ATG" +#line 1208 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1201 "cs.ATG" +#line 1209 "cs.ATG" Statement stmt = null; Expect(128); -#line 1204 "cs.ATG" +#line 1212 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1205 "cs.ATG" +#line 1213 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(187); -#line 1206 "cs.ATG" +#line 1214 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); -#line 1207 "cs.ATG" +#line 1215 "cs.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } void SetAccessorDecl( -#line 1210 "cs.ATG" +#line 1218 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1211 "cs.ATG" +#line 1219 "cs.ATG" Statement stmt = null; Expect(129); -#line 1214 "cs.ATG" +#line 1222 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1215 "cs.ATG" +#line 1223 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(188); -#line 1216 "cs.ATG" +#line 1224 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); -#line 1217 "cs.ATG" +#line 1225 "cs.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } void AddAccessorDecl( -#line 1299 "cs.ATG" +#line 1307 "cs.ATG" out Statement stmt) { -#line 1300 "cs.ATG" +#line 1308 "cs.ATG" stmt = null; Expect(130); Block( -#line 1303 "cs.ATG" +#line 1311 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1306 "cs.ATG" +#line 1314 "cs.ATG" out Statement stmt) { -#line 1307 "cs.ATG" +#line 1315 "cs.ATG" stmt = null; Expect(131); Block( -#line 1310 "cs.ATG" +#line 1318 "cs.ATG" out stmt); } void VariableInitializer( -#line 1328 "cs.ATG" +#line 1336 "cs.ATG" out Expression initializerExpression) { -#line 1329 "cs.ATG" +#line 1337 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(6)) { Expr( -#line 1331 "cs.ATG" +#line 1339 "cs.ATG" out initializerExpression); } else if (la.kind == 16) { CollectionInitializer( -#line 1332 "cs.ATG" +#line 1340 "cs.ATG" out initializerExpression); } else if (la.kind == 106) { lexer.NextToken(); Type( -#line 1333 "cs.ATG" +#line 1341 "cs.ATG" out type); Expect(18); Expr( -#line 1333 "cs.ATG" +#line 1341 "cs.ATG" out expr); Expect(19); -#line 1333 "cs.ATG" +#line 1341 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); } else SynErr(189); } void Statement() { -#line 1489 "cs.ATG" +#line 1497 "cs.ATG" Statement stmt = null; Location startPos = la.Location; while (!(StartOf(28))) {SynErr(190); lexer.NextToken(); } if ( -#line 1496 "cs.ATG" +#line 1504 "cs.ATG" IsLabel()) { Identifier(); -#line 1496 "cs.ATG" +#line 1504 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 60) { lexer.NextToken(); LocalVariableDecl( -#line 1500 "cs.ATG" +#line 1508 "cs.ATG" out stmt); -#line 1501 "cs.ATG" +#line 1509 "cs.ATG" if (stmt != null) { ((LocalVariableDeclaration)stmt).Modifier |= Modifiers.Const; } Expect(11); -#line 1502 "cs.ATG" +#line 1510 "cs.ATG" compilationUnit.AddChild(stmt); } else if ( -#line 1504 "cs.ATG" +#line 1512 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1504 "cs.ATG" +#line 1512 "cs.ATG" out stmt); Expect(11); -#line 1504 "cs.ATG" +#line 1512 "cs.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(29)) { EmbeddedStatement( -#line 1506 "cs.ATG" +#line 1514 "cs.ATG" out stmt); -#line 1506 "cs.ATG" +#line 1514 "cs.ATG" compilationUnit.AddChild(stmt); } else SynErr(191); -#line 1512 "cs.ATG" +#line 1520 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3283,63 +3282,63 @@ out stmt); } void Argument( -#line 1368 "cs.ATG" +#line 1376 "cs.ATG" out Expression argumentexpr) { -#line 1369 "cs.ATG" +#line 1377 "cs.ATG" argumentexpr = null; if ( -#line 1371 "cs.ATG" +#line 1379 "cs.ATG" IdentAndColon()) { -#line 1372 "cs.ATG" +#line 1380 "cs.ATG" Token ident; Expression expr; Identifier(); -#line 1373 "cs.ATG" +#line 1381 "cs.ATG" ident = t; Expect(9); ArgumentValue( -#line 1375 "cs.ATG" +#line 1383 "cs.ATG" out expr); -#line 1376 "cs.ATG" +#line 1384 "cs.ATG" argumentexpr = new NamedArgumentExpression(ident.val, expr) { StartLocation = ident.Location, EndLocation = t.EndLocation }; } else if (StartOf(25)) { ArgumentValue( -#line 1378 "cs.ATG" +#line 1386 "cs.ATG" out argumentexpr); } else SynErr(192); } void CollectionInitializer( -#line 1412 "cs.ATG" +#line 1420 "cs.ATG" out Expression outExpr) { -#line 1414 "cs.ATG" +#line 1422 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1418 "cs.ATG" +#line 1426 "cs.ATG" initializer.StartLocation = t.Location; if (StartOf(30)) { VariableInitializer( -#line 1419 "cs.ATG" +#line 1427 "cs.ATG" out expr); -#line 1420 "cs.ATG" +#line 1428 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1421 "cs.ATG" +#line 1429 "cs.ATG" NotFinalComma()) { Expect(14); VariableInitializer( -#line 1422 "cs.ATG" +#line 1430 "cs.ATG" out expr); -#line 1423 "cs.ATG" +#line 1431 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3348,15 +3347,15 @@ out expr); } Expect(17); -#line 1427 "cs.ATG" +#line 1435 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void ArgumentValue( -#line 1381 "cs.ATG" +#line 1389 "cs.ATG" out Expression argumentexpr) { -#line 1383 "cs.ATG" +#line 1391 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3364,118 +3363,118 @@ out Expression argumentexpr) { if (la.kind == 100) { lexer.NextToken(); -#line 1388 "cs.ATG" +#line 1396 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1389 "cs.ATG" +#line 1397 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1391 "cs.ATG" +#line 1399 "cs.ATG" out expr); -#line 1392 "cs.ATG" +#line 1400 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void AssignmentOperator( -#line 1395 "cs.ATG" +#line 1403 "cs.ATG" out AssignmentOperatorType op) { -#line 1396 "cs.ATG" +#line 1404 "cs.ATG" op = AssignmentOperatorType.None; if (la.kind == 3) { lexer.NextToken(); -#line 1398 "cs.ATG" +#line 1406 "cs.ATG" op = AssignmentOperatorType.Assign; } else if (la.kind == 38) { lexer.NextToken(); -#line 1399 "cs.ATG" +#line 1407 "cs.ATG" op = AssignmentOperatorType.Add; } else if (la.kind == 39) { lexer.NextToken(); -#line 1400 "cs.ATG" +#line 1408 "cs.ATG" op = AssignmentOperatorType.Subtract; } else if (la.kind == 40) { lexer.NextToken(); -#line 1401 "cs.ATG" +#line 1409 "cs.ATG" op = AssignmentOperatorType.Multiply; } else if (la.kind == 41) { lexer.NextToken(); -#line 1402 "cs.ATG" +#line 1410 "cs.ATG" op = AssignmentOperatorType.Divide; } else if (la.kind == 42) { lexer.NextToken(); -#line 1403 "cs.ATG" +#line 1411 "cs.ATG" op = AssignmentOperatorType.Modulus; } else if (la.kind == 43) { lexer.NextToken(); -#line 1404 "cs.ATG" +#line 1412 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; } else if (la.kind == 44) { lexer.NextToken(); -#line 1405 "cs.ATG" +#line 1413 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; } else if (la.kind == 45) { lexer.NextToken(); -#line 1406 "cs.ATG" +#line 1414 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; } else if (la.kind == 46) { lexer.NextToken(); -#line 1407 "cs.ATG" +#line 1415 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; } else if ( -#line 1408 "cs.ATG" +#line 1416 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { Expect(22); Expect(35); -#line 1409 "cs.ATG" +#line 1417 "cs.ATG" op = AssignmentOperatorType.ShiftRight; } else SynErr(193); } void CollectionOrObjectInitializer( -#line 1430 "cs.ATG" +#line 1438 "cs.ATG" out Expression outExpr) { -#line 1432 "cs.ATG" +#line 1440 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1436 "cs.ATG" +#line 1444 "cs.ATG" initializer.StartLocation = t.Location; if (StartOf(30)) { ObjectPropertyInitializerOrVariableInitializer( -#line 1437 "cs.ATG" +#line 1445 "cs.ATG" out expr); -#line 1438 "cs.ATG" +#line 1446 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1439 "cs.ATG" +#line 1447 "cs.ATG" NotFinalComma()) { Expect(14); ObjectPropertyInitializerOrVariableInitializer( -#line 1440 "cs.ATG" +#line 1448 "cs.ATG" out expr); -#line 1441 "cs.ATG" +#line 1449 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3484,280 +3483,280 @@ out expr); } Expect(17); -#line 1445 "cs.ATG" +#line 1453 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void ObjectPropertyInitializerOrVariableInitializer( -#line 1448 "cs.ATG" +#line 1456 "cs.ATG" out Expression expr) { -#line 1449 "cs.ATG" +#line 1457 "cs.ATG" expr = null; if ( -#line 1451 "cs.ATG" +#line 1459 "cs.ATG" IdentAndAsgn()) { Identifier(); -#line 1453 "cs.ATG" +#line 1461 "cs.ATG" NamedArgumentExpression nae = new NamedArgumentExpression(t.val, null); nae.StartLocation = t.Location; Expression r = null; Expect(3); if (la.kind == 16) { CollectionOrObjectInitializer( -#line 1457 "cs.ATG" +#line 1465 "cs.ATG" out r); } else if (StartOf(30)) { VariableInitializer( -#line 1458 "cs.ATG" +#line 1466 "cs.ATG" out r); } else SynErr(194); -#line 1459 "cs.ATG" +#line 1467 "cs.ATG" nae.Expression = r; nae.EndLocation = t.EndLocation; expr = nae; } else if (StartOf(30)) { VariableInitializer( -#line 1461 "cs.ATG" +#line 1469 "cs.ATG" out expr); } else SynErr(195); } void LocalVariableDecl( -#line 1465 "cs.ATG" +#line 1473 "cs.ATG" out Statement stmt) { -#line 1467 "cs.ATG" +#line 1475 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Location startPos = la.Location; Type( -#line 1473 "cs.ATG" +#line 1481 "cs.ATG" out type); -#line 1473 "cs.ATG" +#line 1481 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = startPos; LocalVariableDeclarator( -#line 1474 "cs.ATG" +#line 1482 "cs.ATG" out var); -#line 1474 "cs.ATG" +#line 1482 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); while (la.kind == 14) { lexer.NextToken(); LocalVariableDeclarator( -#line 1475 "cs.ATG" +#line 1483 "cs.ATG" out var); -#line 1475 "cs.ATG" +#line 1483 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); } -#line 1476 "cs.ATG" +#line 1484 "cs.ATG" stmt = localVariableDeclaration; stmt.EndLocation = t.EndLocation; } void LocalVariableDeclarator( -#line 1479 "cs.ATG" +#line 1487 "cs.ATG" out VariableDeclaration var) { -#line 1480 "cs.ATG" +#line 1488 "cs.ATG" Expression expr = null; Identifier(); -#line 1482 "cs.ATG" +#line 1490 "cs.ATG" var = new VariableDeclaration(t.val); var.StartLocation = t.Location; if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1483 "cs.ATG" +#line 1491 "cs.ATG" out expr); -#line 1483 "cs.ATG" +#line 1491 "cs.ATG" var.Initializer = expr; } -#line 1484 "cs.ATG" +#line 1492 "cs.ATG" var.EndLocation = t.EndLocation; } void EmbeddedStatement( -#line 1519 "cs.ATG" +#line 1527 "cs.ATG" out Statement statement) { -#line 1521 "cs.ATG" +#line 1529 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; statement = null; -#line 1527 "cs.ATG" +#line 1535 "cs.ATG" Location startLocation = la.Location; if (la.kind == 16) { Block( -#line 1529 "cs.ATG" +#line 1537 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1532 "cs.ATG" +#line 1540 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1535 "cs.ATG" +#line 1543 "cs.ATG" UnCheckedAndLBrace()) { -#line 1535 "cs.ATG" +#line 1543 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 58) { lexer.NextToken(); } else if (la.kind == 118) { lexer.NextToken(); -#line 1536 "cs.ATG" +#line 1544 "cs.ATG" isChecked = false; } else SynErr(196); Block( -#line 1537 "cs.ATG" +#line 1545 "cs.ATG" out block); -#line 1537 "cs.ATG" +#line 1545 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 79) { IfStatement( -#line 1540 "cs.ATG" +#line 1548 "cs.ATG" out statement); } else if (la.kind == 110) { lexer.NextToken(); -#line 1542 "cs.ATG" +#line 1550 "cs.ATG" List switchSections = new List(); Expect(20); Expr( -#line 1543 "cs.ATG" +#line 1551 "cs.ATG" out expr); Expect(21); Expect(16); SwitchSections( -#line 1544 "cs.ATG" +#line 1552 "cs.ATG" switchSections); Expect(17); -#line 1546 "cs.ATG" +#line 1554 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 125) { lexer.NextToken(); Expect(20); Expr( -#line 1549 "cs.ATG" +#line 1557 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1550 "cs.ATG" +#line 1558 "cs.ATG" out embeddedStatement); -#line 1551 "cs.ATG" +#line 1559 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 65) { lexer.NextToken(); EmbeddedStatement( -#line 1553 "cs.ATG" +#line 1561 "cs.ATG" out embeddedStatement); Expect(125); Expect(20); Expr( -#line 1554 "cs.ATG" +#line 1562 "cs.ATG" out expr); Expect(21); Expect(11); -#line 1555 "cs.ATG" +#line 1563 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 76) { lexer.NextToken(); -#line 1557 "cs.ATG" +#line 1565 "cs.ATG" List initializer = null; List iterator = null; Expect(20); if (StartOf(6)) { ForInitializer( -#line 1558 "cs.ATG" +#line 1566 "cs.ATG" out initializer); } Expect(11); if (StartOf(6)) { Expr( -#line 1559 "cs.ATG" +#line 1567 "cs.ATG" out expr); } Expect(11); if (StartOf(6)) { ForIterator( -#line 1560 "cs.ATG" +#line 1568 "cs.ATG" out iterator); } Expect(21); EmbeddedStatement( -#line 1561 "cs.ATG" +#line 1569 "cs.ATG" out embeddedStatement); -#line 1562 "cs.ATG" +#line 1570 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 77) { lexer.NextToken(); Expect(20); Type( -#line 1564 "cs.ATG" +#line 1572 "cs.ATG" out type); Identifier(); -#line 1564 "cs.ATG" +#line 1572 "cs.ATG" string varName = t.val; Expect(81); Expr( -#line 1565 "cs.ATG" +#line 1573 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1566 "cs.ATG" +#line 1574 "cs.ATG" out embeddedStatement); -#line 1567 "cs.ATG" +#line 1575 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); } else if (la.kind == 53) { lexer.NextToken(); Expect(11); -#line 1570 "cs.ATG" +#line 1578 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 61) { lexer.NextToken(); Expect(11); -#line 1571 "cs.ATG" +#line 1579 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 78) { GotoStatement( -#line 1572 "cs.ATG" +#line 1580 "cs.ATG" out statement); } else if ( -#line 1574 "cs.ATG" +#line 1582 "cs.ATG" IsYieldStatement()) { Expect(132); if (la.kind == 101) { lexer.NextToken(); Expr( -#line 1575 "cs.ATG" +#line 1583 "cs.ATG" out expr); -#line 1575 "cs.ATG" +#line 1583 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 53) { lexer.NextToken(); -#line 1576 "cs.ATG" +#line 1584 "cs.ATG" statement = new YieldStatement(new BreakStatement()); } else SynErr(197); Expect(11); @@ -3765,90 +3764,90 @@ out expr); lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1579 "cs.ATG" +#line 1587 "cs.ATG" out expr); } Expect(11); -#line 1579 "cs.ATG" +#line 1587 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 112) { lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1580 "cs.ATG" +#line 1588 "cs.ATG" out expr); } Expect(11); -#line 1580 "cs.ATG" +#line 1588 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(6)) { StatementExpr( -#line 1583 "cs.ATG" +#line 1591 "cs.ATG" out statement); while (!(la.kind == 0 || la.kind == 11)) {SynErr(198); lexer.NextToken(); } Expect(11); } else if (la.kind == 114) { TryStatement( -#line 1586 "cs.ATG" +#line 1594 "cs.ATG" out statement); } else if (la.kind == 86) { lexer.NextToken(); Expect(20); Expr( -#line 1589 "cs.ATG" +#line 1597 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1590 "cs.ATG" +#line 1598 "cs.ATG" out embeddedStatement); -#line 1590 "cs.ATG" +#line 1598 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 121) { -#line 1593 "cs.ATG" +#line 1601 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1595 "cs.ATG" +#line 1603 "cs.ATG" out resourceAcquisitionStmt); Expect(21); EmbeddedStatement( -#line 1596 "cs.ATG" +#line 1604 "cs.ATG" out embeddedStatement); -#line 1596 "cs.ATG" +#line 1604 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 119) { lexer.NextToken(); Block( -#line 1599 "cs.ATG" +#line 1607 "cs.ATG" out embeddedStatement); -#line 1599 "cs.ATG" +#line 1607 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 74) { -#line 1601 "cs.ATG" +#line 1609 "cs.ATG" Statement pointerDeclarationStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1603 "cs.ATG" +#line 1611 "cs.ATG" out pointerDeclarationStmt); Expect(21); EmbeddedStatement( -#line 1604 "cs.ATG" +#line 1612 "cs.ATG" out embeddedStatement); -#line 1604 "cs.ATG" +#line 1612 "cs.ATG" statement = new FixedStatement(pointerDeclarationStmt, embeddedStatement); } else SynErr(199); -#line 1606 "cs.ATG" +#line 1614 "cs.ATG" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -3857,10 +3856,10 @@ out embeddedStatement); } void IfStatement( -#line 1613 "cs.ATG" +#line 1621 "cs.ATG" out Statement statement) { -#line 1615 "cs.ATG" +#line 1623 "cs.ATG" Expression expr = null; Statement embeddedStatement = null; statement = null; @@ -3868,26 +3867,26 @@ out Statement statement) { Expect(79); Expect(20); Expr( -#line 1621 "cs.ATG" +#line 1629 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1622 "cs.ATG" +#line 1630 "cs.ATG" out embeddedStatement); -#line 1623 "cs.ATG" +#line 1631 "cs.ATG" Statement elseStatement = null; if (la.kind == 67) { lexer.NextToken(); EmbeddedStatement( -#line 1624 "cs.ATG" +#line 1632 "cs.ATG" out elseStatement); } -#line 1625 "cs.ATG" +#line 1633 "cs.ATG" statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); -#line 1626 "cs.ATG" +#line 1634 "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( @@ -3900,29 +3899,29 @@ out elseStatement); } void SwitchSections( -#line 1656 "cs.ATG" +#line 1664 "cs.ATG" List switchSections) { -#line 1658 "cs.ATG" +#line 1666 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1662 "cs.ATG" +#line 1670 "cs.ATG" out label); -#line 1662 "cs.ATG" +#line 1670 "cs.ATG" SafeAdd(switchSection, switchSection.SwitchLabels, label); -#line 1663 "cs.ATG" +#line 1671 "cs.ATG" compilationUnit.BlockStart(switchSection); while (StartOf(31)) { if (la.kind == 55 || la.kind == 63) { SwitchLabel( -#line 1665 "cs.ATG" +#line 1673 "cs.ATG" out label); -#line 1666 "cs.ATG" +#line 1674 "cs.ATG" if (label != null) { if (switchSection.Children.Count > 0) { // open new section @@ -3938,145 +3937,145 @@ out label); } } -#line 1678 "cs.ATG" +#line 1686 "cs.ATG" compilationUnit.BlockEnd(); switchSections.Add(switchSection); } void ForInitializer( -#line 1637 "cs.ATG" +#line 1645 "cs.ATG" out List initializer) { -#line 1639 "cs.ATG" +#line 1647 "cs.ATG" Statement stmt; initializer = new List(); if ( -#line 1643 "cs.ATG" +#line 1651 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1643 "cs.ATG" +#line 1651 "cs.ATG" out stmt); -#line 1643 "cs.ATG" +#line 1651 "cs.ATG" initializer.Add(stmt); } else if (StartOf(6)) { StatementExpr( -#line 1644 "cs.ATG" +#line 1652 "cs.ATG" out stmt); -#line 1644 "cs.ATG" +#line 1652 "cs.ATG" initializer.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1644 "cs.ATG" +#line 1652 "cs.ATG" out stmt); -#line 1644 "cs.ATG" +#line 1652 "cs.ATG" initializer.Add(stmt); } } else SynErr(200); } void ForIterator( -#line 1647 "cs.ATG" +#line 1655 "cs.ATG" out List iterator) { -#line 1649 "cs.ATG" +#line 1657 "cs.ATG" Statement stmt; iterator = new List(); StatementExpr( -#line 1653 "cs.ATG" +#line 1661 "cs.ATG" out stmt); -#line 1653 "cs.ATG" +#line 1661 "cs.ATG" iterator.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1653 "cs.ATG" +#line 1661 "cs.ATG" out stmt); -#line 1653 "cs.ATG" +#line 1661 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1735 "cs.ATG" +#line 1743 "cs.ATG" out Statement stmt) { -#line 1736 "cs.ATG" +#line 1744 "cs.ATG" Expression expr; stmt = null; Expect(78); if (StartOf(18)) { Identifier(); -#line 1740 "cs.ATG" +#line 1748 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1741 "cs.ATG" +#line 1749 "cs.ATG" out expr); Expect(11); -#line 1741 "cs.ATG" +#line 1749 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(11); -#line 1742 "cs.ATG" +#line 1750 "cs.ATG" stmt = new GotoCaseStatement(null); } else SynErr(201); } void StatementExpr( -#line 1762 "cs.ATG" +#line 1770 "cs.ATG" out Statement stmt) { -#line 1763 "cs.ATG" +#line 1771 "cs.ATG" Expression expr; Expr( -#line 1765 "cs.ATG" +#line 1773 "cs.ATG" out expr); -#line 1768 "cs.ATG" +#line 1776 "cs.ATG" stmt = new ExpressionStatement(expr); } void TryStatement( -#line 1688 "cs.ATG" +#line 1696 "cs.ATG" out Statement tryStatement) { -#line 1690 "cs.ATG" +#line 1698 "cs.ATG" Statement blockStmt = null, finallyStmt = null; CatchClause catchClause = null; List catchClauses = new List(); Expect(114); Block( -#line 1695 "cs.ATG" +#line 1703 "cs.ATG" out blockStmt); while (la.kind == 56) { CatchClause( -#line 1697 "cs.ATG" +#line 1705 "cs.ATG" out catchClause); -#line 1698 "cs.ATG" +#line 1706 "cs.ATG" if (catchClause != null) catchClauses.Add(catchClause); } if (la.kind == 73) { lexer.NextToken(); Block( -#line 1700 "cs.ATG" +#line 1708 "cs.ATG" out finallyStmt); } -#line 1702 "cs.ATG" +#line 1710 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); if (catchClauses != null) { foreach (CatchClause cc in catchClauses) cc.Parent = tryStatement; @@ -4085,59 +4084,59 @@ out finallyStmt); } void ResourceAcquisition( -#line 1746 "cs.ATG" +#line 1754 "cs.ATG" out Statement stmt) { -#line 1748 "cs.ATG" +#line 1756 "cs.ATG" stmt = null; Expression expr; if ( -#line 1753 "cs.ATG" +#line 1761 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1753 "cs.ATG" +#line 1761 "cs.ATG" out stmt); } else if (StartOf(6)) { Expr( -#line 1754 "cs.ATG" +#line 1762 "cs.ATG" out expr); -#line 1758 "cs.ATG" +#line 1766 "cs.ATG" stmt = new ExpressionStatement(expr); } else SynErr(202); } void SwitchLabel( -#line 1681 "cs.ATG" +#line 1689 "cs.ATG" out CaseLabel label) { -#line 1682 "cs.ATG" +#line 1690 "cs.ATG" Expression expr = null; label = null; if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1684 "cs.ATG" +#line 1692 "cs.ATG" out expr); Expect(9); -#line 1684 "cs.ATG" +#line 1692 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(9); -#line 1685 "cs.ATG" +#line 1693 "cs.ATG" label = new CaseLabel(); } else SynErr(203); } void CatchClause( -#line 1709 "cs.ATG" +#line 1717 "cs.ATG" out CatchClause catchClause) { Expect(56); -#line 1711 "cs.ATG" +#line 1719 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; @@ -4146,35 +4145,35 @@ out CatchClause catchClause) { if (la.kind == 16) { Block( -#line 1719 "cs.ATG" +#line 1727 "cs.ATG" out stmt); -#line 1719 "cs.ATG" +#line 1727 "cs.ATG" catchClause = new CatchClause(stmt); } else if (la.kind == 20) { lexer.NextToken(); ClassType( -#line 1722 "cs.ATG" +#line 1730 "cs.ATG" out typeRef, false); -#line 1722 "cs.ATG" +#line 1730 "cs.ATG" identifier = null; if (StartOf(18)) { Identifier(); -#line 1723 "cs.ATG" +#line 1731 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1724 "cs.ATG" +#line 1732 "cs.ATG" out stmt); -#line 1725 "cs.ATG" +#line 1733 "cs.ATG" catchClause = new CatchClause(typeRef, identifier, stmt); } else SynErr(204); -#line 1728 "cs.ATG" +#line 1736 "cs.ATG" if (catchClause != null) { catchClause.StartLocation = startPos; catchClause.EndLocation = t.Location; @@ -4183,75 +4182,75 @@ out stmt); } void UnaryExpr( -#line 1797 "cs.ATG" +#line 1805 "cs.ATG" out Expression uExpr) { -#line 1799 "cs.ATG" +#line 1807 "cs.ATG" TypeReference type = null; Expression expr = null; ArrayList expressions = new ArrayList(); uExpr = null; while (StartOf(32) || -#line 1821 "cs.ATG" +#line 1829 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1808 "cs.ATG" +#line 1816 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1809 "cs.ATG" +#line 1817 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 24) { lexer.NextToken(); -#line 1810 "cs.ATG" +#line 1818 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1811 "cs.ATG" +#line 1819 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1812 "cs.ATG" +#line 1820 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1813 "cs.ATG" +#line 1821 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 32) { lexer.NextToken(); -#line 1814 "cs.ATG" +#line 1822 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 28) { lexer.NextToken(); -#line 1815 "cs.ATG" +#line 1823 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf)); } else { Expect(20); Type( -#line 1821 "cs.ATG" +#line 1829 "cs.ATG" out type); Expect(21); -#line 1821 "cs.ATG" +#line 1829 "cs.ATG" expressions.Add(new CastExpression(type)); } } if ( -#line 1826 "cs.ATG" +#line 1834 "cs.ATG" LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffix()) { Expect(2); -#line 1829 "cs.ATG" +#line 1837 "cs.ATG" expressions.RemoveAt(expressions.Count - 1); if (t.literalValue is uint) { expr = new PrimitiveExpression(int.MinValue, int.MinValue.ToString()); @@ -4263,11 +4262,11 @@ LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffi } else if (StartOf(33)) { PrimaryExpr( -#line 1838 "cs.ATG" +#line 1846 "cs.ATG" out expr); } else SynErr(205); -#line 1840 "cs.ATG" +#line 1848 "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) { @@ -4285,325 +4284,325 @@ out expr); } void ConditionalOrExpr( -#line 2164 "cs.ATG" +#line 2172 "cs.ATG" ref Expression outExpr) { -#line 2165 "cs.ATG" +#line 2173 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2167 "cs.ATG" +#line 2175 "cs.ATG" ref outExpr); while (la.kind == 26) { lexer.NextToken(); UnaryExpr( -#line 2167 "cs.ATG" +#line 2175 "cs.ATG" out expr); ConditionalAndExpr( -#line 2167 "cs.ATG" +#line 2175 "cs.ATG" ref expr); -#line 2167 "cs.ATG" +#line 2175 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1857 "cs.ATG" +#line 1865 "cs.ATG" out Expression pexpr) { -#line 1859 "cs.ATG" +#line 1867 "cs.ATG" TypeReference type = null; Expression expr; pexpr = null; -#line 1864 "cs.ATG" +#line 1872 "cs.ATG" Location startLocation = la.Location; if (la.kind == 113) { lexer.NextToken(); -#line 1866 "cs.ATG" +#line 1874 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 72) { lexer.NextToken(); -#line 1867 "cs.ATG" +#line 1875 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 90) { lexer.NextToken(); -#line 1868 "cs.ATG" +#line 1876 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 1869 "cs.ATG" +#line 1877 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; } else if ( -#line 1870 "cs.ATG" +#line 1878 "cs.ATG" StartOfQueryExpression()) { QueryExpression( -#line 1871 "cs.ATG" +#line 1879 "cs.ATG" out pexpr); } else if ( -#line 1872 "cs.ATG" +#line 1880 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 1873 "cs.ATG" +#line 1881 "cs.ATG" type = new TypeReference(t.val); Expect(10); -#line 1874 "cs.ATG" +#line 1882 "cs.ATG" pexpr = new TypeReferenceExpression(type); Identifier(); -#line 1875 "cs.ATG" +#line 1883 "cs.ATG" if (type.Type == "global") { type.IsGlobal = true; type.Type = t.val ?? "?"; } else type.Type += "." + (t.val ?? "?"); } else if (StartOf(18)) { Identifier(); -#line 1879 "cs.ATG" +#line 1887 "cs.ATG" pexpr = new IdentifierExpression(t.val); if (la.kind == 48 || -#line 1882 "cs.ATG" +#line 1890 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { if (la.kind == 48) { ShortedLambdaExpression( -#line 1881 "cs.ATG" +#line 1889 "cs.ATG" (IdentifierExpression)pexpr, out pexpr); } else { -#line 1883 "cs.ATG" +#line 1891 "cs.ATG" List typeList; TypeArgumentList( -#line 1884 "cs.ATG" +#line 1892 "cs.ATG" out typeList, false); -#line 1885 "cs.ATG" +#line 1893 "cs.ATG" ((IdentifierExpression)pexpr).TypeArguments = typeList; } } } else if ( -#line 1887 "cs.ATG" +#line 1895 "cs.ATG" IsLambdaExpression()) { LambdaExpression( -#line 1888 "cs.ATG" +#line 1896 "cs.ATG" out pexpr); } else if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1891 "cs.ATG" +#line 1899 "cs.ATG" out expr); Expect(21); -#line 1891 "cs.ATG" +#line 1899 "cs.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(34)) { -#line 1894 "cs.ATG" +#line 1902 "cs.ATG" string val = null; switch (la.kind) { case 52: { lexer.NextToken(); -#line 1895 "cs.ATG" +#line 1903 "cs.ATG" val = "System.Boolean"; break; } case 54: { lexer.NextToken(); -#line 1896 "cs.ATG" +#line 1904 "cs.ATG" val = "System.Byte"; break; } case 57: { lexer.NextToken(); -#line 1897 "cs.ATG" +#line 1905 "cs.ATG" val = "System.Char"; break; } case 62: { lexer.NextToken(); -#line 1898 "cs.ATG" +#line 1906 "cs.ATG" val = "System.Decimal"; break; } case 66: { lexer.NextToken(); -#line 1899 "cs.ATG" +#line 1907 "cs.ATG" val = "System.Double"; break; } case 75: { lexer.NextToken(); -#line 1900 "cs.ATG" +#line 1908 "cs.ATG" val = "System.Single"; break; } case 82: { lexer.NextToken(); -#line 1901 "cs.ATG" +#line 1909 "cs.ATG" val = "System.Int32"; break; } case 87: { lexer.NextToken(); -#line 1902 "cs.ATG" +#line 1910 "cs.ATG" val = "System.Int64"; break; } case 91: { lexer.NextToken(); -#line 1903 "cs.ATG" +#line 1911 "cs.ATG" val = "System.Object"; break; } case 102: { lexer.NextToken(); -#line 1904 "cs.ATG" +#line 1912 "cs.ATG" val = "System.SByte"; break; } case 104: { lexer.NextToken(); -#line 1905 "cs.ATG" +#line 1913 "cs.ATG" val = "System.Int16"; break; } case 108: { lexer.NextToken(); -#line 1906 "cs.ATG" +#line 1914 "cs.ATG" val = "System.String"; break; } case 116: { lexer.NextToken(); -#line 1907 "cs.ATG" +#line 1915 "cs.ATG" val = "System.UInt32"; break; } case 117: { lexer.NextToken(); -#line 1908 "cs.ATG" +#line 1916 "cs.ATG" val = "System.UInt64"; break; } case 120: { lexer.NextToken(); -#line 1909 "cs.ATG" +#line 1917 "cs.ATG" val = "System.UInt16"; break; } case 123: { lexer.NextToken(); -#line 1910 "cs.ATG" +#line 1918 "cs.ATG" val = "System.Void"; break; } } -#line 1912 "cs.ATG" +#line 1920 "cs.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)) { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (la.kind == 111) { lexer.NextToken(); -#line 1915 "cs.ATG" +#line 1923 "cs.ATG" pexpr = new ThisReferenceExpression(); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; } else if (la.kind == 51) { lexer.NextToken(); -#line 1917 "cs.ATG" +#line 1925 "cs.ATG" pexpr = new BaseReferenceExpression(); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; } else if (la.kind == 89) { NewExpression( -#line 1920 "cs.ATG" +#line 1928 "cs.ATG" out pexpr); } else if (la.kind == 115) { lexer.NextToken(); Expect(20); if ( -#line 1924 "cs.ATG" +#line 1932 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1924 "cs.ATG" +#line 1932 "cs.ATG" type = new TypeReference("System.Void", true); } else if (StartOf(10)) { TypeWithRestriction( -#line 1925 "cs.ATG" +#line 1933 "cs.ATG" out type, true, true); } else SynErr(206); Expect(21); -#line 1927 "cs.ATG" +#line 1935 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 63) { lexer.NextToken(); Expect(20); Type( -#line 1929 "cs.ATG" +#line 1937 "cs.ATG" out type); Expect(21); -#line 1929 "cs.ATG" +#line 1937 "cs.ATG" pexpr = new DefaultValueExpression(type); } else if (la.kind == 105) { lexer.NextToken(); Expect(20); Type( -#line 1930 "cs.ATG" +#line 1938 "cs.ATG" out type); Expect(21); -#line 1930 "cs.ATG" +#line 1938 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 58) { lexer.NextToken(); Expect(20); Expr( -#line 1931 "cs.ATG" +#line 1939 "cs.ATG" out expr); Expect(21); -#line 1931 "cs.ATG" +#line 1939 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 118) { lexer.NextToken(); Expect(20); Expr( -#line 1932 "cs.ATG" +#line 1940 "cs.ATG" out expr); Expect(21); -#line 1932 "cs.ATG" +#line 1940 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 64) { lexer.NextToken(); AnonymousMethodExpr( -#line 1933 "cs.ATG" +#line 1941 "cs.ATG" out expr); -#line 1933 "cs.ATG" +#line 1941 "cs.ATG" pexpr = expr; } else SynErr(207); -#line 1935 "cs.ATG" +#line 1943 "cs.ATG" if (pexpr != null) { if (pexpr.StartLocation.IsEmpty) pexpr.StartLocation = startLocation; @@ -4613,57 +4612,57 @@ out expr); while (StartOf(35)) { -#line 1943 "cs.ATG" +#line 1951 "cs.ATG" startLocation = la.Location; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1945 "cs.ATG" +#line 1953 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); break; } case 32: { lexer.NextToken(); -#line 1947 "cs.ATG" +#line 1955 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); break; } case 47: { PointerMemberAccess( -#line 1949 "cs.ATG" +#line 1957 "cs.ATG" out pexpr, pexpr); break; } case 15: { MemberAccess( -#line 1950 "cs.ATG" +#line 1958 "cs.ATG" out pexpr, pexpr); break; } case 20: { lexer.NextToken(); -#line 1954 "cs.ATG" +#line 1962 "cs.ATG" List parameters = new List(); -#line 1955 "cs.ATG" +#line 1963 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); if (StartOf(25)) { Argument( -#line 1956 "cs.ATG" +#line 1964 "cs.ATG" out expr); -#line 1956 "cs.ATG" +#line 1964 "cs.ATG" SafeAdd(pexpr, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1957 "cs.ATG" +#line 1965 "cs.ATG" out expr); -#line 1957 "cs.ATG" +#line 1965 "cs.ATG" SafeAdd(pexpr, parameters, expr); } } @@ -4672,24 +4671,24 @@ out expr); } case 18: { -#line 1963 "cs.ATG" +#line 1971 "cs.ATG" List indices = new List(); pexpr = new IndexerExpression(pexpr, indices); lexer.NextToken(); Expr( -#line 1966 "cs.ATG" +#line 1974 "cs.ATG" out expr); -#line 1966 "cs.ATG" +#line 1974 "cs.ATG" SafeAdd(pexpr, indices, expr); while (la.kind == 14) { lexer.NextToken(); Expr( -#line 1967 "cs.ATG" +#line 1975 "cs.ATG" out expr); -#line 1967 "cs.ATG" +#line 1975 "cs.ATG" SafeAdd(pexpr, indices, expr); } Expect(19); @@ -4697,7 +4696,7 @@ out expr); } } -#line 1970 "cs.ATG" +#line 1978 "cs.ATG" if (pexpr != null) { if (pexpr.StartLocation.IsEmpty) pexpr.StartLocation = startLocation; @@ -4709,83 +4708,83 @@ out expr); } void QueryExpression( -#line 2417 "cs.ATG" +#line 2425 "cs.ATG" out Expression outExpr) { -#line 2418 "cs.ATG" +#line 2426 "cs.ATG" QueryExpression q = new QueryExpression(); outExpr = q; q.StartLocation = la.Location; QueryExpressionFromClause fromClause; QueryExpressionFromClause( -#line 2422 "cs.ATG" +#line 2430 "cs.ATG" out fromClause); -#line 2422 "cs.ATG" +#line 2430 "cs.ATG" q.FromClause = fromClause; QueryExpressionBody( -#line 2423 "cs.ATG" +#line 2431 "cs.ATG" ref q); -#line 2424 "cs.ATG" +#line 2432 "cs.ATG" q.EndLocation = t.EndLocation; outExpr = q; /* set outExpr to q again if QueryExpressionBody changed it (can happen with 'into' clauses) */ } void ShortedLambdaExpression( -#line 2084 "cs.ATG" +#line 2092 "cs.ATG" IdentifierExpression ident, out Expression pexpr) { -#line 2085 "cs.ATG" +#line 2093 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); pexpr = lambda; Expect(48); -#line 2090 "cs.ATG" +#line 2098 "cs.ATG" lambda.StartLocation = ident.StartLocation; SafeAdd(lambda, lambda.Parameters, new ParameterDeclarationExpression(null, ident.Identifier)); lambda.Parameters[0].StartLocation = ident.StartLocation; lambda.Parameters[0].EndLocation = ident.EndLocation; LambdaExpressionBody( -#line 2095 "cs.ATG" +#line 2103 "cs.ATG" lambda); } void TypeArgumentList( -#line 2336 "cs.ATG" +#line 2344 "cs.ATG" out List types, bool canBeUnbound) { -#line 2338 "cs.ATG" +#line 2346 "cs.ATG" types = new List(); TypeReference type = null; Expect(23); if ( -#line 2343 "cs.ATG" +#line 2351 "cs.ATG" canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) { -#line 2344 "cs.ATG" +#line 2352 "cs.ATG" types.Add(TypeReference.Null); while (la.kind == 14) { lexer.NextToken(); -#line 2345 "cs.ATG" +#line 2353 "cs.ATG" types.Add(TypeReference.Null); } } else if (StartOf(10)) { Type( -#line 2346 "cs.ATG" +#line 2354 "cs.ATG" out type); -#line 2346 "cs.ATG" +#line 2354 "cs.ATG" if (type != null) { types.Add(type); } while (la.kind == 14) { lexer.NextToken(); Type( -#line 2347 "cs.ATG" +#line 2355 "cs.ATG" out type); -#line 2347 "cs.ATG" +#line 2355 "cs.ATG" if (type != null) { types.Add(type); } } } else SynErr(208); @@ -4793,10 +4792,10 @@ out type); } void LambdaExpression( -#line 2064 "cs.ATG" +#line 2072 "cs.ATG" out Expression outExpr) { -#line 2066 "cs.ATG" +#line 2074 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; ParameterDeclarationExpression p; @@ -4805,33 +4804,33 @@ out Expression outExpr) { Expect(20); if (StartOf(36)) { LambdaExpressionParameter( -#line 2074 "cs.ATG" +#line 2082 "cs.ATG" out p); -#line 2074 "cs.ATG" +#line 2082 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); while (la.kind == 14) { lexer.NextToken(); LambdaExpressionParameter( -#line 2076 "cs.ATG" +#line 2084 "cs.ATG" out p); -#line 2076 "cs.ATG" +#line 2084 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); } } Expect(21); Expect(48); LambdaExpressionBody( -#line 2081 "cs.ATG" +#line 2089 "cs.ATG" lambda); } void NewExpression( -#line 2011 "cs.ATG" +#line 2019 "cs.ATG" out Expression pexpr) { -#line 2012 "cs.ATG" +#line 2020 "cs.ATG" pexpr = null; List parameters = new List(); TypeReference type = null; @@ -4840,65 +4839,65 @@ out Expression pexpr) { Expect(89); if (StartOf(10)) { NonArrayType( -#line 2019 "cs.ATG" +#line 2027 "cs.ATG" out type); } if (la.kind == 16 || la.kind == 20) { if (la.kind == 20) { -#line 2025 "cs.ATG" +#line 2033 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); lexer.NextToken(); -#line 2026 "cs.ATG" +#line 2034 "cs.ATG" if (type == null) Error("Cannot use an anonymous type with arguments for the constructor"); if (StartOf(25)) { Argument( -#line 2027 "cs.ATG" +#line 2035 "cs.ATG" out expr); -#line 2027 "cs.ATG" +#line 2035 "cs.ATG" SafeAdd(oce, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2028 "cs.ATG" +#line 2036 "cs.ATG" out expr); -#line 2028 "cs.ATG" +#line 2036 "cs.ATG" SafeAdd(oce, parameters, expr); } } Expect(21); -#line 2030 "cs.ATG" +#line 2038 "cs.ATG" pexpr = oce; if (la.kind == 16) { CollectionOrObjectInitializer( -#line 2031 "cs.ATG" +#line 2039 "cs.ATG" out expr); -#line 2031 "cs.ATG" +#line 2039 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; } } else { -#line 2032 "cs.ATG" +#line 2040 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); CollectionOrObjectInitializer( -#line 2033 "cs.ATG" +#line 2041 "cs.ATG" out expr); -#line 2033 "cs.ATG" +#line 2041 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; -#line 2034 "cs.ATG" +#line 2042 "cs.ATG" pexpr = oce; } } else if (la.kind == 18) { lexer.NextToken(); -#line 2039 "cs.ATG" +#line 2047 "cs.ATG" ArrayCreateExpression ace = new ArrayCreateExpression(type); /* we must not change RankSpecifier on the null type reference*/ if (ace.CreateType.IsNull) { ace.CreateType = new TypeReference(""); } @@ -4909,80 +4908,80 @@ out expr); while (la.kind == 14) { lexer.NextToken(); -#line 2046 "cs.ATG" +#line 2054 "cs.ATG" dims += 1; } Expect(19); -#line 2047 "cs.ATG" +#line 2055 "cs.ATG" ranks.Add(dims); dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2048 "cs.ATG" +#line 2056 "cs.ATG" ++dims; } Expect(19); -#line 2048 "cs.ATG" +#line 2056 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2049 "cs.ATG" +#line 2057 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); CollectionInitializer( -#line 2050 "cs.ATG" +#line 2058 "cs.ATG" out expr); -#line 2050 "cs.ATG" +#line 2058 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } else if (StartOf(6)) { Expr( -#line 2051 "cs.ATG" +#line 2059 "cs.ATG" out expr); -#line 2051 "cs.ATG" +#line 2059 "cs.ATG" if (expr != null) parameters.Add(expr); while (la.kind == 14) { lexer.NextToken(); -#line 2052 "cs.ATG" +#line 2060 "cs.ATG" dims += 1; Expr( -#line 2053 "cs.ATG" +#line 2061 "cs.ATG" out expr); -#line 2053 "cs.ATG" +#line 2061 "cs.ATG" if (expr != null) parameters.Add(expr); } Expect(19); -#line 2055 "cs.ATG" +#line 2063 "cs.ATG" ranks.Add(dims); ace.Arguments = parameters; dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2056 "cs.ATG" +#line 2064 "cs.ATG" ++dims; } Expect(19); -#line 2056 "cs.ATG" +#line 2064 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2057 "cs.ATG" +#line 2065 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); if (la.kind == 16) { CollectionInitializer( -#line 2058 "cs.ATG" +#line 2066 "cs.ATG" out expr); -#line 2058 "cs.ATG" +#line 2066 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } } else SynErr(209); @@ -4990,10 +4989,10 @@ out expr); } void AnonymousMethodExpr( -#line 2131 "cs.ATG" +#line 2139 "cs.ATG" out Expression outExpr) { -#line 2133 "cs.ATG" +#line 2141 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; BlockStatement stmt; @@ -5004,59 +5003,59 @@ out Expression outExpr) { lexer.NextToken(); if (StartOf(11)) { FormalParameterList( -#line 2142 "cs.ATG" +#line 2150 "cs.ATG" p); -#line 2142 "cs.ATG" +#line 2150 "cs.ATG" expr.Parameters = p; } Expect(21); -#line 2144 "cs.ATG" +#line 2152 "cs.ATG" expr.HasParameterList = true; } BlockInsideExpression( -#line 2146 "cs.ATG" +#line 2154 "cs.ATG" out stmt); -#line 2146 "cs.ATG" +#line 2154 "cs.ATG" expr.Body = stmt; -#line 2147 "cs.ATG" +#line 2155 "cs.ATG" expr.EndLocation = t.Location; } void PointerMemberAccess( -#line 1999 "cs.ATG" +#line 2007 "cs.ATG" out Expression expr, Expression target) { -#line 2000 "cs.ATG" +#line 2008 "cs.ATG" List typeList; Expect(47); Identifier(); -#line 2004 "cs.ATG" +#line 2012 "cs.ATG" expr = new PointerReferenceExpression(target, t.val); expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; if ( -#line 2005 "cs.ATG" +#line 2013 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 2006 "cs.ATG" +#line 2014 "cs.ATG" out typeList, false); -#line 2007 "cs.ATG" +#line 2015 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void MemberAccess( -#line 1980 "cs.ATG" +#line 1988 "cs.ATG" out Expression expr, Expression target) { -#line 1981 "cs.ATG" +#line 1989 "cs.ATG" List typeList; -#line 1983 "cs.ATG" +#line 1991 "cs.ATG" if (ShouldConvertTargetExpressionToTypeReference(target)) { TypeReference type = GetTypeReferenceFromExpression(target); if (type != null) { @@ -5066,39 +5065,39 @@ out Expression expr, Expression target) { Expect(15); -#line 1990 "cs.ATG" +#line 1998 "cs.ATG" Location startLocation = t.Location; Identifier(); -#line 1992 "cs.ATG" +#line 2000 "cs.ATG" expr = new MemberReferenceExpression(target, t.val); expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; if ( -#line 1993 "cs.ATG" +#line 2001 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 1994 "cs.ATG" +#line 2002 "cs.ATG" out typeList, false); -#line 1995 "cs.ATG" +#line 2003 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void LambdaExpressionParameter( -#line 2098 "cs.ATG" +#line 2106 "cs.ATG" out ParameterDeclarationExpression p) { -#line 2099 "cs.ATG" +#line 2107 "cs.ATG" Location start = la.Location; p = null; TypeReference type; ParameterModifiers mod = ParameterModifiers.In; if ( -#line 2104 "cs.ATG" +#line 2112 "cs.ATG" Peek(1).kind == Tokens.Comma || Peek(1).kind == Tokens.CloseParenthesis) { Identifier(); -#line 2106 "cs.ATG" +#line 2114 "cs.ATG" p = new ParameterDeclarationExpression(null, t.val); p.StartLocation = start; p.EndLocation = t.EndLocation; @@ -5107,21 +5106,21 @@ Peek(1).kind == Tokens.Comma || Peek(1).kind == Tokens.CloseParenthesis) { if (la.kind == 100) { lexer.NextToken(); -#line 2109 "cs.ATG" +#line 2117 "cs.ATG" mod = ParameterModifiers.Ref; } else { lexer.NextToken(); -#line 2110 "cs.ATG" +#line 2118 "cs.ATG" mod = ParameterModifiers.Out; } } Type( -#line 2112 "cs.ATG" +#line 2120 "cs.ATG" out type); Identifier(); -#line 2114 "cs.ATG" +#line 2122 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val, mod); p.StartLocation = start; p.EndLocation = t.EndLocation; @@ -5129,263 +5128,263 @@ out type); } void LambdaExpressionBody( -#line 2120 "cs.ATG" +#line 2128 "cs.ATG" LambdaExpression lambda) { -#line 2121 "cs.ATG" +#line 2129 "cs.ATG" Expression expr; BlockStatement stmt; if (la.kind == 16) { BlockInsideExpression( -#line 2124 "cs.ATG" +#line 2132 "cs.ATG" out stmt); -#line 2124 "cs.ATG" +#line 2132 "cs.ATG" lambda.StatementBody = stmt; } else if (StartOf(6)) { Expr( -#line 2125 "cs.ATG" +#line 2133 "cs.ATG" out expr); -#line 2125 "cs.ATG" +#line 2133 "cs.ATG" lambda.ExpressionBody = expr; } else SynErr(212); -#line 2127 "cs.ATG" +#line 2135 "cs.ATG" lambda.EndLocation = t.EndLocation; -#line 2128 "cs.ATG" +#line 2136 "cs.ATG" lambda.ExtendedEndLocation = la.Location; } void BlockInsideExpression( -#line 2150 "cs.ATG" +#line 2158 "cs.ATG" out BlockStatement outStmt) { -#line 2151 "cs.ATG" +#line 2159 "cs.ATG" Statement stmt = null; outStmt = null; -#line 2155 "cs.ATG" +#line 2163 "cs.ATG" if (compilationUnit != null) { Block( -#line 2156 "cs.ATG" +#line 2164 "cs.ATG" out stmt); -#line 2156 "cs.ATG" +#line 2164 "cs.ATG" outStmt = (BlockStatement)stmt; -#line 2157 "cs.ATG" +#line 2165 "cs.ATG" } else { Expect(16); -#line 2159 "cs.ATG" +#line 2167 "cs.ATG" lexer.SkipCurrentBlock(0); Expect(17); -#line 2161 "cs.ATG" +#line 2169 "cs.ATG" } } void ConditionalAndExpr( -#line 2170 "cs.ATG" +#line 2178 "cs.ATG" ref Expression outExpr) { -#line 2171 "cs.ATG" +#line 2179 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2173 "cs.ATG" +#line 2181 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2173 "cs.ATG" +#line 2181 "cs.ATG" out expr); InclusiveOrExpr( -#line 2173 "cs.ATG" +#line 2181 "cs.ATG" ref expr); -#line 2173 "cs.ATG" +#line 2181 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2176 "cs.ATG" +#line 2184 "cs.ATG" ref Expression outExpr) { -#line 2177 "cs.ATG" +#line 2185 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" ref expr); -#line 2179 "cs.ATG" +#line 2187 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2182 "cs.ATG" +#line 2190 "cs.ATG" ref Expression outExpr) { -#line 2183 "cs.ATG" +#line 2191 "cs.ATG" Expression expr; AndExpr( -#line 2185 "cs.ATG" +#line 2193 "cs.ATG" ref outExpr); while (la.kind == 30) { lexer.NextToken(); UnaryExpr( -#line 2185 "cs.ATG" +#line 2193 "cs.ATG" out expr); AndExpr( -#line 2185 "cs.ATG" +#line 2193 "cs.ATG" ref expr); -#line 2185 "cs.ATG" +#line 2193 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2188 "cs.ATG" +#line 2196 "cs.ATG" ref Expression outExpr) { -#line 2189 "cs.ATG" +#line 2197 "cs.ATG" Expression expr; EqualityExpr( -#line 2191 "cs.ATG" +#line 2199 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2191 "cs.ATG" +#line 2199 "cs.ATG" out expr); EqualityExpr( -#line 2191 "cs.ATG" +#line 2199 "cs.ATG" ref expr); -#line 2191 "cs.ATG" +#line 2199 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2194 "cs.ATG" +#line 2202 "cs.ATG" ref Expression outExpr) { -#line 2196 "cs.ATG" +#line 2204 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2200 "cs.ATG" +#line 2208 "cs.ATG" ref outExpr); while (la.kind == 33 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2203 "cs.ATG" +#line 2211 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2204 "cs.ATG" +#line 2212 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2206 "cs.ATG" +#line 2214 "cs.ATG" out expr); RelationalExpr( -#line 2206 "cs.ATG" +#line 2214 "cs.ATG" ref expr); -#line 2206 "cs.ATG" +#line 2214 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2210 "cs.ATG" +#line 2218 "cs.ATG" ref Expression outExpr) { -#line 2212 "cs.ATG" +#line 2220 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2217 "cs.ATG" +#line 2225 "cs.ATG" ref outExpr); while (StartOf(37)) { if (StartOf(38)) { if (la.kind == 23) { lexer.NextToken(); -#line 2219 "cs.ATG" +#line 2227 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 22) { lexer.NextToken(); -#line 2220 "cs.ATG" +#line 2228 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 36) { lexer.NextToken(); -#line 2221 "cs.ATG" +#line 2229 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 35) { lexer.NextToken(); -#line 2222 "cs.ATG" +#line 2230 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(213); UnaryExpr( -#line 2224 "cs.ATG" +#line 2232 "cs.ATG" out expr); ShiftExpr( -#line 2225 "cs.ATG" +#line 2233 "cs.ATG" ref expr); -#line 2226 "cs.ATG" +#line 2234 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 85) { lexer.NextToken(); TypeWithRestriction( -#line 2229 "cs.ATG" +#line 2237 "cs.ATG" out type, false, false); if ( -#line 2230 "cs.ATG" +#line 2238 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2231 "cs.ATG" +#line 2239 "cs.ATG" ref type); } -#line 2232 "cs.ATG" +#line 2240 "cs.ATG" outExpr = new TypeOfIsExpression(outExpr, type); } else if (la.kind == 50) { lexer.NextToken(); TypeWithRestriction( -#line 2234 "cs.ATG" +#line 2242 "cs.ATG" out type, false, false); if ( -#line 2235 "cs.ATG" +#line 2243 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2236 "cs.ATG" +#line 2244 "cs.ATG" ref type); } -#line 2237 "cs.ATG" +#line 2245 "cs.ATG" outExpr = new CastExpression(type, outExpr, CastType.TryCast); } else SynErr(214); } @@ -5393,83 +5392,83 @@ ref type); } void ShiftExpr( -#line 2242 "cs.ATG" +#line 2250 "cs.ATG" ref Expression outExpr) { -#line 2244 "cs.ATG" +#line 2252 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2248 "cs.ATG" +#line 2256 "cs.ATG" ref outExpr); while (la.kind == 37 || -#line 2251 "cs.ATG" +#line 2259 "cs.ATG" IsShiftRight()) { if (la.kind == 37) { lexer.NextToken(); -#line 2250 "cs.ATG" +#line 2258 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(22); Expect(22); -#line 2252 "cs.ATG" +#line 2260 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2255 "cs.ATG" +#line 2263 "cs.ATG" out expr); AdditiveExpr( -#line 2255 "cs.ATG" +#line 2263 "cs.ATG" ref expr); -#line 2255 "cs.ATG" +#line 2263 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2259 "cs.ATG" +#line 2267 "cs.ATG" ref Expression outExpr) { -#line 2261 "cs.ATG" +#line 2269 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2265 "cs.ATG" +#line 2273 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2268 "cs.ATG" +#line 2276 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2269 "cs.ATG" +#line 2277 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2271 "cs.ATG" +#line 2279 "cs.ATG" out expr); MultiplicativeExpr( -#line 2271 "cs.ATG" +#line 2279 "cs.ATG" ref expr); -#line 2271 "cs.ATG" +#line 2279 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2275 "cs.ATG" +#line 2283 "cs.ATG" ref Expression outExpr) { -#line 2277 "cs.ATG" +#line 2285 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5477,124 +5476,124 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2283 "cs.ATG" +#line 2291 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2284 "cs.ATG" +#line 2292 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2285 "cs.ATG" +#line 2293 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2287 "cs.ATG" +#line 2295 "cs.ATG" out expr); -#line 2287 "cs.ATG" +#line 2295 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void VariantTypeParameter( -#line 2365 "cs.ATG" +#line 2373 "cs.ATG" out TemplateDefinition typeParameter) { -#line 2367 "cs.ATG" +#line 2375 "cs.ATG" typeParameter = new TemplateDefinition(); AttributeSection section; while (la.kind == 18) { AttributeSection( -#line 2371 "cs.ATG" +#line 2379 "cs.ATG" out section); -#line 2371 "cs.ATG" +#line 2379 "cs.ATG" typeParameter.Attributes.Add(section); } if (la.kind == 81 || la.kind == 93) { if (la.kind == 81) { lexer.NextToken(); -#line 2373 "cs.ATG" +#line 2381 "cs.ATG" typeParameter.VarianceModifier = VarianceModifier.Contravariant; } else { lexer.NextToken(); -#line 2374 "cs.ATG" +#line 2382 "cs.ATG" typeParameter.VarianceModifier = VarianceModifier.Covariant; } } Identifier(); -#line 2376 "cs.ATG" +#line 2384 "cs.ATG" typeParameter.Name = t.val; typeParameter.StartLocation = t.Location; -#line 2377 "cs.ATG" +#line 2385 "cs.ATG" typeParameter.EndLocation = t.EndLocation; } void TypeParameterConstraintsClauseBase( -#line 2408 "cs.ATG" +#line 2416 "cs.ATG" out TypeReference type) { -#line 2409 "cs.ATG" +#line 2417 "cs.ATG" TypeReference t; type = null; if (la.kind == 109) { lexer.NextToken(); -#line 2411 "cs.ATG" +#line 2419 "cs.ATG" type = TypeReference.StructConstraint; } else if (la.kind == 59) { lexer.NextToken(); -#line 2412 "cs.ATG" +#line 2420 "cs.ATG" type = TypeReference.ClassConstraint; } else if (la.kind == 89) { lexer.NextToken(); Expect(20); Expect(21); -#line 2413 "cs.ATG" +#line 2421 "cs.ATG" type = TypeReference.NewConstraint; } else if (StartOf(10)) { Type( -#line 2414 "cs.ATG" +#line 2422 "cs.ATG" out t); -#line 2414 "cs.ATG" +#line 2422 "cs.ATG" type = t; } else SynErr(215); } void QueryExpressionFromClause( -#line 2429 "cs.ATG" +#line 2437 "cs.ATG" out QueryExpressionFromClause fc) { -#line 2430 "cs.ATG" +#line 2438 "cs.ATG" fc = new QueryExpressionFromClause(); fc.StartLocation = la.Location; CollectionRangeVariable variable; Expect(137); QueryExpressionFromOrJoinClause( -#line 2436 "cs.ATG" +#line 2444 "cs.ATG" out variable); -#line 2437 "cs.ATG" +#line 2445 "cs.ATG" fc.EndLocation = t.EndLocation; fc.Sources.Add(variable); } void QueryExpressionBody( -#line 2473 "cs.ATG" +#line 2481 "cs.ATG" ref QueryExpression q) { -#line 2474 "cs.ATG" +#line 2482 "cs.ATG" QueryExpressionFromClause fromClause; QueryExpressionWhereClause whereClause; QueryExpressionLetClause letClause; QueryExpressionJoinClause joinClause; QueryExpressionOrderClause orderClause; @@ -5603,252 +5602,252 @@ ref QueryExpression q) { while (StartOf(39)) { if (la.kind == 137) { QueryExpressionFromClause( -#line 2480 "cs.ATG" +#line 2488 "cs.ATG" out fromClause); -#line 2480 "cs.ATG" +#line 2488 "cs.ATG" SafeAdd(q, q.MiddleClauses, fromClause); } else if (la.kind == 127) { QueryExpressionWhereClause( -#line 2481 "cs.ATG" +#line 2489 "cs.ATG" out whereClause); -#line 2481 "cs.ATG" +#line 2489 "cs.ATG" SafeAdd(q, q.MiddleClauses, whereClause); } else if (la.kind == 141) { QueryExpressionLetClause( -#line 2482 "cs.ATG" +#line 2490 "cs.ATG" out letClause); -#line 2482 "cs.ATG" +#line 2490 "cs.ATG" SafeAdd(q, q.MiddleClauses, letClause); } else if (la.kind == 142) { QueryExpressionJoinClause( -#line 2483 "cs.ATG" +#line 2491 "cs.ATG" out joinClause); -#line 2483 "cs.ATG" +#line 2491 "cs.ATG" SafeAdd(q, q.MiddleClauses, joinClause); } else { QueryExpressionOrderByClause( -#line 2484 "cs.ATG" +#line 2492 "cs.ATG" out orderClause); -#line 2484 "cs.ATG" +#line 2492 "cs.ATG" SafeAdd(q, q.MiddleClauses, orderClause); } } if (la.kind == 133) { QueryExpressionSelectClause( -#line 2486 "cs.ATG" +#line 2494 "cs.ATG" out selectClause); -#line 2486 "cs.ATG" +#line 2494 "cs.ATG" q.SelectOrGroupClause = selectClause; } else if (la.kind == 134) { QueryExpressionGroupClause( -#line 2487 "cs.ATG" +#line 2495 "cs.ATG" out groupClause); -#line 2487 "cs.ATG" +#line 2495 "cs.ATG" q.SelectOrGroupClause = groupClause; } else SynErr(216); if (la.kind == 136) { QueryExpressionIntoClause( -#line 2489 "cs.ATG" +#line 2497 "cs.ATG" ref q); } } void QueryExpressionFromOrJoinClause( -#line 2463 "cs.ATG" +#line 2471 "cs.ATG" out CollectionRangeVariable variable) { -#line 2464 "cs.ATG" +#line 2472 "cs.ATG" TypeReference type; Expression expr; variable = new CollectionRangeVariable(); -#line 2466 "cs.ATG" +#line 2474 "cs.ATG" variable.Type = null; if ( -#line 2467 "cs.ATG" +#line 2475 "cs.ATG" IsLocalVarDecl()) { Type( -#line 2467 "cs.ATG" +#line 2475 "cs.ATG" out type); -#line 2467 "cs.ATG" +#line 2475 "cs.ATG" variable.Type = type; } Identifier(); -#line 2468 "cs.ATG" +#line 2476 "cs.ATG" variable.Identifier = t.val; Expect(81); Expr( -#line 2470 "cs.ATG" +#line 2478 "cs.ATG" out expr); -#line 2470 "cs.ATG" +#line 2478 "cs.ATG" variable.Expression = expr; } void QueryExpressionJoinClause( -#line 2442 "cs.ATG" +#line 2450 "cs.ATG" out QueryExpressionJoinClause jc) { -#line 2443 "cs.ATG" +#line 2451 "cs.ATG" jc = new QueryExpressionJoinClause(); jc.StartLocation = la.Location; Expression expr; CollectionRangeVariable variable; Expect(142); QueryExpressionFromOrJoinClause( -#line 2449 "cs.ATG" +#line 2457 "cs.ATG" out variable); Expect(143); Expr( -#line 2451 "cs.ATG" +#line 2459 "cs.ATG" out expr); -#line 2451 "cs.ATG" +#line 2459 "cs.ATG" jc.OnExpression = expr; Expect(144); Expr( -#line 2453 "cs.ATG" +#line 2461 "cs.ATG" out expr); -#line 2453 "cs.ATG" +#line 2461 "cs.ATG" jc.EqualsExpression = expr; if (la.kind == 136) { lexer.NextToken(); Identifier(); -#line 2455 "cs.ATG" +#line 2463 "cs.ATG" jc.IntoIdentifier = t.val; } -#line 2458 "cs.ATG" +#line 2466 "cs.ATG" jc.EndLocation = t.EndLocation; jc.Source = variable; } void QueryExpressionWhereClause( -#line 2492 "cs.ATG" +#line 2500 "cs.ATG" out QueryExpressionWhereClause wc) { -#line 2493 "cs.ATG" +#line 2501 "cs.ATG" Expression expr; wc = new QueryExpressionWhereClause(); wc.StartLocation = la.Location; Expect(127); Expr( -#line 2496 "cs.ATG" +#line 2504 "cs.ATG" out expr); -#line 2496 "cs.ATG" +#line 2504 "cs.ATG" wc.Condition = expr; -#line 2497 "cs.ATG" +#line 2505 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionLetClause( -#line 2500 "cs.ATG" +#line 2508 "cs.ATG" out QueryExpressionLetClause wc) { -#line 2501 "cs.ATG" +#line 2509 "cs.ATG" Expression expr; wc = new QueryExpressionLetClause(); wc.StartLocation = la.Location; Expect(141); Identifier(); -#line 2504 "cs.ATG" +#line 2512 "cs.ATG" wc.Identifier = t.val; Expect(3); Expr( -#line 2506 "cs.ATG" +#line 2514 "cs.ATG" out expr); -#line 2506 "cs.ATG" +#line 2514 "cs.ATG" wc.Expression = expr; -#line 2507 "cs.ATG" +#line 2515 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionOrderByClause( -#line 2510 "cs.ATG" +#line 2518 "cs.ATG" out QueryExpressionOrderClause oc) { -#line 2511 "cs.ATG" +#line 2519 "cs.ATG" QueryExpressionOrdering ordering; oc = new QueryExpressionOrderClause(); oc.StartLocation = la.Location; Expect(140); QueryExpressionOrdering( -#line 2514 "cs.ATG" +#line 2522 "cs.ATG" out ordering); -#line 2514 "cs.ATG" +#line 2522 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); while (la.kind == 14) { lexer.NextToken(); QueryExpressionOrdering( -#line 2516 "cs.ATG" +#line 2524 "cs.ATG" out ordering); -#line 2516 "cs.ATG" +#line 2524 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); } -#line 2518 "cs.ATG" +#line 2526 "cs.ATG" oc.EndLocation = t.EndLocation; } void QueryExpressionSelectClause( -#line 2531 "cs.ATG" +#line 2539 "cs.ATG" out QueryExpressionSelectClause sc) { -#line 2532 "cs.ATG" +#line 2540 "cs.ATG" Expression expr; sc = new QueryExpressionSelectClause(); sc.StartLocation = la.Location; Expect(133); Expr( -#line 2535 "cs.ATG" +#line 2543 "cs.ATG" out expr); -#line 2535 "cs.ATG" +#line 2543 "cs.ATG" sc.Projection = expr; -#line 2536 "cs.ATG" +#line 2544 "cs.ATG" sc.EndLocation = t.EndLocation; } void QueryExpressionGroupClause( -#line 2539 "cs.ATG" +#line 2547 "cs.ATG" out QueryExpressionGroupClause gc) { -#line 2540 "cs.ATG" +#line 2548 "cs.ATG" Expression expr; gc = new QueryExpressionGroupClause(); gc.StartLocation = la.Location; Expect(134); Expr( -#line 2543 "cs.ATG" +#line 2551 "cs.ATG" out expr); -#line 2543 "cs.ATG" +#line 2551 "cs.ATG" gc.Projection = expr; Expect(135); Expr( -#line 2545 "cs.ATG" +#line 2553 "cs.ATG" out expr); -#line 2545 "cs.ATG" +#line 2553 "cs.ATG" gc.GroupBy = expr; -#line 2546 "cs.ATG" +#line 2554 "cs.ATG" gc.EndLocation = t.EndLocation; } void QueryExpressionIntoClause( -#line 2549 "cs.ATG" +#line 2557 "cs.ATG" ref QueryExpression q) { -#line 2550 "cs.ATG" +#line 2558 "cs.ATG" QueryExpression firstQuery = q; QueryExpression continuedQuery = new QueryExpression(); continuedQuery.StartLocation = q.StartLocation; @@ -5865,43 +5864,43 @@ ref QueryExpression q) { Expect(136); Identifier(); -#line 2565 "cs.ATG" +#line 2573 "cs.ATG" fromVariable.Identifier = t.val; -#line 2566 "cs.ATG" +#line 2574 "cs.ATG" continuedQuery.FromClause.EndLocation = t.EndLocation; QueryExpressionBody( -#line 2567 "cs.ATG" +#line 2575 "cs.ATG" ref q); } void QueryExpressionOrdering( -#line 2521 "cs.ATG" +#line 2529 "cs.ATG" out QueryExpressionOrdering ordering) { -#line 2522 "cs.ATG" +#line 2530 "cs.ATG" Expression expr; ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; Expr( -#line 2524 "cs.ATG" +#line 2532 "cs.ATG" out expr); -#line 2524 "cs.ATG" +#line 2532 "cs.ATG" ordering.Criteria = expr; if (la.kind == 138 || la.kind == 139) { if (la.kind == 138) { lexer.NextToken(); -#line 2525 "cs.ATG" +#line 2533 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2526 "cs.ATG" +#line 2534 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2528 "cs.ATG" +#line 2536 "cs.ATG" ordering.EndLocation = t.EndLocation; } @@ -6066,7 +6065,7 @@ out expr); case 146: s = "invalid NamespaceMemberDecl"; break; case 147: s = "invalid NonArrayType"; break; case 148: s = "invalid Identifier"; break; - case 149: s = "invalid AttributeArguments"; break; + case 149: s = "invalid AttributeArgument"; break; case 150: s = "invalid Expr"; break; case 151: s = "invalid TypeModifier"; break; case 152: s = "invalid TypeDecl"; break; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 1e175d3b71..fa338f7490 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -252,39 +252,47 @@ Attribute . AttributeArguments positional, List named> -(. - bool nameFound = false; - string name = ""; - Expression expr; -.) = "(" [ - [ - IF (IsAssignment()) (. nameFound = true; .) - Identifier (. name = t.val; .) - "=" - ] Expr (. if (expr != null) {if(name == "") positional.Add(expr); - else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } - } - .) - + AttributeArgument { "," - ( - IF (IsAssignment()) (. nameFound = true; .) - Identifier (. name = t.val; .) - "=" - | /*Empty*/ (. if (nameFound) Error("no positional argument after named argument"); .) - ) Expr (. if (expr != null) { if(name == "") positional.Add(expr); - else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } - } - .) + AttributeArgument } ] ")" . +AttributeArgument positional, List named> +(. string name = null; bool isNamed = false; Expression expr; .) += + ( + IF (IsAssignment()) (. isNamed = true; .) + Identifier (. name = t.val; .) + "=" + | + IF (IdentAndColon()) + Identifier (. name = t.val; .) + ":" + | /* empty */ + ) + Expr + (. + if (expr != null) { + if (isNamed) { + named.Add(new NamedArgumentExpression(name, expr)); + } else { + if (named.Count > 0) + Error("positional argument after named argument is not allowed"); + if (name != null) + expr = new NamedArgumentExpression(name, expr); + positional.Add(expr); + } + } + .) +. + AttributeSection (. string attributeTarget = ""; diff --git a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs index 82f3eb7e27..128d8d19dc 100644 --- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs @@ -276,7 +276,14 @@ namespace ICSharpCode.NRefactory.PrettyPrinter PrintFormattedComma(); } for (int i = 0; i < attribute.NamedArguments.Count; ++i) { - TrackVisit((INode)attribute.NamedArguments[i], data); + NamedArgumentExpression nae = attribute.NamedArguments[i]; + outputFormatter.PrintIdentifier(nae.Name); + if (prettyPrintOptions.AroundAssignmentParentheses) + outputFormatter.Space(); + outputFormatter.PrintToken(Tokens.Assign); + if (prettyPrintOptions.AroundAssignmentParentheses) + outputFormatter.Space(); + nae.Expression.AcceptVisitor(this, data); if (i + 1 < attribute.NamedArguments.Count) { PrintFormattedComma(); } @@ -292,10 +299,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public override object TrackedVisitNamedArgumentExpression(NamedArgumentExpression namedArgumentExpression, object data) { outputFormatter.PrintIdentifier(namedArgumentExpression.Name); - if (this.prettyPrintOptions.AroundAssignmentParentheses) { - outputFormatter.Space(); - } - outputFormatter.PrintToken(Tokens.Assign); + outputFormatter.PrintToken(Tokens.Colon); if (this.prettyPrintOptions.AroundAssignmentParentheses) { outputFormatter.Space(); } @@ -2878,7 +2882,24 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.NewLine (); outputFormatter.Indent (); } - this.AppendCommaSeparatedList (arrayInitializerExpression.CreateExpressions, true); + var createExprs = arrayInitializerExpression.CreateExpressions; + for (int i = 0; i < createExprs.Count; i++) { + if (i > 0) { + PrintFormattedCommaAndNewLine(); + } + NamedArgumentExpression nae = createExprs[i] as NamedArgumentExpression; + if (nae != null) { + outputFormatter.PrintIdentifier(nae.Name); + if (prettyPrintOptions.AroundAssignmentParentheses) + outputFormatter.Space(); + outputFormatter.PrintToken(Tokens.Assign); + if (prettyPrintOptions.AroundAssignmentParentheses) + outputFormatter.Space(); + nae.Expression.AcceptVisitor(this, data); + } else { + createExprs[i].AcceptVisitor(this, data); + } + } if (arrayInitializerExpression.CreateExpressions.Count == 1) { outputFormatter.Space (); } else { diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs index cebde99528..6fdb7c65ab 100644 --- a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs +++ b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs @@ -789,5 +789,17 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter { TestTypeMember("void M(int x = 0);"); } + + [Test] + public void NamedArguments() + { + TestExpression("M(x: 1)"); + } + + [Test] + public void TestAttributeWithNamedArgument() + { + TestProgram("[assembly: Foo(1, namedArg: 2, prop = 3)]"); + } } } diff --git a/src/Libraries/NRefactory/Test/Parser/GlobalScope/AttributeSectionTests.cs b/src/Libraries/NRefactory/Test/Parser/GlobalScope/AttributeSectionTests.cs index 98e2b719ff..fd91937652 100644 --- a/src/Libraries/NRefactory/Test/Parser/GlobalScope/AttributeSectionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/GlobalScope/AttributeSectionTests.cs @@ -81,6 +81,25 @@ public class Form1 { Assert.AreEqual("assembly", decl.AttributeTarget); } + [Test] + public void AssemblyAttributeCSharpWithNamedArguments() + { + string program = @"[assembly: Foo(1, namedArg: 2, prop = 3)]"; + AttributeSection decl = ParseUtilCSharp.ParseGlobal(program); + Assert.AreEqual("assembly", decl.AttributeTarget); + var a = decl.Attributes[0]; + Assert.AreEqual("Foo", a.Name); + Assert.AreEqual(2, a.PositionalArguments.Count); + Assert.AreEqual(1, a.NamedArguments.Count); + Assert.AreEqual(1, ((PrimitiveExpression)a.PositionalArguments[0]).Value); + NamedArgumentExpression nae = a.PositionalArguments[1] as NamedArgumentExpression; + Assert.AreEqual("namedArg", nae.Name); + Assert.AreEqual(2, ((PrimitiveExpression)nae.Expression).Value); + nae = a.NamedArguments[0]; + Assert.AreEqual("prop", nae.Name); + Assert.AreEqual(3, ((PrimitiveExpression)nae.Expression).Value); + } + [Test] public void ModuleAttributeCSharp() {