Merge branch 'master' into epec-kernel

1 files changed, 23 insertions, 21 deletions

diff --git a/tests/dumptest.cc b/tests/dumptest.cc
index b75a2e2..4477703 100644
--- a/tests/dumptest.cc
+++ b/tests/dumptest.cc
@@ -29,13 +29,12 @@
 #include "parsersettings.h"
 #include "node.h"
 #include "module.h"
-#include "context.h"
+#include "modcontext.h"
 #include "value.h"
 #include "export.h"
 #include "builtin.h"
 #include "Tree.h"
 
-#include <QCoreApplication>
 #ifndef _MSC_VER
 #include <getopt.h>
 #endif
@@ -50,7 +49,6 @@ namespace fs = boost::filesystem;
 
 std::string commandline_commands;
 std::string currentdir;
-QString examplesdir;
 
 using std::string;
 
@@ -76,24 +74,22 @@ int main(int argc, char **argv)
 
 	const char *filename = argv[1];
 	const char *outfilename = argv[2];
-
 	int rc = 0;
 
 	Builtins::instance()->initialize();
 
-	QCoreApplication app(argc, argv);
 	fs::path original_path = fs::current_path();
 
 	currentdir = boosty::stringy(fs::current_path());
 
-	parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
-	add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries"));
+	parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
+	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
 
-	Context root_ctx;
-	register_builtin(root_ctx);
+	ModuleContext top_ctx;
+	top_ctx.registerBuiltin();
 
-	AbstractModule *root_module;
-	ModuleInstantiation root_inst;
+	FileModule *root_module;
+	ModuleInstantiation root_inst("group");
 	AbstractNode *root_node;
 
 	root_module = parsefile(filename);
@@ -101,12 +97,13 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (fs::path(filename).has_parent_path()) {
-		fs::current_path(fs::path(filename).parent_path());
-	}
+	fs::path fpath = boosty::absolute(fs::path(filename));
+	fs::path fparent = fpath.parent_path();
+	fs::current_path(fparent);
+	top_ctx.setDocumentPath(fparent.string());
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&top_ctx, &root_inst);
 
 	Tree tree;
 	tree.setRoot(root_node);
@@ -121,27 +118,32 @@ int main(int argc, char **argv)
 	fs::current_path(original_path);
 	std::ofstream outfile;
 	outfile.open(outfilename);
+	if (!outfile.is_open()) {
+		fprintf(stderr, "Error: Unable to open output file %s\n", outfilename);
+		exit(1);
+	}
+	std::cout << "Opened " << outfilename << "\n";
 	outfile << dumpstdstr << "\n";
 	outfile.close();
+	if (outfile.fail()) fprintf(stderr, "Failed to close file\n");
 
 	delete root_node;
 	delete root_module;
 
-	root_module = parsefile(outfilename);
+	fs::current_path(original_path);
+	root_module = parsefile(outfilename, fparent.string().c_str());
 	if (!root_module) {
 		fprintf(stderr, "Error: Unable to read back dumped file\n");
 		exit(1);
 	}
 
-	if (fs::path(filename).has_parent_path()) {
-		fs::current_path(fs::path(filename).parent_path());
-	}
-
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&top_ctx, &root_inst);
 
 	tree.setRoot(root_node);
 
+	fs::current_path(fparent);
+
 	string readbackstr = dumptree(tree, *root_node);
 	if (dumpstdstr != readbackstr) {
 		fprintf(stderr, "Error: Readback is different from original dump:\n");