Changeset 80d3b1b

Timestamp:

Jan 15, 2021, 12:23:18 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

bdbc24d

Parents:

325e6ea

Message:

Libcfa parseargs now supports arguments that don't have short options

Location:

libcfa/src

Files:

• parseargs.cfa (modified) (6 diffs)
• parseargs.hfa (modified) (3 diffs)

libcfa/src/parseargs.cfa

@@ -30 +30 @@
 
 static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * usage, FILE * out)  __attribute__ ((noreturn));
-
+//-----------------------------------------------------------------------------
+// checking
+static void check_args(cfa_option options[], size_t opt_count) {
+        for(i; opt_count) {
+                for(j; opt_count) {
+                        if(i == j) continue;
+
+                        if( options[i].short_name != '\0'
+                        && options[i].short_name == options[j].short_name)
+                                abort("Parse Args error: two options have short name '%c' (%d & %d)", options[i].short_name, i, j);
+
+                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%d & %d)", options[i].long_name, i, j);
+                }
+        }
+}
+
+
+//-----------------------------------------------------------------------------
+// Parsing args
 void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
         if( 0p != &cfa_args_argc ) {
@@ -41 +59 @@
 }
 
-//-----------------------------------------------------------------------------
-// getopt_long wrapping
 void parse_args(
         int argc,
@@ -51 +67 @@
         char ** & left
 ) {
+        check_args(options, opt_count);
+
+        int maxv = 'h';
+        char optstring[opt_count * 3] = { '\0' };
+        {
+                int idx = 0;
+                for(i; opt_count) {
+                        if (options[i].short_name) {
+                                maxv = max(options[i].short_name, maxv);
+                                optstring[idx] = options[i].short_name;
+                                idx++;
+                                if(    ((intptr_t)options[i].parse) != ((intptr_t)parse_settrue)
+                                && ((intptr_t)options[i].parse) != ((intptr_t)parse_setfalse) ) {
+                                        optstring[idx] = ':';
+                                        idx++;
+                                }
+                        }
+                }
+                optstring[idx+0] = 'h';
+                optstring[idx+1] = '\0';
+        }
+
         struct option optarr[opt_count + 2];
         {
@@ -56 +94 @@
                 for(i; opt_count) {
                         if(options[i].long_name) {
+                                options[i].val = (options[i].short_name != '\0') ? ((int)options[i].short_name) : ++maxv;
                                 optarr[idx].name = options[i].long_name;
                                 optarr[idx].flag = 0p;
-                                optarr[idx].val  = options[i].short_name;
+                                optarr[idx].val  = options[i].val;
                                 if(    ((intptr_t)options[i].parse) == ((intptr_t)parse_settrue)
                                     || ((intptr_t)options[i].parse) == ((intptr_t)parse_setfalse) ) {
@@ -70 +109 @@
                 optarr[idx+0].[name, has_arg, flag, val] = ["help", no_argument, 0, 'h'];
                 optarr[idx+1].[name, has_arg, flag, val] = [0, no_argument, 0, 0];
-        }
-
-        char optstring[opt_count * 3] = { '\0' };
-        {
-                int idx = 0;
-                for(i; opt_count) {
-                        optstring[idx] = options[i].short_name;
-                        idx++;
-                        if(    ((intptr_t)options[i].parse) != ((intptr_t)parse_settrue)
-                            && ((intptr_t)options[i].parse) != ((intptr_t)parse_setfalse) ) {
-                                optstring[idx] = ':';
-                                idx++;
-                        }
-                }
-                optstring[idx+0] = 'h';
-                optstring[idx+1] = '\0';
         }
 
@@ -103 +126 @@
                         default:
                                 for(i; opt_count) {
-                                        if(opt == options[i].short_name) {
+                                        if(opt == options[i].val) {
                                                 const char * arg = optarg ? optarg : "";
                                                 if( arg[0] == '=' ) { arg++; }

libcfa/src/parseargs.hfa

@@ -2 +2 @@
 
 struct cfa_option {
+      int val; // reserved
       char short_name;
       const char * long_name;
@@ -15 +16 @@
 forall(dtype T | { bool parse(const char *, T & ); })
 static inline void ?{}( cfa_option & this, char short_name, const char * long_name, const char * help, T & variable ) {
+      this.val        = 0;
       this.short_name = short_name;
       this.long_name  = long_name;
@@ -24 +26 @@
 forall(dtype T)
 static inline void ?{}( cfa_option & this, char short_name, const char * long_name, const char * help, T & variable, bool (*parse)(const char *, T & )) {
+      this.val        = 0;
       this.short_name = short_name;
       this.long_name  = long_name;