Changeset 64226

Timestamp:

Jan 16, 2015, 8:12:51 PM (10 years ago)

Author:

glynn

Message:

Add inter-dependency rules to --interface-description output

Location:

grass/trunk

Files:

• gui/xml/grass-interface.dtd (modified) (1 diff)
• lib/gis/parser_dependencies.c (modified) (1 diff)
• lib/gis/parser_interface.c (modified) (1 diff)
• lib/gis/parser_local_proto.h (modified) (1 diff)

grass/trunk/gui/xml/grass-interface.dtd

@@ -153 +153 @@
 -->
 <!ELEMENT keywords   (#PCDATA)>
+
+<!--    option inter-dependency rules
+-->
+<!ELEMENT rules   (rule+)>
+
+<!--    an option inter-dependency rule
+-->
+<!ELEMENT rule   (rule-flag*, rule-option*)>
+<!ATTLIST rule   type            (exclusive | required | requires | requires-all |
+                                  excludes | collective) #REQUIRED>
+
+<!--    a flag name
+-->
+<!ELEMENT rule-flag    EMPTY>
+<!ATTLIST rule-flag    key       CDATA #REQUIRED>
+
+<!--    an option name
+-->
+<!ELEMENT rule-option    EMPTY>
+<!ATTLIST rule-option    key       CDATA #REQUIRED>

grass/trunk/lib/gis/parser_dependencies.c

@@ -409 +409 @@
     return FALSE;
 }
+
+static const char * const rule_types[] = {
+    "exclusive",
+    "required",
+    "requires",
+    "requires-all",
+    "excludes",
+    "collective"
+};
+
+void G__describe_option_rules_xml(FILE *fp)
+{
+    unsigned int i, j;
+
+    if (!rules.count)
+        return;
+
+    fprintf(fp, "\t<rules>\n");
+    for (i = 0; i < rules.count; i++) {
+        const struct rule *rule = &((const struct rule *) rules.data)[i];
+        fprintf(fp, "\t\t<rule type=\"%s\">\n", rule_types[rule->type]);
+        for (j = 0; j < rule->count; j++) {
+            void *p = rule->opts[j];
+            if (is_flag(p)) {
+                const struct Flag *flag = (const struct Flag *) p;
+                fprintf(fp, "\t\t\t<rule-flag key=\"%c\"/>\n", flag->key);
+            }
+            else {
+                const struct Option *opt = (const struct Option *) p;
+                fprintf(fp, "\t\t\t<rule-option key=\"%s\"/>\n", opt->key);
+            }
+        }
+        fprintf(fp, "\t\t</rule>\n");
+    }
+    fprintf(fp, "\t</rules>\n");
+}
+

grass/trunk/lib/gis/parser_interface.c

@@ -353 +353 @@
     fprintf(stdout, "\t</flag>\n");
 
+    G__describe_option_rules_xml(stdout);
+
     fprintf(stdout, "</task>\n");
 }

grass/trunk/lib/gis/parser_local_proto.h

@@ -60 +60 @@
 void G__describe_option_rules(void);
 int G__has_required_rule(void);
+void G__describe_option_rules_xml(FILE *);
 
 #endif