]> git.draconx.ca Git - gob-dx.git/blobdiff - src/main.c
Release 2.0.8
[gob-dx.git] / src / main.c
index 6f5bf2cb5e2368b43726f4f7edcbcd50d704df95..c94c805121d6c0852b2ca475ad66d9a1dbf15733 100644 (file)
@@ -1,7 +1,7 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999,2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
- * Copyright (C) 2001 George Lebl
+ * Copyright (C) 2001-2004 George Lebl
  *
  * Author: George Lebl
  *
@@ -53,6 +53,7 @@ extern GList *include_files;
 extern GHashTable *gtk_doc_hash;
 
 char *filebase;
+char *fullfilebase;
 static char *funcbase;
 static char *pfuncbase;
 static char *macrobase;
@@ -63,6 +64,8 @@ static char *pmacrotype;
 static char *typebase;
 static char *ptypebase;
 
+char *output_dir = NULL;
+
 static int signals = 0; /* number of signals */
 static int set_properties = 0; /* number of named (set) properties */
 static int get_properties = 0; /* number of named (get) properties */
@@ -120,16 +123,23 @@ static void
 make_bases (void)
 {
        filebase = replace_sep (((Class *)class)->otype, '-');
-       g_strdown (filebase);
+       gob_strdown (filebase);
+
+       if (output_dir != NULL &&
+           output_dir[0] != '\0') {
+               fullfilebase = g_build_filename (output_dir, filebase, NULL);
+       } else {
+               fullfilebase = g_strdup (filebase);
+       }
 
        funcbase = replace_sep (((Class *)class)->otype, '_');
-       g_strdown (funcbase);
+       gob_strdown (funcbase);
 
        pfuncbase = replace_sep (((Class *)class)->ptype, '_');
-       g_strdown (pfuncbase);
+       gob_strdown (pfuncbase);
 
        macrobase = replace_sep (((Class *)class)->otype, '_');
-       g_strup (macrobase);
+       gob_strup (macrobase);
        
        macrois = make_pre_macro (((Class *)class)->otype, "IS");
        pmacrois = make_pre_macro (((Class *)class)->ptype, "IS");
@@ -751,7 +761,7 @@ print_signal_marsal_args (const Method *m)
                                get_func = g_strdup_printf
                                        ("g_value_get_%s", (char *)li->data);
 
-                       g_strdown (get_func);
+                       gob_strdown (get_func);
                        out_printf (out, ",\n\t\t(%s) "
                                    "%s (param_values + %d)",
                                    get_cast (li->data, FALSE),
@@ -875,7 +885,7 @@ add_signal_prots(Method *m)
                                                    (char *)m->gtktypes->data,
                                                    take_ownership ?
                                                    "_take_ownership" : ""); 
-               g_strdown (set_func);
+               gob_strdown (set_func);
 
                out_printf (out, "\n\t%s (return_value, v_return);\n",
                            set_func);
@@ -899,7 +909,7 @@ add_enums(Class *c)
                                if(m->method == SIGNAL_LAST_METHOD ||
                                   m->method == SIGNAL_FIRST_METHOD) {
                                        char *s = g_strdup(m->id);
-                                       g_strup(s);
+                                       gob_strup(s);
                                        out_printf(out, "\t%s_SIGNAL,\n", s);
                                        g_free(s);
                                }
@@ -915,13 +925,13 @@ add_enums(Class *c)
                        if (n->type == PROPERTY_NODE) {
                                Property *p = (Property *)n;
                                char *s = g_strdup (p->name);
-                               g_strup (s);
+                               gob_strup (s);
                                out_printf (out, ",\n\tPROP_%s", s);
                                g_free(s);
                        } else if (n->type == ARGUMENT_NODE) {
                                Argument *a = (Argument *)n;
                                char *s = g_strdup(a->name);
-                               g_strup(s);
+                               gob_strup (s);
                                out_printf(out, ",\n\tPROP_%s", s);
                                g_free(s);
                        }
@@ -1053,7 +1063,7 @@ static void
 add_get_type(void)
 {
        /*char *chunk_size = ((Class*)class)->chunk_size;*/
-       
+
        out_printf(out,
                   "GType\n"
                   "%s_get_type (void)\n"
@@ -1188,7 +1198,7 @@ add_overrides(Class *c, const char *oname,
                g_hash_table_insert(done, s, s);
 
                f = replace_sep(m->otype, '_');
-               g_strdown(f);
+               gob_strdown(f);
 
                out_printf(out, "\t%sClass *%s_class = (%sClass *)%s;\n",
                           s, f, s, oname);
@@ -1282,7 +1292,7 @@ add_signals(Class *c)
                is_none = (strcmp(m->gtktypes->next->data, "NONE")==0);
 
                sig = g_strdup (m->id);
-               g_strup (sig);
+               gob_strup (sig);
                flags = make_run_signal_flags (m, last);
                out_printf (out, "\tobject_signals[%s_SIGNAL] =\n"
                            "\t\tg_signal_new (\"%s\",\n"
@@ -1383,7 +1393,7 @@ set_def_handlers(Class *c, const char *oname)
                if (m->method == OVERRIDE_METHOD) {
                        char *s;
                        s = replace_sep (m->otype, '_');
-                       g_strdown (s);
+                       gob_strdown (s);
 
                        if (need_dispose &&
                            dispose_handler != NULL &&
@@ -1469,7 +1479,7 @@ make_argument (Argument *a)
        g_string_append (flags, ")");
 
        s = g_strdup(a->name);
-       g_strup(s);
+       gob_strup (s);
        if (!strcmp (a->gtktype, "ENUM"))
                out_printf(out, "\tparam_spec = g_param_spec_enum (\"%s\", NULL, NULL,\n"
                           "\t\tG_TYPE_ENUM, 0,\n"
@@ -1538,6 +1548,18 @@ make_argument (Argument *a)
                           "\t\t0,\n"
                           "\t\t%s);\n",
                           a->name, flags->str);
+       else if (!strcmp (a->gtktype, "INT64"))
+               out_printf(out, "\tparam_spec = g_param_spec_int64 (\"%s\", NULL, NULL,\n"
+                          "\t\tG_MININT64, G_MAXINT64,\n"
+                          "\t\t0,\n"
+                          "\t\t%s);\n",
+                          a->name, flags->str);
+       else if (!strcmp (a->gtktype, "UINT64"))
+               out_printf(out, "\tparam_spec = g_param_spec_uint64 (\"%s\", NULL, NULL,\n"
+                          "\t\t0, G_MAXUINT64,\n"
+                          "\t\t0,\n"
+                          "\t\t%s);\n",
+                          a->name, flags->str);
        else if (!strcmp (a->gtktype, "FLOAT"))
                out_printf(out, "\tparam_spec = g_param_spec_float (\"%s\", NULL, NULL,\n"
                           "\t\tG_MINFLOAT, G_MAXFLOAT,\n"
@@ -1569,21 +1591,6 @@ make_argument (Argument *a)
 
 #define value_for_print(str, alt) (str != NULL ? str : alt)
 
-static char *
-make_me_type (const char *type, const char *alt)
-{
-       if (type == NULL)
-               return g_strdup (alt);
-       /* HACK!  just in case someone made this
-        * work with 2.0.0 by using the TYPE
-        * macro directly */
-       if ((strstr (type, "_TYPE_") != NULL ||
-            strstr (type, "TYPE_") == type) &&
-           strchr (type, ':') == NULL)
-               return g_strdup (type);
-       return make_pre_macro (type, "TYPE");
-}
-
 static void
 make_property (Property *p)
 {
@@ -1746,6 +1753,38 @@ make_property (Property *p)
                            value_for_print (p->maximum, "G_MAXULONG"),
                            value_for_print (p->default_value, "0"),
                            flags->str);
+       } else if (strcmp (p->gtktype, "INT64") == 0) {
+               out_printf (out, "\tparam_spec = g_param_spec_int64\n"
+                           "\t\t(\"%s\" /* name */,\n"
+                           "\t\t %s /* nick */,\n"
+                           "\t\t %s /* blurb */,\n"
+                           "\t\t %s /* minimum */,\n"
+                           "\t\t %s /* maximum */,\n"
+                           "\t\t %s /* default_value */,\n"
+                           "\t\t %s);\n",
+                           p->name,
+                           value_for_print (p->nick, "NULL"),
+                           value_for_print (p->blurb, "NULL"),
+                           value_for_print (p->minimum, "G_MININT64"),
+                           value_for_print (p->maximum, "G_MAXINT64"),
+                           value_for_print (p->default_value, "0"),
+                           flags->str);
+       } else if (strcmp (p->gtktype, "UINT64") == 0) {
+               out_printf (out, "\tparam_spec = g_param_spec_uint64\n"
+                           "\t\t(\"%s\" /* name */,\n"
+                           "\t\t %s /* nick */,\n"
+                           "\t\t %s /* blurb */,\n"
+                           "\t\t %s /* minimum */,\n"
+                           "\t\t %s /* maximum */,\n"
+                           "\t\t %s /* default_value */,\n"
+                           "\t\t %s);\n",
+                           p->name,
+                           value_for_print (p->nick, "NULL"),
+                           value_for_print (p->blurb, "NULL"),
+                           value_for_print (p->minimum, "0"),
+                           value_for_print (p->maximum, "G_MAXUINT64"),
+                           value_for_print (p->default_value, "0"),
+                           flags->str);
        } else if (strcmp (p->gtktype, "UNICHAR") == 0) {
                out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
                            "\t\t(\"%s\" /* name */,\n"
@@ -1909,7 +1948,7 @@ make_property (Property *p)
        }
 
        s = g_strdup (p->name);
-       g_strup (s);
+       gob_strup (s);
        out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
                    "\t\tPROP_%s,\n"
                    "\t\tparam_spec);\n", s);
@@ -2303,11 +2342,11 @@ add_argument (Argument *a, gboolean is_set)
        if (cbuf == NULL)
                return;
        s = g_strdup(a->name);
-       g_strup(s);
+       gob_strup (s);
        out_printf(out, "\tcase PROP_%s:\n\t{", s);
 
        the_type_lower = g_strdup (a->gtktype);
-       g_strdown (the_type_lower);
+       gob_strdown (the_type_lower);
 
        /* HACK because there is no g_value_set/get for unichar */
        if (strcmp (the_type_lower, "unichar") == 0) {
@@ -2387,9 +2426,9 @@ add_property (Property *p, gboolean is_set)
                return;
 
        name_upper = g_strdup (p->name);
-       g_strup (name_upper);
+       gob_strup (name_upper);
        the_type_lower = g_strdup (p->gtktype);
-       g_strdown (the_type_lower);
+       gob_strdown (the_type_lower);
 
        out_printf (out, "\tcase PROP_%s:\n", name_upper);
 
@@ -2597,7 +2636,7 @@ put_signal_args (Method *m)
                        set_func = g_strdup_printf ("g_value_set%s_%s",
                                                    do_static ? "_static" : "",
                                                    (char *)ali->data);
-               g_strdown (set_func);
+               gob_strdown (set_func);
 
                out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n",
                            set_func, i, cast, fa->name);
@@ -2727,7 +2766,7 @@ put_method(Method *m)
                                        set_func = g_strdup_printf ("g_value_set%s_%s",
                                                                    do_static ? "_static" : "",
                                                                    (char *)m->gtktypes->data);
-                               g_strdown (set_func);
+                               gob_strdown (set_func);
 
                                out_printf (out, "\t%s (&___return_val, (%s) (%s));\n",
                                            set_func, cast, defret);
@@ -2739,7 +2778,7 @@ put_method(Method *m)
                }
 
                s = g_strdup (m->id);
-               g_strup (s);
+               gob_strup (s);
 
                out_printf(out, "\tg_signal_emitv (___param_values,\n"
                           "\t\tobject_signals[%s_SIGNAL],\n"
@@ -2767,7 +2806,7 @@ put_method(Method *m)
                                getfunc = g_strdup_printf ("g_value_%s_%s",
                                                           do_dup ? "dup" : "get",
                                                           (char *)m->gtktypes->data);
-                       g_strdown (getfunc);
+                       gob_strdown (getfunc);
 
                        if (cast == NULL)
                                cast = get_type (m->mtype, TRUE);
@@ -2866,7 +2905,7 @@ put_method(Method *m)
                g_free(s);
                out_addline_outfile(out);
                s = replace_sep(m->otype, '_');
-               g_strup(s);
+               gob_strup (s);
                args = get_arg_names_for_macro(m);
                if(is_void) {
                        out_printf(out, "#define PARENT_HANDLER(%s) \\\n"
@@ -2901,18 +2940,18 @@ open_files(void)
        char *outfile, *outfileh, *outfileph;
 
        if ( ! for_cpp)
-               outfile = g_strconcat (filebase, ".c", NULL);
+               outfile = g_strconcat (fullfilebase, ".c", NULL);
        else
-               outfile = g_strconcat (filebase, ".cc", NULL);
+               outfile = g_strconcat (fullfilebase, ".cc", NULL);
        if (no_touch_headers)
-               outfileh = g_strconcat ("#gob#", filebase, ".h#gob#", NULL);
+               outfileh = g_strconcat (fullfilebase, ".h#gob#", NULL);
        else
-               outfileh = g_strconcat (filebase, ".h", NULL);
+               outfileh = g_strconcat (fullfilebase, ".h", NULL);
 
        if ((privates > 0 || protecteds > 0 ||
             private_header == PRIVATE_HEADER_ALWAYS) &&
            private_header != PRIVATE_HEADER_NEVER)
-               outfileph = g_strconcat (filebase, "-private.h", NULL);
+               outfileph = g_strconcat (fullfilebase, "-private.h", NULL);
        else
                outfileph = NULL;
 
@@ -2920,7 +2959,7 @@ open_files(void)
        if (no_write) {
                devnull = fopen ("/dev/null", "w");
                if (devnull == NULL)
-                       g_error ("Cannot open null device");
+                       error_print (GOB_ERROR, 0, "Cannot open null device");
                out = devnull;
                outh = devnull;
                if (outfileph != NULL)
@@ -2928,15 +2967,21 @@ open_files(void)
        } else {
                out = fopen (outfile, "w");
                if (out == NULL) {
-                       g_error ("Cannot open outfile: %s", outfile);
+                       error_printf (GOB_ERROR, 0,
+                                     "Cannot open outfile: %s", outfile);
                }
                outh = fopen (outfileh, "w");
-               if (outh == NULL)
-                       g_error ("Cannot open outfile: %s", outfileh);
+               if (outh == NULL) {
+                       error_printf (GOB_ERROR, 0,
+                                     "Cannot open outfile: %s", outfileh);
+               }
                if (outfileph != NULL) {
                        outph = fopen (outfileph, "w");
-                       if (outph == NULL)
-                               g_error ("Cannot open outfile: %s", outfileh);
+                       if (outph == NULL) {
+                               error_printf (GOB_ERROR, 0,
+                                             "Cannot open outfile: %s",
+                                             outfileph);
+                       }
                }
        }
 }
@@ -2976,7 +3021,7 @@ put_argument_nongnu_wrappers (Class *c)
                }
 
                aname = g_strdup (name);
-               g_strup (aname);
+               gob_strup (aname);
 
                if (atype != NULL)
                        cast = get_type (atype, TRUE);
@@ -3042,7 +3087,7 @@ put_argument_gnu_wrappers(Class *c)
                }
 
                aname = g_strdup (name);
-               g_strup (aname);
+               gob_strup (aname);
 
                if (atype != NULL)
                        cast = get_type (atype, TRUE);
@@ -3202,7 +3247,7 @@ print_class_block(Class *c)
                    " * Main object structure\n"
                    " */\n");
        s = replace_sep (c->otype, '_');
-       g_strup (s);
+       gob_strup (s);
        out_printf (outh, "#ifndef __TYPEDEF_%s__\n"
                    "#define __TYPEDEF_%s__\n", s, s);
        g_free (s);
@@ -3541,7 +3586,7 @@ print_header_prefixes(void)
        char *p;
 
        p = replace_sep(((Class *)class)->otype, '_');
-       g_strup(p);
+       gob_strup (p);
        out_printf(outh, "#ifndef __%s_H__\n#define __%s_H__\n\n", p, p);
        if(outph)
                out_printf(outph, "#ifndef __%s_PRIVATE_H__\n"
@@ -3622,7 +3667,7 @@ print_enum (EnumDef *enode)
        char *str;
 
        funcprefix = replace_sep (enode->etype, '_');
-       g_strdown (funcprefix);
+       gob_strdown (funcprefix);
        out_printf (out, "static const GEnumValue _%s_values[] = {\n",
                    funcprefix);
        type = remove_sep (enode->etype);
@@ -3632,7 +3677,7 @@ print_enum (EnumDef *enode)
        for (li = enode->values; li != NULL; li = li->next) {
                EnumValue *value = li->data; 
                char *p;
-               char *sname = g_strdown (g_strdup (value->name));
+               char *sname = gob_strdown (g_strdup (value->name));
 
                while ((p = strchr (sname, '_')) != NULL)
                        *p = '-';
@@ -3688,7 +3733,7 @@ print_flags (Flags *fnode)
        int i;
 
        funcprefix = replace_sep (fnode->ftype, '_');
-       g_strdown (funcprefix);
+       gob_strdown (funcprefix);
        out_printf (out, "static const GFlagsValue _%s_values[] = {\n",
                    funcprefix);
        type = remove_sep (fnode->ftype);
@@ -3698,7 +3743,7 @@ print_flags (Flags *fnode)
        for (i = 0, li = fnode->values; li != NULL; i++, li = li->next) {
                const char *name = li->data; 
                char *p;
-               char *sname = g_strdown (g_strdup (name));
+               char *sname = gob_strdown (g_strdup (name));
 
                while ((p = strchr (sname, '_')) != NULL)
                        *p = '-';
@@ -3752,7 +3797,7 @@ print_error (Error *enode)
        char *str;
 
        funcprefix = replace_sep (enode->etype, '_');
-       g_strdown (funcprefix);
+       gob_strdown (funcprefix);
        out_printf (out, "static const GEnumValue _%s_values[] = {\n",
                    funcprefix);
        type = remove_sep (enode->etype);
@@ -3762,7 +3807,7 @@ print_error (Error *enode)
        for (li = enode->values; li != NULL; li = li->next) {
                const char *name = li->data;
                char *p;
-               char *sname = g_strdown (g_strdup (name));
+               char *sname = gob_strdown (g_strdup (name));
 
                while ((p = strchr (sname, '_')) != NULL)
                        *p = '-';
@@ -3806,7 +3851,7 @@ print_error (Error *enode)
        out_printf (outh, "GQuark %s_quark (void);\n\n", funcprefix);
 
        str = replace_sep (enode->etype, '-');
-       g_strdown (str);
+       gob_strdown (str);
 
        out_printf (out,
                    "GQuark\n%s_quark (void)\n"
@@ -3884,10 +3929,10 @@ print_help(void)
                                          "really changed\n"
                "\t--always-private-header Always create a private header "
                                          "file,\n"
-               "\t                        even if it would be empty "
-                                         "[default]\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 "
@@ -3906,7 +3951,9 @@ print_help(void)
                "\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--no-kill-underscores   Ignored for compatibility\n"
+               "\t-o,--output-dir         The directory where output "
+                                         "should be placed\n");
 }
 
 static void
@@ -4008,6 +4055,21 @@ parse_options(int argc, char *argv[])
                        use_m4_clean=TRUE;
                        m4_opts = TRUE;
                        m4_commandline=g_strdup(M4_COMMANDLINE);
+               } else if (strcmp (argv[i], "-o") == 0 || 
+                          strcmp (argv[i], "--output-dir") == 0) {
+                       if (i+1 < argc) {
+                               output_dir = g_strdup (argv[i+1]);
+                               i++;
+                       } else {
+                               output_dir = NULL;
+                       }
+               } else if (strncmp (argv[i], "-o=", strlen ("-o=")) == 0 || 
+                          strncmp (argv[i],
+                                   "--output-dir=",
+                                   strlen ("--output-dir=")) == 0) {
+                       char *p = strchr (argv[i], '=');
+                       g_assert (p != NULL);
+                       output_dir = g_strdup (p+1);
                } else if(strcmp(argv[i], "--")==0) {
                        /*further arguments are files*/
                        no_opts = TRUE;
@@ -4060,8 +4122,8 @@ parse_options(int argc, char *argv[])
 static void
 compare_and_move_header(void)
 {
-       char *hfnew = g_strconcat("#gob#", filebase, ".h#gob#", NULL);
-       char *hf = g_strconcat(filebase, ".h", NULL);
+       char *hfnew = g_strconcat(fullfilebase, ".h#gob#", NULL);
+       char *hf = g_strconcat(fullfilebase, ".h", NULL);
        struct stat s;
        if(stat(hf, &s) == 0) {
                char *s;
@@ -4114,7 +4176,7 @@ main(int argc, char *argv[])
        /* This is where parsing is done */
        /*yydebug = 1;*/
        if(yyparse() != 0)
-               g_error("Parsing errors, quitting");
+               error_print (GOB_ERROR, 0, "Parsing errors, quitting");
 
        /* close input file */
        if(use_m4) pclose(yyin);
@@ -4122,7 +4184,7 @@ main(int argc, char *argv[])
        yyin=stdin;
 
        if( ! class)
-               error_print(GOB_ERROR, 0, " no class defined");
+               error_print (GOB_ERROR, 0, "no class defined");
        
 
        exit_on_error = FALSE;
@@ -4163,6 +4225,7 @@ main(int argc, char *argv[])
        check_property_types ((Class *)class);
        check_argument_types ((Class *)class);
        check_func_arg_checks ((Class *)class);
+       check_for_class_destructors ((Class *)class);
 
        exit_on_error = TRUE;