Doxygen: improve static members and zoned strings

diff --git a/qcsrc/Doxyfile b/qcsrc/Doxyfile
index 631b9d5cf11f8efcc8d63ae777b8fc732f90e700..d0379e41fca0c9643bbdcf1a14bb4fe99564af46 100644 (file)
--- a/qcsrc/Doxyfile
+++ b/qcsrc/Doxyfile
@@ -2002,6 +2002,9 @@ PREDEFINED             = \
     "CONSTRUCTOR(class)=class::class(" \
     "DESTRUCTOR(class)=class::~class()" \
     "ATTRIB(class, name, T, val)=T name = val;" \
     "CONSTRUCTOR(class)=class::class(" \
     "DESTRUCTOR(class)=class::~class()" \
     "ATTRIB(class, name, T, val)=T name = val;" \

+    "ATTRIB_STRZONE(class, name, T, val)=T name = val;" \
+    "STATIC_ATTRIB(class, name, T, val)=static T name = val;" \
+    "STATIC_ATTRIB_STRZONE(class, name, T, val)=static T name = val;" \

     "METHOD(class, name, prototype)=virtual void class::name()" \
     "ENDCLASS(class)=};" \
     __STDC__
     "METHOD(class, name, prototype)=virtual void class::name()" \
     "ENDCLASS(class)=};" \
     __STDC__


@@ -2018,7 +2021,8 @@ EXPAND_AS_DEFINED      = \
     CLASS \
     CONSTRUCTOR \
     DESTRUCTOR \
     CLASS \
     CONSTRUCTOR \
     DESTRUCTOR \

-    ATTRIB \
+    ATTRIB ATTRIB_STRZONE \
+    STATIC_ATTRIB STATIC_ATTRIB_STRZONE \

     METHOD \
     ENDCLASS \
     LABEL \
     METHOD \
     ENDCLASS \
     LABEL \

diff --git a/qcsrc/lib/oo.qh b/qcsrc/lib/oo.qh
index 5e0efc218e2f565365984467cd03b309f582b1e0..45fbb2627dd1f6d947c0aa0b61c2c1ad83ee9715 100644 (file)
--- a/qcsrc/lib/oo.qh
+++ b/qcsrc/lib/oo.qh
@@ -136,7 +136,7 @@ STATIC_INIT(RegisterClasses)
 }
 
 #define VTBL(cname, base) \
 }
 
 #define VTBL(cname, base) \

-       INIT_STATIC(cname); \
+       _INIT_STATIC(cname); \

        entity cname##_vtbl; \
        void cname##_vtbl_init() \
        { \
        entity cname##_vtbl; \
        void cname##_vtbl_init() \
        { \


@@ -149,7 +149,7 @@ STATIC_INIT(RegisterClasses)
        } \
        ACCUMULATE_FUNCTION(RegisterClasses, cname##_vtbl_init)
 
        } \
        ACCUMULATE_FUNCTION(RegisterClasses, cname##_vtbl_init)
 

-#define INIT_STATIC(cname) [[accumulate]] void spawn##cname##_static(cname this)
+#define _INIT_STATIC(cname) [[accumulate]] void spawn##cname##_static(cname this)

 #define INIT(cname) [[accumulate]] cname spawn##cname##_1(cname this)
 
 #define CLASS(cname, base)                  \
 #define INIT(cname) [[accumulate]] cname spawn##cname##_1(cname this)
 
 #define CLASS(cname, base)                  \


@@ -157,7 +157,7 @@ STATIC_INIT(RegisterClasses)
        class(cname).bool instanceOf##cname;   \
     bool is_##cname(entity e) { return e.instanceOf##cname; } \
        VTBL(cname, base)                       \
        class(cname).bool instanceOf##cname;   \
     bool is_##cname(entity e) { return e.instanceOf##cname; } \
        VTBL(cname, base)                       \

-       INIT_STATIC(cname) \
+       _INIT_STATIC(cname) \

        {                    \
                if (cname##_vtbl) \
                {                 \
        {                    \
                if (cname##_vtbl) \
                {                 \


@@ -189,7 +189,7 @@ STATIC_INIT(RegisterClasses)
 #define METHOD(cname, name, prototype) \
        STATIC_METHOD(cname, name, prototype); \
        class(cname) .prototype name; \
 #define METHOD(cname, name, prototype) \
        STATIC_METHOD(cname, name, prototype); \
        class(cname) .prototype name; \

-       INIT_STATIC(cname) \
+       _INIT_STATIC(cname) \

        { \
                this.name = METHOD_REFERENCE(cname, name); \
        } \
        { \
                this.name = METHOD_REFERENCE(cname, name); \
        } \


@@ -213,6 +213,16 @@ STATIC_INIT(RegisterClasses)
                this.name = val; \
        }
 
                this.name = val; \
        }
 

+#define STATIC_ATTRIB(cname, name, type, val) \
+       type cname##_##name; \
+       _INIT_STATIC(cname) \
+       { \
+               noref bool strzone; /* Error on strzone() calls. */ \
+               cname##_##name = val; \
+       }
+
+// cleanup potentially zoned strings from base classes
+

 #define ATTRIB_STRZONE(cname, name, type, val)      \
        class(cname).type name;                \
        INIT(cname) \
 #define ATTRIB_STRZONE(cname, name, type, val)      \
        class(cname).type name;                \
        INIT(cname) \


@@ -222,6 +232,15 @@ STATIC_INIT(RegisterClasses)
                this.name = strzone(val); \
        }
 
                this.name = strzone(val); \
        }
 

+#define STATIC_ATTRIB_STRZONE(cname, name, type, val) \
+       type cname##_##name; \
+       _INIT_STATIC(cname) \
+       { \
+        if (cname##_##name) \
+            strunzone(cname##_##name); \
+               cname##_##name = val; \
+       }
+

 #define ATTRIBARRAY(cname, name, type, cnt) \
        class(cname).type name[cnt];
 
 #define ATTRIBARRAY(cname, name, type, cnt) \
        class(cname).type name[cnt];
 

diff --git a/qcsrc/menu/xonotic/datasource.qh b/qcsrc/menu/xonotic/datasource.qh
index 1808b765515d0d81f60e9a3c517ef1ecdbe423be..1ca3d5811fd316192c7ca4b86bbf5b10ada6ca5c 100644 (file)
--- a/qcsrc/menu/xonotic/datasource.qh
+++ b/qcsrc/menu/xonotic/datasource.qh
@@ -1,12 +1,8 @@
 #pragma once
 
 CLASS(DataSource, Object)
 #pragma once
 
 CLASS(DataSource, Object)

-    entity DataSource_true;
-    entity DataSource_false;
-    INIT_STATIC(DataSource) {
-        DataSource_true = NEW(Object);
-        DataSource_false = NULL;
-    }
+    STATIC_ATTRIB(DataSource, true, entity, NEW(Object));
+    STATIC_ATTRIB(DataSource, false, entity, NULL);

     /**
      * get entry `i` passing `name` and `icon` through `returns` if it is not null
      * returns `DataSource_false` if out of bounds
     /**
      * get entry `i` passing `name` and `icon` through `returns` if it is not null
      * returns `DataSource_false` if out of bounds