Added moduledumptest. Fixes #384

9 files changed, 262 insertions, 0 deletions

diff --git a/testdata/scad/minimal/allexpressions.scad b/testdata/scad/minimal/allexpressions.scad
new file mode 100644
index 0000000..f618c4b
--- /dev/null
+++ b/testdata/scad/minimal/allexpressions.scad
@@ -0,0 +1,30 @@
+a = true;
+b = false;
+c = undef;
+d = a;
+e = $fn;
+f1 = [1,,];
+f2 = [1,2,3];
+g = f2.x + f2.y + f2.z;
+h1 = [2:5];
+h2 = [1:2:10];
+i = h2.begin - h2.step - h2.end;
+j = "test";
+k = 1.23e-2;
+l = a * b;
+m = a / b;
+n = a % b;
+o = c < d;
+p = c <= d;
+q = c == d;
+r = c != d;
+s = c >= d;
+t = c > d;
+u = e && g;
+v = e || g;
+w = +i;
+x = -i;
+y = !i;
+z = (j);
+aa = k ? l : m;
+bb = n[o];
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d1ee312..2781124 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -531,6 +531,12 @@ add_executable(dumptest dumptest.cc)
 target_link_libraries(dumptest tests-nocgal ${TESTS-NOCGAL-LIBRARIES})
 
 #
+# moduledumptest
+#
+add_executable(moduledumptest moduledumptest.cc)
+target_link_libraries(moduledumptest tests-nocgal ${TESTS-NOCGAL-LIBRARIES})
+
+#
 # modulecachetest
 #
 add_executable(modulecachetest modulecachetest.cc)
@@ -920,6 +926,10 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake ${TMP})
 
 add_cmdline_test(echotest SUFFIX txt FILES ${ECHO_FILES})
 add_cmdline_test(dumptest SUFFIX txt FILES ${DUMPTEST_FILES})
+add_cmdline_test(moduledumptest SUFFIX txt FILES
+                 ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allmodules.scad
+                 ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allfunctions.scad
+                 ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allexpressions.scad)
 add_cmdline_test(csgtexttest SUFFIX txt FILES ${MINIMAL_FILES})
 add_cmdline_test(csgtermtest SUFFIX txt FILES ${MINIMAL_FILES})
 add_cmdline_test(cgalpngtest SUFFIX png FILES ${CGALPNGTEST_FILES})
diff --git a/tests/moduledumptest.cc b/tests/moduledumptest.cc
new file mode 100644
index 0000000..5925d03
--- /dev/null
+++ b/tests/moduledumptest.cc
@@ -0,0 +1,118 @@
+/*
+ *  OpenSCAD (www.openscad.org)
+ *  Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and
+ *                          Marius Kintel <marius@kintel.net>
+ *
+ *  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 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  As a special exception, you have permission to link this program
+ *  with the CGAL library and distribute executables, as long as you
+ *  follow the requirements of the GNU GPL in regard to all of the
+ *  software in the executable aside from CGAL.
+ *
+ *  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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "tests-common.h"
+#include "openscad.h"
+#include "parsersettings.h"
+#include "node.h"
+#include "module.h"
+#include "modcontext.h"
+#include "value.h"
+#include "export.h"
+#include "builtin.h"
+#include "Tree.h"
+
+#ifndef _MSC_VER
+#include <getopt.h>
+#endif
+#include <assert.h>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <boost/filesystem.hpp>
+namespace fs = boost::filesystem;
+#include "boosty.h"
+
+std::string commandline_commands;
+std::string currentdir;
+
+using std::string;
+
+string dumptree(const Tree &tree, const AbstractNode &node)
+{
+	std::stringstream str;
+	const std::vector<AbstractNode*> &children = node.getChildren();
+	for (std::vector<AbstractNode*>::const_iterator iter = children.begin(); iter != children.end(); iter++) {
+		str << tree.getString(**iter) << "\n";
+	}
+	return str.str();
+}
+
+int main(int argc, char **argv)
+{
+#ifdef _MSC_VER
+  _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <file.scad> <output.txt>\n", argv[0]);
+		exit(1);
+	}
+
+	const char *filename = argv[1];
+	const char *outfilename = argv[2];
+	int rc = 0;
+
+	Builtins::instance()->initialize();
+
+	fs::path original_path = fs::current_path();
+
+	currentdir = boosty::stringy(fs::current_path());
+
+	parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
+	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
+
+	ModuleContext top_ctx;
+	top_ctx.registerBuiltin();
+
+	FileModule *root_module;
+	ModuleInstantiation root_inst("group");
+
+	root_module = parsefile(filename);
+	if (!root_module) {
+		exit(1);
+	}
+
+	string dumpstdstr = root_module->dump("", "");
+
+	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_module;
+
+	Builtins::instance(true);
+
+	return rc;
+}
diff --git a/tests/regression/csgtermtest/allexpressions-expected.txt b/tests/regression/csgtermtest/allexpressions-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/allexpressions-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtexttest/allexpressions-expected.txt b/tests/regression/csgtexttest/allexpressions-expected.txt
new file mode 100644
index 0000000..331822f
--- /dev/null
+++ b/tests/regression/csgtexttest/allexpressions-expected.txt
@@ -0,0 +1 @@
+group1
diff --git a/tests/regression/dumptest/allexpressions-expected.txt b/tests/regression/dumptest/allexpressions-expected.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/tests/regression/dumptest/allexpressions-expected.txt
@@ -0,0 +1 @@
+
diff --git a/tests/regression/moduledumptest/allexpressions-expected.txt b/tests/regression/moduledumptest/allexpressions-expected.txt
new file mode 100644
index 0000000..6d9de40
--- /dev/null
+++ b/tests/regression/moduledumptest/allexpressions-expected.txt
@@ -0,0 +1,31 @@
+a = true;
+b = false;
+c = undef;
+d = a;
+e = $fn;
+f1 = [1];
+f2 = [1, 2, 3];
+g = ((f2.x + f2.y) + f2.z);
+h1 = [2 : 1 : 5];
+h2 = [1 : 2 : 10];
+i = ((h2.begin - h2.step) - h2.end);
+j = "test";
+k = 0.0123;
+l = (a * b);
+m = (a / b);
+n = (a % b);
+o = (c < d);
+p = (c <= d);
+q = (c == d);
+r = (c != d);
+s = (c >= d);
+t = (c > d);
+u = (e && g);
+v = (e || g);
+w = i;
+x = -i;
+y = !i;
+z = j;
+aa = (k ? l : m);
+bb = n[o];
+
diff --git a/tests/regression/moduledumptest/allfunctions-expected.txt b/tests/regression/moduledumptest/allfunctions-expected.txt
new file mode 100644
index 0000000..a8a0fea
--- /dev/null
+++ b/tests/regression/moduledumptest/allfunctions-expected.txt
@@ -0,0 +1,29 @@
+a = abs();
+b = sign();
+c = rands();
+d = min();
+e = max();
+f = sin();
+g = cos();
+h = asin();
+i = acos();
+j = tan();
+k = atan();
+l = atan2();
+m = round();
+n = ceil();
+o = floor();
+p = pow();
+q = sqrt();
+r = exp();
+s = log();
+t = ln();
+u = str();
+v = lookup();
+w = dxf_dim();
+x = dxf_cross();
+y = version();
+z = version_num();
+aa = len();
+bb = search();
+
diff --git a/tests/regression/moduledumptest/allmodules-expected.txt b/tests/regression/moduledumptest/allmodules-expected.txt
new file mode 100644
index 0000000..0e3fc32
--- /dev/null
+++ b/tests/regression/moduledumptest/allmodules-expected.txt
@@ -0,0 +1,41 @@
+minkowski();
+glide();
+subdiv();
+hull();
+resize();
+child();
+echo();
+assign();
+for();
+intersection_for();
+if(false) cube();
+else sphere();
+union();
+difference();
+intersection();
+dxf_linear_extrude();
+linear_extrude();
+dxf_rotate_extrude();
+rotate_extrude();
+import();
+import_stl();
+import_off();
+import_dxf();
+group();
+cube();
+sphere();
+cylinder();
+polyhedron();
+square();
+circle();
+polygon();
+projection();
+render();
+surface();
+scale();
+rotate();
+mirror();
+translate();
+multmatrix();
+color();
+