Merge branch 'master' into issue181

4 files changed, 67 insertions, 29 deletions

diff --git a/testdata/scad/features/ifelse-tests.scad b/testdata/scad/features/ifelse-tests.scad
index d8c777b..3c72d55 100644
--- a/testdata/scad/features/ifelse-tests.scad
+++ b/testdata/scad/features/ifelse-tests.scad
@@ -1,5 +1,11 @@
-if (true) cube(2, true);
-else cylinder(r=1,h=2);
+if (true) {
+  cube(2, true);
+  translate([-3,0,0]) cube(2, true);
+}
+else {
+  cylinder(r=1,h=2);
+  translate([-3,0,0]) cylinder(r=1,h=2);
+}
 
 translate([3,0,0])
   if (false) cylinder(r=1,h=2);
diff --git a/testdata/scad/minimal/allexpressions.scad b/testdata/scad/minimal/allexpressions.scad
new file mode 100644
index 0000000..f618c4b
--- /dev/null
+++ b/testdata/scad/minimal/allexpressions.scad
@@ -0,0 +1,30 @@
+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:5];
+h2 = [1:2:10];
+i = h2.begin - h2.step - h2.end;
+j = "test";
+k = 1.23e-2;
+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/testdata/scad/minimal/allfunctions.scad b/testdata/scad/minimal/allfunctions.scad
index 2aebe54..b97f121 100644
--- a/testdata/scad/minimal/allfunctions.scad
+++ b/testdata/scad/minimal/allfunctions.scad
@@ -1,27 +1,28 @@
 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();
-a = version();
-a = version_num();
-a = len();
+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/testdata/scad/minimal/allmodules.scad b/testdata/scad/minimal/allmodules.scad
index 4395fd7..2e38d8f 100644
--- a/testdata/scad/minimal/allmodules.scad
+++ b/testdata/scad/minimal/allmodules.scad
@@ -2,12 +2,13 @@ minkowski();
 glide();
 subdiv();
 hull();
+resize();
 child();
 echo();
 assign();
 for();
 intersection_for();
-if(true) { }
+if(false) { cube(); } else { sphere(); }
 union();
 difference();
 intersection();