Author: martin
Date: 2005-05-02 06:17:42 -0400 (Mon, 02 May 2005)
New Revision: 43874
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/expression.cs
trunk/mcs/gmcs/statement.cs
Log:
Fix my previous commit; it broke an error test.
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-05-02 09:11:46 UTC (rev 43873)
+++ trunk/mcs/gmcs/ChangeLog 2005-05-02 10:17:42 UTC (rev 43874)
@@ -7,7 +7,7 @@
(Constructor.Emit): Call `block.ResolveMeta ()' before resolving
our ConstructorInitializer.
- * statement.cs (Block.IsConstructor): New public property.
+ * statement.cs
(TopLevelBlock.TopLevelBranching): New public property.
(TopLevelBlock.ResolveMeta): New public method; call ResolveMeta()
and create our `TopLevelBranching'.
@@ -16,9 +16,6 @@
anonymous method host, use `block.TopLevelBranching' rather than
creating a new branching.
- * expression.cs (This.DoResolve): Don't report a CS0188 if we're
- inside the constructor.
-
2005-04-20 Miguel de Icaza <[EMAIL PROTECTED]>
* anonymous.cs (ScopeInfo.AddChild): when adding a new child to
Modified: trunk/mcs/gmcs/expression.cs
===================================================================
--- trunk/mcs/gmcs/expression.cs 2005-05-02 09:11:46 UTC (rev 43873)
+++ trunk/mcs/gmcs/expression.cs 2005-05-02 10:17:42 UTC (rev 43874)
@@ -6980,9 +6980,7 @@
if (!ResolveBase (ec))
return null;
- bool is_ctor = (block == null) || block.IsConstructor;
-
- if ((variable_info != null) && !is_ctor &&
!variable_info.IsAssigned (ec)) {
+ if ((variable_info != null) &&
!variable_info.IsAssigned (ec)) {
Error (188, "The this object cannot be used
before all " +
"of its fields are assigned to");
variable_info.SetAssigned (ec);
Modified: trunk/mcs/gmcs/statement.cs
===================================================================
--- trunk/mcs/gmcs/statement.cs 2005-05-02 09:11:46 UTC (rev 43873)
+++ trunk/mcs/gmcs/statement.cs 2005-05-02 10:17:42 UTC (rev 43874)
@@ -1187,12 +1187,6 @@
}
Flags flags;
- public bool IsConstructor {
- get {
- return this_variable != null;
- }
- }
-
public bool Implicit {
get {
return (flags & Flags.Implicit) != 0;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
