Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/dumptest.cc b/tests/dumptest.cc
index d2fd9b1..5f2f22f 100644
--- a/tests/dumptest.cc
+++ b/tests/dumptest.cc
@@ -65,6 +65,10 @@ string dumptree(const Tree &tree, const AbstractNode &node)
 
 int main(int argc, char **argv)
 {
+#ifdef WIN32
+  _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
+
 	if (argc != 3) {
 		fprintf(stderr, "Usage: %s <file.scad> <output.txt>\n", argv[0]);
 		exit(1);
@@ -75,8 +79,7 @@ int main(int argc, char **argv)
 
 	int rc = 0;
 
-	initialize_builtin_functions();
-	initialize_builtin_modules();
+	Builtins::instance()->initialize();
 
 	QApplication app(argc, argv, false);
 	QDir original_path = QDir::current();
@@ -159,9 +162,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-
-	destroy_builtin_functions();
-	destroy_builtin_modules();
+	Builtins::instance(true);
 
 	return rc;
 }