Changes in libcfa/src/parseargs.hfa [481f882:d1abc63c]

File:

• libcfa/src/parseargs.hfa (modified) (3 diffs)

libcfa/src/parseargs.hfa

@@ -16 +16 @@
 #pragma once
 
+#include <array.hfa>
+
 struct cfa_option {
-      int val; // reserved
-      char short_name;
-      const char * long_name;
-      const char * help;
-      void * variable;
-      bool (*parse)(const char *, void * );
+        int val; // reserved
+        char short_name;
+        const char * long_name;
+        const char * help;
+        void * variable;
+        bool (*parse)(const char *, void * );
 };
 
@@ -31 +33 @@
 forall(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;
-      this.help       = help;
-      this.variable   = (void*)&variable;
-      this.parse      = (bool (*)(const char *, void * ))parse;
+        this.val        = 0;
+        this.short_name = short_name;
+        this.long_name  = long_name;
+        this.help       = help;
+        this.variable   = (void*)&variable;
+        this.parse      = (bool (*)(const char *, void * ))parse;
 }
 
 forall(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;
-      this.help       = help;
-      this.variable   = (void*)&variable;
-      this.parse      = (bool (*)(const char *, void * ))parse;
+        this.val        = 0;
+        this.short_name = short_name;
+        this.long_name  = long_name;
+        this.help       = help;
+        this.variable   = (void*)&variable;
+        this.parse      = (bool (*)(const char *, void * ))parse;
 }
 
@@ -52 +54 @@
 void parse_args( int argc, char * argv[], cfa_option options[], size_t opt_count, const char * usage, char ** & left );
 
+forall( [N] ) {
+        void parse_args( const array( cfa_option, N ) & options, const char * usage, char ** & left );
+        void parse_args( int argc, char * argv[], const array( cfa_option, N ) & options, const char * usage, char ** & left );
+}
+
 void print_args_usage(cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn));
 void print_args_usage(int argc, char * argv[], cfa_option options[], size_t opt_count, const char * usage, bool error)  __attribute__ ((noreturn));
+
+forall( [N] ) {
+        void print_args_usage( const array(cfa_option, N ) & options, const char * usage, bool error)  __attribute__ ((noreturn));
+        void print_args_usage(int argc, char * argv[], const array( cfa_option, N ) & options, const char * usage, bool error)  __attribute__ ((noreturn));
+}
 
 bool parse_yesno    (const char *, bool & );