[svn] r6114: nemerle/trunk/ncc: hierarchy/TypeBuilder.n testsuite/positive/two-ctors.n

[malekith]

Log:
Don't make static ctor prevent adding default instance ctor.

Author: malekith
Date: Fri Feb 10 08:17:01 2006
New Revision: 6114

Modified:
   nemerle/trunk/ncc/hierarchy/TypeBuilder.n
   nemerle/trunk/ncc/testsuite/positive/two-ctors.n

Modified: nemerle/trunk/ncc/hierarchy/TypeBuilder.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/TypeBuilder.n	(original)
+++ nemerle/trunk/ncc/hierarchy/TypeBuilder.n	Fri Feb 10 08:17:01 2006
@@ -1643,7 +1643,8 @@
         | (PT.ClassMember.Function) as f =>          
           def r = MethodBuilder (this, f);
           unless (instance_ctor_occured)
-            instance_ctor_occured = r.MemberType == MemberTypes.Constructor;
+            instance_ctor_occured = r.MemberType == MemberTypes.Constructor && 
+                                    !(r.Attributes %&& NemerleAttributes.Static);
           AddMember (r);
           r
           

Modified: nemerle/trunk/ncc/testsuite/positive/two-ctors.n
==============================================================================
--- nemerle/trunk/ncc/testsuite/positive/two-ctors.n	(original)
+++ nemerle/trunk/ncc/testsuite/positive/two-ctors.n	Fri Feb 10 08:17:01 2006
@@ -10,10 +10,15 @@
   }
 }
 
+class A {
+  static this () {}
+}
+
+
 module M {
   public Main () : void {
     def _ = C ();
-    ()
+    _ = A ();
   }
 }
 /*