[GRASS-SVN] r60871 - in grass/trunk: include/defs lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jun 19 07:35:40 PDT 2014


Author: glynn
Date: 2014-06-19 07:35:40 -0700 (Thu, 19 Jun 2014)
New Revision: 60871

Added:
   grass/trunk/lib/gis/parser_dependencies.c
Modified:
   grass/trunk/include/defs/gis.h
   grass/trunk/lib/gis/parser_local_proto.h
Log:
First draft of inter-option dependency rules


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-06-19 14:35:05 UTC (rev 60870)
+++ grass/trunk/include/defs/gis.h	2014-06-19 14:35:40 UTC (rev 60871)
@@ -501,6 +501,12 @@
 FILE *G_open_option_file(const struct Option *);
 void G_close_option_file(FILE *);
 
+void G_option_exclusive(void *first, ...);
+void G_option_required(void *first, ...);
+void G_option_requires(void *first, ...);
+void G_option_requires_all(void *first, ...);
+void G_option_collective(void *first, ...);
+
 /* paths.c */
 int G_mkdir(const char *);
 int G_is_dirsep(char);

Added: grass/trunk/lib/gis/parser_dependencies.c
===================================================================
--- grass/trunk/lib/gis/parser_dependencies.c	                        (rev 0)
+++ grass/trunk/lib/gis/parser_dependencies.c	2014-06-19 14:35:40 UTC (rev 60871)
@@ -0,0 +1,313 @@
+/*!
+  \file lib/gis/parser_dependencies.c
+  
+  \brief GIS Library - Argument parsing functions (dependencies between options)
+  
+  (C) 2014 by the GRASS Development Team
+  
+  This program is free software under the GNU General Public License
+  (>=v2). Read the file COPYING that comes with GRASS for details.
+  
+  \author Glynn Clements Jun. 2014
+*/
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <grass/gis.h>
+#include <grass/glocale.h>
+
+#include "parser_local_proto.h"
+
+enum rule_type {
+    RULE_EXCLUSIVE,
+    RULE_REQUIRED,
+    RULE_REQUIRES,
+    RULE_REQUIRES_ALL,
+    RULE_COLLECTIVE
+};
+
+struct vector {
+    size_t elsize;
+    size_t increment;
+    size_t count;
+    size_t limit;
+    void *data;
+};
+
+static void vector_new(struct vector *v, size_t elsize, size_t increment)
+{
+    v->elsize = elsize;
+    v->increment = increment;
+    v->count = 0;
+    v->limit = 0;
+    v->data = NULL;
+}
+
+static void vector_append(struct vector *v, const void *data)
+{
+    void *p;
+
+    if (v->count >= v->limit) {
+	v->limit += v->increment;
+	v->data = G_realloc(v->data, v->limit * v->elsize);
+    }
+
+    p = G_incr_void_ptr(v->data, v->count * v->elsize);
+    memcpy(p, data, v->elsize);
+    v->count++;
+}
+
+struct rule {
+    int type;
+    int count;
+    void **opts;
+};
+
+static struct vector rules = {sizeof(struct rule), 50};
+
+static void make_rule(int type, void *first, va_list ap)
+{
+    struct vector opts;
+    void *opt;
+    struct rule rule;
+
+    vector_new(&opts, sizeof(void *), 10);
+
+    opt = first;
+    vector_append(&opts, &opt);
+    for (;;) {
+	opt = va_arg(ap, void*);
+	if (!opt)
+	    break;
+	vector_append(&opts, &opt);
+    }
+
+    rule.type = type;
+    rule.count = opts.count;
+    rule.opts = (void**) opts.data;
+
+    vector_append(&rules, &rule);
+}
+
+static int is_flag(const void *p)
+{
+    if (st->n_flags) {
+	const struct Flag *flag;
+	for (flag = &st->first_flag; flag; flag = flag->next_flag)
+	    if ((const void *) flag == p)
+		return 1;
+    }
+
+    if (st->n_opts) {
+	const struct Option *opt;
+	for (opt = &st->first_option; opt; opt = opt->next_opt)
+	    if ((const void *) opt == p)
+		return 0;
+    }
+
+    G_fatal_error(_("Internal error: option or flag not found"));
+}
+
+static int is_present(const void *p)
+{
+    if (is_flag(p)) {
+	const struct Flag *flag = p;
+	return (int) flag->answer;
+    }
+    else {
+	const struct Option *opt = p;
+	return opt->count > 0;
+    }
+}
+
+static char *get_name(const void *p)
+{
+    if (is_flag(p)) {
+	char *s;
+	G_asprintf(&s, "-%c", ((const struct Flag *) p)->key);
+	return s;
+    }
+    else
+	return G_store(((const struct Option *) p)->key);
+}
+
+static int count_present(const struct rule *rule, int start)
+{
+    int i;
+    int count = 0;
+
+    for (i = start; i < rule->count; i++)
+	if (is_present(rule->opts[i]))
+	    count++;
+
+    return count;
+}
+
+static const char *describe_rule(const struct rule *rule, int start, int disjunction)
+{
+    char *s = get_name(rule->opts[start]);
+    int i;
+
+    for (i = start + 1; i < rule->count - 1; i++) {
+	char *s0 = s;
+	char *ss = get_name(rule->opts[i]);
+	s = NULL;
+	G_asprintf(&s, "%s, %s", s0, ss);
+	G_free(s0);
+	G_free(ss);
+    }
+
+    if (rule->count - start > 1) {
+	char *s0 = s;
+	char *ss = get_name(rule->opts[i]);
+	s = NULL;
+	G_asprintf(&s, disjunction ? _("%s or %s") : _("%s and %s"), s0, ss);
+	G_free(s0);
+	G_free(ss);
+    }
+
+    return s;
+}
+
+/* at most one option from a set */
+void G_option_exclusive(void *first, ...)
+{
+    va_list ap;
+    va_start(ap, first);
+    make_rule(RULE_EXCLUSIVE, first, ap);
+    va_end(ap);
+}
+
+static void check_exclusive(const struct rule *rule)
+{
+    if (count_present(rule, 0) > 1)
+	G_fatal_error(_("Options %s are mutually exclusive"), describe_rule(rule, 0, 0));
+}
+
+/* at least one option from a set */
+void G_option_required(void *first, ...)
+{
+    va_list ap;
+    va_start(ap, first);
+    make_rule(RULE_REQUIRED, first, ap);
+    va_end(ap);
+}
+
+static void check_required(const struct rule *rule)
+{
+    if (count_present(rule, 0) < 1)
+	G_fatal_error(_("At least one of %s is required"), describe_rule(rule, 0, 0));
+}
+
+/* if the first option is present, at least one of the other
+   options must also be present */
+void G_option_requires(void *first, ...)
+{
+    va_list ap;
+    va_start(ap, first);
+    make_rule(RULE_REQUIRES, first, ap);
+    va_end(ap);
+}
+
+static void check_requires(const struct rule *rule)
+{
+    if (!is_present(rule->opts[0]))
+	return;
+    if (count_present(rule, 1) < 1)
+	G_fatal_error(_("Options %s requires at least one of %s"), describe_rule(rule, 0, 1));
+}
+
+/* if the first option is present, all the other options must also
+   be present. */
+void G_option_requires_all(void *first, ...)
+{
+    va_list ap;
+    va_start(ap, first);
+    make_rule(RULE_REQUIRES_ALL, first, ap);
+    va_end(ap);
+}
+
+static void check_requires_all(const struct rule *rule)
+{
+    if (!is_present(rule->opts[0]))
+	return;
+    if (count_present(rule, 1) < rule->count - 1)
+	G_fatal_error(_("Options %s requires all of %s"), describe_rule(rule, 0, 0));
+}
+
+/* if any option is present, all the other options must also be present
+   all or nothing from a set */
+void G_option_collective(void *first, ...)
+{
+    va_list ap;
+    va_start(ap, first);
+    make_rule(RULE_COLLECTIVE, first, ap);
+    va_end(ap);
+}
+
+static void check_collective(const struct rule *rule)
+{
+    int count = count_present(rule, 0);
+    if (count > 0 && count < rule->count)
+	G_fatal_error(_("Either all or none of %s must be given"), describe_rule(rule, 0, 0));
+}
+
+void G__check_option_rules(void)
+{
+    int i;
+
+    for (i = 0; i < rules.count; i++) {
+	const struct rule *rule = &((const struct rule *) rules.data)[i];
+	switch (rule->type) {
+	case RULE_EXCLUSIVE:
+	    check_exclusive(rule);
+	    break;
+	case RULE_REQUIRED:
+	    check_required(rule);
+	    break;
+	case RULE_REQUIRES:
+	    check_requires(rule);
+	    break;
+	case RULE_REQUIRES_ALL:
+	    check_requires_all(rule);
+	    break;
+	case RULE_COLLECTIVE:
+	    check_collective(rule);
+	    break;
+	default:
+	    G_fatal_error(_("Internal error: invalid rule type: %d"), rule->type);
+	    break;
+	}
+    }
+}
+
+void G__describe_option_rules(void)
+{
+    int i;
+
+    for (i = 0; i < rules.count; i++) {
+	const struct rule *rule = &((const struct rule *) rules.data)[i];
+	switch (rule->type) {
+	case RULE_EXCLUSIVE:
+	    fprintf(stderr, "Exclusive: %s", describe_rule(rule, 0, 0));
+	    break;
+	case RULE_REQUIRED:
+	    fprintf(stderr, "Required: %s", describe_rule(rule, 0, 1));
+	    break;
+	case RULE_REQUIRES:
+	    fprintf(stderr, "Requires: %s => %s", rule->opts[0], describe_rule(rule, 1, 1));
+	    break;
+	case RULE_REQUIRES_ALL:
+	    fprintf(stderr, "Requires: %s => %s", rule->opts[0], describe_rule(rule, 1, 0));
+	    break;
+	case RULE_COLLECTIVE:
+	    fprintf(stderr, "Collective: %s", describe_rule(rule, 0, 0));
+	    break;
+	default:
+	    G_fatal_error(_("Internal error: invalid rule type: %d"), rule->type);
+	    break;
+	}
+    }
+}


Property changes on: grass/trunk/lib/gis/parser_dependencies.c
___________________________________________________________________
Added: svn:mime-type
   + text/x-csrc
Added: svn:eol-style
   + native

Modified: grass/trunk/lib/gis/parser_local_proto.h
===================================================================
--- grass/trunk/lib/gis/parser_local_proto.h	2014-06-19 14:35:05 UTC (rev 60870)
+++ grass/trunk/lib/gis/parser_local_proto.h	2014-06-19 14:35:40 UTC (rev 60871)
@@ -54,5 +54,8 @@
 int  G__uses_new_gisprompt(void);
 void G__print_keywords(FILE *, void (*)(FILE *, const char *));
 
+void G__check_option_rules(void);
+void G__describe_option_rules(void);
+
 #endif
 



More information about the grass-commit mailing list