* class.cs: Couple of bug fixes in defining default static constructor, partially...

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

diff --git a/mcs/mbas/ChangeLog b/mcs/mbas/ChangeLog
index c102e14dcfcefbe8f7ea96de6eddc6062654e6bf..a574e37f52ebda24da5754f0e830d07e72af2565 100644 (file)
--- a/mcs/mbas/ChangeLog
+++ b/mcs/mbas/ChangeLog
@@ -1,3 +1,6 @@
+2004-04-15 Anirban Bhattacharjee <banirban@novell.com>
+       * class.cs: Couple of bug fixes in defining default static constructor, partially imposed by the fix earlier
+
 2004-04-14 Anirban Bhattacharjee <banirban@novell.com>
        * class.cs: Added support for Shadows modifier in Variables
 

diff --git a/mcs/mbas/class.cs b/mcs/mbas/class.cs
index 3795c4d61fb3cc16c1018e136d035b9e5819a6a2..bc31822b95788613c730dda827c1bd80ff2ed451 100644 (file)
--- a/mcs/mbas/class.cs
+++ b/mcs/mbas/class.cs
@@ -586,15 +586,17 @@ namespace Mono.MonoBASIC {
                        int mods = 0;
 
                        c = new Constructor ("New", Parameters.EmptyReadOnlyParameters,
-                                            new ConstructorBaseInitializer (
-                                                    null, Parameters.EmptyReadOnlyParameters,
-                                                    Location.Null),
+                                            null,
                                             Location.Null);
                        
-                       if (is_static)
+                       if (is_static) {
                                mods = Modifiers.STATIC;
-
-                       c.ModFlags |= mods;
+                               c.ModFlags = mods;
+                       }
+                       else 
+                               c.Initializer = new ConstructorBaseInitializer (
+                                       null, Parameters.EmptyReadOnlyParameters,
+                                       Location.Null);
 
                        AddConstructor (c);