Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat

Conflicts:
	src/Preferences.ui

2 files changed, 49 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 376b874..306f063 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -517,6 +517,7 @@ set(CORE_SOURCES
   ../src/context.cc 
   ../src/modcontext.cc 
   ../src/evalcontext.cc 
+  ../src/feature.cc
   ../src/csgterm.cc 
   ../src/csgtermnormalizer.cc 
   ../src/polyset.cc 
@@ -990,6 +991,11 @@ add_cmdline_test(throwntogethertest EXE ${OPENSCAD_BINPATH} ARGS --preview=throw
 # with anything. It's self-contained and returns != 0 on error
 add_cmdline_test(cgalstlsanitytest EXE ${CMAKE_SOURCE_DIR}/cgalstlsanitytest SUFFIX txt ARGS ${OPENSCAD_BINPATH} FILES ${CGALSTLSANITYTEST_FILES})
 
+# Add experimental tests
+
+add_cmdline_test(echotest EXE ${OPENSCAD_BINPATH} ARGS --enable=concat -o SUFFIX echo FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/experimental/concat-tests.scad)
+
+
 # Tests using the actual OpenSCAD binary
 
 # non-ASCII filenames
diff --git a/tests/regression/echotest/concat-tests-expected.echo b/tests/regression/echotest/concat-tests-expected.echo
new file mode 100644
index 0000000..58b41d0
--- /dev/null
+++ b/tests/regression/echotest/concat-tests-expected.echo
@@ -0,0 +1,43 @@
+ECHO: "--- empty"
+ECHO: []
+ECHO: []
+ECHO: []
+ECHO: []
+ECHO: "--- single elements"
+ECHO: [undef]
+ECHO: [true]
+ECHO: [3]
+ECHO: ["abc"]
+ECHO: [[0 : 1 : 10]]
+ECHO: "--- single vectors"
+ECHO: [1, 2, 3]
+ECHO: [[1, 2, 3]]
+ECHO: [[[1, 2, 3]]]
+ECHO: [[[1, 2, [3, 4], 5]]]
+ECHO: "--- multiple elements"
+ECHO: [3, 3]
+ECHO: [1, 2, 3]
+ECHO: [1, 2, 3, 4, 5]
+ECHO: [1, "text", false, [1 : 0.5 : 3]]
+ECHO: "--- vector / element"
+ECHO: [3, 4, undef]
+ECHO: [3, 4, 5, 6]
+ECHO: [3, 4, 5, 6, true]
+ECHO: [3, 4, "5", 6, "test"]
+ECHO: [3, 4, true, 6, [4 : 1 : 3]]
+ECHO: "--- element / vector"
+ECHO: [3]
+ECHO: [3, 3, 4]
+ECHO: [true, 3, [4]]
+ECHO: ["9", 1, 2, 3]
+ECHO: [[6 : 2 : 9], 3, [4]]
+ECHO: "--- vector / vector"
+ECHO: [3, 4]
+ECHO: [[], 3, 4]
+ECHO: [[2, 4], 3, 4]
+ECHO: [5, 6, "d", [3, 4]]
+ECHO: [[1, 0, 0], [2, 0, 0], 3, 0, 0]
+ECHO: [[1, 0, 0], [2, 0, 0], [3, 0, 0]]
+ECHO: [[1, 0, 0], [2, 0, 0], [3, 0, 0], [4, 4, 4], [5, 5, 5]]
+ECHO: "--- recursive function"
+ECHO: [[1, 1], [2, 4], [3, 9], [4, 16], [5, 25], [6, 36], [7, 49], [8, 64], [9, 81], [10, 100]]