Don't parse command-line options more than once.

Instead of parsing the options a second time to collect the --execute
option arguments, we can easily permute the argv array on the first
pass through, which simplifies the subsequent evaluation.

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 9d9fcc8a6615f5c5462cb903823e1516887c10d3..fc9d3b2593ebba80e101f9121055007dff01e659 100644 (file)
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,6 +1,6 @@
 /*
  * Command line utility for making sense of C declarations.
- * Copyright © 2011-2012, 2020-2022 Nick Bowler
+ * 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
@@ -75,7 +75,7 @@ static void print_version(void)
        }
 
        puts(PACKAGE_STRING);
-       printf("Copyright %s 2022 Nick Bowler.\n", copysign);
+       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.");
@@ -148,16 +148,13 @@ 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, false);
+       for (i = 0; i < count; i++) {
+               int rc = run_command(commands[i], false);
                if (rc < 0)
                        ret = -1;
                else if (rc > 0)
@@ -209,8 +206,9 @@ static void init_i18n(void)
 
 int main(int argc, char **argv)
 {
-       bool show_intro = true, execute = false;
+       bool show_intro = true;
        const char *filename = NULL;
+       unsigned execute = 0;
        int i, opt, rc;
 
        if (argc > 0)
@@ -233,7 +231,7 @@ int main(int argc, char **argv)
                        filename = optarg;
                        break;
                case 'e':
-                       execute = true;
+                       argv[execute++] = optarg;
                        break;
                case 'V':
                        print_version();
@@ -278,7 +276,7 @@ int main(int argc, char **argv)
        if (interactive)
                rc = repl();
        else if (execute)
-               rc = repl_cmdline(argc, argv);
+               rc = repl_cmdline(execute, argv);
        else
                rc = repl_noninteractive();
 

diff --git a/tests/general.at b/tests/general.at
index 38493ce1e9d0a53dc05c0ff8f0f0e8f2649d7d55..b5a623dabf6783008a1db823156af6c2366e9851 100644 (file)
--- a/tests/general.at
+++ b/tests/general.at
@@ -1,4 +1,4 @@
-# Copyright © 2012, 2020 Nick Bowler
+# Copyright © 2012, 2020-2021, 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
@@ -72,3 +72,14 @@ AT_CHECK([sed -n '$p' stdout], [0], [type int
 ])
 
 AT_CLEANUP
+
+AT_SETUP([cdecl99 --execute option])
+
+AT_CHECK([cdecl99 --execute 'explain int' --execute='declare x as int' \
+                  --execute='simplify int (x)()'], [0],
+[[type int
+int x
+int x()
+]])
+
+AT_CLEANUP