2008-09-17 Marek Safar <marek.safar@gmail.com>

	* expression.cs, statement.cs, class.cs, cs-parser.jay: Fixed
	void parsing conflicts.

svn path=/trunk/mcs/; revision=113259

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index afc19562ab2a98c8e9619072cea7157009dc4193..0bafe354efc5f47121f7cdbbbbe28812fb95077c 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-17  Marek Safar  <marek.safar@gmail.com>
+
+       * expression.cs, statement.cs, class.cs, cs-parser.jay: Fixed
+       void parsing conflicts.
+
+2008-09-15  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #425601
+       * driver.cs, typemanager.cs, namespace.cs: Automatically reference
+       System.Core only when there is no custom ExtensionAttribute
+       implementation.
+
 2008-09-15  Miguel de Icaza  <miguel@novell.com>
 
        * namespace.cs: Do not report CS0246 (name

diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index c3180170faec8d5c84ac4c37ad3cdcde0740f12c..6d15c32ec6740fee09db0c4543269d8d7eb0e5cb 100644 (file)
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -2800,11 +2800,6 @@ namespace Mono.CSharp {
                                        continue;
                                }
 
-                               if ((m.ModFlags & Modifiers.PROTECTED) != 0) {
-                                       m.CheckProtectedModifier ();
-                                       continue;
-                               }
-
                                if (m is Indexer) {
                                        Report.Error (720, m.Location, "`{0}': cannot declare indexers in a static class", m.GetSignatureForError ());
                                        continue;
@@ -5463,12 +5458,6 @@ namespace Mono.CSharp {
                        if (TypeManager.IsGenericParameter (MemberType))
                                return true;
 
-                       if (MemberType == TypeManager.void_type) {
-                               // TODO: wrong location
-                               Expression.Error_VoidInvalidInTheContext (Location);
-                               return false;
-                       }
-
                        if (MemberType.IsSealed && MemberType.IsAbstract) {
                                Error_VariableOfStaticClass (Location, GetSignatureForError (), MemberType);
                                return false;
@@ -7793,11 +7782,6 @@ namespace Mono.CSharp {
                        else if (OperatorType == OpType.Implicit)
                                Parent.MemberCache.CheckExistingMembersOverloads (this, GetMetadataName (OpType.Explicit), Parameters);
 
-                       if (MemberType == TypeManager.void_type) {
-                               Report.Error (590, Location, "User-defined operators cannot return void");
-                               return false;
-                       }
-
                        Type declaring_type = MethodData.DeclaringType;
                        Type return_type = MemberType;
                        Type first_arg_type = ParameterTypes [0];

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 9bee2d25581908d4ddab1af6e59f4681f2a3fcb3..eeaabe5a99d7ab3011e8d60d917cbb35f019c79c 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -1031,11 +1031,14 @@ constant_declarator
 field_declaration
        : opt_attributes
          opt_modifiers
-         type 
+         type_and_void
          variable_declarators
          SEMICOLON
          { 
                FullNamedExpression type = (FullNamedExpression) $3;
+               if (type == TypeManager.system_void_expr)
+                       Report.Error (670, GetLocation ($3), "Fields cannot have void type");
+               
                int mod = (int) $2;
 
                current_array_type = null;
@@ -1057,11 +1060,12 @@ field_declaration
        | opt_attributes
          opt_modifiers
          FIXED
-         type 
+         type_and_void
          fixed_variable_declarators
          SEMICOLON
          { 
                        FullNamedExpression type = (FullNamedExpression) $4;
+                       
                        int mod = (int) $2;
 
                        current_array_type = null;
@@ -1081,19 +1085,11 @@ field_declaration
        | opt_attributes
          opt_modifiers
          FIXED
-         type 
+         type_and_void
          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  
-         variable_declarators
-         SEMICOLON {
-               current_array_type = null;
-               Report.Error (670, (Location) $3, "Fields cannot have void type");
-         }
        ;
 
 fixed_variable_declarators
@@ -1170,7 +1166,7 @@ variable_initializer
          {
                $$ = $1;
          }
-       | STACKALLOC type OPEN_BRACKET expression CLOSE_BRACKET
+       | STACKALLOC type_expression OPEN_BRACKET expression CLOSE_BRACKET
          {
                $$ = new StackAlloc ((Expression) $2, (Expression) $4, (Location) $1);
          }
@@ -1230,7 +1226,7 @@ opt_error_modifier
 method_header
        : opt_attributes
          opt_modifiers
-         type member_name
+         type_and_void member_name
          OPEN_PARENS
          {
                arglist_allowed = true;
@@ -1270,48 +1266,6 @@ method_header
 
                $$ = method;
          }
-       | opt_attributes
-         opt_modifiers
-         VOID member_name
-         OPEN_PARENS
-         {
-               arglist_allowed = true;
-         }       
-         opt_formal_parameter_list CLOSE_PARENS
-         {
-               lexer.ConstraintsParsing = true;
-         }
-         opt_type_parameter_constraints_clauses
-         {
-               lexer.ConstraintsParsing = false;
-               arglist_allowed = false;
-
-               MemberName name = (MemberName) $4;
-               current_local_parameters = (Parameters) $7;
-
-               if ($10 != null && name.TypeArguments == null)
-                       Report.Error (80, lexer.Location,
-                                     "Constraints are not allowed on non-generic declarations");
-
-               Method method;
-               GenericMethod generic = null;
-               if (name.TypeArguments != null) {
-                       generic = new GenericMethod (current_namespace, current_class, name,
-                                                    TypeManager.system_void_expr, current_local_parameters);
-
-                       generic.SetParameterInfo ((ArrayList) $10);
-               }
-
-               method = new Method (current_class, generic, TypeManager.system_void_expr,
-                                    (int) $2, name, current_local_parameters, (Attributes) $1);
-
-               current_generic_method = generic;
-
-               if (RootContext.Documentation != null)
-                       method.DocComment = Lexer.consume_doc_comment ();
-
-               $$ = method;
-       }
        | opt_attributes
          opt_modifiers
          PARTIAL
@@ -1371,7 +1325,7 @@ method_header
          }
        | opt_attributes
          opt_modifiers
-         type 
+         type_and_void 
          modifiers member_name OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
          {
                MemberName name = (MemberName) $5;
@@ -1645,7 +1599,7 @@ arglist_modifier
 property_declaration
        : opt_attributes
          opt_modifiers
-         type
+         type_and_void
          namespace_or_type_name
          {
                if (RootContext.Documentation != null)
@@ -1654,7 +1608,6 @@ property_declaration
          OPEN_BRACE 
          {
                implicit_value_parameter_type = (FullNamedExpression) $3;
-
                lexer.PropertyParsing = true;
          }
          accessor_declarations 
@@ -1680,7 +1633,7 @@ property_declaration
                                     name, (Attributes) $1, get_block, set_block, order, current_block);
 
                if (ptype == TypeManager.system_void_expr)
-                       Report.Error (547, ptype.Location, "`{0}': property return type cannot be `void'", prop.GetSignatureForError ());
+                       Report.Error (547, name.Location, "`{0}': property or indexer cannot have void type", prop.GetSignatureForError ());
                        
                if (accessors == null)
                        Report.Error (548, prop.Location, "`{0}': property or indexer must have at least one accessor", prop.GetSignatureForError ());
@@ -1701,7 +1654,7 @@ property_declaration
 
          }
        ;
-       
+
 accessor_declarations
        : get_accessor_declaration
         {
@@ -1915,8 +1868,17 @@ operator_body
        | SEMICOLON { $$ = null; }
        ; 
 
+operator_type
+       : type_expression_or_array
+       | VOID
+         {
+               Report.Error (590, lexer.Location, "User-defined operators cannot return void");
+               $$ = TypeManager.system_void_expr;              
+         }
+       ;
+
 operator_declarator
-       : type OPERATOR overloadable_operator OPEN_PARENS
+       : operator_type OPERATOR overloadable_operator OPEN_PARENS
          {
                params_modifiers_not_allowed = true;
          }
@@ -2388,7 +2350,7 @@ indexer_declaration
        ;
 
 indexer_declarator
-       : type THIS OPEN_BRACKET opt_parameter_list_no_mod CLOSE_BRACKET
+       : type_and_void THIS OPEN_BRACKET opt_parameter_list_no_mod CLOSE_BRACKET
          {
                Parameters pars = (Parameters) $4;
                if (pars.IsEmpty){
@@ -2401,7 +2363,7 @@ indexer_declarator
 
                $$ = new IndexerDeclaration ((FullNamedExpression) $1, null, pars, (Location) $2);
          }
-       | type namespace_or_type_name DOT THIS OPEN_BRACKET opt_formal_parameter_list CLOSE_BRACKET
+       | type_and_void namespace_or_type_name DOT THIS OPEN_BRACKET opt_formal_parameter_list CLOSE_BRACKET
          {
                Parameters pars = (Parameters) $6;
                if (pars.IsEmpty){
@@ -2558,7 +2520,7 @@ delegate_declaration
        : opt_attributes
          opt_modifiers
          DELEGATE
-         type type_name
+         type_and_void type_name
          OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
          {
                MemberName name = MakeName ((MemberName) $5);
@@ -2712,14 +2674,36 @@ type_argument
                $$ = $2;          
          }
        ;
-       
-/* 
- * Before you think of adding a return_type, notice that we have been
- * using two rules in the places where it matters (one rule using type
- * and another identical one that uses VOID as the return type).  This
- * gets rid of a shift/reduce couple
- */
+
+//
+// All types where void is allowed
+//
+type_and_void
+       : type_expression_or_array
+       | VOID
+         {
+               $$ = TypeManager.system_void_expr;
+         }
+       ;
+
+//
+// A type which does not allow `void' to be used
+//
 type
+       : type_expression_or_array
+       | VOID
+         {
+               Expression.Error_VoidInvalidInTheContext (lexer.Location);
+               $$ = TypeManager.system_void_expr;
+         }     
+       ;
+
+type_expression_or_array
+       : type_expression
+       | array_type      
+       ;
+       
+type_expression
        : namespace_or_type_name opt_nullable
          {
                MemberName name = (MemberName) $1;
@@ -2739,12 +2723,7 @@ type
                if ($2 != null)
                        $$ = new ComposedCast ((FullNamedExpression) $1, "?", lexer.Location);
          }
-       | array_type
-       | pointer_type
-       ;
-
-pointer_type
-       : type STAR
+       | type_expression STAR
          {
                //
                // Note that here only unmanaged types are allowed but we
@@ -2756,7 +2735,7 @@ pointer_type
        | VOID STAR
          {
                $$ = new ComposedCast (TypeManager.system_void_expr, "*", (Location) $1);
-         }
+         }     
        ;
 
 non_expression_type
@@ -2765,6 +2744,10 @@ non_expression_type
                if ($2 != null)
                        $$ = new ComposedCast ((FullNamedExpression) $1, "?", lexer.Location);
          }
+       | VOID
+         {
+               $$ = TypeManager.system_void_expr;
+         }
        | non_expression_type rank_specifier
          {
                Location loc = GetLocation ($1);
@@ -2832,7 +2815,6 @@ builtin_types
        | DECIMAL       { $$ = TypeManager.system_decimal_expr; }
        | FLOAT         { $$ = TypeManager.system_single_expr; }
        | DOUBLE        { $$ = TypeManager.system_double_expr; }
-       | VOID          { $$ = TypeManager.system_void_expr; }  
        | integral_type
        ;
 
@@ -2849,13 +2831,21 @@ integral_type
        ;
 
 array_type
-       : type rank_specifiers
+       : type_expression rank_specifiers
          {
                string rank_specifiers = (string) $2;
                $$ = current_array_type = new ComposedCast ((FullNamedExpression) $1, rank_specifiers);
          }
        ;
 
+predefined_type
+       : builtin_types
+       | VOID
+         {
+               $$ = TypeManager.system_void_expr;      
+         }
+       ;
+
 //
 // Expressions, section 7.5
 //
@@ -2977,10 +2967,6 @@ member_access
          }
        ;
 
-predefined_type
-       : builtin_types
-       ;
-
 invocation_expression
        : primary_expression OPEN_PARENS opt_argument_list CLOSE_PARENS
          {
@@ -3269,13 +3255,13 @@ object_or_delegate_creation_expression
        ;
 
 array_creation_expression
-       : NEW type OPEN_BRACKET expression_list CLOSE_BRACKET 
+       : NEW type_expression OPEN_BRACKET expression_list CLOSE_BRACKET 
          opt_rank_specifier
          opt_array_initializer
          {
                $$ = new ArrayCreation ((FullNamedExpression) $2, (ArrayList) $4, (string) $6, (ArrayList) $7, (Location) $1);
          }
-       | NEW type rank_specifiers array_initializer
+       | NEW type_expression rank_specifiers array_initializer
          {
                $$ = new ArrayCreation ((FullNamedExpression) $2, (string) $3, (ArrayList) $4, (Location) $1);
          }
@@ -3286,9 +3272,9 @@ array_creation_expression
        | NEW error
          {
                Report.Error (1031, (Location) $1, "Type expected");
-                $$ = null;
+               $$ = null;
          }          
-       | NEW type error 
+       | NEW type_expression error
          {
                Report.Error (1526, (Location) $1, "A new expression requires () or [] after type");
                $$ = null;
@@ -3481,7 +3467,7 @@ typeof_expression
        ;
        
 typeof_type_expression
-       : type
+       : type_and_void
          {
                $$ = $1;
          }
@@ -3636,6 +3622,9 @@ cast_expression
        : cast_list
        | OPEN_PARENS non_expression_type CLOSE_PARENS prefixed_unary_expression
          {
+               if ($2 == TypeManager.system_void_expr)
+                       Expression.Error_VoidInvalidInTheContext (GetLocation ($2));
+
                // TODO: wrong location
                $$ = new Cast ((Expression) $2, (Expression) $4, lexer.Location);
          }
@@ -4387,7 +4376,12 @@ local_variable_type
                else
                        $$ = current_array_type = new ComposedCast ((FullNamedExpression) $1, (string) $2, lexer.Location);
          }
-        ;
+       | VOID opt_rank_specifier
+         {
+               Expression.Error_VoidInvalidInTheContext (lexer.Location);
+               $$ = TypeManager.system_void_expr;
+         }
+       ;
 
 local_variable_pointer_type
        : primary_expression STAR
@@ -5005,7 +4999,7 @@ unsafe_statement
 
 fixed_statement
        : FIXED OPEN_PARENS 
-         type fixed_pointer_declarators 
+         type_and_void fixed_pointer_declarators 
          CLOSE_PARENS
          {
                ArrayList list = (ArrayList) $4;

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 8bf169241f75ba64101910b2633d8a2eb5c5590c..b3a88cccca53b401678513fbbfe2904bc8d030a2 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -1143,12 +1143,6 @@ namespace Mono.CSharp {
                        if (expr == null)
                                return null;
 
-                       if (probe_type_expr.Type == TypeManager.void_type) {
-                               // TODO: Void is missing location (ProbeType.Location)
-                               Error_VoidInvalidInTheContext (Location);
-                               return null;
-                       }
-
                        if ((probe_type_expr.Type.Attributes & Class.StaticClassAttribute) == Class.StaticClassAttribute) {
                                Report.Error (-244, loc, "The `{0}' operator cannot be applied to an operand of a static type",
                                        OperatorName);
@@ -1471,9 +1465,6 @@ namespace Mono.CSharp {
                        this.target_type = cast_type;
                        this.expr = expr;
                        this.loc = loc;
-
-                       if (target_type == TypeManager.system_void_expr)
-                               Error_VoidInvalidInTheContext (loc);
                }
 
                public Expression TargetType {
@@ -1566,11 +1557,6 @@ namespace Mono.CSharp {
 
                        type = texpr.Type;
 
-                       if (type == TypeManager.void_type) {
-                               Error_VoidInvalidInTheContext (loc);
-                               return null;
-                       }
-
                        if ((type.Attributes & Class.StaticClassAttribute) == Class.StaticClassAttribute) {
                                Report.Error (-244, loc, "The `default value' operator cannot be applied to an operand of a static type");
                        }
@@ -5416,11 +5402,6 @@ namespace Mono.CSharp {
 
                        type = texpr.Type;
 
-                       if (type == TypeManager.void_type) {
-                               Error_VoidInvalidInTheContext (loc);
-                               return null;
-                       }
-
                        if (type.IsPointer) {
                                Report.Error (1919, loc, "Unsafe type `{0}' cannot be used in an object creation expression",
                                        TypeManager.CSharpName (type));
@@ -7220,11 +7201,6 @@ namespace Mono.CSharp {
                        if (TypeManager.IsEnumType (type_queried))
                                type_queried = TypeManager.GetEnumUnderlyingType (type_queried);
 
-                       if (type_queried == TypeManager.void_type) {
-                               Expression.Error_VoidInvalidInTheContext (loc);
-                               return null;
-                       }
-
                        int size_of = GetTypeSize (type_queried);
                        if (size_of > 0) {
                                return new IntConstant (size_of, loc);
@@ -8975,11 +8951,6 @@ namespace Mono.CSharp {
                                return null;
 
                        Type ltype = lexpr.Type;
-                       if ((ltype == TypeManager.void_type) && (dim != "*")) {
-                               Error_VoidInvalidInTheContext (loc);
-                               return null;
-                       }
-
 #if GMCS_SOURCE
                        if ((dim.Length > 0) && (dim [0] == '?')) {
                                TypeExpr nullable = new Nullable.NullableType (left, loc);

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index fa7fbf5de34be26327a856422e774012a944a412..1f42cbdabd0b1873671e424bea8dd1ff3c90fa00 100644 (file)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -1389,11 +1389,6 @@ namespace Mono.CSharp {
                        if (TypeManager.IsGenericParameter (VariableType))
                                return true;
 
-                       if (VariableType == TypeManager.void_type) {
-                               Expression.Error_VoidInvalidInTheContext (Location);
-                               return false;
-                       }
-
                        if (VariableType.IsAbstract && VariableType.IsSealed) {
                                FieldBase.Error_VariableOfStaticClass (Location, Name, VariableType);
                                return false;