From: Daniel Martin <consume.noise@gmail.com>
Date: Sun, 18 Aug 2013 13:18:10 +0000 (+0200)
Subject: Enforce a bit or value in enum items
X-Git-Tag: xcb-proto-1.9~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb2fa837ffada5d1a682749c40dbdaf28b6a442c;p=platform%2Fupstream%2Fxcb-proto.git

Enforce a bit or value in enum items

Do not allow enum items without an explicit bit or value. The value of
an enum item is known when adding the enum to the xml specification.
There's no reason why this information shouldn't be where it belongs to.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Ran Benita <ran234@gmail.com> (and tested)
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---

diff --git a/src/xcb.xsd b/src/xcb.xsd
index 819495b..7a9c800 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -353,7 +353,10 @@ authorization from the authors.
           <xsd:sequence minOccurs="1" maxOccurs="unbounded">
             <xsd:element name="item">
               <xsd:complexType>
-                <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
+                <xsd:choice minOccurs="1" maxOccurs="1">
+                  <xsd:element name="value" type="dec-or-hex-integer" />
+                  <xsd:element name="bit" type="xsd:integer" />
+                </xsd:choice>
                 <xsd:attribute name="name" type="xsd:string" use="required" />
               </xsd:complexType>
             </xsd:element>