From 6a88f32eea3850d58411b854ba102a2baa978158 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 14 May 2018 04:47:12 +0200
Subject: T633: build integration and minor fixes in the op mode command
 generator.

---
 schema/op-mode-definition.rnc |  5 ++---
 schema/op-mode-definition.rng | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'schema')

diff --git a/schema/op-mode-definition.rnc b/schema/op-mode-definition.rnc
index 01276123c..9c84de0e4 100644
--- a/schema/op-mode-definition.rnc
+++ b/schema/op-mode-definition.rnc
@@ -52,8 +52,7 @@ tagNode = element tagNode
 leafNode = element leafNode
 {
     nodeNameAttr,
-    command,
-    properties
+    (command & properties)
 }
 
 # Normal and tag nodes may have children
@@ -105,4 +104,4 @@ completionHelp = element completionHelp
     (element list { text })* &
     (element path { text })* &
     (element script { text })*
-}
\ No newline at end of file
+}
diff --git a/schema/op-mode-definition.rng b/schema/op-mode-definition.rng
index 98a231e53..e9e7887cf 100644
--- a/schema/op-mode-definition.rng
+++ b/schema/op-mode-definition.rng
@@ -67,7 +67,9 @@
         <optional>
           <ref name="properties"/>
         </optional>
-        <ref name="children"/>
+        <optional>
+          <ref name="children"/>
+        </optional>
         <optional>
           <ref name="command"/>
         </optional>
@@ -81,8 +83,10 @@
   <define name="leafNode">
     <element name="leafNode">
       <ref name="nodeNameAttr"/>
-      <ref name="command"/>
-      <ref name="properties"/>
+      <interleave>
+        <ref name="command"/>
+        <ref name="properties"/>
+      </interleave>
     </element>
   </define>
   <!-- Normal and tag nodes may have children -->
-- 
cgit v1.2.3