#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
+#include <errno.h>
#include <getopt.h>
#include "readline.h"
#include "cdecl.h"
static const char *progname = "cdecl99";
-static const char sopts[] = "qbiVH";
+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 }
return buf;
}
-static int cmd_explain(char *cmd, char *arg)
+static int cmd_explain(const char *cmd, const char *arg)
{
struct cdecl *decl;
const char *str;
return ret;
}
-static int cmd_simplify(char *cmd, char *arg)
+static int cmd_simplify(const char *cmd, const char *arg)
{
struct cdecl *decl;
const char *str;
return ret;
}
-static int cmd_quit(char *cmd, char *arg)
+static int cmd_declare(const char *cmd, const char *arg)
+{
+ struct cdecl *decl;
+ const char *str;
+ int ret = -1;
+
+ /* The name of the command is significant here. */
+ decl = cdecl_parse_english(cmd);
+ if (!decl)
+ 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(char *cmd, char *arg);
+static int cmd_help(const char *cmd, const char *arg);
static const struct command {
char name[16];
- int (*func)(char *cmd, char *arg);
+ 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(char *cmd, char *arg)
+static int cmd_help(const char *cmd, const char *arg)
{
for (size_t i = 0; i < ncommands; i++) {
if (!commands[i].blurb)
return 1;
}
-static int repl(bool interactive)
+/*
+ * 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 int repl(void)
{
- char *prompt = interactive ? "> " : NULL;
- int rc, ret = 0;
char *line;
- for (; (line = readline(prompt)); free(line)) {
- char *cmd = line + strspn(line, " \t");
- char *arg = cmd + strcspn(cmd, " \t");
+ for (; (line = readline("> ")); free(line)) {
+ if (!run_command(line))
+ break;
+ }
+
+ free(line);
+ return 0;
+}
+
+static int repl_cmdline(int argc, char **argv)
+{
+ int opt, rc, ret = 0;
- if (cmd[0] == '\0')
+ optind = 1;
+ while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
+ if (opt != 'e')
continue;
- if (arg[0] != '\0')
- *arg++ = '\0';
-
- for (size_t i = 0; i < ncommands; i++) {
- if (strcmp(cmd, commands[i].name) != 0)
- continue;
-
- rc = commands[i].func(cmd, arg);
- if (!interactive && rc < 0)
- ret = -1;
- if (rc == 0)
- goto out;
- goto next;
- }
- fprintf(stderr, "Undefined command: %s\n", cmd);
- ret = -1;
- next:
- ;
+ rc = run_command(optarg);
+ if (rc < 0)
+ ret = -1;
+ else if (rc == 0)
+ break;
}
-out:
+
+ return ret;
+}
+
+static int repl_noninteractive(void)
+{
+ int rc, ret = 0, saved_errno;
+ char *line = NULL;
+ size_t n;
+
+ while (getline(&line, &n, stdin) >= 0) {
+ char *c = strchr(line, '\n');
+ if (c)
+ *c = '\0';
+
+ rc = run_command(line);
+ if (rc < 0)
+ ret = -1;
+ else if (rc == 0)
+ break;
+ }
+
+ saved_errno = errno;
free(line);
+
+ if (ferror(stdin)) {
+ errno = saved_errno;
+ perror("read error");
+ return -1;
+ }
+
return ret;
}
int main(int argc, char **argv)
{
- bool show_intro = true, interactive = true;
- int opt;
+ bool show_intro = true, interactive = true, execute = false;
+ const char *filename = NULL;
+ int opt, rc;
if (argc > 0)
progname = argv[0];
case 'i':
interactive = true;
break;
+ case 'f':
+ filename = optarg;
+ break;
+ case 'e':
+ execute = true;
+ break;
case 'V':
print_version();
return EXIT_SUCCESS;
}
}
+ /* --filename and --execute imply --batch. */
+ if (filename || execute)
+ interactive = false;
+
+ /* --batch implies --quiet */
if (interactive && show_intro)
print_version();
- if (repl(interactive) != 0)
- return EXIT_FAILURE;
+ /* --execute supersedes --filename */
+ if (filename && !execute) {
+ if (!freopen(filename, "r", stdin)) {
+ perror(filename);
+ return EXIT_FAILURE;
+ }
+ }
+ if (interactive)
+ rc = repl();
+ else if (execute)
+ rc = repl_cmdline(argc, argv);
+ else
+ rc = repl_noninteractive();
+
+ if (rc != 0)
+ return EXIT_FAILURE;
return EXIT_SUCCESS;
}
projects / cdecl99.git / blobdiff