]> git.draconx.ca Git - gob-dx.git/blobdiff - src/checks.c
Release 2.0.13
[gob-dx.git] / src / checks.c
index 7c675ee041e20a75ed1fb49b88ad5d3b5a9d1380..cccdedba562a4d80537724b79749d8d8aada9326 100644 (file)
@@ -1,6 +1,7 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999-2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2001-2004 George Lebl
  *
  * Author: George Lebl
  *
 #include "checks.h"
 
 static void
-check_duplicate(Class *c, Node *node, char *id, int line_no,
-               gboolean underscore)
+check_duplicate (Class *c, Node *node, const char *id, int line_no)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               char *nid;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               const char *nid;
                int nline_no;
-               gboolean here_underscore = FALSE;
-               char *s;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
 
@@ -49,11 +47,8 @@ check_duplicate(Class *c, Node *node, char *id, int line_no,
                        if(m->method == OVERRIDE_METHOD)
                                continue;
 
-                       nid = get_real_id(m->id);
+                       nid = m->id;
                        nline_no = m->line_no;
-
-                       if(m->id[0] == '_' && m->id[1] != '\0')
-                               here_underscore = TRUE;
                } else if(n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
                        nid = v->id;
@@ -65,54 +60,41 @@ check_duplicate(Class *c, Node *node, char *id, int line_no,
                   n->type != node->type ||
                   strcmp(nid, id) != 0)
                        continue;
-               /* this can only happen if the things were methods and
-                * one had an underscore and the other one didn't */
-               if(!no_kill_underscores && underscore != here_underscore)
-                       s = g_strdup_printf("symbol '%s' ('_%s') redefined, "
-                                           "first defined on line %d. "
-                                           "Note that '%s' and '_%s' are "
-                                           "eqivalent.",
-                                           id, id, line_no, id, id);
-               else
-                       s = g_strdup_printf("symbol '%s' redefined, "
-                                           "first defined on line %d",
-                                           id, line_no);
-               print_error(FALSE, s, nline_no);
-               g_free(s);
+
+               error_printf (GOB_ERROR, nline_no,
+                             "symbol '%s' redefined, "
+                             "first defined on line %d",
+                             id, line_no);
        }
 }
 
 void
-check_duplicate_symbols(Class *c)
+check_duplicate_symbols (Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+
+               if (n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
-                       gboolean underscore = FALSE;
                        /* override methods are checked separately */
-                       if(m->method == OVERRIDE_METHOD)
-                               continue;
-                       if(m->id[0] == '_' && m->id[1] != '\0')
-                               underscore = TRUE;
-                       check_duplicate(c, n, get_real_id(m->id), m->line_no,
-                                       underscore);
-               } else if(n->type == VARIABLE_NODE) {
+                       if (m->method != OVERRIDE_METHOD) {
+                               check_duplicate (c, n, m->id, m->line_no);
+                       }
+               } else if (n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
-                       check_duplicate(c, n, v->id, v->line_no, FALSE);
+                       check_duplicate (c, n, v->id, v->line_no);
                }
        }
 }
 
 static void
-check_duplicate_override(Class *c, Method *method)
+check_duplicate_override (Class *c, Method *method)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                Method *m = (Method *)n;
-               char *s;
                if(n->type != METHOD_NODE ||
                   m->method != OVERRIDE_METHOD)
                        continue;
@@ -122,20 +104,19 @@ check_duplicate_override(Class *c, Method *method)
                   strcmp(m->id, method->id) != 0 ||
                   strcmp(m->otype, method->otype) != 0)
                        continue;
-               s = g_strdup_printf("override '%s(%s)' redefined, "
-                                   "first defined on line %d",
-                                   m->id, m->otype, method->line_no);
-               print_error(FALSE, s, m->line_no);
-               g_free(s);
+               error_printf(GOB_ERROR, m->line_no,
+                            "override '%s(%s)' redefined, "
+                            "first defined on line %d",
+                            m->id, m->otype, method->line_no);
        }
 }
 
 void
 check_duplicate_overrides(Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                Method *m = (Method *)n;
                if(n->type != METHOD_NODE ||
                   m->method != OVERRIDE_METHOD)
@@ -147,95 +128,103 @@ check_duplicate_overrides(Class *c)
 void
 check_bad_symbols(Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if((m->method == SIGNAL_LAST_METHOD ||
                            m->method == SIGNAL_FIRST_METHOD ||
                            m->method == VIRTUAL_METHOD) &&
-                          strcmp(m->id, "__parent__")==0) {
-                               char *s;
-                               s = g_strdup_printf("'%s' not allowed as an "
-                                                   "identifier of signal "
-                                                   "or virtual methods",
-                                                   m->id);
-                               print_error(FALSE,s,m->line_no);
-                               g_free(s);
+                          (strcmp(m->id, "_epv")==0 ||
+                           strcmp(m->id, "__parent__")==0 ||
+                           strcmp(m->id, "___parent__")==0)) {
+                               error_printf(GOB_ERROR, m->line_no,
+                                            "'%s' not allowed as an "
+                                            "identifier of signal "
+                                            "or virtual methods",
+                                            m->id);
                        }
                        if(m->method != INIT_METHOD &&
                           m->method != CLASS_INIT_METHOD &&
                           (strcmp(m->id, "init")==0 ||
                            strcmp(m->id, "class_init")==0)) {
-                               print_error(FALSE,"init, or class_init not "
+                               error_print(GOB_ERROR, m->line_no,
+                                           "init, or class_init not "
                                            "allowed as an "
                                            "identifier of non-"
-                                           "constructor methods", m->line_no);
+                                           "constructor methods");
                        }
                } else if(n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
                        if(strcmp(v->id, "_priv")==0 ||
                           strcmp(v->id, "__parent__")==0) {
-                               char *s;
-                               s = g_strdup_printf("'%s' not allowed as a "
-                                                   "data member name", v->id);
-                               print_error(FALSE, s, v->line_no);
-                               g_free(s);
+                               error_printf(GOB_ERROR, v->line_no,
+                                            "'%s' not allowed as a "
+                                            "data member name", v->id);
                        }
                }
        }
 }
 
 static void
-check_duplicate_named(Class *c, Node *node, char *id, int line_no)
+check_duplicate_named (Class *c, Node *node, const char *id, int line_no)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               char *nid;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               const char *nid;
                int nline_no;
-               char *s;
-               if(n->type == METHOD_NODE) {
+               if (n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
-                       if(m->method == SIGNAL_LAST_METHOD ||
-                          m->method == SIGNAL_FIRST_METHOD) {
+                       if (m->method == SIGNAL_LAST_METHOD ||
+                           m->method == SIGNAL_FIRST_METHOD) {
                                nid = m->id;
                                nline_no = m->line_no;
-                       } else
+                       } else {
                                continue;
-               } else if(n->type == ARGUMENT_NODE) {
+                       }
+               } else if (n->type == ARGUMENT_NODE) {
                        Argument *a = (Argument *)n;
                        nid = a->name;
                        nline_no = a->line_no;
-               } else
+               } else if (n->type == PROPERTY_NODE) {
+                       Property *p = (Property *)n;
+                       nid = p->name;
+                       nline_no = p->line_no;
+               } else {
                        continue;
-               if(n==node ||
-                  line_no>=nline_no ||
-                  g_strcasecmp(nid,id)!=0)
+               }
+               if (n == node ||
+                   line_no >= nline_no ||
+                   g_strcasecmp (nid, id) != 0)
                        continue;
-               s = g_strdup_printf("named symbol (argument or signal) '%s' "
-                                   "redefined, first defined on line %d "
-                                   "(case insensitive)",
-                                   id,line_no);
-               print_error(FALSE,s,nline_no);
+               error_printf (GOB_ERROR, nline_no,
+                             "named symbol (argument or signal) '%s' "
+                             "redefined, first defined on line %d "
+                             "(case insensitive)",
+                             id, line_no);
        }
 }
 
 void
-check_duplicate_signals_args(Class *c)
+check_duplicate_signals_args (Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == METHOD_NODE) {
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->method == SIGNAL_LAST_METHOD ||
                           m->method == SIGNAL_FIRST_METHOD)
-                               check_duplicate_named(c,n,m->id,m->line_no);
-               } else if(n->type == ARGUMENT_NODE) {
+                               check_duplicate_named (c, n, m->id,
+                                                      m->line_no);
+               } else if (n->type == PROPERTY_NODE) {
+                       Property *p = (Property *)n;
+                       check_duplicate_named (c, n, p->name, p->line_no);
+               } else if (n->type == ARGUMENT_NODE) {
                        Argument *a = (Argument *)n;
-                       check_duplicate_named(c,n,a->name,a->line_no);
+                       check_duplicate_named (c, n, a->name, a->line_no);
                }
        }
 }
@@ -243,18 +232,17 @@ check_duplicate_signals_args(Class *c)
 void
 check_public_new(Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
-                       if((strcmp(m->id,"new")==0) &&
+                       if((strcmp(m->id, "new")==0) &&
                           (m->method != REGULAR_METHOD ||
                            m->scope != PUBLIC_SCOPE))
-                               print_error(TRUE,
+                               error_print(GOB_WARN, m->line_no,
                                            "'new' should be a regular\n"
-                                           "public method",
-                                           m->line_no);
+                                           "public method");
                }
        }
 }
@@ -262,22 +250,21 @@ check_public_new(Class *c)
 void
 check_vararg(Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
-                       if(!m->vararg)
+                       if( ! m->vararg)
                                continue;
                        if(m->method == OVERRIDE_METHOD ||
                           m->method == SIGNAL_LAST_METHOD ||
                           m->method == SIGNAL_FIRST_METHOD ||
                           m->method == VIRTUAL_METHOD) {
-                               print_error(FALSE,
+                               error_print(GOB_ERROR, m->line_no,
                                            "signals, overrides and virtuals, "
                                            "can't have variable argument "
-                                           "lists",
-                                           m->line_no);
+                                           "lists");
                        }
                }
        }
@@ -286,9 +273,9 @@ check_vararg(Class *c)
 void
 check_firstarg(Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->args)
@@ -297,10 +284,9 @@ check_firstarg(Class *c)
                           m->method == SIGNAL_LAST_METHOD ||
                           m->method == SIGNAL_FIRST_METHOD ||
                           m->method == VIRTUAL_METHOD) {
-                               print_error(FALSE,
+                               error_print(GOB_ERROR, m->line_no,
                                            "signals, overrides and virtuals, "
-                                           "can't have no arguments",
-                                           m->line_no);
+                                           "can't have no arguments");
                        }
                }
        }
@@ -310,7 +296,7 @@ void
 check_nonvoidempty(Class *c)
 {
        GList *li;
-       for(li = c->nodes; li != NULL; li = g_list_next(li)) {
+       for(li = c->nodes; li != NULL; li = li->next) {
                Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
@@ -319,11 +305,10 @@ check_nonvoidempty(Class *c)
                        if(!(strcmp(m->mtype->name, "void")==0 &&
                             m->mtype->pointer == NULL) &&
                           !m->cbuf) {
-                               print_error(TRUE,
+                               error_print(GOB_WARN, m->line_no,
                                            "non-void empty method found, "
                                            "regular non-void function should "
-                                           "not be empty.",
-                                           m->line_no);
+                                           "not be empty.");
                                /* add a body here, so that the user will also
                                   get a warning from gcc, and so that it will
                                   at least point him to the prototype of the
@@ -336,10 +321,10 @@ check_nonvoidempty(Class *c)
 }
 
 void
-check_signal_args(Class *c)
+check_signal_args (Class *c)
 {
        GList *li;
-       for(li = c->nodes; li != NULL; li = g_list_next(li)) {
+       for (li = c->nodes; li != NULL; li = li->next) {
                Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
@@ -348,39 +333,63 @@ check_signal_args(Class *c)
                           m->method != SIGNAL_FIRST_METHOD)
                                continue;
 
-                       for(l=m->gtktypes;l;l=l->next) {
-                               char *s;
-                               if(get_cast(l->data, FALSE))
+                       for (l = m->gtktypes; l != NULL; l = l->next) {
+                               if (strcmp (l->data, "BOXED") == 0) {
+                                       error_printf (GOB_ERROR, m->line_no,
+                                                     "BOXED not allowed as "
+                                                     "a signal argument, use "
+                                                     "POINTER, or BOXED_*");
+                                       continue;
+                               } else if (strcmp (l->data, "FLAGS") == 0) {
+                                       error_printf (GOB_ERROR, m->line_no,
+                                                     "FLAGS not allowed as "
+                                                     "a signal argument, use "
+                                                     "UINT");
                                        continue;
-                               s = g_strdup_printf("Unknown GTK+ type '%s' "
-                                                   "among signal types",
-                                                   (char *)l->data);
-                               print_error(FALSE, s, m->line_no);
-                               g_free(s);
+                               }
+                               if (get_cast (l->data, FALSE))
+                                       continue;
+                               error_printf (GOB_ERROR, m->line_no,
+                                             "Unknown GTK+ type '%s' "
+                                             "among signal types",
+                                             (char *)l->data);
                        }
                }
        }
 }
 
 void
-check_argument_types(Class *c)
+check_argument_types (Class *c)
 {
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == ARGUMENT_NODE) {
                        Argument *a = (Argument *)n;
-                       char *s;
                        if(get_cast(a->gtktype, FALSE))
                                continue;
-                       s = g_strdup_printf("Unknown GTK+ type '%s' "
-                                           "as argument type",
-                                           a->gtktype);
-                       /* this could perhaps be a warning, but
-                          can there really be a type beyond the
-                          fundementals? */
-                       print_error(FALSE, s, a->line_no);
-                       g_free(s);
+                       error_printf(GOB_ERROR, a->line_no,
+                                    "Unknown GLib type '%s' "
+                                    "as argument type",
+                                    a->gtktype);
+               }
+       }
+}
+
+void
+check_property_types (Class *c)
+{
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == PROPERTY_NODE) {
+                       Property *p = (Property *)n;
+                       if (get_cast (p->gtktype, FALSE))
+                               continue;
+                       error_printf (GOB_ERROR, p->line_no,
+                                     "Unknown GLib type '%s' "
+                                     "as property type",
+                                     p->gtktype);
                }
        }
 }
@@ -396,12 +405,12 @@ check_func_arg_check_func_arg(Method *m, FuncArg *fa)
 
        if(strcmp(fa->atype->name, "void") == 0 &&
           fa->atype->pointer == NULL) {
-               print_error(FALSE, "Running checks on a void function "
-                           "argument", m->line_no);
+               error_print(GOB_ERROR, m->line_no,
+                           "Running checks on a void function argument");
                return;
        }
        
-       for(li = fa->checks; li; li = g_list_next(li)) {
+       for(li = fa->checks; li; li = li->next) {
                Check *ch = li->data;
                if(ch->chtype == TYPE_CHECK) {
                        char *p;
@@ -428,7 +437,8 @@ check_func_arg_check_func_arg(Method *m, FuncArg *fa)
 
                        if(fa->atype->pointer == NULL ||
                           (strcmp(fa->atype->pointer, "*") != 0 &&
-                           strcmp(fa->atype->pointer, "* const") != 0))
+                           strcmp(fa->atype->pointer, "* const") != 0 &&
+                           strcmp(fa->atype->pointer, "const *") != 0))
                                goto type_check_error;
                }
        }
@@ -436,20 +446,20 @@ check_func_arg_check_func_arg(Method *m, FuncArg *fa)
 
 type_check_error:
        if(fa->atype->pointer)
-               s = g_strdup_printf("Cannot check the type of '%s %s'",
-                                   fa->atype->name, fa->atype->pointer);
+               error_printf(GOB_ERROR, m->line_no,
+                            "Cannot check the type of '%s %s'",
+                            fa->atype->name, fa->atype->pointer);
        else
-               s = g_strdup_printf("Cannot check the type of '%s'",
-                                   fa->atype->name);
-       print_error(FALSE, s, m->line_no);
-       g_free(s);
+               error_printf(GOB_ERROR, m->line_no,
+                            "Cannot check the type of '%s'",
+                            fa->atype->name);
 }
 
 static void
 check_func_arg_check_method(Method *m)
 {
        GList *li;
-       for(li = m->args; li; li = g_list_next(li)) {
+       for(li = m->args; li; li = li->next) {
                FuncArg *fa = li->data;
                check_func_arg_check_func_arg(m, fa);
        }
@@ -459,7 +469,7 @@ void
 check_func_arg_checks(Class *c)
 {
        GList *li;
-       for(li = c->nodes; li != NULL; li = g_list_next(li)) {
+       for(li = c->nodes; li != NULL; li = li->next) {
                Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
@@ -468,13 +478,33 @@ check_func_arg_checks(Class *c)
        }
 }
 
+void
+check_for_class_destructors (Class *c)
+{
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == VARIABLE_NODE) {
+                       Variable *v = (Variable *)n;
+                       if (v->destructor != NULL &&
+                           v->scope == CLASS_SCOPE) {
+                               error_print (GOB_WARN, v->line_no,
+                                            "classwide members cannot have "
+                                            "destructors since the classes "
+                                            "are static and never get "
+                                            "destroyed anyway");
+                       }
+               }
+       }
+}
+
 int
 count_signals(Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->method == SIGNAL_LAST_METHOD ||
@@ -486,13 +516,61 @@ count_signals(Class *c)
 }
 
 int
-count_arguments(Class *c)
+count_set_properties (Class *c)
+{
+       int num = 0;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               Property *p = li->data;
+               if (n->type == PROPERTY_NODE &&
+                   p->set != NULL)
+                       num ++;
+       }
+       return num;
+}
+
+int
+count_get_properties (Class *c)
+{
+       int num = 0;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               Property *p = li->data;
+               if (n->type == PROPERTY_NODE &&
+                   p->get != NULL)
+                       num ++;
+       }
+       return num;
+}
+
+
+int
+count_set_arguments(Class *c)
 {
        int num = 0;
        GList *li;
-       for(li = c->nodes; li != NULL; li = g_list_next(li)) {
+       for(li = c->nodes; li != NULL; li = li->next) {
                Node *n = li->data;
-               if(n->type == ARGUMENT_NODE)
+               Argument *a = li->data;
+               if(n->type == ARGUMENT_NODE &&
+                  a->set)
+                       num ++;
+       }
+       return num;
+}
+
+int
+count_get_arguments(Class *c)
+{
+       int num = 0;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               Argument *a = li->data;
+               if(n->type == ARGUMENT_NODE &&
+                  a->get)
                        num ++;
        }
        return num;
@@ -502,9 +580,9 @@ int
 count_overrides(Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->method == OVERRIDE_METHOD)
@@ -518,9 +596,9 @@ int
 count_privates(Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for(li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
                        if(v->scope == PRIVATE_SCOPE)
@@ -531,12 +609,12 @@ count_privates(Class *c)
 }
 
 int
-count_protecteds(Class *c)
+count_protecteds (Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
                if(n->type == METHOD_NODE) {
                        Method *m = (Method *)n;
                        if(m->scope == PROTECTED_SCOPE)
@@ -547,15 +625,17 @@ count_protecteds(Class *c)
 }
 
 int
-count_destructors(Class *c)
+count_unreftors (Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == VARIABLE_NODE) {
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
-                       if(v->destructor)
+                       if (v->destructor != NULL &&
+                           v->destructor_unref &&
+                           v->scope != CLASS_SCOPE)
                                num++;
                }
        }
@@ -563,17 +643,75 @@ count_destructors(Class *c)
 }
 
 int
-count_initializers(Class *c)
+count_destructors (Class *c)
 {
        int num = 0;
-       GList *l;
-       for(l = c->nodes; l != NULL; l = g_list_next(l)) {
-               Node *n = l->data;
-               if(n->type == VARIABLE_NODE) {
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == VARIABLE_NODE) {
+                       Variable *v = (Variable *)n;
+                       if (v->destructor != NULL &&
+                           ! v->destructor_unref &&
+                           v->scope != CLASS_SCOPE)
+                               num++;
+               }
+       }
+       return num;
+}
+
+int
+count_initializers (Class *c)
+{
+       int num = 0;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == VARIABLE_NODE) {
                        Variable *v = (Variable *)n;
-                       if(v->initializer)
+                       if (v->initializer != NULL)
                                num++;
                }
        }
        return num;
 }
+
+int
+count_glade_widgets (Class *c)
+{
+       int num = 0;
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               if (n->type == VARIABLE_NODE) {
+                       Variable *v = (Variable *)n;
+                       if (v->glade_widget)
+                               num++;
+               }
+       }
+       return num;
+}
+
+gboolean
+find_get_type (Class *c)
+{
+       GList *li;
+       for (li = c->nodes; li != NULL; li = li->next) {
+               Node *n = li->data;
+               Method *m = (Method *)n;
+               if (n->type == METHOD_NODE &&
+                   strcmp (m->id, "get_type") == 0) {
+                       if (m->method != REGULAR_METHOD ||
+                           m->scope != PUBLIC_SCOPE ||
+                           m->args != NULL) {
+                               error_printf (GOB_ERROR, m->line_no,
+                                             "get_type method must be a "
+                                             "regular public method with "
+                                             "no arguments");
+                       }
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}