merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

3 files changed, 26 insertions, 0 deletions

diff --git a/testdata/scad/minimal/allfunctions.scad b/testdata/scad/minimal/allfunctions.scad
new file mode 100644
index 0000000..e58bd07
--- /dev/null
+++ b/testdata/scad/minimal/allfunctions.scad
@@ -0,0 +1,24 @@
+a = abs();
+a = sign();
+a = rands();
+a = min();
+a = max();
+a = sin();
+a = cos();
+a = asin();
+a = acos();
+a = tan();
+a = atan();
+a = atan2();
+a = round();
+a = ceil();
+a = floor();
+a = pow();
+a = sqrt();
+a = exp();
+a = log();
+a = ln();
+a = str();
+a = lookup();
+a = dxf_dim();
+a = dxf_cross();
diff --git a/testdata/scad/minimal/allmodules.scad b/testdata/scad/minimal/allmodules.scad
index a940947..4395fd7 100644
--- a/testdata/scad/minimal/allmodules.scad
+++ b/testdata/scad/minimal/allmodules.scad
@@ -15,6 +15,7 @@ dxf_linear_extrude();
 linear_extrude();
 dxf_rotate_extrude();
 rotate_extrude();
+import();
 import_stl();
 import_off();
 import_dxf();
diff --git a/testdata/scad/minimal/import.scad b/testdata/scad/minimal/import.scad
new file mode 100644
index 0000000..6f375fe
--- /dev/null
+++ b/testdata/scad/minimal/import.scad
@@ -0,0 +1 @@
+import();