From 27d042b203f1984e62600529edcfb5b76d0c4cc4 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 25 Jan 2015 23:14:38 +0100
Subject: Moved StandaloneParserContext to StandaloneEnvironment

---
 test/core/StandaloneEnvironment.hpp          | 58 ++++++++++++++++++++++++++++
 test/core/parser/StandaloneParserContext.hpp | 56 ---------------------------
 2 files changed, 58 insertions(+), 56 deletions(-)
 create mode 100644 test/core/StandaloneEnvironment.hpp
 delete mode 100644 test/core/parser/StandaloneParserContext.hpp

(limited to 'test')

diff --git a/test/core/StandaloneEnvironment.hpp b/test/core/StandaloneEnvironment.hpp
new file mode 100644
index 0000000..23efbe0
--- /dev/null
+++ b/test/core/StandaloneEnvironment.hpp
@@ -0,0 +1,58 @@
+/*
+    Ousía
+    Copyright (C) 2014, 2015  Benjamin Paaßen, Andreas Stöckel
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _OUSIA_STANDALONE_ENVIRONMENT_
+#define _OUSIA_STANDALONE_ENVIRONMENT_
+
+#include <memory>
+
+#include <core/common/Logger.hpp>
+#include <core/model/Project.hpp>
+#include <core/parser/Parser.hpp>
+#include <core/parser/ParserScope.hpp>
+#include <core/parser/ParserContext.hpp>
+#include <core/Registry.hpp>
+
+namespace ousia {
+
+struct StandaloneEnvironment {
+	ConcreteLogger &logger;
+	Manager manager;
+	Registry registry;
+	Rooted<Project> project;
+	ParserScope scope;
+	ParserContext context;
+
+	StandaloneEnvironment(ConcreteLogger &logger)
+	    : logger(logger), project(new Project(manager, registry)),
+	      context(project, scope, logger)
+	{
+		logger.reset();
+		logger.setSourceContextCallback(
+		    project->getSourceContextCallback());
+	}
+
+	~StandaloneEnvironment()
+	{
+		logger.setSourceContextCallback(NullSourceContextCallback);
+	}
+};
+}
+
+#endif /* _OUSIA_STANDALONE_ENVIRONMENT_ */
+
diff --git a/test/core/parser/StandaloneParserContext.hpp b/test/core/parser/StandaloneParserContext.hpp
deleted file mode 100644
index cae843f..0000000
--- a/test/core/parser/StandaloneParserContext.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Ousía
-    Copyright (C) 2014, 2015  Benjamin Paaßen, Andreas Stöckel
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _OUSIA_STANDALONE_PARSER_CONTEXT_
-#define _OUSIA_STANDALONE_PARSER_CONTEXT_
-
-#include <memory>
-
-#include <core/model/Project.hpp>
-#include <core/parser/Parser.hpp>
-#include <core/parser/ParserScope.hpp>
-#include <core/parser/ParserContext.hpp>
-#include <core/Registry.hpp>
-
-namespace ousia {
-
-struct StandaloneParserContext {
-public:
-	Manager manager;
-	Logger logger;
-	Registry registry;
-	Rooted<Project> project;
-	ParserScope scope;
-	ParserContext context;
-
-	StandaloneParserContext()
-	    : project(new Project(manager, registry)),
-	      context(project, scope, logger)
-	{
-	}
-
-	StandaloneParserContext(Logger &externalLogger)
-	    : project(new Project(manager, registry)),
-	      context(project, scope, externalLogger)
-	{
-	}
-};
-}
-
-#endif /* _OUSIA_STANDALONE_PARSER_CONTEXT_ */
-
-- 
cgit v1.2.3