diff options
| -rw-r--r-- | src/openscad.cc | 14 | ||||
| -rw-r--r-- | tests/.gitignore | 1 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/moduledumptest.cc | 118 | ||||
| -rw-r--r-- | tests/regression/moduledumptest/allexpressions-expected.ast (renamed from tests/regression/moduledumptest/allexpressions-expected.txt) | 0 | ||||
| -rw-r--r-- | tests/regression/moduledumptest/allfunctions-expected.ast (renamed from tests/regression/moduledumptest/allfunctions-expected.txt) | 0 | ||||
| -rw-r--r-- | tests/regression/moduledumptest/allmodules-expected.ast (renamed from tests/regression/moduledumptest/allmodules-expected.txt) | 0 |
7 files changed, 15 insertions, 126 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 2619914..483d03e 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -313,6 +313,7 @@ int main(int argc, char **argv) const char *dxf_output_file = NULL; const char *csg_output_file = NULL; const char *png_output_file = NULL; + const char *ast_output_file = NULL; bool null_output = false; QString suffix = QFileInfo(output_file).suffix().toLower(); @@ -321,6 +322,7 @@ int main(int argc, char **argv) else if (suffix == "dxf") dxf_output_file = output_file; else if (suffix == "csg") csg_output_file = output_file; else if (suffix == "png") png_output_file = output_file; + else if (suffix == "ast") ast_output_file = output_file; else if (strcmp(output_file, "null") == 0) null_output = true; else { fprintf(stderr, "Unknown suffix for output file %s\n", output_file); @@ -383,6 +385,18 @@ int main(int argc, char **argv) fstream.close(); } } + else if (ast_output_file) { + fs::current_path(original_path); + std::ofstream fstream(ast_output_file); + if (!fstream.is_open()) { + PRINTB("Can't open file \"%s\" for export", ast_output_file); + } + else { + fs::current_path(fparent); // Force exported filenames to be relative to document path + fstream << root_module->dump("", "") << "\n"; + fstream.close(); + } + } else { #ifdef ENABLE_CGAL if ((null_output || png_output_file) && !vm.count("render")) { diff --git a/tests/.gitignore b/tests/.gitignore index efd1858..587154d 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -19,7 +19,6 @@ out.png /cgalstlsanitytest /cgalcachetest /modulecachetest -/moduledumptest /test_pretty_print /sysinfo.txt /CTestCustom.cmake diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 62e977a..313ac62 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -522,12 +522,6 @@ add_library(tests-offscreen STATIC ${OFFSCREEN_SOURCES}) set(TESTS-NOCGAL-LIBRARIES ${TESTS-CORE-LIBRARIES}) # -# moduledumptest -# -add_executable(moduledumptest moduledumptest.cc) -target_link_libraries(moduledumptest tests-nocgal ${TESTS-NOCGAL-LIBRARIES}) - -# # modulecachetest # add_executable(modulecachetest modulecachetest.cc) @@ -903,7 +897,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake ${TMP}) add_cmdline_test(echotest SUFFIX txt FILES ${ECHO_FILES}) add_cmdline_test(dumptest SUFFIX csg FILES ${DUMPTEST_FILES}) -add_cmdline_test(moduledumptest SUFFIX txt FILES +add_cmdline_test(moduledumptest EXE ${GUI_BINPATH} ARGS -o SUFFIX ast 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) diff --git a/tests/moduledumptest.cc b/tests/moduledumptest.cc deleted file mode 100644 index 5925d03..0000000 --- a/tests/moduledumptest.cc +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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/moduledumptest/allexpressions-expected.txt b/tests/regression/moduledumptest/allexpressions-expected.ast index 6d9de40..6d9de40 100644 --- a/tests/regression/moduledumptest/allexpressions-expected.txt +++ b/tests/regression/moduledumptest/allexpressions-expected.ast diff --git a/tests/regression/moduledumptest/allfunctions-expected.txt b/tests/regression/moduledumptest/allfunctions-expected.ast index a8a0fea..a8a0fea 100644 --- a/tests/regression/moduledumptest/allfunctions-expected.txt +++ b/tests/regression/moduledumptest/allfunctions-expected.ast diff --git a/tests/regression/moduledumptest/allmodules-expected.txt b/tests/regression/moduledumptest/allmodules-expected.ast index 0e3fc32..0e3fc32 100644 --- a/tests/regression/moduledumptest/allmodules-expected.txt +++ b/tests/regression/moduledumptest/allmodules-expected.ast |