Renamed copt -> coption. Some smaller updates.

4 files changed, 45 insertions, 41 deletions

diff --git a/README.md b/README.md
index 1b957255..8f3c9f84 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,10 @@ An elegant, fully typesafe, generic, customizable, user-friendly, consistent, an
 - **stc/cset.h** - A generic **unordered set** implemented in tandem with *unordered map*

 - **stc/cstr.h** - Compact and powerful **string** class.

 - **stc/cvec.h** - Dynamic generic **vector** class, works well as a **stack**.

-- **stc/cprique.h** - Priority queue adapter for **cvec.h**, as a **heap**.

-- **stc/copt.h** - Implementation of a **getopt_long()**-like function, *copt_get()*, to parse command line arguments.

+- **stc/cstack.h** - **stack** adapter, currently works with *cvec*.

+- **stc/cqueue.h** - **queue** adapter, currently works with *clist*.

+- **stc/cprique.h** - **priority queue** adapter. Works with *cvec*.

+- **stc/coption.h** - Implementation of a **getopt_long()**-like function, *coption_get()*, to parse command line arguments.

 - **stc/crandom.h** - A few very efficent modern random number generators *pcg32* and my own *64-bit PRNG* inspired by *sfc64*. Both uniform and normal distributions.

 - **stc/cdefs.h** - A common include file with a few general definitions.

 

diff --git a/examples/queue.c b/examples/queue.c
index fa8700fe..15897f38 100644
--- a/examples/queue.c
+++ b/examples/queue.c
@@ -7,8 +7,8 @@ declare_cqueue(i, clist_i); // min-heap (increasing values)
 

 int main() {

     int n = 10000000;

-    crand_rng32_t gen = crand_rng32_init(1234);

-    crand_uniform_i32_t dist = crand_uniform_i32_init(gen, 0, n);

+    crand_uniform_i32_t dist;

+    dist = crand_uniform_i32_init(crand_rng32_init(1234), 0, n);

 

     cqueue_i queue = cqueue_i_init();

 

diff --git a/stc/cdefs.h b/stc/cdefs.h
index f97d84be..c612eca9 100644
--- a/stc/cdefs.h
+++ b/stc/cdefs.h
@@ -72,23 +72,25 @@
 #define c_default_compare(x, y) c_compare(c_default_less, x, y)

 #define c_default_destroy(p)    ((void)0)

 

-#define c_foreach(it, prefix, container) \

-            for (prefix##_iter_t it = prefix##_begin(&container); it.item != it.end; prefix##_next(&it))

+#define c_foreach(it, ctype, container) \

+            for (ctype##_iter_t it = ctype##_begin(&container); it.item != it.end; ctype##_next(&it))

 

 #define c_items(...) __VA_ARGS__

-#define c_push(container_ptr, prefix, items) do { \

-    const prefix##_input_t __arr[] = { items }; \

-    prefix##_push_n(container_ptr, __arr, sizeof(__arr)/sizeof(__arr[0])); \

+#define c_push(container_ptr, ctype, items) do { \

+    const ctype##_input_t __arr[] = { items }; \

+    ctype##_push_n(container_ptr, __arr, sizeof(__arr)/sizeof(__arr[0])); \

 } while (0)

-#define c_init(prefix, container, items) \

-    prefix container = prefix##_init(); { \

-        const prefix##_input_t __arr[] = { items }; \

-        prefix##_push_n(&container, __arr, sizeof(__arr)/sizeof(__arr[0])); \

+

+#define c_init(ctype, container, items) \

+    ctype container = ctype##_init(); { \

+        const ctype##_input_t __arr[] = { items }; \

+        ctype##_push_n(&container, __arr, sizeof(__arr)/sizeof(__arr[0])); \

     }

-#define c_destroy(prefix, ...) do { \

-    struct prefix* __arr[] = {__VA_ARGS__}; \

+

+#define c_destroy(ctype, ...) do { \

+    struct ctype* __arr[] = {__VA_ARGS__}; \

     for (size_t i=0; i<sizeof(__arr)/sizeof(__arr[0]); ++i) \

-        prefix##_destroy(__arr[i]); \

+        ctype##_destroy(__arr[i]); \

 } while (0)

 

 

diff --git a/stc/copt.h b/stc/coption.h
index 49c895e0..e1c6e7cb 100644
--- a/stc/copt.h
+++ b/stc/coption.h
@@ -20,31 +20,31 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

  * SOFTWARE.

  */

-#ifndef COPT__H__

-#define COPT__H__

+#ifndef COPTIONS__H__

+#define COPTIONS__H__

 

 /*  Inspired by https://attractivechaos.wordpress.com/2018/08/31/a-survey-of-argument-parsing-libraries-in-c-c

     Fixed major bugs with option arguments (both long and short).

     Added arg->faulty output field, and has a more consistent API.

 

-    copt_get() is similar to GNU's getopt_long(). Each call parses one option and

+    coption_get() is similar to GNU's getopt_long(). Each call parses one option and

     returns the option name. opt->arg points to  the option argument if present.

     The function returns -1 when all command-line arguments are parsed. In this case,

     opt->ind is the index of the first non-option argument.

 Example:

     int main(int argc, char *argv[])

     {

-        copt_long_t longopts[] = {

-            {"foo", copt_no_argument,       'f'},

-            {"bar", copt_required_argument, 'b'},

-            {"opt", copt_optional_argument, 'o'},

+        coption_long_t longopts[] = {

+            {"foo", coption_no_argument,       'f'},

+            {"bar", coption_required_argument, 'b'},

+            {"opt", coption_optional_argument, 'o'},

             {NULL}

         };

         const char* optstr = "xy:z::123";

         printf("program -x -y ARG -z [ARG] -1 -2 -3 --foo --bar ARG --opt [ARG] [ARGUMENTS]\n");

         int c;

-        copt_t opt = copt_init;

-        while ((c = copt_get(&opt, argc, argv, optstr, longopts)) != -1) {

+        coption_t opt = coption_init;

+        while ((c = coption_get(&opt, argc, argv, optstr, longopts)) != -1) {

             switch (c) {

                 case '?': printf("error: unknown option: %s\n", opt.faulty); break;

                 case ':': printf("error: missing argument for %s\n", opt.faulty); break;

@@ -63,9 +63,9 @@ Example:
 #include <stdbool.h>

 

 enum {

-    copt_no_argument       = 0,

-    copt_required_argument = 1,

-    copt_optional_argument = 2

+    coption_no_argument       = 0,

+    coption_required_argument = 1,

+    coption_optional_argument = 2

 };

 typedef struct {

     int ind;   /* equivalent to optind */

@@ -75,17 +75,17 @@ typedef struct {
     int longindex; /* idx of long option; or -1 if short */

     int _i, _pos, _nargs;

     char _faulty[4];

-} copt_t;

+} coption_t;

 

 typedef struct {

     char *name;

     int has_arg;

     int val;

-} copt_long_t;

+} coption_long_t;

 

-static const copt_t copt_init = {1, 0, NULL, NULL, -1, 1, 0, 0, {'-', '?', '\0'}};

+static const coption_t coption_init = {1, 0, NULL, NULL, -1, 1, 0, 0, {'-', '?', '\0'}};

 

-static void _copt_permute(char *argv[], int j, int n) { /* move argv[j] over n elements to the left */

+static void _coption_permute(char *argv[], int j, int n) { /* move argv[j] over n elements to the left */

     int k;

     char *p = argv[j];

     for (k = 0; k < n; ++k)

@@ -93,13 +93,13 @@ static void _copt_permute(char *argv[], int j, int n) { /* move argv[j] over n e
     argv[j - k] = p;

 }

 

-/* @param opt   output; must be initialized to copt_init on first call

+/* @param opt   output; must be initialized to coption_init on first call

  * @return      ASCII val for a short option; longopt.val for a long option;

  *              -1 if argv[] is fully processed; '?' for an unknown option or

  *              an ambiguous long option; ':' if an option argument is missing

  */

-static int copt_get(copt_t *opt, int argc, char *argv[],

-                       const char *shortopts, const copt_long_t *longopts) {

+static int coption_get(coption_t *opt, int argc, char *argv[],

+                       const char *shortopts, const coption_long_t *longopts) {

     int optc = -1, i0, j, posixly_correct = (shortopts[0] == '+');

     if (!posixly_correct) {

         while (opt->_i < argc && (argv[opt->_i][0] != '-' || argv[opt->_i][1] == '\0'))

@@ -112,14 +112,14 @@ static int copt_get(copt_t *opt, int argc, char *argv[],
     }

     if (argv[opt->_i][0] == '-' && argv[opt->_i][1] == '-') { /* "--" or a long option */

         if (argv[opt->_i][2] == '\0') { /* a bare "--" */

-            _copt_permute(argv, opt->_i, opt->_nargs);

+            _coption_permute(argv, opt->_i, opt->_nargs);

             ++opt->_i, opt->ind = opt->_i - opt->_nargs;

             return -1;

         }

         opt->opt = 0, optc = '?', opt->_pos = -1;

         if (longopts) { /* parse long options */

             int k, n_exact = 0, n_partial = 0;

-            const copt_long_t *o = 0, *o_exact = 0, *o_partial = 0;

+            const coption_long_t *o = 0, *o_exact = 0, *o_partial = 0;

             for (j = 2; argv[opt->_i][j] != '\0' && argv[opt->_i][j] != '='; ++j) {} /* find the end of the option name */

             for (k = 0; longopts[k].name != 0; ++k)

                 if (strncmp(&argv[opt->_i][2], longopts[k].name, j - 2) == 0) {

@@ -131,13 +131,13 @@ static int copt_get(copt_t *opt, int argc, char *argv[],
             o = n_exact == 1? o_exact : n_partial == 1? o_partial : 0;

             if (o) {

                 opt->opt = optc = o->val, opt->longindex = o - longopts;

-                if (o->has_arg != copt_no_argument) {

+                if (o->has_arg != coption_no_argument) {

                     if (argv[opt->_i][j] == '=') 

                         opt->arg = &argv[opt->_i][j + 1];

-                    else if (argv[opt->_i][j] == '\0' && opt->_i < argc - 1 && (o->has_arg == copt_required_argument ||

+                    else if (argv[opt->_i][j] == '\0' && opt->_i < argc - 1 && (o->has_arg == coption_required_argument ||

                                                                                 argv[opt->_i + 1][0] != '-'))

                         opt->arg = argv[++opt->_i];

-                    else if (o->has_arg == copt_required_argument)

+                    else if (o->has_arg == coption_required_argument)

                         optc = ':'; /* missing option argument */

                 }

             }

@@ -164,7 +164,7 @@ static int copt_get(copt_t *opt, int argc, char *argv[],
         ++opt->_i, opt->_pos = 0;

         if (opt->_nargs > 0) /* permute */

             for (j = i0; j < opt->_i; ++j)

-                _copt_permute(argv, j, opt->_nargs);

+                _coption_permute(argv, j, opt->_nargs);

     }

     opt->ind = opt->_i - opt->_nargs;

     return optc;