Merge branch 'master' into no-testprograms

Conflicts:
	tests/CMakeLists.txt
	tests/regression/csgtermtest/assign-expected.term
	tests/regression/csgtermtest/child-expected.term
	tests/regression/csgtermtest/circle-expected.term
	tests/regression/csgtermtest/color-expected.term
	tests/regression/csgtermtest/cube-expected.term
	tests/regression/csgtermtest/cylinder-expected.term
	tests/regression/csgtermtest/difference-expected.term
	tests/regression/csgtermtest/dxf_linear_extrude-expected.term
	tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
	tests/regression/csgtermtest/echo-expected.term
	tests/regression/csgtermtest/for-expected.term
	tests/regression/csgtermtest/glide-expected.term
	tests/regression/csgtermtest/group-expected.term
	tests/regression/csgtermtest/hull-expected.term
	tests/regression/csgtermtest/if-expected.term
	tests/regression/csgtermtest/import-expected.term
	tests/regression/csgtermtest/import_dxf-expected.term
	tests/regression/csgtermtest/import_off-expected.term
	tests/regression/csgtermtest/import_stl-expected.term
	tests/regression/csgtermtest/intersection-expected.term
	tests/regression/csgtermtest/intersection_for-expected.term
	tests/regression/csgtermtest/linear_extrude-expected.term
	tests/regression/csgtermtest/minkowski-expected.term
	tests/regression/csgtermtest/mirror-expected.term
	tests/regression/csgtermtest/multmatrix-expected.term
	tests/regression/csgtermtest/polygon-expected.term
	tests/regression/csgtermtest/polyhedron-expected.term
	tests/regression/csgtermtest/projection-expected.term
	tests/regression/csgtermtest/render-expected.term
	tests/regression/csgtermtest/rotate-expected.term
	tests/regression/csgtermtest/rotate_extrude-expected.term
	tests/regression/csgtermtest/scale-expected.term
	tests/regression/csgtermtest/sphere-expected.term
	tests/regression/csgtermtest/square-expected.term
	tests/regression/csgtermtest/subdiv-expected.term
	tests/regression/csgtermtest/surface-expected.term
	tests/regression/csgtermtest/translate-expected.term
	tests/regression/csgtermtest/union-expected.term
	tests/regression/dumptest/circle-expected.csg
	tests/regression/dumptest/color-expected.csg
	tests/regression/dumptest/cube-expected.csg
	tests/regression/dumptest/cylinder-expected.csg
	tests/regression/dumptest/difference-expected.csg
	tests/regression/dumptest/dxf_linear_extrude-expected.csg
	tests/regression/dumptest/dxf_rotate_extrude-expected.csg
	tests/regression/dumptest/glide-expected.csg
	tests/regression/dumptest/import-expected.csg
	tests/regression/dumptest/import_dxf-expected.csg
	tests/regression/dumptest/import_off-expected.csg
	tests/regression/dumptest/import_stl-expected.csg
	tests/regression/dumptest/intersection-expected.csg
	tests/regression/dumptest/intersection_for-expected.csg
	tests/regression/dumptest/linear_extrude-expected.csg
	tests/regression/dumptest/minkowski-expected.csg
	tests/regression/dumptest/mirror-expected.csg
	tests/regression/dumptest/multmatrix-expected.csg
	tests/regression/dumptest/polygon-expected.csg
	tests/regression/dumptest/polyhedron-expected.csg
	tests/regression/dumptest/projection-expected.csg
	tests/regression/dumptest/render-expected.csg
	tests/regression/dumptest/rotate-expected.csg
	tests/regression/dumptest/rotate_extrude-expected.csg
	tests/regression/dumptest/scale-expected.csg
	tests/regression/dumptest/sphere-expected.csg
	tests/regression/dumptest/square-expected.csg
	tests/regression/dumptest/subdiv-expected.csg
	tests/regression/dumptest/surface-expected.csg
	tests/regression/dumptest/translate-expected.csg

42 files changed, 27 insertions, 38 deletions

diff --git a/testdata/scad/minimal/assign.scad b/testdata/scad/minimal/assign.scad
deleted file mode 100644
index e4dba58..0000000
--- a/testdata/scad/minimal/assign.scad
+++ /dev/null
@@ -1 +0,0 @@
-assign();
diff --git a/testdata/scad/minimal/child.scad b/testdata/scad/minimal/child.scad
deleted file mode 100644
index ba69caf..0000000
--- a/testdata/scad/minimal/child.scad
+++ /dev/null
@@ -1 +0,0 @@
-child();
diff --git a/testdata/scad/minimal/circle.scad b/testdata/scad/minimal/circle.scad
deleted file mode 100644
index c702f98..0000000
--- a/testdata/scad/minimal/circle.scad
+++ /dev/null
@@ -1 +0,0 @@
-circle();
diff --git a/testdata/scad/minimal/color.scad b/testdata/scad/minimal/color.scad
deleted file mode 100644
index b0ae89c..0000000
--- a/testdata/scad/minimal/color.scad
+++ /dev/null
@@ -1 +0,0 @@
-color();
diff --git a/testdata/scad/minimal/cube.scad b/testdata/scad/minimal/cube.scad
deleted file mode 100644
index 406bf16..0000000
--- a/testdata/scad/minimal/cube.scad
+++ /dev/null
@@ -1 +0,0 @@
-cube();
diff --git a/testdata/scad/minimal/cylinder.scad b/testdata/scad/minimal/cylinder.scad
deleted file mode 100644
index 91c2c30..0000000
--- a/testdata/scad/minimal/cylinder.scad
+++ /dev/null
@@ -1 +0,0 @@
-cylinder();
diff --git a/testdata/scad/minimal/difference.scad b/testdata/scad/minimal/difference.scad
deleted file mode 100644
index c3fd0fe..0000000
--- a/testdata/scad/minimal/difference.scad
+++ /dev/null
@@ -1 +0,0 @@
-difference();
diff --git a/testdata/scad/minimal/dxf_linear_extrude.scad b/testdata/scad/minimal/dxf_linear_extrude.scad
deleted file mode 100644
index 06d6f33..0000000
--- a/testdata/scad/minimal/dxf_linear_extrude.scad
+++ /dev/null
@@ -1 +0,0 @@
-dxf_linear_extrude();
diff --git a/testdata/scad/minimal/dxf_rotate_extrude.scad b/testdata/scad/minimal/dxf_rotate_extrude.scad
deleted file mode 100644
index dee7f49..0000000
--- a/testdata/scad/minimal/dxf_rotate_extrude.scad
+++ /dev/null
@@ -1 +0,0 @@
-dxf_rotate_extrude();
diff --git a/testdata/scad/minimal/echo.scad b/testdata/scad/minimal/echo.scad
deleted file mode 100644
index 34fc70f..0000000
--- a/testdata/scad/minimal/echo.scad
+++ /dev/null
@@ -1 +0,0 @@
-echo();
diff --git a/testdata/scad/minimal/for.scad b/testdata/scad/minimal/for.scad
deleted file mode 100644
index 62356c0..0000000
--- a/testdata/scad/minimal/for.scad
+++ /dev/null
@@ -1 +0,0 @@
-for();
diff --git a/testdata/scad/minimal/glide.scad b/testdata/scad/minimal/glide.scad
deleted file mode 100644
index 9a5f69d..0000000
--- a/testdata/scad/minimal/glide.scad
+++ /dev/null
@@ -1 +0,0 @@
-glide();
diff --git a/testdata/scad/minimal/group.scad b/testdata/scad/minimal/group.scad
deleted file mode 100644
index 0a04719..0000000
--- a/testdata/scad/minimal/group.scad
+++ /dev/null
@@ -1 +0,0 @@
-group();
diff --git a/testdata/scad/minimal/hull.scad b/testdata/scad/minimal/hull.scad
deleted file mode 100644
index 096b0b0..0000000
--- a/testdata/scad/minimal/hull.scad
+++ /dev/null
@@ -1 +0,0 @@
-hull();
diff --git a/testdata/scad/minimal/if.scad b/testdata/scad/minimal/if.scad
deleted file mode 100644
index 9e5c706..0000000
--- a/testdata/scad/minimal/if.scad
+++ /dev/null
@@ -1 +0,0 @@
-if(true) { }
diff --git a/testdata/scad/minimal/import.scad b/testdata/scad/minimal/import.scad
deleted file mode 100644
index 6f375fe..0000000
--- a/testdata/scad/minimal/import.scad
+++ /dev/null
@@ -1 +0,0 @@
-import();
diff --git a/testdata/scad/minimal/import_dxf.scad b/testdata/scad/minimal/import_dxf.scad
deleted file mode 100644
index b8b8fd0..0000000
--- a/testdata/scad/minimal/import_dxf.scad
+++ /dev/null
@@ -1 +0,0 @@
-import_dxf();
diff --git a/testdata/scad/minimal/import_off.scad b/testdata/scad/minimal/import_off.scad
deleted file mode 100644
index 353597f..0000000
--- a/testdata/scad/minimal/import_off.scad
+++ /dev/null
@@ -1 +0,0 @@
-import_off();
diff --git a/testdata/scad/minimal/import_stl.scad b/testdata/scad/minimal/import_stl.scad
deleted file mode 100644
index 416ca6a..0000000
--- a/testdata/scad/minimal/import_stl.scad
+++ /dev/null
@@ -1 +0,0 @@
-import_stl();
diff --git a/testdata/scad/minimal/intersection.scad b/testdata/scad/minimal/intersection.scad
deleted file mode 100644
index 8340c00..0000000
--- a/testdata/scad/minimal/intersection.scad
+++ /dev/null
@@ -1 +0,0 @@
-intersection();
diff --git a/testdata/scad/minimal/intersection_for.scad b/testdata/scad/minimal/intersection_for.scad
deleted file mode 100644
index 7b08d61..0000000
--- a/testdata/scad/minimal/intersection_for.scad
+++ /dev/null
@@ -1 +0,0 @@
-intersection_for();
diff --git a/testdata/scad/minimal/linear_extrude.scad b/testdata/scad/minimal/linear_extrude.scad
deleted file mode 100644
index a621959..0000000
--- a/testdata/scad/minimal/linear_extrude.scad
+++ /dev/null
@@ -1 +0,0 @@
-linear_extrude();
diff --git a/testdata/scad/minimal/minkowski.scad b/testdata/scad/minimal/minkowski.scad
deleted file mode 100644
index 26cd972..0000000
--- a/testdata/scad/minimal/minkowski.scad
+++ /dev/null
@@ -1 +0,0 @@
-minkowski();
diff --git a/testdata/scad/minimal/mirror.scad b/testdata/scad/minimal/mirror.scad
deleted file mode 100644
index 8d74882..0000000
--- a/testdata/scad/minimal/mirror.scad
+++ /dev/null
@@ -1 +0,0 @@
-mirror();
diff --git a/testdata/scad/minimal/multmatrix.scad b/testdata/scad/minimal/multmatrix.scad
deleted file mode 100644
index 7477fa2..0000000
--- a/testdata/scad/minimal/multmatrix.scad
+++ /dev/null
@@ -1 +0,0 @@
-multmatrix();
diff --git a/testdata/scad/minimal/polygon.scad b/testdata/scad/minimal/polygon.scad
deleted file mode 100644
index 6a1f288..0000000
--- a/testdata/scad/minimal/polygon.scad
+++ /dev/null
@@ -1 +0,0 @@
-polygon();
diff --git a/testdata/scad/minimal/polyhedron.scad b/testdata/scad/minimal/polyhedron.scad
deleted file mode 100644
index 941851f..0000000
--- a/testdata/scad/minimal/polyhedron.scad
+++ /dev/null
@@ -1 +0,0 @@
-polyhedron();
diff --git a/testdata/scad/minimal/projection.scad b/testdata/scad/minimal/projection.scad
deleted file mode 100644
index 43ea0a2..0000000
--- a/testdata/scad/minimal/projection.scad
+++ /dev/null
@@ -1 +0,0 @@
-projection();
diff --git a/testdata/scad/minimal/render.scad b/testdata/scad/minimal/render.scad
deleted file mode 100644
index e035a6f..0000000
--- a/testdata/scad/minimal/render.scad
+++ /dev/null
@@ -1 +0,0 @@
-render();
diff --git a/testdata/scad/minimal/rotate.scad b/testdata/scad/minimal/rotate.scad
deleted file mode 100644
index e4acc9c..0000000
--- a/testdata/scad/minimal/rotate.scad
+++ /dev/null
@@ -1 +0,0 @@
-rotate();
diff --git a/testdata/scad/minimal/rotate_extrude.scad b/testdata/scad/minimal/rotate_extrude.scad
deleted file mode 100644
index d11484c..0000000
--- a/testdata/scad/minimal/rotate_extrude.scad
+++ /dev/null
@@ -1 +0,0 @@
-rotate_extrude();
diff --git a/testdata/scad/minimal/scale.scad b/testdata/scad/minimal/scale.scad
deleted file mode 100644
index 5e9baab..0000000
--- a/testdata/scad/minimal/scale.scad
+++ /dev/null
@@ -1 +0,0 @@
-scale();
diff --git a/testdata/scad/minimal/sphere.scad b/testdata/scad/minimal/sphere.scad
deleted file mode 100644
index 8e7ddc1..0000000
--- a/testdata/scad/minimal/sphere.scad
+++ /dev/null
@@ -1 +0,0 @@
-sphere();
diff --git a/testdata/scad/minimal/square.scad b/testdata/scad/minimal/square.scad
deleted file mode 100644
index 5e44b7d..0000000
--- a/testdata/scad/minimal/square.scad
+++ /dev/null
@@ -1 +0,0 @@
-square();
diff --git a/testdata/scad/minimal/subdiv.scad b/testdata/scad/minimal/subdiv.scad
deleted file mode 100644
index 4c1eb74..0000000
--- a/testdata/scad/minimal/subdiv.scad
+++ /dev/null
@@ -1 +0,0 @@
-subdiv();
diff --git a/testdata/scad/minimal/surface.scad b/testdata/scad/minimal/surface.scad
deleted file mode 100644
index c0b213a..0000000
--- a/testdata/scad/minimal/surface.scad
+++ /dev/null
@@ -1 +0,0 @@
-surface();
diff --git a/testdata/scad/minimal/translate.scad b/testdata/scad/minimal/translate.scad
deleted file mode 100644
index c7c0b0b..0000000
--- a/testdata/scad/minimal/translate.scad
+++ /dev/null
@@ -1 +0,0 @@
-translate();
diff --git a/testdata/scad/minimal/union.scad b/testdata/scad/minimal/union.scad
deleted file mode 100644
index e3fa0d5..0000000
--- a/testdata/scad/minimal/union.scad
+++ /dev/null
@@ -1 +0,0 @@
-union();
diff --git a/testdata/scad/minimal/allexpressions.scad b/testdata/scad/misc/allexpressions.scad
index f618c4b..f618c4b 100644
--- a/testdata/scad/minimal/allexpressions.scad
+++ b/testdata/scad/misc/allexpressions.scad
diff --git a/testdata/scad/minimal/allfunctions.scad b/testdata/scad/misc/allfunctions.scad
index b97f121..b97f121 100644
--- a/testdata/scad/minimal/allfunctions.scad
+++ b/testdata/scad/misc/allfunctions.scad
diff --git a/testdata/scad/minimal/allmodules.scad b/testdata/scad/misc/allmodules.scad
index 2e38d8f..2e38d8f 100644
--- a/testdata/scad/minimal/allmodules.scad
+++ b/testdata/scad/misc/allmodules.scad
diff --git a/testdata/scad/misc/expression-shortcircuit-tests.scad b/testdata/scad/misc/expression-shortcircuit-tests.scad
new file mode 100644
index 0000000..dd5a1d5
--- /dev/null
+++ b/testdata/scad/misc/expression-shortcircuit-tests.scad
@@ -0,0 +1,27 @@
+function foo() = search(undef,undef);
+
+if (false && foo()) {
+  echo("Fail");
+} else {
+  echo("Pass");
+}
+
+if (true || foo()) {
+  echo("Pass");
+} else {
+  echo("Fail");
+}
+
+if (true && true) {
+  echo("Pass");
+}
+
+if (false || true) {
+  echo("Pass");
+}
+
+function ternarytest() = true ? true : foo();
+
+if (ternarytest()) {
+  echo("Pass");
+}