From 9bd3b07647bfbd5016f06a4f055a4310b3269587 Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Fri, 1 Aug 2008 10:18:47 +0000
Subject: Support for XML layout with unspecified keys. XML Layout parsing.
 WIP.

svn-id: r33488
---
 common/xmlparser.cpp | 2 +-
 common/xmlparser.h   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
index 89dd5d7e32..25c79e65c0 100644
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -112,7 +112,7 @@ bool XMLParser::parseActiveKey(bool closed) {
 			return parserError("Missing required property '%s' inside key '%s'", i->name.c_str(), key->name.c_str());
 	}
 	
-	if (localMap.empty() == false)
+	if (key->layout.anyProps == false && localMap.empty() == false)
 		return parserError("Unhandled property inside key '%s': '%s'", key->name.c_str(), localMap.begin()->_key.c_str());
 
 	// check if any of the parents must be ignored.
diff --git a/common/xmlparser.h b/common/xmlparser.h
index 11028dbaa8..9308524388 100644
--- a/common/xmlparser.h
+++ b/common/xmlparser.h
@@ -108,6 +108,10 @@ namespace Common {
 	contained children keys, using the XML_KEY() macro again.
 	The scope of a XML key is closed with the KEY_END() macro.
 	
+	Keys which may contain any kind of Property names may be defined with the
+	XML_PROP_ANY() macro instead of the XML_PROP() macro. This macro takes no
+	arguments.
+	
 	As an example, the following XML layout:
 	
 		XML_KEY(palette)
@@ -178,6 +182,7 @@ namespace Common {
 	
 #define XML_KEY(keyName) {\
 		lay = new XMLKeyLayout; \
+		lay->anyProps = false; \
 		lay->custom = new kLocalParserName::CustomParserCallback; \
 		((kLocalParserName::CustomParserCallback*)(lay->custom))->callback = (&kLocalParserName::parserCallback_##keyName); \
 		layout.top()->children[#keyName] = lay; \
@@ -189,6 +194,9 @@ namespace Common {
 		prop.name = #propName; \
 		prop.required = req; \
 		layout.top()->properties.push_back(prop); }\
+		
+#define XML_PROP_ANY() {\
+		layout.top()->anyProps = true; }
 	
 #define CUSTOM_XML_PARSER(parserName) \
 	protected: \
@@ -291,6 +299,7 @@ public:
 		};
 		
 		Common::List<XMLKeyProperty> properties;
+		bool anyProps;
 		ChildMap children;
 		
 		~XMLKeyLayout() {
-- 
cgit v1.2.3