X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/63274ac7f99c516b88bd1f94e05e5c715a4800ce..e0179c069958050100a637bb876c96495276ea76:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index 2df7ec8..518dbbd 100644 --- a/src/cdecl99.c +++ b/src/cdecl99.c @@ -1,61 +1,164 @@ /* - * Command line utility for making sense of C declarations. - * Copyright © 2011 Nick Bowler + * Command line utility for making sense of C declarations. + * Copyright © 2011-2012, 2020-2021 Nick Bowler * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include #include #include #include #include +#include #include -#include -#include "readline.h" +#include +#include +#include "history.h" #include "cdecl.h" +#include +#include +#include +#include +#include +#include + +#define _(x) gettext(x) + static const char *progname = "cdecl99"; -static const char sopts[] = "qbif:e:VH"; + +#include "options.h" +static const char sopts[] = SOPT_STRING; static const struct option lopts[] = { - { "quiet", 0, NULL, 'q' }, - { "batch", 0, NULL, 'b' }, - { "interactive", 0, NULL, 'i' }, - { "file", 1, NULL, 'f' }, - { "execute", 1, NULL, 'e' }, - { "version", 0, NULL, 'V' }, - { "help", 0, NULL, 'H' }, - { 0 } + LOPTS_INITIALIZER, + {0} }; static void print_version(void) { + const char *copysign = "(C)"; + void *convsign = NULL; + + if (ENABLE_NLS) { + convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset()); + if (convsign) + copysign = convsign; + } + puts(PACKAGE_STRING); - puts("Copyright (C) 2011 Nick Bowler."); - puts("License GPLv3+: GNU GPL version 3 or later ."); + printf("Copyright %s 2021 Nick Bowler.\n", copysign); + puts("License GPLv3+: GNU GPL version 3 or any later version."); puts("This is free software: you are free to change and redistribute it."); puts("There is NO WARRANTY, to the extent permitted by law."); + + free(convsign); } static void print_usage(FILE *f) { - fprintf(f, "Usage: %s [options]\n", progname); + fprintf(f, _("Usage: %s [options]\n"), progname); + if (f != stdout) + fprintf(f, _("Try %s --help for more information.\n"), + progname); +} + +static int +print_optstring(const struct option *opt, const struct lopt_help *help) +{ + char optstring[100]; + int w; + + if (!ENABLE_NLS) + goto no_translate; + + if (opt->has_arg) { + w = snprintf(optstring, sizeof optstring, + _(" -%c, --%s=%s"), opt->val, opt->name, + pgettext_expr(opt->name, help->arg)); + } else { + w = snprintf(optstring, sizeof optstring, + _(" -%c, --%s"), opt->val, opt->name); + } + + if (w < 0) + goto no_translate; + + w = mbsnwidth(optstring, w, 0); + printf("%s", optstring); + goto out; + +no_translate: + if (opt->has_arg) { + w = printf(" -%c, --%s=%s", opt->val, opt->name, help->arg); + } else { + w = printf(" -%c, --%s", opt->val, opt->name); + } +out: + if (w < 0 || w > 18) { + putchar('\n'); + return 0; + } + + return w; } static void print_help(void) { + const struct option *opt; + print_usage(stdout); - puts("Detailed help coming soon."); + + puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n" + "complicated C declarations.")); + putchar('\n'); + + puts(_("Options:")); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + const char *line; + int w; + + if (!lopt_get_help(opt, &help)) + continue; + + w = print_optstring(opt, &help); + + if (ENABLE_NLS) + help.desc = pgettext_expr(opt->name, help.desc); + + for (line = help.desc; *line; w = 0) { + const char *nl = strchr(line, '\n'); + int n = (nl ? nl-line : -1); + + printf("%*s%.*s\n", 20-w, "", n, line); + if (!nl) + break; + + line = nl+1; + } + } + putchar('\n'); + + puts(_("For more information, see the cdecl99(1) man page.")); + putchar('\n'); + + /* + * TRANSLATORS: Please add *another line* indicating where users should + * report translation bugs. + */ + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } /* @@ -80,7 +183,7 @@ retry: tmp = realloc(buf, rc + 1); if (!tmp) { - fprintf(stderr, "failed to allocate memory\n"); + fprintf(stderr, "%s\n", _("failed to allocate memory")); return NULL; } @@ -94,13 +197,17 @@ retry: static int cmd_explain(const char *cmd, const char *arg) { + const struct cdecl_error *err; struct cdecl *decl; const char *str; int ret = -1; decl = cdecl_parse_decl(arg); - if (!decl) + if (!decl) { + err = cdecl_get_error(); + fprintf(stderr, "%s\n", err->str); goto out; + } for (struct cdecl *i = decl; i; i = i->next) { str = do_format(cdecl_explain, i); @@ -118,13 +225,17 @@ out: static int cmd_simplify(const char *cmd, const char *arg) { + const struct cdecl_error *err; struct cdecl *decl; const char *str; int ret = -1; decl = cdecl_parse_decl(arg); - if (!decl) + if (!decl) { + err = cdecl_get_error(); + fprintf(stderr, "%s\n", err->str); goto out; + } for (struct cdecl *i = decl; i; i = i->next) { struct cdecl_declspec *s = i->specifiers; @@ -151,6 +262,36 @@ out: return ret; } +static int cmd_declare(const char *cmd, const char *arg) +{ + const struct cdecl_error *err; + struct cdecl *decl; + const char *str; + int ret = -1; + + /* The name of the command is significant here. */ + decl = cdecl_parse_english(cmd); + if (!decl) { + err = cdecl_get_error(); + fprintf(stderr, "%s\n", err->str); + goto out; + } + + /* + * English parses have at most one full declarator, so no loop is + * needed here. + */ + str = do_format(cdecl_declare, decl); + if (!str) + goto out; + + printf("%s\n", str); + ret = 1; +out: + cdecl_free(decl); + return ret; +} + static int cmd_quit(const char *cmd, const char *arg) { return 0; @@ -165,6 +306,8 @@ static const struct command { } commands[] = { { "explain", cmd_explain, "Explain a C declaration." }, { "simplify", cmd_simplify, "Simplify a C declaration." }, + { "declare", cmd_declare, "Construct a C declaration." }, + { "type", cmd_declare, "Construct a C type name." }, { "help", cmd_help, "Print this list of commands." }, { "quit", cmd_quit, "Quit the program." }, { "exit", cmd_quit, NULL } @@ -217,11 +360,24 @@ static int run_command(const char *line) return -1; } +static bool is_blank_line(const char *line) +{ + for (size_t i = 0; line[i]; i++) { + if (!isblank((unsigned char)line[i])) + return false; + } + + return true; +} + static int repl(void) { char *line; for (; (line = readline("> ")); free(line)) { + if (!is_blank_line(line)) + cdecl_add_history(line); + if (!run_command(line)) break; } @@ -279,15 +435,28 @@ static int repl_noninteractive(void) return ret; } +/* Initialize gettext */ +static void init_i18n(void) +{ + if (!ENABLE_NLS) + return; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +} + int main(int argc, char **argv) { bool show_intro = true, interactive = true, execute = false; const char *filename = NULL; - int opt, rc; + int i, opt, rc; if (argc > 0) progname = argv[0]; + init_i18n(); + while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { switch (opt) { case 'q': @@ -317,6 +486,17 @@ int main(int argc, char **argv) } } + if (optind < argc) { + fprintf(stderr, _("%s: excess command-line arguments:"), + progname); + for (i = optind; i < argc; i++) { + fprintf(stderr, " %s", argv[i]); + } + fprintf(stderr, "\n"); + print_usage(stderr); + return EXIT_FAILURE; + } + /* --filename and --execute imply --batch. */ if (filename || execute) interactive = false;