From 729ea17ed17cf81eb19847216406e40686df679d Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Fri, 30 Jan 2015 14:42:06 +0100
Subject: Finished implementing constant importing

---
 src/plugins/xml/XmlParser.cpp | 45 +++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'src/plugins/xml/XmlParser.cpp')

diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp
index 70ea48c..88447ed 100644
--- a/src/plugins/xml/XmlParser.cpp
+++ b/src/plugins/xml/XmlParser.cpp
@@ -214,21 +214,23 @@ public:
 
 		// Try to resolve the type and default value
 		if (optional) {
-			scope().resolveTypeWithValue(type, attribute, attribute->getDefaultValue(), logger(),
-				                  [](Handle<Node> type, Handle<Node> attribute,
-				                     Logger &logger) {
-				if (type != nullptr) {
-					attribute.cast<Attribute>()->setType(type.cast<Type>(), logger);
-				}
-			});
+			scope().resolveTypeWithValue(
+			    type, attribute, attribute->getDefaultValue(), logger(),
+			    [](Handle<Node> type, Handle<Node> attribute, Logger &logger) {
+				    if (type != nullptr) {
+					    attribute.cast<Attribute>()->setType(type.cast<Type>(),
+					                                         logger);
+				    }
+				});
 		} else {
-			scope().resolveType(type, attribute, logger(),
-				                  [](Handle<Node> type, Handle<Node> attribute,
-				                     Logger &logger) {
-				if (type != nullptr) {
-					attribute.cast<Attribute>()->setType(type.cast<Type>(), logger);
-				}
-			});
+			scope().resolveType(
+			    type, attribute, logger(),
+			    [](Handle<Node> type, Handle<Node> attribute, Logger &logger) {
+				    if (type != nullptr) {
+					    attribute.cast<Attribute>()->setType(type.cast<Type>(),
+					                                         logger);
+				    }
+				});
 		}
 	}
 
@@ -256,13 +258,14 @@ public:
 		constant->setLocation(location());
 
 		// Try to resolve the type
-		scope().resolveTypeWithValue(type, constant, constant->getValue(), logger(),
-		                      [](Handle<Node> type, Handle<Node> constant,
-		                         Logger &logger) {
-			if (type != nullptr) {
-				constant.cast<Constant>()->setType(type.cast<Type>(), logger);
-			}
-		});
+		scope().resolveTypeWithValue(
+		    type, constant, constant->getValue(), logger(),
+		    [](Handle<Node> type, Handle<Node> constant, Logger &logger) {
+			    if (type != nullptr) {
+				    constant.cast<Constant>()->setType(type.cast<Type>(),
+				                                       logger);
+			    }
+			});
 	}
 
 	void end() override {}
-- 
cgit v1.2.3