2:25 p.m.
nwfilter.rng defines uint16range and uint32range, but in a different
manner (it also allows a variable name as the value, rather than just
a decimal or hex number). I wanted to add uint16range to
basictypes.rng, but my desired definition was parallel to those for
uint8range and uint24range which are defined in basictypes.rng - they
*don't* allow a variable name for the value.
The simplest path to make everyone happy is to make the "plain"
versions in basictypes.rng have simpler names - "uint8", "uint16",
and
"uint24". This patch renames uint8range and uint24range to uint8 and
uint24, while the next patch will add uint16.
---
docs/schemas/basictypes.rng | 4 ++--
docs/schemas/domaincommon.rng | 6 +++---
docs/schemas/networkcommon.rng | 12 ++++++------
docs/schemas/nwfilter.rng | 16 ++++++++--------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 084d403..cfbf40d 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -32,7 +32,7 @@
</data>
</define>
- <define name="uint8range">
+ <define name="uint8">
<choice>
<data type="string">
<param name="pattern">0x[0-9a-fA-F]{1,2}</param>
@@ -43,7 +43,7 @@
</data>
</choice>
</define>
- <define name="uint24range">
+ <define name="uint24">
<choice>
<data type="string">
<param name="pattern">0x[0-9a-fA-F]{1,6}</param>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index da6de40..236a2ba 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1768,17 +1768,17 @@
<element name="target">
<optional>
<attribute name='chassisNr'>
- <ref name='uint8range'/>
+ <ref name='uint8'/>
</attribute>
</optional>
<optional>
<attribute name="chassis">
- <ref name='uint8range'/>
+ <ref name='uint8'/>
</attribute>
</optional>
<optional>
<attribute name="port">
- <ref name='uint8range'/>
+ <ref name='uint8'/>
</attribute>
</optional>
<empty/>
diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng
index 09691dc..fb69f7c 100644
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -19,17 +19,17 @@
<element name="parameters">
<optional>
<attribute name="managerid">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="typeid">
- <ref name="uint24range"/>
+ <ref name="uint24"/>
</attribute>
</optional>
<optional>
<attribute name="typeidversion">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
@@ -97,17 +97,17 @@
<element name="parameters">
<optional>
<attribute name="managerid">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="typeid">
- <ref name="uint24range"/>
+ <ref name="uint24"/>
</attribute>
</optional>
<optional>
<attribute name="typeidversion">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index 9df39c0..dbe6af7 100644
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -578,12 +578,12 @@
<interleave>
<optional>
<attribute name="type">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="code">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
</interleave>
@@ -593,22 +593,22 @@
<interleave>
<optional>
<attribute name="type">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="typeend">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="code">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="codeend">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
</interleave>
@@ -642,12 +642,12 @@
<define name="stp-attributes">
<optional>
<attribute name="type">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
<attribute name="flags">
- <ref name="uint8range"/>
+ <ref name="uint8"/>
</attribute>
</optional>
<optional>
--
2.5.5