Changeset 7874d77

Timestamp:

Aug 11, 2020, 5:33:21 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

cd9ee44

Parents:

8e516fd

Message:

Parseargs now magically figures out argc/argv

Location:

libcfa

Files:

• prelude/bootloader.cf (modified) (1 diff)
• src/parseargs.cfa (modified) (2 diffs)
• src/parseargs.hfa (modified) (1 diff)

libcfa/prelude/bootloader.cf

@@ -1 +1 @@
 extern "C" { static inline int invoke_main(int argc, char* argv[], char* envp[]); }
+int cfa_args_argc;
+char ** cfa_args_argv;
+char ** cfa_args_envp;
 
 int main(int argc, char* argv[], char* envp[]) {
+        cfa_args_argc = argc;
+        cfa_args_argv = argv;
+        cfa_args_envp = envp;
         return invoke_main(argc, argv, envp);
 }

libcfa/src/parseargs.cfa

@@ -24 +24 @@
 #include "limits.hfa"
 
+extern int cfa_args_argc;
+extern char ** cfa_args_argv;
+extern char ** cfa_args_envp;
+
 void printopt(FILE * out, int width, int max, char sn, const char * ln, const char * help) {
         int hwidth = max - (11 + width);
@@ -34 +38 @@
                 fprintf(out, "%*s%.*s\n", width + 11, "", hwidth, help);
         }
+}
+
+void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
+        parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
 }
 

libcfa/src/parseargs.hfa

@@ -31 +31 @@
 }
 
+void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left );
 void parse_args( int argc, char * argv[], cfa_option options[], size_t opt_count, const char * usage, char ** & left );