Browse Source

xml: Rename MULTI to SEQ

Serj Kalichev 1 year ago
parent
commit
480c71832a
2 changed files with 7 additions and 6 deletions
  1. 3 3
      klish.xsd
  2. 4 3
      klish/xml-helper/load.c

+ 3 - 3
klish.xsd

@@ -34,7 +34,7 @@
 	<xs:element name="PTYPE" type="ptype_t"/> <!-- Wrapper -->
 	<xs:element name="PARAM" type="param_t"/> <!-- Wrapper -->
 	<xs:element name="SWITCH" type="param_t"/> <!-- Wrapper -->
-	<xs:element name="MULTI" type="param_t"/> <!-- Wrapper -->
+	<xs:element name="SEQ" type="param_t"/> <!-- Wrapper -->
 
 
 <!--
@@ -283,7 +283,7 @@
 			<xs:element ref="HELP" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="PROMPT" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="SWITCH" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="MULTI" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element ref="SEQ" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:choice>
 	</xs:group>
 
@@ -371,7 +371,7 @@
 			<xs:element ref="HELP" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="PROMPT" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="SWITCH" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="MULTI" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element ref="SEQ" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:choice>
 	</xs:group>
 

+ 4 - 3
klish/xml-helper/load.c

@@ -41,7 +41,7 @@ typedef enum {
 	KTAG_ACTION,
 	KTAG_PARAM,
 	KTAG_SWITCH, // PARAM alias
-	KTAG_MULTI, // PARAM alias
+	KTAG_SEQ, // PARAM alias
 	KTAG_COMMAND,
 	KTAG_FILTER,
 	KTAG_VIEW,
@@ -61,7 +61,7 @@ static const char * const kxml_tags[] = {
 	"ACTION",
 	"PARAM",
 	"SWITCH",
-	"MULTI",
+	"SEQ",
 	"COMMAND",
 	"FILTER",
 	"VIEW",
@@ -645,6 +645,7 @@ err:
 }
 
 
+// PARAM, SWITCH, SEQ
 static bool_t process_param(const kxml_node_t *element, void *parent,
 	faux_error_t *error)
 {
@@ -681,7 +682,7 @@ static bool_t process_param(const kxml_node_t *element, void *parent,
 		(KTAG_PARAM != parent_tag) &&
 		(KTAG_ENTRY != parent_tag) &&
 		(KTAG_SWITCH != parent_tag) &&
-		(KTAG_MULTI != parent_tag) &&
+		(KTAG_SEQ != parent_tag) &&
 		(KTAG_COND != parent_tag) &&
 		(KTAG_COMPL != parent_tag) &&
 		(KTAG_HELP != parent_tag) &&