X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/3df85155e2dbf9307dd64bd222bf74389c45a75c..d3e3654f75d01376794676885589a911d4b12e41:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index c5f913b..18c6a5d 100644 --- a/src/cdecl99.c +++ b/src/cdecl99.c @@ -1,263 +1,184 @@ /* - * 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 +#include "history.h" +#include "cdecl.h" + #include #include -#include "readline.h" -#include "cdecl.h" +#include +#include +#include +#include + +#include "cdecl99.h" 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); - /* TRANSLATORS: (C) must *always* be translated as ©. */ - printf("Copyright %s 2011 Nick Bowler.\n", gettext("(C)")); - 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."); -} -static void print_usage(FILE *f) -{ - fprintf(f, "Usage: %s [options]\n", progname); + free(convsign); } -static void print_help(void) +static void print_usage(FILE *f) { - print_usage(stdout); - puts("Detailed help coming soon."); + fprintf(f, _("Usage: %s [options]\n"), progname); + if (f != stdout) + fprintf(f, _("Try %s --help for more information.\n"), + progname); } -/* - * Format a declaration according to the given function and return a pointer - * to the formatted string. The returned pointer remains valid until the - * next call, after which it must not be re-used. - * - * Returns NULL on failure. - */ -static const char * -do_format(size_t func(char *, size_t, struct cdecl *), struct cdecl *decl) +static int +print_optstring(const struct option *opt, const struct lopt_help *help) { - static size_t bufsz; - static char *buf; + 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); + } - size_t rc; + if (w < 0) + goto no_translate; -retry: - rc = func(buf, bufsz, decl); - if (rc >= bufsz) { - char *tmp; + w = mbsnwidth(optstring, w, 0); + printf("%s", optstring); + goto out; - tmp = realloc(buf, rc + 1); - if (!tmp) { - fprintf(stderr, "failed to allocate memory\n"); - return NULL; - } - - buf = tmp; - bufsz = rc + 1; - goto retry; +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 buf; + return w; } -static int cmd_explain(const char *cmd, const char *arg) +/* + * 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). + */ +void print_block(const char *s, int i, int w) { - const struct cdecl_error *err; - struct cdecl *decl; - const char *str; - int ret = -1; - - decl = cdecl_parse_decl(arg); - if (!decl) { - err = cdecl_get_error(); - fprintf(stderr, "%s\n", err->str); - goto out; - } + for (; *s; w = 0) { + const char *nl = strchr(s, '\n'); + int n = (nl ? nl-s : -1); - for (struct cdecl *i = decl; i; i = i->next) { - str = do_format(cdecl_explain, i); - if (!str) - goto out; + printf("%*s%.*s\n", i-w, "", n, s); + if (!nl) + break; - printf("%s\n", str); + s = nl+1; } - - ret = 1; -out: - cdecl_free(decl); - return ret; } -static int cmd_simplify(const char *cmd, const char *arg) +static void print_help(void) { - const struct cdecl_error *err; - struct cdecl *decl; - const char *str; - int ret = -1; - - decl = cdecl_parse_decl(arg); - 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; + const struct option *opt; - if (i != decl) { - i->specifiers = NULL; - printf(", "); - } - - str = do_format(cdecl_declare, i); - i->specifiers = s; - - if (!str) - goto out; - - printf("%s", str); - } + print_usage(stdout); + puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n" + "complicated C declarations.")); putchar('\n'); - ret = 1; -out: - cdecl_free(decl); - 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; + puts(_("Options:")); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + const char *line; + int w; - printf("%s\n", str); - ret = 1; -out: - cdecl_free(decl); - return ret; -} - -static int cmd_quit(const char *cmd, const char *arg) -{ - return 0; -} + if (!lopt_get_help(opt, &help)) + continue; -static int cmd_help(const char *cmd, const char *arg); - -static const struct command { - char name[16]; - int (*func)(const char *cmd, const char *arg); - const char *blurb; -} 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 } -}; -static const size_t ncommands = sizeof commands / sizeof commands[0]; + w = print_optstring(opt, &help); -static int cmd_help(const char *cmd, const char *arg) -{ - for (size_t i = 0; i < ncommands; i++) { - if (!commands[i].blurb) - continue; + if (ENABLE_NLS) + help.desc = pgettext_expr(opt->name, help.desc); - printf("%s -- %s\n", commands[i].name, commands[i].blurb); + print_block(help.desc, 20, w); } + putchar('\n'); - return 1; -} - -/* - * Ensure that the first n characters of str equal the entire (null-terminated) - * string cmd. - */ -static int cmd_cmp(const char *str, const char *cmd, size_t n) -{ - size_t cmdlen = strlen(cmd); + puts(_("For more information, see the cdecl99(1) man page.")); + putchar('\n'); - if (n < cmdlen) - return -1; - if (n > cmdlen) - return 1; - return memcmp(str, cmd, n); + /* + * TRANSLATORS: Please add *another line* indicating where users should + * report translation bugs. + */ + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -static int run_command(const char *line) +static bool is_blank_line(const char *line) { - const char *cmd = line + strspn(line, " \t"); - const char *arg = cmd + strcspn(cmd, " \t"); - - if (cmd[0] == '\0') - return 1; - - for (size_t i = 0; i < ncommands; i++) { - if (cmd_cmp(cmd, commands[i].name, arg-cmd) != 0) - continue; - - return commands[i].func(cmd, arg); + for (size_t i = 0; line[i]; i++) { + if (!isblank((unsigned char)line[i])) + return false; } - fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd); - return -1; + return true; } static int repl(void) @@ -265,7 +186,10 @@ static int repl(void) char *line; for (; (line = readline("> ")); free(line)) { - if (!run_command(line)) + if (!is_blank_line(line)) + cdecl_add_history(line); + + if (run_command(line, true) > 0) break; } @@ -282,10 +206,10 @@ static int repl_cmdline(int argc, char **argv) if (opt != 'e') continue; - rc = run_command(optarg); + rc = run_command(optarg, false); if (rc < 0) ret = -1; - else if (rc == 0) + else if (rc > 0) break; } @@ -303,10 +227,10 @@ static int repl_noninteractive(void) if (c) *c = '\0'; - rc = run_command(line); + rc = run_command(line, false); if (rc < 0) ret = -1; - else if (rc == 0) + else if (rc > 0) break; } @@ -322,19 +246,27 @@ 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]; - /* Initialize gettext. */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); + init_i18n(); while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { switch (opt) { @@ -365,6 +297,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;