From 2006824c24fe5611fe6f2cbb5453f43b0066f0a9 Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 24 Jun 2013 20:10:15 +0200 Subject: drop moduledumptest, use `openscad -o ${NAME}.ast` src/openscad.cc code was copy/pasted from .csg section; some refactoring might make things nicer, but i didn't dare change too much for lack of language knowledge 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 and - * Marius Kintel - * - * 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 -#endif -#include -#include -#include -#include - -#include -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 &children = node.getChildren(); - for (std::vector::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 \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.ast b/tests/regression/moduledumptest/allexpressions-expected.ast new file mode 100644 index 0000000..6d9de40 --- /dev/null +++ b/tests/regression/moduledumptest/allexpressions-expected.ast @@ -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/allexpressions-expected.txt b/tests/regression/moduledumptest/allexpressions-expected.txt deleted file mode 100644 index 6d9de40..0000000 --- a/tests/regression/moduledumptest/allexpressions-expected.txt +++ /dev/null @@ -1,31 +0,0 @@ -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.ast b/tests/regression/moduledumptest/allfunctions-expected.ast new file mode 100644 index 0000000..a8a0fea --- /dev/null +++ b/tests/regression/moduledumptest/allfunctions-expected.ast @@ -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/allfunctions-expected.txt b/tests/regression/moduledumptest/allfunctions-expected.txt deleted file mode 100644 index a8a0fea..0000000 --- a/tests/regression/moduledumptest/allfunctions-expected.txt +++ /dev/null @@ -1,29 +0,0 @@ -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.ast b/tests/regression/moduledumptest/allmodules-expected.ast new file mode 100644 index 0000000..0e3fc32 --- /dev/null +++ b/tests/regression/moduledumptest/allmodules-expected.ast @@ -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(); + diff --git a/tests/regression/moduledumptest/allmodules-expected.txt b/tests/regression/moduledumptest/allmodules-expected.txt deleted file mode 100644 index 0e3fc32..0000000 --- a/tests/regression/moduledumptest/allmodules-expected.txt +++ /dev/null @@ -1,41 +0,0 @@ -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(); - -- cgit v0.10.1