X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/c3ec2de25a739b8afec1d19a950ba5bc399c1dcb..3c1af3b9549abe3bfcdf72d92df371745dc2d93c:/src/main.c diff --git a/src/main.c b/src/main.c index 783e46e..6436cde 100644 --- a/src/main.c +++ b/src/main.c @@ -2,7 +2,7 @@ * Copyright (C) 1999,2000 the Free Software Foundation. * Copyright (C) 2000 Eazel, Inc. * Copyright (C) 2001-2011 George (Jiri) Lebl - * Copyright © 2019-2020 Nick Bowler + * Copyright © 2019-2021 Nick Bowler * * Author: George (Jiri) Lebl * @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "treefuncs.h" #include "parse.h" @@ -40,6 +42,14 @@ #include "main.h" +#include "options.h" + +static const char sopts[] = SOPT_STRING; +static const struct option lopts[] = { + LOPTS_INITIALIZER, + { 0 } +}; + char *filename = NULL; int yyparse(void); @@ -128,7 +138,6 @@ gint prealloc = 0; gboolean use_m4 = FALSE; /* preprocess sources with m4 */ -gboolean use_m4_clean = FALSE; /* preprocess sources with m4, no m4 flags */ char *m4_commandline = NULL; #define M4_INCLUDE_DIR PKGDATADIR "/m4" #define M4_BASE_FILENAME "gobm4.m4" @@ -1228,6 +1237,23 @@ define_dynamic_add_interfaces(Class *c) out_printf(out, "}\n\n"); } +static void define_add_privates(Class *c) +{ + const char *addprivate = c->dynamic + ? "G_ADD_PRIVATE_DYNAMIC" + : "G_ADD_PRIVATE"; + + if (!privates) + return; + + out_printf(out, "#ifdef %s\n" + "#define ___add_privates() %s(%s)\n" + "#else\n" + "#define ___add_privates()\n" + "#endif\n\n", + addprivate, addprivate, typebase); +} + static void add_type_info(void) { out_printf(out, "\tstatic const GTypeInfo info = {\n" @@ -1251,6 +1277,7 @@ 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" @@ -1258,6 +1285,9 @@ add_get_type(void) 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"); @@ -1296,6 +1326,7 @@ add_dynamic_get_type(void) Class *c = (Class *)class; define_dynamic_add_interfaces(c); + define_add_privates(c); /* * G_DEFINE_DYNAMIC_TYPE_EXTENDED is usable if available, except for @@ -1312,6 +1343,9 @@ add_dynamic_get_type(void) 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); @@ -2544,6 +2578,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) { @@ -2572,17 +2651,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; @@ -2643,11 +2714,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; @@ -3434,13 +3501,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) { @@ -3849,7 +3916,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 @@ -4257,7 +4324,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" @@ -4322,7 +4390,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" @@ -4385,7 +4454,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" @@ -4462,237 +4532,253 @@ generate_outfiles(void) print_header_postfixes(); } -static void -print_help(void) +static void print_version(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"); + 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 ."); + 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 -parse_options(int argc, char *argv[]) +static void print_usage(FILE *f) { - int i; - int got_file = FALSE; - int no_opts = FALSE; - int m4_opts = FALSE; /* if we are just passing on args to m4 */ - - filename = NULL; - - for(i = 1 ; i < argc; i++) { - if(m4_opts) { - char *new_commandline; - g_assert(m4_commandline!=NULL); - - /* check whether this one looks like the filename */ - if((!strcmp(argv[i],"-") || argv[i][0] != '-') - && !got_file) { - const gchar *m4_flags=use_m4_clean?"":M4_FLAGS; - filename = argv[i]; - got_file = TRUE; - - /* insert flags before the filename */ - new_commandline=g_strconcat(m4_commandline, - " ", - m4_flags, - " ", - argv[i], - NULL); - } + 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()); + } +} - /* just an ordinary option */ - else - new_commandline=g_strconcat(m4_commandline, - " ", - argv[i], - NULL); - - /* free old commandline */ - g_free(m4_commandline); - m4_commandline=new_commandline; - - } else if(no_opts || - argv[i][0] != '-') { - /*must be a file*/ - if(got_file) { - fprintf(stderr, "Specify only one file!\n"); - print_help(); - exit(1); - } - filename = argv[i]; - got_file = TRUE; - } else if(strcmp(argv[i], "--help")==0) { - print_help(); - exit(0); - } else if(strcmp(argv[i], "--version")==0) { - fprintf(stderr, "Gob version %s\n", VERSION); - exit(0); - } else if(strcmp(argv[i], "--exit-on-warn")==0) { - exit_on_warn = TRUE; - } else if(strcmp(argv[i], "--no-exit-on-warn")==0) { - exit_on_warn = FALSE; - } else if(strcmp(argv[i], "--for-cpp")==0) { - for_cpp = TRUE; - } else if(strcmp(argv[i], "--no-touch")==0) { - no_touch = TRUE; - no_touch_headers = TRUE; - } else if(strcmp(argv[i], "--no-touch-headers")==0) { - no_touch_headers = TRUE; - } else if(strcmp(argv[i], "--ondemand-private-header")==0) { - private_header = PRIVATE_HEADER_ONDEMAND; - } else if(strcmp(argv[i], "--always-private-header")==0) { - private_header = PRIVATE_HEADER_ALWAYS; - } else if(strcmp(argv[i], "--no-private-header")==0) { - private_header = PRIVATE_HEADER_NEVER; - } else if(strcmp(argv[i], "--no-gnu")==0) { - no_gnu = TRUE; - } else if(strcmp(argv[i], "--no-extern-c")==0) { - no_extern_c = TRUE; - } else if(strcmp(argv[i], "--no-write")==0) { +/* + * Given a long option, return the corresponding short option character, + * or 0 if there is no such character. + */ +static char lopt_to_sopt(const char *sopts, const struct option *opt) +{ + int val = opt->val; + const char *c; + + if (val <= 0 || val > CHAR_MAX) + return 0; + + if (val == ':' || val == '+' || val == '-') + return 0; + + c = strchr(sopts, opt->val); + if (c) + return *c; + return 0; +} + +/* + * Print a string, with each line indented by i spaces. The first line + * will be indented by w fewer spaces (to account for the cursor being in + * some other column). + */ +static void print_block(const char *s, int i, int w) +{ + for (; *s; w = 0) { + const char *nl = strchr(s, '\n'); + int n = (nl ? nl-s : -1); + + printf("%*s%.*s\n", i-w, "", n, s); + if (!nl) + break; + + s = nl+1; + } +} + +static void print_help(void) +{ + const struct option *opt; + + print_usage(stdout); + + puts("This is \"GObject Builder\": a simple preprocessor to help with\n" + "implementing GObject types in C."); + + puts("\nOptions:"); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + char sopt; + int w; + + /* Don't display obsolete options that don't do anything */ + if (!opt->flag && !opt->val) + continue; + + if (!lopt_get_help(opt, &help)) + continue; + + if ((sopt = lopt_to_sopt(sopts, opt))) { + w = printf(opt->has_arg == 0 ? " -%c, --%s" + : opt->has_arg == 1 ? " -%c, --%s=%s" + : " -%c, --%s[=%s]", + sopt, opt->name, help.arg); + } else { + w = printf(opt->has_arg == 0 ? " --%s" + : opt->has_arg == 1 ? " --%s=%s" + : " --%s[=%s]", + opt->name, help.arg); + } + + if (w < 0 || w > 18) { + putchar('\n'); + w = 0; + } + + print_block(help.desc, 20, w); + } + putchar('\n'); + + puts("End world hunger, donate to the World Food Programme: https://www.wfp.org/"); +} + +/* + * Called after getopt_long receives an --m4 argument. Immediately stop + * processing options. Then all non-option arguments seen so far together + * with all remaining arguments are appended to M4_COMMANDLINE. If m4_clean + * is false, then M4_FLAGS is inserted before the first non-option argument, + * if any. + * + * The resulting string is returned, which should be freed by the caller. + */ +static char *parse_m4_options(int argc, char **argv, gboolean m4_clean) +{ + char **nonopt = NULL, *save_argv0, *ret; + int opt; + + /* First, conclude getopt run and reset with remaining args */ + getopt_long(optind, argv, sopts, lopts, NULL); + argv += optind-1; + argc -= optind-1; + optind = 0; + + save_argv0 = argv[0]; + argv[0] = M4_COMMANDLINE; + + if (m4_clean) { + ret = g_strjoinv(" ", argv); + argv[0] = save_argv0; + return ret; + } + + /* Locate first non-option argument, if any. */ + while ((opt = getopt_long(argc, argv, "-", NULL, NULL)) != -1) { + if (opt == 1) { + nonopt = &argv[optind-2]; + break; + } + } + + /* If there is a non-option but the above didn't see it, must be "--" */ + if (!nonopt && argv[optind]) + nonopt = &argv[optind-2]; + + if (nonopt) { + /* Found non-option, insert M4_FLAGS just before it. */ + char *save_argv[3] = { nonopt[0], nonopt[1], nonopt[2] }; + + nonopt[1] = M4_FLAGS; + nonopt[2] = NULL; + nonopt[0] = g_strjoinv(" ", argv); + + nonopt[1] = save_argv[1]; + nonopt[2] = save_argv[2]; + ret = g_strjoinv(" ", nonopt); + + g_free(nonopt[0]); + nonopt[0] = save_argv[0]; + } else { + /* Only options, not inserting M4_FLAGS. */ + ret = g_strjoinv(" ", argv); + } + + argv[0] = save_argv0; + return ret; +} + +static int parse_options(int argc, char **argv) +{ + gboolean show_m4_dir = FALSE, m4_clean = FALSE; + char *raw_file_sep = "-"; + int opt; + + opterr = 0; + while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { + switch (opt) { + case 'n': no_write = TRUE; - } else if(strcmp(argv[i], "--no-lines")==0) { - no_lines = TRUE; - } else if(strcmp(argv[i], "--no-self-alias")==0) { - no_self_alias = TRUE; - } else if(strcmp(argv[i], "--no-kill-underscores")==0) { - /* no op */; - } else if(strcmp(argv[i], "--always-private-struct")==0) { - always_private_struct = TRUE; - } else if(strcmp(argv[i], "--m4-dir")==0) { - printf("%s\n",M4_INCLUDE_DIR); - exit(0); - } else if(strcmp(argv[i], "--m4")==0) { - use_m4 = TRUE; - use_m4_clean=FALSE; - m4_opts = TRUE; - m4_commandline=g_strdup(M4_COMMANDLINE); - } else if(strcmp(argv[i], "--m4-clean")==0) { + break; + case 'o': + output_dir = optarg; + break; + case 'w': + exit_on_warn = TRUE; + break; + case LOPT_FILE_SEP: + raw_file_sep = optarg ? optarg : ""; + break; + case LOPT_M4_DIR: + show_m4_dir = TRUE; + break; + case LOPT_NO_TOUCH: + no_touch = no_touch_headers = TRUE; + break; + case LOPT_M4_CLEAN: + m4_clean = TRUE; + case LOPT_M4: use_m4 = TRUE; - 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 (strncmp (argv[i], "--file-sep=", - strlen ("--file-sep=")) == 0) { - char *p = strchr (argv[i], '='); - g_assert (p != NULL); - file_sep = *(p+1); - } else if (strncmp (argv[i], "--file-sep", - strlen ("--file-sep")) == 0) { - if (i+1 < argc) { - file_sep = (argv[i+1])[0]; - i++; - } else { - file_sep = 0; - } - } else if(strcmp(argv[i], "--gtk3")==0) { - gtk3_ok = TRUE; - } else if(strcmp(argv[i], "--")==0) { - /*further arguments are files*/ - no_opts = TRUE; - } else if(strncmp(argv[i], "--", 2)==0) { - /*unknown long option*/ - fprintf(stderr, "Unknown option '%s'!\n", argv[i]); - print_help(); - exit(1); - } else { - /*by now we know we have a string starting with - - which is a short option string*/ - char *p; - for(p = argv[i] + 1; *p; p++) { - switch(*p) { - case 'w': - exit_on_warn=TRUE; - break; - case 'n': - no_write = TRUE; - break; - case 'h': - case '?': - print_help(); - exit(0); - default: - fprintf(stderr, - "Unknown option '%c'!\n", *p); - print_help(); - exit(1); - } + m4_commandline = parse_m4_options(argc, argv, m4_clean); + goto out; + case LOPT_VERSION: + print_version(); + return 1; + default: + if (optopt == '?') { + case 'h': + print_help(); + return 1; } + + /* Rewind getopt to get internal error messages. */ + optind = 0, opterr = 1; + while (getopt_long(argc, argv, sopts, lopts, NULL) + != opt); + return -1; + case 0: /* no-op or option set by flag */; } } -#if 0 - /* if we are using m4, and got no filename, append m4 flags now */ - if(!got_file && use_m4 && !use_m4_clean) { - char *new_commandline; - new_commandline=g_strconcat(m4_commandline, - " ", - M4_FLAGS, - NULL); - g_free(m4_commandline); - m4_commandline=new_commandline; + filename = argv[optind]; + if (argc > optind+1) { + char *s = g_strjoinv(" ", argv+optind+1); + fprintf(stderr, "%s: Warning: excess arguments ignored: %s\n", + g_get_prgname(), s); + g_free(s); + if (exit_on_warn) + return -1; + } +out: + file_sep = raw_file_sep[0]; + if (raw_file_sep[0] && raw_file_sep[1]) { + fprintf(stderr, "%s: Warning: --file-sep characters beyond the first are ignored\n", + g_get_prgname()); + if (exit_on_warn) + return -1; + } + + if (show_m4_dir) { + printf("%s\n", M4_INCLUDE_DIR); + return 1; } -#endif + + return 0; } static void @@ -4773,7 +4859,17 @@ compare_and_move (const char *old_filename) int main(int argc, char *argv[]) { - parse_options(argc, argv); + int rc; + + g_set_prgname(argc > 0 ? argv[0] : "gob2"); + + rc = parse_options(argc, argv); + if (rc < 0) { + print_usage(stderr); + return EXIT_FAILURE; + } else if (rc > 0) { + return EXIT_SUCCESS; + } if(use_m4) { yyin = popen(m4_commandline, "r"); @@ -4877,15 +4973,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; }