]> git.draconx.ca Git - gob-dx.git/blobdiff - src/main.c
Make --no-gnu suppress get_type function attributes.
[gob-dx.git] / src / main.c
index 6a0c7911cadee6726195ce40eb05754cb288b28b..295199cb6c0263d3d89b929f9c26b97729b37621 100644 (file)
@@ -22,7 +22,7 @@
  * USA.
  */
 
-#include "config.h"
+#include <config.h>
 #include <glib.h>
 #include <time.h>
 #include <stdio.h>
@@ -954,6 +954,59 @@ add_signal_prots(Method *m)
        out_printf (out, "}\n\n");
 }
 
+static char *
+interface_type(const char *if_name)
+{
+       char *rawtype = remove_sep(if_name);
+       char *end = "", *typename;
+
+       if (!gtk3_ok) {
+               /*
+                * EEEK! evil, we should have some sort of option
+                * to force this for arbitrary interfaces, since
+                * some are Class and some are Iface.  Glib is shite
+                * in consistency.
+                */
+
+               if (strcmp (rawtype, "GtkEditable") == 0
+                   || strcmp (rawtype, "GTypePlugin") == 0)
+               {
+                       end = "Class";
+               } else {
+                       /* We'll assume Iface is the standard ending */
+                       end = "Iface";
+               }
+       } else {
+               /* GTK3 doesn't need Iface end */
+               end = "Interface";
+       }
+
+       typename = g_strconcat(rawtype, end, (char *)NULL);
+       g_free(rawtype);
+
+       return typename;
+}
+
+static void
+define_parent_interface_refs(Class *c)
+{
+       GList *li;
+
+       if (!c->interfaces)
+               return;
+
+       out_printf(out, "\n/* parent class interface implementations */\n");
+       for (li = c->interfaces; li != NULL; li = li->next) {
+               char *name = replace_sep(li->data, '_');
+               char *type = interface_type(li->data);
+
+               out_printf (out, "static %s *%s_parent_iface;\n", type, name);
+
+               g_free(name);
+               g_free(type);
+       }
+}
+
 static void
 add_enums(Class *c)
 {
@@ -1003,7 +1056,9 @@ add_enums(Class *c)
                           "static guint object_signals[LAST_SIGNAL] = {0};\n\n");
 
        out_printf(out, "/* pointer to the class of our parent */\n");
-       out_printf(out, "static %sClass *parent_class = NULL;\n\n", ptypebase);
+       out_printf(out, "static %sClass *parent_class = NULL;\n", ptypebase);
+       define_parent_interface_refs(c);
+       out_printf(out, "\n");
 }
 
 static void
@@ -1037,7 +1092,7 @@ add_interface_methods (Class *c, const char *interface)
 }
 
 static void
-add_interface_inits (Class *c)
+add_interface_inits(Class *c)
 {
        GList *li;
 
@@ -1047,39 +1102,19 @@ add_interface_inits (Class *c)
        out_printf(out, "\n");
 
        for (li = c->interfaces; li != NULL; li = li->next) {
-               const char *interface = li->data;
-               const char *end;
-               char *name = replace_sep (interface, '_');
-               char *type = remove_sep (interface);
+               char *name = replace_sep(li->data, '_');
+               char *type = interface_type(li->data);
 
-               if(!gtk3_ok)
-               {
-                       /* EEEK! evil, we should have some sort of option
-                        * to force this for arbitrary interfaces, since
-                        * some are Class and some are Iface.  Glib is shite
-                        * in consistency. */
-               
-                       if (strcmp (type, "GtkEditable") == 0 ||
-                           strcmp (type, "GTypePlugin") == 0)
-                               end = "Class";
-                       else
-                               // We'll assume Iface is the standard ending 
-                               end = "Iface";
-                       }
-               else
-               {
-                       /*GTK3 doesn't need Iface end*/
-                       end="Interface";
-               }
-               
-               out_printf (out, "\nstatic void\n"
-                           "___%s_init (%s%s *iface)\n"
-                           "{\n",
-                           name, type, end);
+               out_printf(out, "static void\n"
+                               "___%s_init (%s *iface)\n"
+                               "{\n", name, type);
 
-               add_interface_methods (c, interface);
+               add_interface_methods(c, li->data);
 
-               out_printf (out, "}\n\n");
+               out_printf(out, "\t%s_parent_iface\n", name);
+               out_printf(out, for_cpp ? "\t\t= (%s *)" : "\t\t= ", type);
+               out_printf(out, "g_type_interface_peek_parent(iface);\n"
+                               "}\n\n");
 
                g_free (name);
                g_free (type);
@@ -1087,254 +1122,299 @@ add_interface_inits (Class *c)
 }
 
 static void
-add_interface_infos (void)
+add_interface_infos(Class *c, gboolean static_storage)
 {
        GList *li;
-       for (li = ((Class *)class)->interfaces;
-            li != NULL;
-            li = li->next) {
-               char *name = replace_sep (li->data, '_');
-               out_printf (out,
-                           "\t\tstatic const GInterfaceInfo %s_info = {\n"
-                           "\t\t\t(GInterfaceInitFunc) ___%s_init,\n"
-                           "\t\t\tNULL,\n"
-                           "\t\t\tNULL\n"
-                           "\t\t};\n\n",
-                           name, name);
-               g_free (name);
+
+       for (li = c->interfaces; li; li = li->next) {
+               char *name = replace_sep(li->data, '_');
+               out_printf(out, "\t%sconst GInterfaceInfo %s_info = {\n"
+                               "\t\t(GInterfaceInitFunc) ___%s_init,\n"
+                               "\t\tNULL,\n"
+                               "\t\tNULL\n"
+                               "\t};\n",
+                               static_storage ? "static " : "",
+                               name, name);
+               g_free(name);
        }
+
+       out_printf(out, "\n");
 }
 
 static void
-add_interfaces (void)
+define_add_interfaces(Class *c)
 {
        GList *li;
-       for (li = ((Class *)class)->interfaces;
-            li != NULL;
-            li = li->next) {
-               char *name = replace_sep (li->data, '_');
-               char *type = make_pre_macro (li->data, "TYPE");
 
-               out_printf (out,
-                           "\t\tg_type_add_interface_static (type,\n"
-                           "\t\t\t%s,\n"
-                           "\t\t\t&%s_info);\n",
-                           type,
-                           name);
+       if (!c->interfaces)
+               return;
 
-               g_free (type);
-               g_free (name);
+       out_printf(out, "static void ___add_interfaces(GType type)\n{\n");
+       add_interface_infos(c, TRUE);
+
+       for (li = c->interfaces; li; li = li->next) {
+               char *type = make_pre_macro(li->data, "TYPE");
+               char *name = replace_sep(li->data, '_');
+
+               out_printf(out, "\tg_type_add_interface_static\n"
+                               "\t\t( type\n"
+                               "\t\t, %s\n"
+                               "\t\t, &%s_info\n"
+                               "\t\t);\n",
+                               type, name);
+
+               g_free(name);
+               g_free(type);
        }
+
+       out_printf(out, "}\n\n");
 }
 
 static void
-add_dynamic_interfaces(void)
+define_dynamic_add_interfaces(Class *c)
 {
-       GList *li = ((Class *)class)->interfaces;
+       GList *li;
 
-       if (li) {
-               /*
-                * Hack to work around bug in g_type_module_add_interface,
-                * which will fail to add an interface to types that derive
-                * from something that also implements the same interface.
-                *
-                * The actual GType system does not have any such problem,
-                * and the GTypeModule implementation details relied upon
-                * here have not changed once since the feature was first
-                * implemented almost 20 years ago.
-                */
-               out_printf(out, "\t\tstruct _ModuleInterfaceInfo {\n"
-                               "\t\t\tgboolean loaded;\n"
-                               "\t\t\tGType instance_type;\n"
-                               "\t\t\tGType interface_type;\n"
-                               "\t\t\tGInterfaceInfo info;\n"
-                               "\t\t} *modinfo;\n");
-       }
+       if (!c->interfaces)
+               return;
 
-       for (; li; li = li->next) {
-               char *name = replace_sep(li->data, '_');
+       out_printf(out, "static void ___add_interfaces"
+                           "(GTypeModule *type_module, GType type)\n"
+                       "{\n");
+       add_interface_infos(c, FALSE);
+
+       /*
+        * Hack to work around bug in g_type_module_add_interface,
+        * which will fail to add an interface to types that derive
+        * from something that also implements the same interface.
+        *
+        * The actual GType system does not have any such problem,
+        * and the GTypeModule implementation details relied upon
+        * here have not changed once since the feature was first
+        * implemented almost 20 years ago.
+        */
+       out_printf(out, "\tstruct _ModuleInterfaceInfo {\n"
+                       "\t\tgboolean loaded;\n"
+                       "\t\tGType instance_type;\n"
+                       "\t\tGType interface_type;\n"
+                       "\t\tGInterfaceInfo info;\n"
+                       "\t} *modinfo;\n");
+
+       for (li = c->interfaces; li; li = li->next) {
                char *type = make_pre_macro(li->data, "TYPE");
+               char *name = replace_sep(li->data, '_');
 
                out_printf(out, "\n"
-                               "\t\tmodinfo = g_malloc(sizeof *modinfo);\n"
-                               "\t\tmodinfo->loaded = TRUE;\n"
-                               "\t\tmodinfo->instance_type = %s_type_id;\n"
-                               "\t\tmodinfo->interface_type = %s;\n"
-                               "\t\tmodinfo->info = %s_info;\n"
-                               "\t\tg_type_add_interface_dynamic\n"
-                               "\t\t\t( modinfo->instance_type\n"
-                               "\t\t\t, modinfo->interface_type\n"
-                               "\t\t\t, G_TYPE_PLUGIN(type_module)\n"
-                               "\t\t\t);\n"
-                               "\t\ttype_module->interface_infos = g_slist_prepend\n"
-                               "\t\t\t( type_module->interface_infos\n"
-                               "\t\t\t, modinfo\n"
-                               "\t\t\t);\n", funcbase, type, name);
+                               "\tmodinfo = g_malloc(sizeof *modinfo);\n"
+                               "\tmodinfo->loaded = TRUE;\n"
+                               "\tmodinfo->instance_type = type;\n"
+                               "\tmodinfo->interface_type = %s;\n"
+                               "\tmodinfo->info = %s_info;\n"
+                               "\tg_type_add_interface_dynamic\n"
+                               "\t\t( modinfo->instance_type\n"
+                               "\t\t, modinfo->interface_type\n"
+                               "\t\t, G_TYPE_PLUGIN(type_module)\n"
+                               "\t\t);\n"
+                               "\ttype_module->interface_infos = g_slist_prepend\n"
+                               "\t\t( type_module->interface_infos\n"
+                               "\t\t, modinfo\n"
+                               "\t\t);\n",
+                               type, name);
 
-               g_free(type);
                g_free(name);
+               g_free(type);
        }
+
+       out_printf(out, "}\n\n");
 }
 
-static void
-add_get_type(void)
+static void define_add_privates(Class *c)
 {
-       /*char *chunk_size = ((Class*)class)->chunk_size;*/
+       const char *addprivate = c->dynamic
+               ? "G_ADD_PRIVATE_DYNAMIC"
+               : "G_ADD_PRIVATE";
 
-       out_printf(out,
-                  "GType\n"
-                  "%s_get_type (void)\n"
-                  "{\n"
-                  "\tstatic GType type = 0;\n\n"
-                  "\tif ___GOB_UNLIKELY(type == 0) {\n"
-                  "\t\tstatic const GTypeInfo info = {\n"
-                  "\t\t\tsizeof (%sClass),\n"
-                  "\t\t\t(GBaseInitFunc) NULL,\n"
-                  "\t\t\t(GBaseFinalizeFunc) NULL,\n"
-                  "\t\t\t(GClassInitFunc) %s_class_init,\n"
-                  "\t\t\t(GClassFinalizeFunc) NULL,\n"
-                  "\t\t\tNULL /* class_data */,\n"
-                  "\t\t\tsizeof (%s),\n"
-                  "\t\t\t%d /* n_preallocs */,\n"
-                  "\t\t\t(GInstanceInitFunc) %s_init,\n"
-                  "\t\t\tNULL\n"
-                  "\t\t};\n\n",
-                  funcbase, typebase, funcbase, typebase, prealloc, funcbase);
-
-       add_interface_infos ();
+       if (!privates)
+               return;
 
-       out_printf (out,
-                   "\t\ttype = g_type_register_static (%s, \"%s\", &info, (GTypeFlags)%s);\n",
-                   pmacrotype, typebase, ((Class *)class)->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
+       out_printf(out, "#ifdef %s\n"
+                       "#define ___add_privates() %s(%s)\n"
+                       "#else\n"
+                       "#define ___add_privates()\n"
+                       "#endif\n\n",
+                       addprivate, addprivate, typebase);
+}
 
-       add_interfaces ();
+static void add_type_info(void)
+{
+       out_printf(out, "\tstatic const GTypeInfo info = {\n"
+                       "\t\tsizeof (%sClass),\n"
+                       "\t\t(GBaseInitFunc) NULL,\n"
+                       "\t\t(GBaseFinalizeFunc) NULL,\n"
+                       "\t\t(GClassInitFunc) %s_class_init,\n"
+                       "\t\t(GClassFinalizeFunc) NULL,\n"
+                       "\t\tNULL /* class_data */,\n"
+                       "\t\tsizeof (%s),\n"
+                       "\t\t%d /* n_preallocs */,\n"
+                       "\t\t(GInstanceInitFunc) %s_init,\n"
+                       "\t\tNULL\n"
+                       "\t};\n\n",
+                       typebase, funcbase, typebase, prealloc, funcbase);
+}
 
-       /*
-       if(chunk_size)  {
-               out_printf(out,
-                          "#if %s > 0\n"
-                          "\t\tgtk_type_set_chunk_alloc(type, %s);\n"
-                          "#endif\n", 
-                          chunk_size, chunk_size);
-       }
-       */
-       out_printf(out,
-                  "\t}\n\n"
-                  "\treturn type;\n"
-                  "}\n\n");
+static void
+add_get_type(void)
+{
+       Class *c = (Class *)class;
+
+       define_add_interfaces(c);
+       define_add_privates(c);
+
+       out_printf(out, "#ifdef G_DEFINE_TYPE_EXTENDED\n\n"
+                       "G_DEFINE_TYPE_EXTENDED(%s, %s, %s,\n"
+                       "\t(GTypeFlags)%s,\n",
+                       typebase, funcbase, pmacrotype,
+                       c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
+
+       if (privates)
+               out_printf(out, "\t___add_privates();\n");
+
+       if (c->interfaces)
+               out_printf(out, "\t___add_interfaces(g_define_type_id);\n");
+
+       /* Fallback for GLib < 2.4 */
+       out_printf(out, ");\n\n"
+                       "#else\n\n"
+                       "GType %s_get_type(void)\n"
+                       "{\n"
+                       "\tstatic GType type = 0;\n",
+                       funcbase);
+
+       add_type_info();
+
+       out_printf(out, "\tif ___GOB_UNLIKELY(type == 0) {\n"
+                       "\t\ttype = g_type_register_static\n"
+                       "\t\t\t( %s\n"
+                       "\t\t\t, \"%s\"\n"
+                       "\t\t\t, &info\n"
+                       "\t\t\t, (GTypeFlags)%s\n"
+                       "\t\t\t);\n",
+                       pmacrotype, typebase,
+                       c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
+
+       if (c->interfaces)
+               out_printf(out, "\t\t___add_interfaces(type);\n");
+
+       out_printf(out, "\t}\n\n"
+                       "\treturn type;\n"
+                       "}\n\n"
+                       "#endif\n\n");
 }
 
 static void
-add_dynamic_get_type (void)
+add_dynamic_get_type(void)
 {
-       out_printf(out,
-                  "static GType %s_type_id;\n\n"
-                  "GType\n"
-                  "%s_get_type (void)\n"
-                  "{\n"
-                  "\treturn %s_type_id;\n"
-                  "}\n\n",
-                  funcbase, funcbase, funcbase);
+       Class *c = (Class *)class;
 
-       out_printf(out,
-                  "void\n"
-                  "%s_register_type (GTypeModule *type_module)\n"
-                  "{\n"
-                  "\tstatic const GTypeInfo info = {\n"
-                  "\t\tsizeof (%sClass),\n"
-                  "\t\t(GBaseInitFunc) NULL,\n"
-                  "\t\t(GBaseFinalizeFunc) NULL,\n"
-                  "\t\t(GClassInitFunc) %s_class_init,\n"
-                  "\t\t(GClassFinalizeFunc) NULL,\n"
-                  "\t\tNULL /* class_data */,\n"
-                  "\t\tsizeof (%s),\n"
-                  "\t\t%d /* n_preallocs */,\n"
-                  "\t\t(GInstanceInitFunc) %s_init,\n"
-                  "\t\tNULL\n"
-                  "\t};\n\n",
-                  funcbase, typebase, funcbase, typebase, prealloc, funcbase);
-
-       add_interface_infos();
+       define_dynamic_add_interfaces(c);
+       define_add_privates(c);
 
-       out_printf(out,
-                  "\t%s_type_id = g_type_module_register_type(\n"
-                  "\t\ttype_module,\n"
-                  "\t\t%s,\n"
-                  "\t\t\"%s\",\n"
-                  "\t\t&info,\n"
-                  "\t\t(GTypeFlags)%s\n"
-                  "\t);\n\n"
-                  "\t{\n",
-                  funcbase, pmacrotype, typebase,
-                  ((Class *)class)->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
-
-       add_dynamic_interfaces();
+       /*
+        * G_DEFINE_DYNAMIC_TYPE_EXTENDED is usable if available, except for
+        * some reason it defines an xxx_register_type function with internal
+        * linkage.  This is kind of weird so we have to work around that.
+        */
+       out_printf(out, "#ifdef G_DEFINE_DYNAMIC_TYPE_EXTENDED\n\n"
+                       "static void %s_class_finalize(%sClass *c) { }\n\n"
+                       "#define %s_register_type ___register_type\n",
+                       funcbase, typebase, funcbase);
+
+       out_printf(out, "G_DEFINE_DYNAMIC_TYPE_EXTENDED(%s, %s, %s,\n"
+                       "\t(GTypeFlags)%s,\n",
+                       typebase, funcbase, pmacrotype,
+                       c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
+
+       if (privates)
+               out_printf(out, "\t___add_privates();\n");
+
+       if (c->interfaces) {
+               out_printf(out, "\t___add_interfaces"
+                                   "(type_module, %s_type_id);\n", funcbase);
+       }
 
-       out_printf(out,
-                  "\t}\n"
-                  "}\n\n");
+       out_printf(out, ");\n"
+                       "#undef %s_register_type\n\n"
+                       "void %s_register_type(GTypeModule *type_module)\n"
+                       "{\n"
+                       "\t___register_type(type_module);\n"
+                       "}\n\n",
+                       funcbase, funcbase);
+
+       /* Fallback for GLib < 2.14 */
+       out_printf(out, "#else\n\n"
+                       "static GType %s_type_id;\n\n"
+                       "GType %s_get_type(void)\n"
+                       "{\n"
+                       "\treturn %s_type_id;\n"
+                       "}\n\n",
+                       funcbase, funcbase, funcbase);
+
+       out_printf(out, "void %s_register_type(GTypeModule *type_module)\n"
+                       "{\n",
+                       funcbase);
+
+       add_type_info();
+
+       out_printf(out, "\t%s_type_id = g_type_module_register_type\n"
+                       "\t\t( type_module\n"
+                       "\t\t, %s\n"
+                       "\t\t, \"%s\"\n"
+                       "\t\t, &info\n"
+                       "\t\t, (GTypeFlags)%s\n"
+                       "\t\t);\n",
+                       funcbase, pmacrotype, typebase,
+                       c->abstract ? "G_TYPE_FLAG_ABSTRACT" : "0");
+
+       if (c->interfaces) {
+               out_printf(out, "\t___add_interfaces"
+                                   "(type_module, %s_type_id);\n",
+                               funcbase);
+       }
+
+       out_printf(out, "}\n\n"
+                       "#endif\n\n");
 }
 
 static void
-add_bonobo_object_get_type (void)
+add_bonobo_object_get_type(void)
 {
-       /* char *chunk_size = ((Class*)class)->chunk_size; */
-       /* _vicious_ spanks seth with a rusty nail
-        out_printf(out,
-                  "\n#warning \"Bonobo isn't fully ported to glib 2.0 and "
-                  "gob2 doesn't officially support it yet. It'd be safer "
-                   "and a lot more fun to blow goats.\"\n");
-                  */
+       Class *c = (Class *)class;
 
-       out_printf (out,
-                   "GType\n"
-                   "%s_get_type (void)\n" /* 1 */
-                   "{\n"
-                   "\tstatic GType type = 0;\n\n"
-                   "\tif ___GOB_UNLIKELY(type == 0) {\n"
-                   "\t\tstatic const GTypeInfo info = {\n"
-                   "\t\t\tsizeof (%sClass),\n" /* 2 */
-                   "\t\t\t(GBaseInitFunc) NULL,\n"
-                   "\t\t\t(GBaseFinalizeFunc) NULL,\n"
-                   "\t\t\t(GClassInitFunc) %s_class_init,\n" /* 3 */
-                   "\t\t\tNULL, /* class_finalize */\n"
-                   "\t\t\tNULL, /* class_data */\n"
-                   "\t\t\tsizeof (%s),\n" /* 4 */
-                   "\t\t\t0, /* n_preallocs */\n"
-                   "\t\t\t(GInstanceInitFunc)  %s_init,\n" /* 5 */
-                   "\t\t\tNULL\n"
-                   "\t\t};\n\n",
-                   funcbase /* 1 */,
-                   typebase /* 2 */,
-                   funcbase /* 3 */,
-                   typebase /* 4 */,
-                   funcbase /* 5 */);
-
-       add_interface_infos ();
+       define_add_interfaces(c);
 
-       out_printf (out,
-                  "\t\ttype = bonobo_type_unique (\n"
-                  "\t\t\tBONOBO_OBJECT_TYPE,\n"
-                  "\t\t\tPOA_%s__init, NULL,\n" /* 1 */
-                  "\t\t\tG_STRUCT_OFFSET (%sClass, _epv),\n" /* 2 */
-                  "\t\t\t&info, \"%s\");\n", /* 3 */
-                  ((Class*)class)->bonobo_object_class /* 1 */,
-                  typebase /* 2 */,
-                  typebase /* 3 */);
-
-       add_interfaces ();
-
-       /*if(chunk_size)  {
-               out_printf(out,
-                          "#if %s > 0\n"
-                          "\t\tgtk_type_set_chunk_alloc(type, %s);\n"
-                          "#endif\n", 
-                          chunk_size, chunk_size);
-       }*/
-       out_printf(out,
-                  "\t}\n\n"
-                  "\treturn type;\n"
-                  "}\n\n");
+       out_printf (out, "GType %s_get_type(void)\n"
+                        "{\n"
+                        "\tstatic GType type = 0;\n",
+                        funcbase);
+
+       add_type_info();
+
+       out_printf (out, "\tif ___GOB_UNLIKELY(type == 0) {\n"
+                        "\t\ttype = bonobo_type_unique\n"
+                        "\t\t\t( BONOBO_OBJECT_TYPE\n"
+                        "\t\t\t, POA_%s__init, NULL\n"
+                        "\t\t\t, G_STRUCT_OFFSET (%sClass, _epv)\n"
+                        "\t\t\t, &info\n"
+                        "\t\t\t, \"%s\"\n"
+                        "\t\t\t);\n",
+                        c->bonobo_object_class, typebase, typebase);
+
+       if (((Class *)class)->interfaces)
+               out_printf(out, "\t\t___add_interfaces(type);\n");
+
+       out_printf(out, "\t}\n\n"
+                       "\treturn type;\n"
+                       "}\n\n");
 }
 
 static void
@@ -2489,6 +2569,51 @@ make_bonobo_object_epv (Class *c, const char *classname)
                out_addline_outfile(out);
 }
 
+static void add_class_private(Class *c, Method *m)
+{
+       const char *dynamic = c->dynamic ? "_DYNAMIC" : "";
+
+       if (!privates)
+               return;
+
+       out_printf(out, "\n#if !defined(G_DEFINE%s_TYPE_EXTENDED)"
+                           " || !defined(G_ADD_PRIVATE%s)\n"
+                       "\tg_type_class_add_private(%s, sizeof(%sPrivate));\n"
+                       "#endif\n",
+                       dynamic, dynamic,
+                       ((FuncArg *)m->args->data)->name, typebase);
+}
+
+static void get_instance_private(Class *c, Method *m)
+{
+       const char *self = ((FuncArg *)m->args->data)->name;
+       const char *dynamic = c->dynamic ? "_DYNAMIC" : "";
+
+       if (!privates) {
+               if (always_private_struct) {
+                       out_printf(out, "\t%s->_priv = NULL;\n", self);
+               }
+
+               return;
+       }
+
+       out_printf(out, "\t%s->_priv = (%sPrivate *)\n"
+                       "#if defined(G_DEFINE%s_TYPE_EXTENDED)"
+                           " && defined(G_ADD_PRIVATE%s)\n"
+                       "\t\t%s_get_instance_private(%s);\n"
+                       "#else\n"
+                       "\t\tG_TYPE_INSTANCE_GET_PRIVATE\n"
+                       "\t\t\t( %s\n"
+                       "\t\t\t, %s\n"
+                       "\t\t\t, %sPrivate\n"
+                       "\t\t\t);\n"
+                       "#endif\n",
+                       self, typebase,
+                       dynamic, dynamic,
+                       funcbase, self,
+                       self, macrotype, typebase);
+}
+
 static void
 add_inits(Class *c)
 {
@@ -2517,17 +2642,9 @@ add_inits(Class *c)
                        out_printf(out,
                                   "#define __GOB_FUNCTION__ \"%s::init\"\n",
                                   c->otype);
-                       if (privates > 0) {
-                               out_printf(out, "\t%s->_priv = "
-                                               "G_TYPE_INSTANCE_GET_PRIVATE(%s,%s,%sPrivate);\n",
-                                               ((FuncArg *)m->args->data)->name,
-                                               ((FuncArg *)m->args->data)->name,
-                                               macrotype,
-                                               typebase);
-                       } else if(always_private_struct) {
-                               out_printf(out, "\t%s->_priv = NULL;\n",
-                                          ((FuncArg *)m->args->data)->name);
-                       }
+
+                       get_instance_private(c, m);
+
                        if(initializers > 0) {
                                GList *li;
                                for(li = ((Class *)class)->nodes;
@@ -2588,11 +2705,7 @@ add_inits(Class *c)
                                               ((FuncArg *)m->args->data)->name,
                                               did_base_obj);
 
-                       if (privates > 0)
-                               out_printf (out,
-                                           "\n\tg_type_class_add_private(%s,sizeof(%sPrivate));\n",
-                                           ((FuncArg *)m->args->data)->name,
-                                           typebase);
+                       add_class_private(c, m);
 
                        if (initializers > 0) {
                                GList *li;
@@ -3053,6 +3166,35 @@ get_arg_names_for_macro (Method *m)
        return g_string_free (gs, FALSE);
 }
 
+static gboolean method_is_void(Method *m)
+{
+       return !strcmp(m->mtype->name, "void") && !m->mtype->pointer;
+}
+
+static const char *method_err_retval(Method *m)
+{
+       if (method_is_void(m))
+               return "(void)0";
+       if (m->onerror)
+               return m->onerror;
+       return "0";
+}
+
+static void
+put_interface_parent_handler(Method *m)
+{
+       const char *errval = method_err_retval(m);
+       char *name = replace_sep(m->interface, '_');
+       char *args = get_arg_names_for_macro(m);
+
+       out_printf(out, "#define PARENT_HANDLER(%s) (%s_parent_iface \\\n"
+                       "\t? %s_parent_iface->%s(%s) \\\n"
+                       "\t: %s)\n", args, name, name, m->id, args, errval);
+
+       g_free(name);
+       g_free(args);
+}
+
 static void
 put_method(Method *m)
 {
@@ -3068,6 +3210,7 @@ put_method(Method *m)
                        g_free(doc);
                }
        }
+
        switch(m->method) {
        case REGULAR_METHOD:
                if(m->line_no > 0)
@@ -3078,7 +3221,18 @@ put_method(Method *m)
                else /* PUBLIC, PROTECTED */
                        print_method(out, "", "\n", "", " ", "", "\n",
                                     m, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
+
+               if (m->interface) {
+                       out_addline_outfile(out);
+                       put_interface_parent_handler(m);
+               }
+
                print_method_body(m, TRUE, TRUE);
+
+               if (m->interface) {
+                       out_printf(out, "#undef PARENT_HANDLER\n");
+               }
+
                /* the outfile line was added above */
                break;
        case SIGNAL_FIRST_METHOD:
@@ -3338,13 +3492,13 @@ open_files(void)
                if (file_sep != 0)
                        sep[0] = file_sep;
                outfilephbase = g_strconcat (fullfilebase, sep, "private.h", NULL);
-               outfileph = g_strconcat (outfilephbase, no_touch ? "#gob#" : "", NULL);
+               outfileph = g_strconcat (outfilephbase, no_touch_headers ? "#gob#" : "", NULL);
        } else {
                outfilephbase = NULL;
                outfileph = NULL;
        }
 
-       
+
        if ( ! no_write) {
                out = fopen (outfile, "w");
                if (out == NULL) {
@@ -3753,7 +3907,7 @@ print_class_block(Class *c)
                    " * Public methods\n"
                    " */\n");
 
-       if (!overrode_get_type) {
+       if (!overrode_get_type && !no_gnu) {
                /*
                 * For ordinary "static" types it should be safe to mark the
                 * get_type implementation as const, since the get_type
@@ -4161,7 +4315,8 @@ print_enum (EnumDef *enode)
        g_free (str);
 
        out_printf (outh, "%s_get_type()\n", funcprefix);
-       out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
+       out_printf (outh, "GType %s_get_type (void)%s;\n\n",
+                         funcprefix, no_gnu ? "": " G_GNUC_CONST");
 
        out_printf (out,
                    "GType\n%s_get_type (void)\n"
@@ -4226,7 +4381,8 @@ print_flags (Flags *fnode)
        g_free (str);
 
        out_printf (outh, "%s_get_type()\n", funcprefix);
-       out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
+       out_printf (outh, "GType %s_get_type (void)%s;\n\n",
+                         funcprefix, no_gnu ? "" : " G_GNUC_CONST");
 
        out_printf (out,
                    "GType\n%s_get_type (void)\n"
@@ -4289,7 +4445,8 @@ print_error (Error *enode)
        g_free (str);
 
        out_printf (outh, "%s_get_type ()\n", funcprefix);
-       out_printf (outh, "GType %s_get_type (void) G_GNUC_CONST;\n\n", funcprefix);
+       out_printf (outh, "GType %s_get_type (void)%s;\n\n",
+                         funcprefix, no_gnu ? "" : " G_GNUC_CONST");
 
        out_printf (out,
                    "GType\n%s_get_type (void)\n"
@@ -4366,57 +4523,84 @@ generate_outfiles(void)
        print_header_postfixes();
 }
 
+static void print_version(void)
+{
+       printf("%s (%s) %s\n", PACKAGE_NAME, PACKAGE_TARNAME, PACKAGE_VERSION);
+       putchar('\n');
+       puts("Copyright (C) 2013 George (Jiri) Lebl et al.");
+       puts("Copyright (C) 2020 Nick Bowler");
+       puts("License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>.");
+       puts("This is free software: you are free to change and redistribute it.");
+       puts("There is NO WARRANTY, to the extent permitted by law.");
+
+}
+
+static void print_usage(FILE *f)
+{
+       fprintf(f, "Usage: %s [options] file.gob\n", g_get_prgname());
+       if (f == stderr) {
+               fprintf(f, "Try '%s --help' for more information.\n",
+                          g_get_prgname());
+       }
+}
+
 static void
 print_help(void)
 {
-       fprintf(stderr, "Gob version %s\n\n", VERSION);
-       fprintf(stderr, "gob [options] file.gob\n\n");
-       fprintf(stderr, "Options:\n"
-               "\t--help,-h,-?            Display this help\n"
-               "\t--version               Display version\n"
-               "\t--exit-on-warn,-w       Exit with an error on warnings\n"
-               "\t--no-exit-on-warn       Don't exit on warnings [default]\n"
-               "\t--for-cpp               Create C++ files\n"
-               "\t--no-extern-c           Never print extern \"C\" into the "
-                                         "header\n"
-               "\t--no-gnu                Never use GNU extentions\n"
-               "\t--no-touch              Don't touch output files unless they "
-                                         "really\n"
-               "\t                        changed (implies --no-touch-headers)\n"
-               "\t--no-touch-headers      Don't touch headers unless they "
-                                         "really changed\n"
-               "\t--always-private-header Always create a private header "
-                                         "file,\n"
-               "\t                        even if it would be empty\n"
-               "\t--ondemand-private-header Create private header only when "
-                                         "needed\n"
-               "\t                        [default]\n"
-               "\t--no-private-header     Don't create a private header, "
-                                         "put private\n"
-               "\t                        structure and protected "
-                                         "prototypes inside c file\n"
-               "\t--always-private-struct Always create a private pointer "
-                                         "in\n"
-               "\t                        the object structure\n"
-               "\t--m4                    Preprocess source with m4. "
-                                         "Following args will\n"
-               "\t                        be passed to m4\n"
-               "\t--m4-dir                Print directory that will be "
-                                         "searched for m4\n"
-               "\t                        files\n"
-               "\t--no-write,-n           Don't write output files, just "
-                                         "check syntax\n"
-               "\t--no-lines              Don't print '#line' to output\n"
-               "\t--no-self-alias         Don't create self type and macro "
-                                         "aliases\n"
-               "\t--no-kill-underscores   Ignored for compatibility\n"
-               "\t-o,--output-dir         The directory where output "
-                                         "should be placed\n"
-               "\t--file-sep[=c]          replace default \'-\' file "
-                                         "name separator\n\n"
-               "\t--gtk3                  Use gtk+3\n"
-               );
-       fprintf(stderr, "End world hunger, donate to the World Food Programme, http://www.wfp.org\n");
+       print_usage(stdout);
+
+       puts(
+"This is \"GObject Builder\": a simple preprocessor to help with\n"
+"implementing GObject types in C.\n"
+       );
+
+       puts("Options:");
+       puts("  --help,-h,-?            Display this help\n"
+            "  --version               Display version\n"
+            "  --exit-on-warn,-w       Exit with an error on warnings\n"
+            "  --no-exit-on-warn       Don't exit on warnings [default]\n"
+            "  --for-cpp               Create C++ files\n"
+            "  --no-extern-c           Never print extern \"C\" into the "
+                                      "header\n"
+            "  --no-gnu                Never use GNU extentions\n"
+            "  --no-touch              Don't touch output files unless they "
+                                      "really\n"
+            "                          changed (implies --no-touch-headers)\n"
+            "  --no-touch-headers      Don't touch headers unless they "
+                                      "really changed\n"
+            "  --always-private-header Always create a private header "
+                                      "file,\n"
+            "                          even if it would be empty\n"
+            "  --ondemand-private-header Create private header only when "
+                                      "needed\n"
+            "                          [default]\n"
+            "  --no-private-header     Don't create a private header, "
+                                      "put private\n"
+            "                          structure and protected "
+                                      "prototypes inside c file\n"
+            "  --always-private-struct Always create a private pointer "
+                                      "in\n"
+            "                          the object structure\n"
+            "  --m4                    Preprocess source with m4. "
+                                      "Following args will\n"
+            "                          be passed to m4\n"
+            "  --m4-dir                Print directory that will be "
+                                      "searched for m4\n"
+            "                          files\n"
+            "  --no-write,-n           Don't write output files, just "
+                                      "check syntax\n"
+            "  --no-lines              Don't print '#line' to output\n"
+            "  --no-self-alias         Don't create self type and macro "
+                                      "aliases\n"
+            "  --no-kill-underscores   Ignored for compatibility\n"
+            "  -o,--output-dir         The directory where output "
+                                 "should be placed\n"
+            "  --file-sep[=c]          replace default \'-\' file "
+                                      "name separator\n\n"
+            "  --gtk3                  Use gtk+3\n"
+            );
+
+       puts("End world hunger, donate to the World Food Programme: https://www.wfp.org/");
 }
 
 static void
@@ -4466,7 +4650,7 @@ parse_options(int argc, char *argv[])
                        /*must be a file*/
                        if(got_file) {
                                fprintf(stderr, "Specify only one file!\n");
-                               print_help();
+                               print_usage(stderr);
                                exit(1);
                        }
                        filename = argv[i];
@@ -4475,7 +4659,7 @@ parse_options(int argc, char *argv[])
                        print_help();
                        exit(0);
                } else if(strcmp(argv[i], "--version")==0) {
-                       fprintf(stderr, "Gob version %s\n", VERSION);
+                       print_version();
                        exit(0);
                } else if(strcmp(argv[i], "--exit-on-warn")==0) {
                        exit_on_warn = TRUE;
@@ -4557,7 +4741,7 @@ parse_options(int argc, char *argv[])
                } else if(strncmp(argv[i], "--", 2)==0) {
                        /*unknown long option*/
                        fprintf(stderr, "Unknown option '%s'!\n", argv[i]);
-                       print_help();
+                       print_usage(stderr);
                        exit(1);
                } else {
                        /*by now we know we have a string starting with
@@ -4578,7 +4762,7 @@ parse_options(int argc, char *argv[])
                                default:
                                        fprintf(stderr,
                                                "Unknown option '%c'!\n", *p);
-                                       print_help();
+                                       print_usage(stderr);
                                        exit(1);
                                }
                        }
@@ -4677,6 +4861,8 @@ compare_and_move (const char *old_filename)
 int
 main(int argc, char *argv[])
 {
+       g_set_prgname(argc > 0 ? argv[0] : "gob2");
+
        parse_options(argc, argv);
 
        if(use_m4) {
@@ -4781,15 +4967,16 @@ main(int argc, char *argv[])
        if (outph)
                fclose (outph);
 
-       if (! no_write) {
+       if (!no_write) {
                if (no_touch) {
-                       compare_and_move (outfilebase);
+                       compare_and_move(outfilebase);
+               }
+               if (no_touch_headers) {
+                       compare_and_move(outfilehbase);
                        if (outfilephbase)
-                               compare_and_move (outfilephbase);
+                               compare_and_move(outfilephbase);
                }
-               if (no_touch_headers)
-                       compare_and_move (outfilehbase);
        }
-       
+
        return 0;
 }