Added initializing flag to classinfo structure. This is used by the

compiler to prevent circularity in class_init's.

diff --git a/global.h b/global.h
index 7247302ba894d1391611be941e6bee284d65909c..9edecdf37f596027c5f00ef2ced5e2d9c38969a6 100644 (file)
--- a/global.h
+++ b/global.h
@@ -31,7 +31,7 @@
             Philipp Tomsich
                        Edwin Steiner
 
-   $Id: global.h 1173 2004-06-16 14:56:18Z jowenn $
+   $Id: global.h 1187 2004-06-19 12:26:33Z twisti $
 
 */
 
@@ -661,6 +661,7 @@ struct classinfo {                /* class structure                          */
        listnode    listnode;         /* linkage                                  */
 
        bool        initialized;      /* true, if class already initialised       */
+       bool        initializing;     /* flag for the compiler                    */
        bool        loaded;           /* true, if class already loaded            */
        bool        linked;           /* true, if class already linked            */
        s4          index;            /* hierarchy depth (classes) or index

diff --git a/src/vm/global.h b/src/vm/global.h
index 7247302ba894d1391611be941e6bee284d65909c..9edecdf37f596027c5f00ef2ced5e2d9c38969a6 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -31,7 +31,7 @@
             Philipp Tomsich
                        Edwin Steiner
 
-   $Id: global.h 1173 2004-06-16 14:56:18Z jowenn $
+   $Id: global.h 1187 2004-06-19 12:26:33Z twisti $
 
 */
 
@@ -661,6 +661,7 @@ struct classinfo {                /* class structure                          */
        listnode    listnode;         /* linkage                                  */
 
        bool        initialized;      /* true, if class already initialised       */
+       bool        initializing;     /* flag for the compiler                    */
        bool        loaded;           /* true, if class already loaded            */
        bool        linked;           /* true, if class already linked            */
        s4          index;            /* hierarchy depth (classes) or index