diff options
| author | Marius Kintel <kintel@sim.no> | 2010-03-02 18:22:31 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2010-10-31 00:42:34 (GMT) |
| commit | 393c5a19fedfa4f97ca939fbcf52c2ccab1cde6a (patch) | |
| tree | fbcb75d32e8763aac3f0ad28528936a0ec11930b /test-code | |
| parent | 746159d1838e895e80725cdc892f7bef85feb1af (diff) | |
Committed current version of visitor refactoring
Diffstat (limited to 'test-code')
| -rw-r--r-- | test-code/dumptest.cc | 16 | ||||
| -rw-r--r-- | test-code/dumptest.pro | 18 |
2 files changed, 25 insertions, 9 deletions
diff --git a/test-code/dumptest.cc b/test-code/dumptest.cc index 45d19ff..cb2b13c 100644 --- a/test-code/dumptest.cc +++ b/test-code/dumptest.cc @@ -30,7 +30,7 @@ #include "value.h" #include "export.h" #include "builtin.h" -//#include "nodedumper.h" +#include "nodedumper.h" #include <QApplication> #include <QFile> @@ -148,17 +148,19 @@ int main(int argc, char **argv) QString dumpstr_cached = root_node->dump(""); if (dumpstr != dumpstr_cached) rc = 1; - printf(dumpstr.toUtf8()); - -#if 0 NodeDumper dumper; Traverser trav(dumper, *root_node, Traverser::PRE_AND_POSTFIX); trav.execute(); - std::string dumpstdstr = dumper.getDump(); + std::string dumpstdstr = dumper.getDump() + "\n"; trav.execute(); - std::string dumpstdstr_cached = dumper.getDump(); + std::string dumpstdstr_cached = dumper.getDump() + "\n"; if (dumpstdstr != dumpstdstr_cached) rc = 1; -#endif + + if (QString::fromStdString(dumpstdstr) != dumpstr) { + printf(dumpstr.toUtf8()); + printf(dumpstdstr.c_str()); + rc = 1; + } destroy_builtin_functions(); destroy_builtin_modules(); diff --git a/test-code/dumptest.pro b/test-code/dumptest.pro index a6729f7..d196cda 100644 --- a/test-code/dumptest.pro +++ b/test-code/dumptest.pro @@ -50,11 +50,23 @@ HEADERS += ../src/builtin.h \ ../src/grid.h \ ../src/module.h \ ../src/node.h \ + ../src/dxflinextrudenode.h \ + ../src/dxfrotextrudenode.h \ + ../src/projectionnode.h \ + ../src/importnode.h \ + ../src/csgnode.h \ ../src/openscad.h \ ../src/polyset.h \ ../src/printutils.h \ ../src/value.h \ - ../src/progress.h + ../src/progress.h \ + ../src/traverser.h \ + ../src/csgnode.h \ + ../src/visitor.h \ + ../src/nodedumper.h \ + ../src/nodecache.h \ + ../src/importnode.h \ + ../src/state.h SOURCES += dumptest.cc \ ../src/export.cc \ @@ -83,4 +95,6 @@ SOURCES += dumptest.cc \ ../src/dxflinextrude.cc \ ../src/dxfrotextrude.cc \ ../src/printutils.cc \ - ../src/progress.cc + ../src/progress.cc \ + ../src/nodedumper.cc \ + ../src/traverser.cc |