X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/3df85155e2dbf9307dd64bd222bf74389c45a75c..94b775009e7dd4a876db03fa631a2188a699e791:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index c5f913b..5ddc889 100644 --- a/src/cdecl99.c +++ b/src/cdecl99.c @@ -1,263 +1,115 @@ /* - * 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-2023 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 + #include #include -#include "readline.h" +#include +#include +#include + +#include "cdecl99.h" #include "cdecl.h" +#include "help.h" +#include "xtra.h" +#include "copysym.h" +#include "options.h" static const char *progname = "cdecl99"; -static const char sopts[] = "qbif:e:VH"; -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 } -}; +static bool interactive = true; -static void print_version(void) +void print_error(const char *fmt, ...) { - 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 ."); - puts("This is free software: you are free to change and redistribute it."); - puts("There is NO WARRANTY, to the extent permitted by law."); -} + va_list(ap); -static void print_usage(FILE *f) -{ - fprintf(f, "Usage: %s [options]\n", progname); -} + if (!interactive) + fprintf(stderr, "%s: ", progname); + fprintf(stderr, "%s", _("error: ")); -static void print_help(void) -{ - print_usage(stdout); - puts("Detailed help coming soon."); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + + fprintf(stderr, "\n"); } -/* - * 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 void print_version(void) { - static size_t bufsz; - static char *buf; - - size_t rc; + const char *copysign = copyright_symbol(locale_charset()); -retry: - rc = func(buf, bufsz, decl); - if (rc >= bufsz) { - char *tmp; - - tmp = realloc(buf, rc + 1); - if (!tmp) { - fprintf(stderr, "failed to allocate memory\n"); - return NULL; - } - - buf = tmp; - bufsz = rc + 1; - goto retry; - } - - return buf; + puts(PACKAGE_STRING); + printf("Copyright %s 2023 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 int cmd_explain(const char *cmd, const char *arg) +static void print_usage(FILE *f) { - 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) { - str = do_format(cdecl_explain, i); - if (!str) - goto out; - - printf("%s\n", str); - } - - ret = 1; -out: - cdecl_free(decl); - return ret; + fprintf(f, _("Usage: %s [options]\n"), progname); + if (f != stdout) + fprintf(f, _("Try %s --help for more information.\n"), + progname); } -static int cmd_simplify(const char *cmd, const char *arg) +static void print_help(const struct option *lopts) { - 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; - } + struct lopt_help help = {0}; + const struct option *opt; - for (struct cdecl *i = decl; i; i = i->next) { - struct cdecl_declspec *s = i->specifiers; - - if (i != decl) { - i->specifiers = NULL; - printf(", "); - } + print_usage(stdout); - str = do_format(cdecl_declare, i); - i->specifiers = s; + puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n" + "complicated C declarations.")); + putchar('\n'); - if (!str) - goto out; + puts(_("Options:")); + for (opt = lopts; opt->name; opt++) { + if (!lopt_get_help(opt, &help)) + continue; - printf("%s", str); + help_print_option(opt, help.arg, help.desc, 20); } - 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; - } + puts(_("For more information, see the cdecl99(1) man page.")); + putchar('\n'); /* - * English parses have at most one full declarator, so no loop is - * needed here. + * TRANSLATORS: Please add *another line* indicating where users should + * report translation bugs. */ - 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; -} - -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]; - -static int cmd_help(const char *cmd, const char *arg) -{ - for (size_t i = 0; i < ncommands; i++) { - if (!commands[i].blurb) - continue; - - printf("%s -- %s\n", commands[i].name, commands[i].blurb); - } - - 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); - - if (n < cmdlen) - return -1; - if (n > cmdlen) - return 1; - return memcmp(str, cmd, n); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -static int run_command(const char *line) +static int 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); - } - - fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd); - return -1; + return !line[strspn(line, " \t")]; } static int repl(void) @@ -265,7 +117,10 @@ static int repl(void) char *line; for (; (line = readline("> ")); free(line)) { - if (!run_command(line)) + if (!is_blank_line(line)) + add_history(line); + + if (run_command(line, true) > 0) break; } @@ -273,19 +128,16 @@ static int repl(void) return 0; } -static int repl_cmdline(int argc, char **argv) +static int repl_cmdline(unsigned count, char **commands) { - int opt, rc, ret = 0; + int ret = 0; + unsigned i; - optind = 1; - while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { - if (opt != 'e') - continue; - - rc = run_command(optarg); + for (i = 0; i < count; i++) { + int rc = run_command(commands[i], false); if (rc < 0) ret = -1; - else if (rc == 0) + else if (rc > 0) break; } @@ -303,10 +155,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; } @@ -314,32 +166,45 @@ static int repl_noninteractive(void) free(line); if (ferror(stdin)) { - errno = saved_errno; - perror("read error"); + print_error("%s", strerror(saved_errno)); return -1; } return ret; } -int main(int argc, char **argv) +/* Initialize gettext */ +static void init_i18n(void) { - bool show_intro = true, interactive = true, execute = false; + if (!ENABLE_NLS) + return; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +} + +enum { + INIT_EXIT_SUCCESS = -1, + INIT_EXIT_FAILURE = -2 +}; + +static int initialize(int argc, char **argv) +{ + int i, opt, quiet = 0, execute = 0; const char *filename = NULL; - int opt, rc; + + XTRA_PACKED_LOPTS(lopts); 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) { + while ((opt = getopt_long(argc, argv, SOPT_STRING, lopts, 0)) != -1) { switch (opt) { case 'q': - show_intro = false; + quiet = 1; break; case 'b': interactive = false; @@ -351,18 +216,29 @@ int main(int argc, char **argv) filename = optarg; break; case 'e': - execute = true; + argv[execute++] = optarg; break; case 'V': print_version(); - return EXIT_SUCCESS; + return INIT_EXIT_SUCCESS; case 'H': - print_help(); - return EXIT_SUCCESS; + print_help(lopts); + return INIT_EXIT_SUCCESS; default: print_usage(stderr); - return EXIT_FAILURE; + return INIT_EXIT_FAILURE; + } + } + + if (optind < argc) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("excess command-line arguments:")); + for (i = optind; i < argc; i++) { + fprintf(stderr, " %s", argv[i]); } + fprintf(stderr, "\n"); + print_usage(stderr); + return INIT_EXIT_FAILURE; } /* --filename and --execute imply --batch. */ @@ -370,21 +246,34 @@ int main(int argc, char **argv) interactive = false; /* --batch implies --quiet */ - if (interactive && show_intro) + if (interactive && !quiet) print_version(); /* --execute supersedes --filename */ if (filename && !execute) { if (!freopen(filename, "r", stdin)) { - perror(filename); - return EXIT_FAILURE; + print_error("failed to open %s: %s", filename, + strerror(errno)); + return INIT_EXIT_FAILURE; } } + return execute; +} + +int main(int argc, char **argv) +{ + int rc, execute; + + switch ((execute = initialize(argc, argv))) { + case INIT_EXIT_SUCCESS: return EXIT_SUCCESS; + case INIT_EXIT_FAILURE: return EXIT_FAILURE; + } + if (interactive) rc = repl(); else if (execute) - rc = repl_cmdline(argc, argv); + rc = repl_cmdline(execute, argv); else rc = repl_noninteractive();