Changeset 93d2219 for tests/configs/parsenums.cfa

Timestamp:

Oct 28, 2022, 3:12:16 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

Children:

fa2e183

Parents:

e874605 (diff), 22a0e87 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/configs/parsenums.cfa (modified) (2 diffs)

tests/configs/parsenums.cfa

@@ -15 +15 @@
 //
 
+#include <fstream.hfa>
+
+#include "../meta/fork+exec.hfa"
+
+// last as workaround to parser bug
 #include <parseargs.hfa>
-#include <fstream.hfa>
-
-#include "../meta/fork+exec.hfa"
 
 #if __SIZEOF_LONG__ == 4
@@ -42 +44 @@
 
 
-        cfa_option options[] = {
-                { 'i', "int",              "test int",                i   },
-                { 'u', "unsigned",         "test unsigned",           u   },
-                { 'l', "unsignedlong",     "test unsigned long",      ul  },
-                { 'L', "unsignedlonglong", "test unsigned long long", ull },
-                { 'd', "double",           "test double",             d   },
-        };
-        int options_cnt = sizeof(options) / sizeof(cfa_option);
+        array( cfa_option, 5 ) options;
+        options[0] = (cfa_option){ 'i', "int",              "test int",                i   };
+        options[1] = (cfa_option){ 'u', "unsigned",         "test unsigned",           u   };
+        options[2] = (cfa_option){ 'l', "unsignedlong",     "test unsigned long",      ul  };
+        options[3] = (cfa_option){ 'L', "unsignedlonglong", "test unsigned long long", ull };
+        options[4] = (cfa_option){ 'd', "double",           "test double",             d   };
 
         char **left;
-        parse_args( options, options_cnt, "[OPTIONS]...\ntesting bool parameters", left);
+        parse_args( options, "[OPTIONS]...\ntesting bool parameters", left);
 
         sout | "int                :" | i;