#include <errno.h>
#include <locale.h>
#include <assert.h>
-#include "history.h"
-#include "cdecl.h"
#include <getopt.h>
#include <gettext.h>
#include <localcharset.h>
#include <mbswidth.h>
-#define _(x) gettext(x)
+#include "cdecl99.h"
+#include "cdecl.h"
static const char *progname = "cdecl99";
return w;
}
+/*
+ * 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)
+{
+ 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;
puts(_("Options:"));
for (opt = lopts; opt->name; opt++) {
struct lopt_help help;
- const char *line;
int w;
if (!lopt_get_help(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;
- }
+ print_block(help.desc, 20, w);
}
putchar('\n');
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
-/*
- * 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 size_t bufsz;
- static char *buf;
-
- size_t rc;
-
-retry:
- rc = func(buf, bufsz, decl);
- if (rc >= bufsz) {
- char *tmp;
-
- tmp = realloc(buf, rc + 1);
- if (!tmp) {
- fprintf(stderr, "%s\n", _("failed to allocate memory"));
- return NULL;
- }
-
- buf = tmp;
- bufsz = rc + 1;
- goto retry;
- }
-
- return buf;
-}
-
-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) {
- 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;
-}
-
-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) {
- 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;
-
- if (i != decl) {
- i->specifiers = NULL;
- printf(", ");
- }
-
- str = do_format(cdecl_declare, i);
- i->specifiers = s;
-
- if (!str)
- goto out;
-
- printf("%s", str);
- }
-
- 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;
-
- 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);
-}
-
-static int run_command(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;
-}
-
static bool is_blank_line(const char *line)
{
for (size_t i = 0; line[i]; i++) {
for (; (line = readline("> ")); free(line)) {
if (!is_blank_line(line))
- cdecl_add_history(line);
+ add_history(line);
- if (!run_command(line))
+ if (run_command(line, true) > 0)
break;
}
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;
}
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;
}