From 3a05dff32f6cf12b66496c225f063ad156a18b3b Mon Sep 17 00:00:00 2001
From: Mathias Hasselmann <mathias.hasselmann@gmx.de>
Date: Wed, 5 Sep 2007 21:38:47 +0200
Subject: [PATCH] parse.dtd: Fix errors in definition of the symbol element.
Describe expression and type-reference elements.

Signed-off-by: Mathias Hasselmann <mathias.hasselmann@gmx.de>
---
 parse.dtd |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/parse.dtd b/parse.dtd
index cbf95ec..f712fda 100644
--- a/parse.dtd
+++ b/parse.dtd
@@ -1,9 +1,9 @@
 <!ELEMENT parse (symbol+) >
 
-<!ELEMENT symbol (symbol*) >
+<!ELEMENT symbol ((symbol|expression)*) >
 
-<!ATTLIST symbol type (uninitialized|preprocessor|basetype|node|pointer|function|array|struct|union|enum|typedef|typeof|member|bitfield|label|restrict|fouled|keyword|bad) #REQUIRED
-                 id ID #REQUIRED
+<!ATTLIST symbol type (uninitialized|preprocessor|basetype|node|pointer|function|array|struct|union|enum|typedef|typeof|member|bitfield|label|restrict|fouled|keyword|bad|macro) #REQUIRED
+		 id ID #REQUIRED
 		 file CDATA #REQUIRED
 		 start-line CDATA #REQUIRED
 		 start-col CDATA #REQUIRED
@@ -13,7 +13,7 @@
 
 		 ident CDATA #IMPLIED
 		 base-type IDREF #IMPLIED
-		 base-type-builtin (char|signed char|unsigned char|short|signed short|unsigned short|int|signed int|unsigned int|signed long|long|unsigned long|long long|signed long long|unsigned long long|void|bool|string|float|double|long double|incomplete type|abstract int|abstract fp|label type|bad type) #IMPLIED
+		 base-type-builtin CDATA #IMPLIED
 
 		 array-size CDATA #IMPLIED
 
@@ -48,4 +48,16 @@
 		 usertype (0|1) #IMPLIED
 		 force (0|1) #IMPLIED
 		 explicitly-signed (0|1) #IMPLIED
-		 bitwise (0|1) #IMPLIED >
+		 bitwise (0|1) #IMPLIED 
+		 user-type (0|1) #IMPLIED>
+
+<!ELEMENT expression EMPTY >
+<!ATTLIST expression type (value|string) #REQUIRED
+		     value CDATA #REQUIRED
+		     file CDATA #REQUIRED
+		     start-line CDATA #REQUIRED
+		     start-col CDATA #REQUIRED
+		     end-line CDATA #IMPLIED
+		     end-col CDATA #IMPLIED
+		     end-file CDATA #IMPLIED>
+
-- 
1.5.2.3