rethrow parsed exception in abstraction

aarbology2/src/aarbology.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main ( int argc, char * argv[] ) {
 	try {
 		common::GlobalData::argc = argc;

acast2/src/acast.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 // -----------------------------------------------------------------------------------------
 int main(int argc, char** argv) {

acompaction2/src/acompaction.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char** argv) {
 	try {
 		common::GlobalData::argc = argc;

aconversions2/src/aconversion.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 #include "ConversionHandler.h"
 int main ( int argc, char * argv[] ) {

aderivation2/src/aderivation.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char** argv) {
 	try {
 		common::GlobalData::argc = argc;

adeterminize2/src/adeterminize.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main ( int argc, char * * argv ) {
 	try {
 		common::GlobalData::argc = argc;

aecho2/src/aecho.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char** argv) {
 	try {
 		common::GlobalData::argc = argc;

aepsilon2/src/aepsilon.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char** argv) {
 	try {
 		common::GlobalData::argc = argc;

agenerate2/src/agenerate.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main ( int argc, char * argv[] ) {
 	try {
 		common::GlobalData::argc = argc;

aintegral2/src/aintegral.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char** argv) {
 	try {
 		common::GlobalData::argc = argc;

alangop2/src/alangop.cpp

@@ -13,6 +13,8 @@
 #include <lexer/Lexer.h>
 #include <parser/Parser.h>
+#include <factory/XmlDataFactory.hpp>
+
 int main(int argc, char* argv[]) {
 	try {
 		common::GlobalData::argc = argc;

alib2cli/src/ast/params/FileParam.h

@@ -16,7 +16,9 @@ public:
 	virtual std::shared_ptr < abstraction::OperationAbstraction > translateAndEval ( const std::shared_ptr < abstraction::OperationAbstraction > &, Environment & environment ) const override {
 		ext::deque < sax::Token > tokens = sax::FromXMLParserHelper::parseInput ( m_arg->eval ( environment ) );
 		std::string type = tokens [ 0 ].getData ( );
-		return abstraction::Registry::getXmlParserAbstraction ( type, tokens );
+		std::shared_ptr < abstraction::OperationAbstraction > res = abstraction::Registry::getXmlParserAbstraction ( type, tokens );
+		res->eval ( );
+		return res;
 	}
 };

alib2cli/src/ast/statements/FileStatement.cpp

@@ -18,7 +18,9 @@ std::shared_ptr < abstraction::OperationAbstraction > FileStatement::translateAn
 	if ( type == "" )
 		type = tokens [ 0 ].getData ( );
-	return abstraction::Registry::getXmlParserAbstraction ( type, tokens );
+	std::shared_ptr < abstraction::OperationAbstraction > res = abstraction::Registry::getXmlParserAbstraction ( type, std::move ( tokens ) );
+	res->eval ( );
+	return res;
 }
 } /* namespace cli */

alib2common/src/abstraction/CastRegistry.hpp

@@ -11,6 +11,7 @@
 #include <memory>
 #include <string>
 #include <set>
+#include <map>
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>

alib2common/src/abstraction/DowncastRegistry.hpp

@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
+#include <map>
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>

alib2common/src/abstraction/ImmediateRegistry.hpp

@@ -8,10 +8,9 @@
 #ifndef _IMMEDIATE_REGISTRY_HPP_
 #define _IMMEDIATE_REGISTRY_HPP_
-#include <factory/XmlDataFactory.hpp>
-
 #include <memory>
 #include <string>
+#include <map>
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>
@@ -43,7 +42,7 @@ public:
 	template < class ResultType >
 	static void registerImmediate ( std::string result ) {
 		if ( ! getEntries ( ).insert ( std::make_pair ( result, std::unique_ptr < Entry > ( new EntryImpl < ResultType > ( ) ) ) ).second )
-			throw ::exception::CommonException ( "Entry " + result + " already registered." );
+			throw exception::CommonException ( "Entry " + result + " already registered." );
 	}
 	template < class ResultType >

alib2common/src/abstraction/NormalizeRegistry.hpp

@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
+#include <map>
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>

alib2common/src/abstraction/OperationAbstraction.hpp

@@ -14,7 +14,6 @@
 #include <functional>
 #include <exception/CommonException.h>
-#include <factory/XmlDataFactory.hpp>
 namespace abstraction {

alib2common/src/abstraction/ValuePrinterRegistry.hpp

@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
+#include <map>
 #include <exception/CommonException.h>
 #include <abstraction/OperationAbstraction.hpp>

alib2common/src/abstraction/XmlComposerAbstraction.hpp

@@ -10,6 +10,7 @@
 #include <abstraction/UnaryOperationAbstraction.hpp>
 #include <tuple>
+#include <factory/XmlDataFactory.hpp>
 namespace abstraction {