* mcs/cs-parser.jay: Use 'start_block' and 'end_block' rather than
[mono.git] / mcs / mcs / cs-parser.jay
index cf7ab09ba23af8ba7fbaf475f4ae1c6f790fc927..ffcdceb761597bd191ad301327a2d738bb2ee273 100644 (file)
@@ -4,6 +4,7 @@
 //
 // Authors: Miguel de Icaza (miguel@gnu.org)
 //          Ravi Pratap     (ravi@ximian.com)
+//          Marek Safar                (marek.safar@gmail.com)
 //
 // Licensed under the terms of the GNU GPL
 //
@@ -74,11 +75,11 @@ namespace Mono.CSharp
                bool parsing_indexer;
 
                bool parsing_anonymous_method;
-
+               
                ///
                /// An out-of-band stack.
                ///
-               Stack oob_stack;
+               static Stack oob_stack;
 
                ///
                /// Switch stack.
@@ -202,6 +203,7 @@ namespace Mono.CSharp
 %token WHILE   
 %token ARGLIST
 %token PARTIAL
+%token ARROW
 
 /* C# keywords which are not really keywords */
 %token GET           "get"
@@ -227,7 +229,9 @@ namespace Mono.CSharp
 %token BANG           "!"
 %token ASSIGN         "="
 %token OP_LT          "<"
+%token OP_GENERICS_LT "<"
 %token OP_GT          ">"
+%token OP_GENERICS_GT ">"
 %token BITWISE_AND    "&"
 %token BITWISE_OR     "|"
 %token STAR           "*"
@@ -269,6 +273,7 @@ namespace Mono.CSharp
 %token LITERAL_STRING            "string literal"
 
 %token IDENTIFIER
+%token OPEN_PARENS_LAMBDA
 %token CLOSE_PARENS_CAST
 %token CLOSE_PARENS_NO_CAST
 %token CLOSE_PARENS_OPEN_PARENS
@@ -337,7 +342,7 @@ extern_alias_directive
                if (s != "alias"){
                        Report.Error (1003, lt.Location, "'alias' expected");
                } else if (RootContext.Version == LanguageVersion.ISO_1) {
-                       Report.FeatureIsNotStandardized (lt.Location, "external alias");
+                       Report.FeatureIsNotISO1 (lt.Location, "external alias");
                } else {
                        lt = (LocatedToken) $3; 
                        current_namespace.UsingExternalAlias (lt.Value, lt.Location);
@@ -429,10 +434,26 @@ namespace_body
                if (RootContext.Documentation != null)
                        Lexer.doc_state = XmlCommentState.Allowed;
          }
-         opt_extern_alias_directives
+         namespace_body_body
+       ;
+       
+namespace_body_body
+       : opt_extern_alias_directives
          opt_using_directives
          opt_namespace_member_declarations
          CLOSE_BRACE
+       | error
+         {
+               Report.Error (1518, lexer.Location, "Expected `class', `delegate', `enum', `interface', or `struct'");
+         }
+         CLOSE_BRACE
+       | opt_extern_alias_directives
+         opt_using_directives
+         opt_namespace_member_declarations
+         EOF
+         {
+               Report.Error (1513, lexer.Location, "} expected");
+         }
        ;
 
 opt_using_directives
@@ -525,55 +546,63 @@ opt_attributes
 attribute_sections
        : attribute_section
          {
-               ArrayList sect = (ArrayList) $1;
-
-               if (global_attrs_enabled) {
-                       if (current_attr_target == "module") {
-                               CodeGen.Module.AddAttributes (sect);
-                               $$ = null;
-                       } else if (current_attr_target != null && current_attr_target.Length > 0) {
-                               CodeGen.Assembly.AddAttributes (sect);
-                               $$ = null;
+               if (current_attr_target != String.Empty) {
+                       ArrayList sect = (ArrayList) $1;
+
+                       if (global_attrs_enabled) {
+                               if (current_attr_target == "module") {
+                                       CodeGen.Module.AddAttributes (sect);
+                                       $$ = null;
+                               } else if (current_attr_target != null && current_attr_target.Length > 0) {
+                                       CodeGen.Assembly.AddAttributes (sect);
+                                       $$ = null;
+                               } else {
+                                       $$ = new Attributes (sect);
+                               }
+                               if ($$ == null) {
+                                       if (RootContext.Documentation != null) {
+                                               Lexer.check_incorrect_doc_comment ();
+                                               Lexer.doc_state =
+                                                       XmlCommentState.Allowed;
+                                       }
+                               }
                        } else {
                                $$ = new Attributes (sect);
-                       }
-                       if ($$ == null) {
-                               if (RootContext.Documentation != null) {
-                                       Lexer.check_incorrect_doc_comment ();
-                                       Lexer.doc_state =
-                                               XmlCommentState.Allowed;
-                               }
-                       }
-               } else {
-                       $$ = new Attributes (sect);
-               }               
+                       }               
+               }
+               else
+                       $$ = null;
                current_attr_target = null;
          }
        | attribute_sections attribute_section
          {
-               Attributes attrs = $1 as Attributes;
-               ArrayList sect = (ArrayList) $2;
-
-               if (global_attrs_enabled) {
-                       if (current_attr_target == "module") {
-                               CodeGen.Module.AddAttributes (sect);
-                               $$ = null;
-                       } else if (current_attr_target == "assembly") {
-                               CodeGen.Assembly.AddAttributes (sect);
-                               $$ = null;
+               if (current_attr_target != String.Empty) {
+                       Attributes attrs = $1 as Attributes;
+                       ArrayList sect = (ArrayList) $2;
+
+                       if (global_attrs_enabled) {
+                               if (current_attr_target == "module") {
+                                       CodeGen.Module.AddAttributes (sect);
+                                       $$ = null;
+                               } else if (current_attr_target == "assembly") {
+                                       CodeGen.Assembly.AddAttributes (sect);
+                                       $$ = null;
+                               } else {
+                                       if (attrs == null)
+                                               attrs = new Attributes (sect);
+                                       else
+                                               attrs.AddAttributes (sect);                     
+                               }
                        } else {
                                if (attrs == null)
                                        attrs = new Attributes (sect);
                                else
-                                       attrs.AddAttributes (sect);                     
-                       }
-               } else {
-                       if (attrs == null)
-                               attrs = new Attributes (sect);
-                       else
-                               attrs.AddAttributes (sect);
-               }               
-               $$ = attrs;
+                                       attrs.AddAttributes (sect);
+                       }               
+                       $$ = attrs;
+               }
+               else
+                       $$ = null;
                current_attr_target = null;
          }
        ;
@@ -601,11 +630,15 @@ attribute_target
        : IDENTIFIER
          {
                LocatedToken lt = (LocatedToken) $1;
-               CheckAttributeTarget (lt.Value, lt.Location);
-               $$ = lt.Value; // Location won't be required anymore.
+               $$ = CheckAttributeTarget (lt.Value, lt.Location);
+         }
+      | EVENT  { $$ = "event"; }         
+      | RETURN { $$ = "return"; }
+      | error
+         {
+               string name = yyNames [yyToken].ToLower ();
+               $$ = CheckAttributeTarget (name, GetLocation ($1));
          }
-        | EVENT  { $$ = "event"; }       
-        | RETURN { $$ = "return"; }
        ;
 
 attribute_list
@@ -636,7 +669,9 @@ attribute
 
                Expression left_expr = left == null ? null : left.GetTypeExpression ();
 
-               if (current_attr_target == "assembly" || current_attr_target == "module")
+               if (current_attr_target == String.Empty)
+                       $$ = null;
+               else if (current_attr_target == "assembly" || current_attr_target == "module")
                        // FIXME: supply "nameEscaped" parameter here.
                        $$ = new GlobalAttribute (current_namespace, current_attr_target,
                                                  left_expr, identifier, arguments, mname.Location, lexer.IsEscapedIdentifier (mname.Location));
@@ -770,7 +805,7 @@ struct_declaration
                MemberName name = MakeName ((MemberName) $5);
                push_current_class (new Struct (
                        current_namespace, current_class, name, (int) $2,
-                       (Attributes) $1), false, $3);
+                       (Attributes) $1), $3);
 
          }
          opt_class_base
@@ -942,6 +977,14 @@ field_declaration
                                $$ = field; // FIXME: might be better if it points to the top item
                        }
          }
+       | opt_attributes
+         opt_modifiers
+         FIXED
+         type 
+         error
+         {
+               Report.Error (1641, GetLocation ($4), "A fixed size buffer field must have the array size specifier after the field name");
+         }
        | opt_attributes
          opt_modifiers
          VOID  
@@ -1075,11 +1118,22 @@ opt_error_modifier
          }
        ;
 
+       // 
+       // This rule is used to handle the cases where OPEN_PARENS_LAMBDA
+       // is returned (type followed by an identifier), these are the
+       // declarations (methods, overloads, constructors, etc) and a handful
+       // of expressions ("using", "fixed") or "catch".
+       //
+open_parens
+       : OPEN_PARENS
+       | OPEN_PARENS_LAMBDA
+       ;
+
 method_header
        : opt_attributes
          opt_modifiers
          type namespace_or_type_name
-         OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS 
+         open_parens opt_formal_parameter_list CLOSE_PARENS 
          {
                MemberName name = (MemberName) $4;
 
@@ -1097,7 +1151,7 @@ method_header
        | opt_attributes
          opt_modifiers
          VOID namespace_or_type_name
-         OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS 
+         open_parens opt_formal_parameter_list CLOSE_PARENS 
          {
                MemberName name = (MemberName) $4;
 
@@ -1116,7 +1170,7 @@ method_header
        | opt_attributes
          opt_modifiers
          type 
-         modifiers namespace_or_type_name OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
+         modifiers namespace_or_type_name open_parens opt_formal_parameter_list CLOSE_PARENS
          {
                MemberName name = (MemberName) $5;
                Report.Error (1585, name.Location, 
@@ -1270,12 +1324,31 @@ fixed_parameter
 
 opt_parameter_modifier
        : /* empty */           { $$ = Parameter.Modifier.NONE; }
-       | parameter_modifier
+       | parameter_modifiers
+       ;
+
+parameter_modifiers
+       : parameter_modifier
+         {
+               $$ = $1;
+         }
+       | parameter_modifiers parameter_modifier
+         {
+               Parameter.Modifier p2 = (Parameter.Modifier)$2;
+               Parameter.Modifier mod = (Parameter.Modifier)$1 | p2;
+               if (((Parameter.Modifier)$1 & p2) == p2) {
+                       Error_DuplicateParameterModifier (lexer.Location, p2);
+               } else {
+                       Report.Error (1108, lexer.Location, "A parameter cannot have specified more than one modifier");
+               }
+               $$ = mod;
+         }
        ;
 
 parameter_modifier
        : REF                   { $$ = Parameter.Modifier.REF; }
        | OUT                   { $$ = Parameter.Modifier.OUT; }
+       | THIS                  { $$ = Parameter.Modifier.This; }
        ;
 
 parameter_array
@@ -1283,11 +1356,20 @@ parameter_array
          { 
                LocatedToken lt = (LocatedToken) $4;
                $$ = new ParamsParameter ((Expression) $3, lt.Value, (Attributes) $1, lt.Location);
-               note ("type must be a single-dimension array type"); 
+         }
+       | opt_attributes PARAMS PARAMS type IDENTIFIER 
+         {
+               Error_DuplicateParameterModifier (lexer.Location, Parameter.Modifier.PARAMS);
+               $$ = null;
          }
        | opt_attributes PARAMS parameter_modifier type IDENTIFIER 
          {
+               Parameter.Modifier mod = (Parameter.Modifier)$3;
+               if ((mod & Parameter.Modifier.This) != 0) {
+                       Report.Error (1104, lexer.Location, "The parameter modifiers `this' and `params' cannot be used altogether");
+               } else {
                Report.Error (1611, (Location) $2, "The params parameter cannot be declared as ref or out");
+               }
                 $$ = null;
          }
        | opt_attributes PARAMS type error {
@@ -1322,14 +1404,14 @@ property_declaration
                        break;
 
                Property prop;
-               Pair pair = (Pair) $8;
-               Accessor get_block = (Accessor) pair.First;
-               Accessor set_block = (Accessor) pair.Second;
+               Accessors accessors = (Accessors) $8;
+               Accessor get_block = accessors.get_or_add;
+               Accessor set_block = accessors.set_or_remove;
 
                MemberName name = (MemberName) $4;
 
                prop = new Property (current_class, (Expression) $3, (int) $2,
-                       false, name, (Attributes) $1, get_block, set_block);
+                       false, name, (Attributes) $1, get_block, set_block, accessors.declared_in_reverse);
                
                current_container.AddProperty (prop);
                implicit_value_parameter_type = null;
@@ -1343,23 +1425,24 @@ property_declaration
 accessor_declarations
        : get_accessor_declaration
         {
-               $$ = new Pair ($1, null);
+               $$ = new Accessors ((Accessor) $1, null);
         }
        | get_accessor_declaration accessor_declarations
         { 
-               Pair pair = (Pair) $2;
-               pair.First = $1;
-               $$ = pair;
+               Accessors accessors = (Accessors) $2;
+               accessors.get_or_add = (Accessor) $1;
+               $$ = accessors;
         }
        | set_accessor_declaration
         {
-               $$ = new Pair (null, $1);
+               $$ = new Accessors (null, (Accessor) $1);
         }
        | set_accessor_declaration accessor_declarations
         { 
-               Pair pair = (Pair) $2;
-               pair.Second = $1;
-               $$ = pair;
+               Accessors accessors = (Accessors) $2;
+               accessors.set_or_remove = (Accessor) $1;
+               accessors.declared_in_reverse = true;
+               $$ = accessors;
         }
        | error
          {
@@ -1471,7 +1554,7 @@ interface_declaration
 
                push_current_class (new Interface (
                        current_namespace, current_class, name, (int) $2,
-                       (Attributes) $1), true, $3);
+                       (Attributes) $1), $3);
          }
          opt_class_base
          {
@@ -1673,24 +1756,24 @@ interface_property_declaration
                if ($7 == null) {
                        p = new Property (current_class, (Expression) $3, (int) $2, true,
                                   name, (Attributes) $1,
-                                  null, null);
+                                  null, null, false);
 
                        Report.Error (548, p.Location, "`{0}': property or indexer must have at least one accessor", p.GetSignatureForError ());
                        break;
                }
 
-               Pair pair = (Pair) $7;
+               Accessors accessor = (Accessors) $7;
                p = new Property (current_class, (Expression) $3, (int) $2, true,
                                   name, (Attributes) $1,
-                                  (Accessor)pair.First, (Accessor)pair.Second);
+                                  accessor.get_or_add, accessor.set_or_remove, accessor.declared_in_reverse);
 
-               if (pair.First != null && ((Accessor)(pair.First)).Block != null) {
+               if (accessor.get_or_add != null && accessor.get_or_add.Block != null) {
                        Report.Error (531, p.Location, "`{0}.get': interface members cannot have a definition", p.GetSignatureForError ());
                        $$ = null;
                        break;
                }
 
-               if (pair.Second != null && ((Accessor)(pair.Second)).Block != null) {
+               if (accessor.set_or_remove != null && accessor.set_or_remove.Block != null) {
                        Report.Error (531, p.Location, "`{0}.set': interface members cannot have a definition", p.GetSignatureForError ());
                        $$ = null;
                        break;
@@ -1760,25 +1843,25 @@ interface_indexer_declaration
                        i = new Indexer (current_class, (Expression) $3,
                                  new MemberName (TypeContainer.DefaultIndexerName, (Location) $4),
                                  (int) $2, true, (Parameters) $6, (Attributes) $1,
-                                 null, null);
+                                 null, null, false);
 
                        Report.Error (548, i.Location, "`{0}': property or indexer must have at least one accessor", i.GetSignatureForError ());
                        break;
                }
 
-               Pair pair = (Pair) $10;
+               Accessors accessors = (Accessors) $10;
                i = new Indexer (current_class, (Expression) $3,
                                  new MemberName (TypeContainer.DefaultIndexerName, (Location) $4),
                                  (int) $2, true, (Parameters) $6, (Attributes) $1,
-                                  (Accessor)pair.First, (Accessor)pair.Second);
+                                  accessors.get_or_add, accessors.set_or_remove, accessors.declared_in_reverse);
 
-               if (pair.First != null && ((Accessor)(pair.First)).Block != null) {
+               if (accessors.get_or_add != null && accessors.get_or_add.Block != null) {
                        Report.Error (531, i.Location, "`{0}.get': interface members cannot have a definition", i.GetSignatureForError ());
                        $$ = null;
                        break;
                }
 
-               if (pair.Second != null && ((Accessor)(pair.Second)).Block != null) {
+               if (accessors.set_or_remove != null && accessors.set_or_remove.Block != null) {
                        Report.Error (531, i.Location, "`{0}.set': interface members cannot have a definition", i.GetSignatureForError ());
                        $$ = null;
                        break;
@@ -1835,9 +1918,13 @@ operator_body
        ; 
 operator_declarator
        : type OPERATOR overloadable_operator 
-         OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+         open_parens opt_attributes opt_parameter_modifier type IDENTIFIER CLOSE_PARENS
          {
-               LocatedToken lt = (LocatedToken) $6;
+               // TODO: wrong location
+               if ((Parameter.Modifier)$6 != Parameter.Modifier.NONE)
+                       Error_ParameterModifierNotValid ((Location) $2);
+         
+               LocatedToken lt = (LocatedToken) $8;
                Operator.OpType op = (Operator.OpType) $3;
                CheckUnaryOperator (op, lt.Location);
 
@@ -1848,9 +1935,9 @@ operator_declarator
                        op = Operator.OpType.UnaryNegation;
 
                Parameter [] pars = new Parameter [1];
-               Expression type = (Expression) $5;
+               Expression type = (Expression) $7;
 
-               pars [0] = new Parameter (type, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
+               pars [0] = new Parameter (type, lt.Value, Parameter.Modifier.NONE, (Attributes) $5, lt.Location);
 
                current_local_parameters = new Parameters (pars);
 
@@ -1863,22 +1950,26 @@ operator_declarator
                                              null, null, (Location) $2);
          }
        | type OPERATOR overloadable_operator
-         OPEN_PARENS 
-               type IDENTIFIER COMMA
-               type IDENTIFIER 
+         open_parens 
+               opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
+               opt_attributes opt_parameter_modifier type IDENTIFIER 
          CLOSE_PARENS
           {
-               LocatedToken ltParam1 = (LocatedToken) $6;
-               LocatedToken ltParam2 = (LocatedToken) $9;
+               // TODO: wrong location
+               if ((Parameter.Modifier)$6 != Parameter.Modifier.NONE || (Parameter.Modifier)$11 != Parameter.Modifier.NONE)
+                       Error_ParameterModifierNotValid ((Location) $2);
+
+               LocatedToken ltParam1 = (LocatedToken) $8;
+               LocatedToken ltParam2 = (LocatedToken) $13;
                CheckBinaryOperator ((Operator.OpType) $3, (Location) $2);
 
                Parameter [] pars = new Parameter [2];
 
-               Expression typeL = (Expression) $5;
-               Expression typeR = (Expression) $8;
+               Expression typeL = (Expression) $7;
+               Expression typeR = (Expression) $12;
 
-              pars [0] = new Parameter (typeL, ltParam1.Value, Parameter.Modifier.NONE, null, ltParam1.Location);
-              pars [1] = new Parameter (typeR, ltParam2.Value, Parameter.Modifier.NONE, null, ltParam2.Location);
+              pars [0] = new Parameter (typeL, ltParam1.Value, Parameter.Modifier.NONE, (Attributes) $5, ltParam1.Location);
+              pars [1] = new Parameter (typeR, ltParam2.Value, Parameter.Modifier.NONE, (Attributes) $10, ltParam2.Location);
 
               current_local_parameters = new Parameters (pars);
 
@@ -1893,18 +1984,16 @@ operator_declarator
           }
        | conversion_operator_declarator
        | type OPERATOR overloadable_operator
-         OPEN_PARENS 
-               type IDENTIFIER COMMA
-               type IDENTIFIER COMMA
-               type IDENTIFIER
-         CLOSE_PARENS
+         open_parens 
+               opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
+               opt_attributes opt_parameter_modifier type IDENTIFIER COMMA error
          {
                Report.Error (1534, (Location) $2, "Overloaded binary operator `{0}' takes two parameters",
                        Operator.GetName ((Operator.OpType) $3));
                $$ = null;
          }
        | type OPERATOR overloadable_operator 
-         OPEN_PARENS CLOSE_PARENS
+         open_parens CLOSE_PARENS
          {
                Report.Error (1535, (Location) $2, "Overloaded unary operator `{0}' takes one parameter",
                        Operator.GetName ((Operator.OpType) $3));
@@ -1941,12 +2030,16 @@ overloadable_operator
        ;
 
 conversion_operator_declarator
-       : IMPLICIT OPERATOR type OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+       : IMPLICIT OPERATOR type open_parens opt_parameter_modifier type IDENTIFIER CLOSE_PARENS
          {
-               LocatedToken lt = (LocatedToken) $6;
+               // TODO: wrong location
+               if ((Parameter.Modifier)$5 != Parameter.Modifier.NONE)
+                       Error_ParameterModifierNotValid (GetLocation ($4));
+
+               LocatedToken lt = (LocatedToken) $7;
                Parameter [] pars = new Parameter [1];
 
-               pars [0] = new Parameter ((Expression) $5, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
+               pars [0] = new Parameter ((Expression) $6, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
 
                current_local_parameters = new Parameters (pars);  
                  
@@ -1955,15 +2048,19 @@ conversion_operator_declarator
                        Lexer.doc_state = XmlCommentState.NotAllowed;
                }
 
-               $$ = new OperatorDeclaration (Operator.OpType.Implicit, (Expression) $3, (Expression) $5, lt.Value,
+               $$ = new OperatorDeclaration (Operator.OpType.Implicit, (Expression) $3, (Expression) $6, lt.Value,
                                              null, null, (Location) $2);
          }
-       | EXPLICIT OPERATOR type OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+       | EXPLICIT OPERATOR type open_parens opt_parameter_modifier type IDENTIFIER CLOSE_PARENS
          {
-               LocatedToken lt = (LocatedToken) $6;
+               // TODO: wrong location
+               if ((Parameter.Modifier)$5 != Parameter.Modifier.NONE)
+                       Error_ParameterModifierNotValid (GetLocation ($4));
+         
+               LocatedToken lt = (LocatedToken) $7;
                Parameter [] pars = new Parameter [1];
 
-               pars [0] = new Parameter ((Expression) $5, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
+               pars [0] = new Parameter ((Expression) $6, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
 
                current_local_parameters = new Parameters (pars);  
                  
@@ -1972,7 +2069,7 @@ conversion_operator_declarator
                        Lexer.doc_state = XmlCommentState.NotAllowed;
                }
 
-               $$ = new OperatorDeclaration (Operator.OpType.Explicit, (Expression) $3, (Expression) $5, lt.Value,
+               $$ = new OperatorDeclaration (Operator.OpType.Explicit, (Expression) $3, (Expression) $6, lt.Value,
                                              null, null, (Location) $2);
          }
        | IMPLICIT error 
@@ -2031,6 +2128,18 @@ constructor_declaration
        ;
 
 constructor_declarator
+       : constructor_header
+         {
+               $$ = $1;
+         }
+       | constructor_header constructor_initializer
+         {
+               ((Constructor)$1).Initializer = (ConstructorInitializer) $2;
+               $$ = $1;
+         }
+       ;
+
+constructor_header
        : IDENTIFIER
          {
                if (RootContext.Documentation != null) {
@@ -2038,36 +2147,31 @@ constructor_declarator
                        Lexer.doc_state = XmlCommentState.Allowed;
                }
          }
-         OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
-         {
-               current_local_parameters = (Parameters) $4;
-         }
-         opt_constructor_initializer
+         open_parens opt_formal_parameter_list CLOSE_PARENS
          {
                LocatedToken lt = (LocatedToken) $1;
-               $$ = new Constructor (current_class, lt.Value, 0, (Parameters) $4,
-                                     (ConstructorInitializer) $7, lt.Location);
+               current_local_parameters = (Parameters) $4;
+               current_block = top_current_block = new ToplevelBlock (null,
+                       current_local_parameters, null, lt.Location);
 
+               $$ = new Constructor (current_class, lt.Value, 0, current_local_parameters,
+                                     null, lt.Location);
+                                     
                anonymous_host = (IAnonymousHost) $$;
          }
        ;
 
 constructor_body
-       : block
-       | SEMICOLON             { $$ = null; }
-       ;
-
-opt_constructor_initializer
-       : /* empty */                   { $$ = null; }
-       | constructor_initializer
+       : block_prepared
+       | SEMICOLON             { current_block = top_current_block = null; $$ = null; }
        ;
 
 constructor_initializer
-       : COLON BASE OPEN_PARENS opt_argument_list CLOSE_PARENS
+       : COLON BASE open_parens opt_argument_list CLOSE_PARENS
          {
                $$ = new ConstructorBaseInitializer ((ArrayList) $4, (Location) $2);
          }
-       | COLON THIS OPEN_PARENS opt_argument_list CLOSE_PARENS
+       | COLON THIS open_parens opt_argument_list CLOSE_PARENS
          {
                $$ = new ConstructorThisInitializer ((ArrayList) $4, (Location) $2);
          }
@@ -2165,14 +2269,14 @@ event_declaration
                                current_container.Name, name.ToString ());
                        $$ = null;
                } else {
-                       Pair pair = (Pair) $8;
-                       if (pair.First == null || pair.Second == null)
+                       Accessors accessors = (Accessors) $8;
+                       if (accessors.get_or_add == null || accessors.set_or_remove == null)
                                // CS0073 is already reported, so no CS0065 here.
                                $$ = null;
                        else {
                                Event e = new EventProperty (
                                        current_class, (Expression) $4, (int) $2, false, name,
-                                       (Attributes) $1, (Accessor) pair.First, (Accessor) pair.Second);
+                                       (Attributes) $1, accessors.get_or_add, accessors.set_or_remove);
                                if (RootContext.Documentation != null) {
                                        e.DocComment = Lexer.consume_doc_comment ();
                                        Lexer.doc_state = XmlCommentState.Allowed;
@@ -2199,11 +2303,13 @@ event_declaration
 event_accessor_declarations
        : add_accessor_declaration remove_accessor_declaration
          {
-               $$ = new Pair ($1, $2);
+               $$ = new Accessors ((Accessor) $1, (Accessor) $2);
          }
        | remove_accessor_declaration add_accessor_declaration
          {
-               $$ = new Pair ($2, $1);
+               Accessors accessors = new Accessors ((Accessor) $2, (Accessor) $1);
+               accessors.declared_in_reverse = true;
+               $$ = accessors;
          }     
        | add_accessor_declaration  { $$ = null; } 
        | remove_accessor_declaration { $$ = null; } 
@@ -2227,11 +2333,19 @@ add_accessor_declaration
                
                current_local_parameters = new Parameters (args);  
                lexer.EventParsing = false;
+               
+               anonymous_host = SimpleAnonymousHost.GetSimple ();
          }
-          block
+      block
          {
-               $$ = new Accessor ((ToplevelBlock) $4, 0, (Attributes) $1, (Location) $2);
+               Accessor accessor = new Accessor ((ToplevelBlock) $4, 0, (Attributes) $1, (Location) $2);
                lexer.EventParsing = true;
+               
+               current_local_parameters = null;
+               SimpleAnonymousHost.Simple.Propagate (accessor);
+               anonymous_host = null;
+               
+               $$ = accessor;
          }
        | opt_attributes ADD error {
                Report.Error (73, (Location) $2, "An add or remove accessor must have a body");
@@ -2301,9 +2415,9 @@ indexer_declaration
                Indexer indexer;
                IndexerDeclaration decl = (IndexerDeclaration) $3;
                Location loc = decl.location;
-               Pair pair = (Pair) $6;
-               Accessor get_block = (Accessor) pair.First;
-               Accessor set_block = (Accessor) pair.Second;
+               Accessors accessors = (Accessors) $6;
+               Accessor get_block = accessors.get_or_add;
+               Accessor set_block = accessors.set_or_remove;
 
                MemberName name;
                if (decl.interface_type != null)
@@ -2313,7 +2427,7 @@ indexer_declaration
 
                indexer = new Indexer (current_class, decl.type, name,
                                       (int) $2, false, decl.param_list, (Attributes) $1,
-                                      get_block, set_block);
+                                      get_block, set_block, accessors.declared_in_reverse);
 
                if (RootContext.Documentation != null)
                        indexer.DocComment = ConsumeStoredComment ();
@@ -2367,7 +2481,6 @@ indexer_declarator
 enum_declaration
        : opt_attributes
          opt_modifiers
-         opt_partial
          ENUM IDENTIFIER 
          opt_enum_base {
                if (RootContext.Documentation != null)
@@ -2376,16 +2489,11 @@ enum_declaration
          enum_body
          opt_semicolon
          {
-               LocatedToken lt = (LocatedToken) $5;
+               LocatedToken lt = (LocatedToken) $4;
                Location enum_location = lt.Location;
 
-               if ($3 != null) {
-                       Report.Error (267, lt.Location, "The partial modifier can only appear immediately before `class', `struct' or `interface'");
-                       break;  // assumes that the parser put us in a switch
-               }
-
                MemberName name = MakeName (new MemberName (lt.Value, enum_location));
-               Enum e = new Enum (current_namespace, current_class, (Expression) $6, (int) $2,
+               Enum e = new Enum (current_namespace, current_class, (Expression) $5, (int) $2,
                                   name, (Attributes) $1);
                
                if (RootContext.Documentation != null)
@@ -2393,9 +2501,10 @@ enum_declaration
 
 
                EnumMember em = null;
-               foreach (VariableDeclaration ev in (ArrayList) $8) {
-                       em = new EnumMember (e, em, (Expression) ev.expression_or_array_initializer,
-                               new MemberName (ev.identifier, ev.Location), ev.OptAttributes);
+               foreach (VariableDeclaration ev in (ArrayList) $7) {
+                       em = new EnumMember (
+                               e, em, ev.identifier, (Expression) ev.expression_or_array_initializer,
+                               ev.OptAttributes, ev.Location);
 
 //                     if (RootContext.Documentation != null)
                                em.DocComment = ev.DocComment;
@@ -2403,7 +2512,7 @@ enum_declaration
                        e.AddEnumMember (em);
                }
 
-               current_container.AddEnum (e);
+               current_container.AddTypeContainer (e);
                $$ = e;
 
          }
@@ -2662,7 +2771,6 @@ primary_expression
          {
                // 7.5.1: Literals
          }
        | member_name
          {
                MemberName mn = (MemberName) $1;
@@ -2732,9 +2840,9 @@ parenthesized_expression_0
        : OPEN_PARENS expression CLOSE_PARENS
          {
                $$ = $2;
-               lexer.Deambiguate_CloseParens ();
+               lexer.Deambiguate_CloseParens ($$);
                // After this, the next token returned is one of
-               // CLOSE_PARENS_CAST, CLOSE_PARENS_NO_CAST, CLOSE_PARENS_OPEN_PARENS
+               // CLOSE_PARENS_CAST, CLOSE_PARENS_NO_CAST (CLOSE_PARENS), CLOSE_PARENS_OPEN_PARENS
                // or CLOSE_PARENS_MINUS.
          }
        | OPEN_PARENS expression error { CheckToken (1026, yyToken, "Expecting ')'", lexer.Location); }
@@ -2744,7 +2852,11 @@ parenthesized_expression
        : parenthesized_expression_0 CLOSE_PARENS_NO_CAST
          {
                $$ = $1;
-         }
+         }  
+       | parenthesized_expression_0 CLOSE_PARENS
+         {
+               $$ = $1;
+         }       
        | parenthesized_expression_0 CLOSE_PARENS_MINUS
          {
                // If a parenthesized expression is followed by a minus, we need to wrap
@@ -2855,6 +2967,10 @@ non_simple_argument
                Expression expr = new Arglist (args, (Location) $1);
                $$ = new Argument (expr, Argument.AType.Expression);
          }
+       | ARGLIST OPEN_PARENS CLOSE_PARENS
+         {
+               $$ = new Argument (new Arglist ((Location) $1), Argument.AType.Expression);
+         }       
        | ARGLIST
          {
                $$ = new Argument (new ArglistAccess ((Location) $1), Argument.AType.ArgList);
@@ -3120,48 +3236,12 @@ pointer_member_access
 anonymous_method_expression
        : DELEGATE opt_anonymous_method_signature
          {
-               if (oob_stack == null)
-                       oob_stack = new Stack (6);
-
-               oob_stack.Push (current_anonymous_method);
-               oob_stack.Push (current_local_parameters);
-               current_local_parameters = (Parameters)$2;
-
-               // Force the next block to be created as a ToplevelBlock
-               oob_stack.Push (current_block);
-               oob_stack.Push (top_current_block);
-
-               Location loc = (Location) $1;
-               current_anonymous_method = new AnonymousMethodExpression (
-                       current_anonymous_method, null, current_container,
-                       (Parameters) $2, (ToplevelBlock) top_current_block, loc);
-
-               parsing_anonymous_method = true;
+               start_anonymous (false, (Parameters) $2, (Location) $1);
          }
          block
          {
-               Location loc = (Location) $1;
-               top_current_block = (Block) oob_stack.Pop ();
-               current_block = (Block) oob_stack.Pop ();
-
-               if (RootContext.Version == LanguageVersion.ISO_1){
-                       Report.FeatureIsNotStandardized (loc, "anonymous methods");
-                       $$ = null;
-               } else  {
-                       ToplevelBlock anon_block = (ToplevelBlock) $4;
-
-                       anon_block.Parent = current_block;
-
-                       current_anonymous_method.Block = anon_block;
-                       if ((anonymous_host != null) && (current_anonymous_method.Parent == null))
-                               anonymous_host.AddAnonymousMethod (current_anonymous_method);
-
-                       $$ = current_anonymous_method;
-               }
-
-               current_local_parameters = (Parameters) oob_stack.Pop ();
-               current_anonymous_method = (AnonymousMethodExpression) oob_stack.Pop ();
-       }
+               $$ = end_anonymous ((ToplevelBlock) $4, (Location) $1);
+         }
        ;
 
 opt_anonymous_method_signature
@@ -3170,7 +3250,7 @@ opt_anonymous_method_signature
        ;
 
 anonymous_method_signature
-       : OPEN_PARENS opt_anonymous_method_parameter_list CLOSE_PARENS 
+       : open_parens opt_anonymous_method_parameter_list CLOSE_PARENS 
          {
                if ($2 == null)
                        $$ = Parameters.EmptyReadOnlyParameters;
@@ -3500,9 +3580,114 @@ assignment_expression
          }
        ;
 
+implicitly_typed_lambda_parameter_list
+       : IDENTIFIER { 
+               LocatedToken lt = (LocatedToken) $1;
+               ArrayList a = new ArrayList (4); 
+
+               a.Add (new Parameter ((Expression)null, lt.Value, Parameter.Modifier.NONE, null, lt.Location));
+               $$ = a;
+         } 
+       | implicitly_typed_lambda_parameter_list COMMA IDENTIFIER {
+               LocatedToken lt = (LocatedToken) $3;
+               ArrayList a = (ArrayList) $1;
+               a.Add (new Parameter ((Expression)null, lt.Value, Parameter.Modifier.NONE, null, lt.Location));
+               $$ = a;
+         }
+       ;
+
+explicitly_typed_lambda_parameter_list
+       : explicitly_typed_lambda_parameter
+         {
+               ArrayList pars = new ArrayList (4);
+               pars.Add ($1);
+
+               $$ = pars;
+         }
+       | explicitly_typed_lambda_parameter_list COMMA explicitly_typed_lambda_parameter
+         {
+               ArrayList pars = (ArrayList) $1;
+               pars.Add ($3);
+
+               $$ = pars;
+         }
+       ;
+
+explicitly_typed_lambda_parameter
+       : parameter_modifier type IDENTIFIER
+         {
+               LocatedToken lt = (LocatedToken) $3;
+
+               $$ = new Parameter ((Expression) $2, lt.Value, (Parameter.Modifier) $1, null, lt.Location);
+         }
+       | type IDENTIFIER
+         {
+               LocatedToken lt = (LocatedToken) $2;
+
+               $$ = new Parameter ((Expression) $1, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
+         }
+       ;
+
+lambda_parameter_list
+       : implicitly_typed_lambda_parameter_list { $$ = $1; }
+       | explicitly_typed_lambda_parameter_list { $$ = $1; }
+       ;
+
+opt_lambda_parameter_list
+       : /* empty */                   { $$ = null; }
+       | lambda_parameter_list         { 
+               ArrayList pars_list = (ArrayList) $1;
+
+               Parameter [] pars = new Parameter [pars_list.Count];
+               pars_list.CopyTo (pars);
+               $$ = new Parameters (pars);
+         }
+       ;
+
+lambda_expression_body
+       : {
+               start_block (lexer.Location);
+         }
+         expression 
+         {
+               Block b = end_block (lexer.Location);
+               b.AddStatement (new ContextualReturn ((Expression) $2));
+               $$ = b;
+         } 
+       | block { 
+               $$ = $1; 
+         } 
+       ;
+
+lambda_expression
+       : IDENTIFIER ARROW 
+         {
+               Parameter [] pars = new Parameter [1];
+               LocatedToken lt = (LocatedToken) $1;
+               pars [0] = new Parameter ((Expression)null, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
+
+               Parameters parameters = new Parameters (pars);
+
+               start_anonymous (true, parameters, (Location) $2);
+         }
+         lambda_expression_body
+         {
+               $$ = end_anonymous ((ToplevelBlock) $4, (Location) $2);
+         }
+       | OPEN_PARENS_LAMBDA opt_lambda_parameter_list CLOSE_PARENS ARROW 
+         {
+               start_anonymous (true, (Parameters) $2, (Location) $4);
+         }
+         lambda_expression_body 
+         {
+               $$ = end_anonymous ((ToplevelBlock) $6, (Location) $4);
+         }
+       ;
+
 expression
        : conditional_expression
        | assignment_expression
+       | lambda_expression
        ;
 
 constant_expression
@@ -3527,7 +3712,7 @@ class_declaration
 
                push_current_class (new Class (
                        current_namespace, current_class, name,
-                       mod_flags, (Attributes) $1), false, $3);
+                       mod_flags, (Attributes) $1), $3);
          }
          opt_class_base
          {
@@ -3567,7 +3752,7 @@ opt_modifiers
        : /* empty */           { $$ = (int) 0; }
        | modifiers
        ;
-
+       
 modifiers
        : modifier
        | modifiers modifier
@@ -3581,7 +3766,7 @@ modifiers
                }
                $$ = (int) (m1 | m2);
          }
-        ;
+      ;
 
 modifier
        : NEW                   { $$ = Modifiers.NEW; }
@@ -3625,29 +3810,19 @@ class_base
 block
        : OPEN_BRACE 
          {
-               if (parsing_anonymous_method) {
-                       top_current_block = new ToplevelBlock (
-                               current_block, current_local_parameters, null, (Location) $1);
-                       if (current_block != null)
-                               current_block.AddAnonymousChild ((ToplevelBlock) top_current_block);
-                       current_block = top_current_block;
-                       parsing_anonymous_method = false;
-               } else if (current_block == null){
-                       current_block = new ToplevelBlock ((ToplevelBlock) top_current_block, current_local_parameters, (Location) $1);
-                       top_current_block = current_block;
-               } else {
-                       current_block = new Block (current_block, (Location) $1, Location.Null);
-               }
+               start_block ((Location) $1);
          } 
          opt_statement_list CLOSE_BRACE 
          { 
-               while (current_block.Implicit)
-                       current_block = current_block.Parent;
-               $$ = current_block;
-               current_block.SetEndLocation ((Location) $4);
-               current_block = current_block.Parent;
-               if (current_block == null)
-                       top_current_block = null;
+               $$ = end_block ((Location) $4);
+         }
+       ;
+
+block_prepared
+       : OPEN_BRACE 
+         opt_statement_list CLOSE_BRACE 
+         { 
+               $$ = end_block ((Location) $3);
          }
        ;
 
@@ -3871,7 +4046,7 @@ statement_expression
                Expression expr = (Expression) $1;
                ExpressionStatement s = expr as ExpressionStatement;
                if (s == null) {
-                       Report.Error (201, expr.Location, "Only assignment, call, increment, decrement, and new object expressions can be used as a statement");
+                       expr.Error_InvalidExpressionStatement ();
                        $$ = null;
                }
                $$ = new StatementExpression (s);
@@ -4039,11 +4214,12 @@ do_statement
        ;
 
 for_statement
-       : FOR OPEN_PARENS 
+       : FOR open_parens 
          opt_for_initializer SEMICOLON
          {
-               Block assign_block = new Block (current_block);
-               current_block = assign_block;
+               Location l = lexer.Location;
+               start_block (l);  
+               Block assign_block = current_block;
 
                if ($3 is DictionaryEntry){
                        DictionaryEntry de = (DictionaryEntry) $3;
@@ -4059,7 +4235,6 @@ for_statement
                                if (vi == null)
                                        continue;
 
-                               Location l = lexer.Location;
                                Expression expr = decl.expression_or_array_initializer;
                                        
                                LocalVariableReference var;
@@ -4088,10 +4263,8 @@ for_statement
                For f = new For ((Statement) $5, (Expression) $6, (Statement) $8, (Statement) $10, l);
 
                current_block.AddStatement (f);
-               while (current_block.Implicit)
-                       current_block = current_block.Parent;
-               $$ = current_block;
-               current_block = current_block.Parent;
+
+               $$ = end_block (lexer.Location);
          }
        ;
 
@@ -4139,16 +4312,16 @@ statement_expression_list
        ;
 
 foreach_statement
-       : FOREACH OPEN_PARENS type IN expression CLOSE_PARENS
+       : FOREACH open_parens type IN expression CLOSE_PARENS
          {
                Report.Error (230, (Location) $1, "Type and identifier are both required in a foreach statement");
                $$ = null;
          }
-       | FOREACH OPEN_PARENS type IDENTIFIER IN
+       | FOREACH open_parens type IDENTIFIER IN
          expression CLOSE_PARENS 
          {
-               Block foreach_block = new Block (current_block);
-               current_block = foreach_block;
+               start_block (lexer.Location);
+               Block foreach_block = current_block;
 
                LocatedToken lt = (LocatedToken) $4;
                Location l = lt.Location;
@@ -4177,10 +4350,7 @@ foreach_statement
                        current_block.AddStatement (f);
                }
 
-               while (current_block.Implicit)
-                         current_block = current_block.Parent;
-               $$ = current_block;
-               current_block = current_block.Parent;
+               $$ = end_block (lexer.Location);
          }
        ;
 
@@ -4247,7 +4417,7 @@ yield_statement
                        $$ = null;
                }
                if (RootContext.Version == LanguageVersion.ISO_1){
-                       Report.FeatureIsNotStandardized (lt.Location, "yield statement");
+                       Report.FeatureIsNotISO1 (lt.Location, "yield statement");
                        $$ = null;
                }
                if (anonymous_host == null){
@@ -4272,7 +4442,7 @@ yield_statement
                        $$ = null;
                }
                if (RootContext.Version == LanguageVersion.ISO_1){
-                       Report.FeatureIsNotStandardized (lt.Location, "yield statement");
+                       Report.FeatureIsNotISO1 (lt.Location, "yield statement");
                        $$ = null;
                }
                if (anonymous_host == null){
@@ -4378,9 +4548,8 @@ catch_clause
 
                                one.Add (new VariableDeclaration (lt, null));
 
-                               current_block = new Block (current_block);
-                               Block b = declare_local_variables (type, one, lt.Location);
-                               current_block = b;
+                               start_block (lexer.Location);
+                               current_block = declare_local_variables (type, one, lt.Location);
                        }
                }
          } block {
@@ -4395,10 +4564,7 @@ catch_clause
 
                        if (lt != null){
                                id = lt.Value;
-                               while (current_block.Implicit)
-                                       current_block = current_block.Parent;
-                               var_block = current_block;
-                               current_block = current_block.Parent;
+                               var_block = end_block (lexer.Location);
                        }
                }
 
@@ -4412,7 +4578,7 @@ opt_catch_args
        ;         
 
 catch_args 
-        : OPEN_PARENS type opt_identifier CLOSE_PARENS 
+        : open_parens type opt_identifier CLOSE_PARENS 
           {
                $$ = new DictionaryEntry ($2, $3);
          }
@@ -4443,7 +4609,7 @@ unsafe_statement
        ;
 
 fixed_statement
-       : FIXED OPEN_PARENS 
+       : FIXED open_parens 
          type fixed_pointer_declarators 
          CLOSE_PARENS
          {
@@ -4452,8 +4618,8 @@ fixed_statement
                Location l = (Location) $1;
                int top = list.Count;
 
-               Block assign_block = new Block (current_block);
-               current_block = assign_block;
+               start_block (lexer.Location);
+               Block assign_block = current_block;
 
                for (int i = 0; i < top; i++){
                        Pair p = (Pair) list [i];
@@ -4476,10 +4642,8 @@ fixed_statement
                Fixed f = new Fixed ((Expression) $3, (ArrayList) $4, (Statement) $7, l);
 
                current_block.AddStatement (f);
-               while (current_block.Implicit)
-                       current_block = current_block.Parent;
-               $$ = current_block;
-               current_block = current_block.Parent;
+
+               $$ = end_block (lexer.Location);
          }
        ;
 
@@ -4525,10 +4689,10 @@ lock_statement
        ;
 
 using_statement
-       : USING OPEN_PARENS resource_acquisition CLOSE_PARENS
+       : USING open_parens resource_acquisition CLOSE_PARENS
          {
-               Block assign_block = new Block (current_block);
-               current_block = assign_block;
+               start_block (lexer.Location);
+               Block assign_block = current_block;
 
                if ($3 is DictionaryEntry){
                        DictionaryEntry de = (DictionaryEntry) $3;
@@ -4576,10 +4740,7 @@ using_statement
          {
                Using u = new Using ($5, (Statement) $6, (Location) $1);
                current_block.AddStatement (u);
-               while (current_block.Implicit)
-                       current_block = current_block.Parent;
-               $$ = current_block;
-               current_block = current_block.Parent;
+               $$ = end_block (lexer.Location);
          }
        ; 
 
@@ -4706,16 +4867,27 @@ void Error_ExpectingTypeName (Expression expr)
        if (expr is Invocation){
                Report.Error (1002, expr.Location, "Expecting `;'");
        } else {
-               Report.Error (201, expr.Location, "Only assignment, call, increment, decrement, and new object expressions can be used as a statement");
+               expr.Error_InvalidExpressionStatement ();
        }
 }
 
-void push_current_class (TypeContainer tc, bool is_interface, object partial_token)
+public static void Error_ParameterModifierNotValid (Location loc)
+{
+       Report.Error (631, loc, "The modifiers `ref' and `out' are not valid in this context");
+}
+
+static void Error_DuplicateParameterModifier (Location loc, Parameter.Modifier mod)
+{
+       Report.Error (1107, loc, "Duplicate parameter modifier `{0}'",
+               Parameter.GetModifierSignature (mod));
+}
+
+void push_current_class (TypeContainer tc, object partial_token)
 {
        if (partial_token != null)
-               current_container = current_container.AddPartial (tc, is_interface);
+               current_container = current_container.AddPartial (tc);
        else
-               current_container = current_container.AddTypeContainer (tc, is_interface);
+               current_container = current_container.AddTypeContainer (tc);
        current_class = tc;
 }
 
@@ -4818,18 +4990,16 @@ Block declare_local_constants (Expression type, ArrayList declarators)
        return implicit_block;
 }
 
-void CheckAttributeTarget (string a, Location l)
+string CheckAttributeTarget (string a, Location l)
 {
        switch (a) {
-
-       case "assembly" : case "module" : case "field" : case "method" : case "param" : case "property" : case "type" :
-               return;
-               
-       default :
-               Report.Error (658, l, "`" + a + "' is an invalid attribute target");
-               break;
+               case "assembly" : case "module" : case "field" : case "method" : case "param" : case "property" : case "type" :
+                       return a;
        }
-
+       
+       Report.Warning (658, 1, l,
+                "`{0}' is invalid attribute target. All attributes in this attribute section will be ignored", a);
+       return string.Empty;
 }
 
 void CheckUnaryOperator (Operator.OpType op, Location l)
@@ -4901,6 +5071,11 @@ public Tokenizer Lexer {
        }
 }                 
 
+static CSharpParser ()
+{
+       oob_stack = new Stack ();
+}
+
 public CSharpParser (SeekableStreamReader reader, SourceFile file, ArrayList defines)
 {
        this.name = file.Name;
@@ -4908,7 +5083,7 @@ public CSharpParser (SeekableStreamReader reader, SourceFile file, ArrayList def
        current_namespace = new NamespaceEntry (null, file, null);
        current_class = current_namespace.SlaveDeclSpace;
        current_container = current_class.PartialContainer; // == RootContest.ToplevelTypes
-
+       oob_stack.Clear ();
        lexer = new Tokenizer (reader, file, defines);
 }
 
@@ -4971,5 +5146,95 @@ Location GetLocation (object obj)
        return lexer.Location;
 }
 
+static GenericMethod current_generic_method = null;
+
+void start_block (Location loc)
+{
+       if (parsing_anonymous_method) {
+               top_current_block = new ToplevelBlock (
+                       current_block, current_local_parameters, current_generic_method, loc);
+               if (current_block != null)
+                       current_block.AddAnonymousChild ((ToplevelBlock) top_current_block);
+               current_block = top_current_block;
+               parsing_anonymous_method = false;
+       } else if (current_block == null) {
+               current_block = new ToplevelBlock (
+                       (ToplevelBlock) top_current_block, current_local_parameters,
+                       current_generic_method, loc);
+               top_current_block = current_block;
+       } else {
+               current_block = new Block (current_block, loc, Location.Null);
+       }
+}
+
+Block
+end_block (Location loc)
+{
+       Block retval;
+
+       while (current_block.Implicit)
+               current_block = current_block.Parent;
+       retval = current_block;
+       current_block.SetEndLocation (loc);
+       current_block = current_block.Parent;
+       if (current_block == null)
+               top_current_block = null;
+       return retval;
+}
+
+void
+start_anonymous (bool lambda, Parameters parameters, Location loc)
+{
+       oob_stack.Push (current_anonymous_method);
+       oob_stack.Push (current_local_parameters);
+
+       current_local_parameters = parameters;
+
+       // Force the next block to be created as a ToplevelBlock
+       oob_stack.Push (current_block);
+       oob_stack.Push (top_current_block);
+
+       current_anonymous_method = lambda 
+               ? new LambdaExpression (
+                       current_anonymous_method, current_generic_method, current_container,
+                       parameters, (ToplevelBlock) top_current_block, loc) 
+               : new AnonymousMethodExpression (
+                       current_anonymous_method, current_generic_method, current_container,
+                       parameters, (ToplevelBlock) top_current_block, loc);
+
+       parsing_anonymous_method = true;
+}
+
+/*
+ * Completes the anonymous method processing, if lambda_expr is null, this
+ * means that we have a Statement instead of an Expression embedded 
+ */
+AnonymousMethodExpression 
+end_anonymous (ToplevelBlock anon_block, Location loc)
+{
+       AnonymousMethodExpression retval;
+
+       top_current_block = (Block) oob_stack.Pop ();
+       current_block = (Block) oob_stack.Pop ();
+
+       if (RootContext.Version == LanguageVersion.ISO_1){
+               Report.FeatureIsNotISO1 (loc, "anonymous methods");
+               retval = null;
+       } else  {
+               anon_block.Parent = current_block;
+
+               current_anonymous_method.Block = anon_block;
+               if ((anonymous_host != null) && (current_anonymous_method.Parent == null))
+                       anonymous_host.AddAnonymousMethod (current_anonymous_method);
+
+               retval = current_anonymous_method;
+       }
+
+       current_local_parameters = (Parameters) oob_stack.Pop ();
+       current_anonymous_method = (AnonymousMethodExpression) oob_stack.Pop ();
+
+       return retval;
+}
+
 /* end end end */
 }