Make semicolons after declarations optional.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 667ae034b2cbc9bf844e99117e2ba8771f92834b..64b95f78cf38a2778dd5a20bad73efc43d45553b 100644 (file)
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -26,11 +26,13 @@
 #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 }
@@ -90,7 +92,7 @@ retry:
        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;
@@ -114,7 +116,7 @@ out:
        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;
@@ -149,27 +151,55 @@ out:
        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)
@@ -181,24 +211,37 @@ static int cmd_help(char *cmd, char *arg)
        return 1;
 }
 
-static int run_command(char *line)
+/*
+ * 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)
 {
-       char *cmd = line + strspn(line, " \t");
-       char *arg = cmd  + strcspn(cmd, " \t");
+       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;
-       if (arg[0] != '\0')
-               *arg++ = '\0';
 
        for (size_t i = 0; i < ncommands; i++) {
-               if (strcmp(cmd, commands[i].name) != 0)
+               if (cmd_cmp(cmd, commands[i].name, arg-cmd) != 0)
                        continue;
 
                return commands[i].func(cmd, arg);
        }
 
-       fprintf(stderr, "Undefined command: %s\n", cmd);
+       fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd);
        return -1;
 }
 
@@ -215,6 +258,25 @@ static int repl(void)
        return 0;
 }
 
+static int repl_cmdline(int argc, char **argv)
+{
+       int opt, rc, ret = 0;
+
+       optind = 1;
+       while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
+               if (opt != 'e')
+                       continue;
+
+               rc = run_command(optarg);
+               if (rc < 0)
+                       ret = -1;
+               else if (rc == 0)
+                       break;
+       }
+
+       return ret;
+}
+
 static int repl_noninteractive(void)
 {
        int rc, ret = 0, saved_errno;
@@ -247,7 +309,8 @@ static int repl_noninteractive(void)
 
 int main(int argc, char **argv)
 {
-       bool show_intro = true, interactive = true;
+       bool show_intro = true, interactive = true, execute = false;
+       const char *filename = NULL;
        int opt, rc;
 
        if (argc > 0)
@@ -264,6 +327,12 @@ int main(int argc, char **argv)
                case 'i':
                        interactive = true;
                        break;
+               case 'f':
+                       filename = optarg;
+                       break;
+               case 'e':
+                       execute = true;
+                       break;
                case 'V':
                        print_version();
                        return EXIT_SUCCESS;
@@ -276,11 +345,26 @@ int main(int argc, char **argv)
                }
        }
 
+       /* --filename and --execute imply --batch. */
+       if (filename || execute)
+               interactive = false;
+
+       /* --batch implies --quiet */
        if (interactive && show_intro)
                print_version();
 
+       /* --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();