Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/regression/dumptest/use-tests-expected.txt b/tests/regression/dumptest/use-tests-expected.txt
new file mode 100644
index 0000000..7ba3ac5
--- /dev/null
+++ b/tests/regression/dumptest/use-tests-expected.txt
@@ -0,0 +1,34 @@
+	group() {
+		group() {
+			multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				group() {
+					cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 0.7, r2 = 0.2, center = true);
+				}
+			}
+			multmatrix([[1, 0, 0, 2], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				group() {
+					cylinder($fn = 10, $fa = 12, $fs = 2, h = 1, r1 = 0.5, r2 = 0.5, center = true);
+				}
+			}
+			cube(size = [1, 1, 1], center = true);
+		}
+		multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
+		multmatrix([[1, 0, 0, 4], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]);
+		multmatrix([[1, 0, 0, -2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			group() {
+				sphere($fn = 8, $fa = 12, $fs = 2, r = 0.5);
+			}
+		}
+		multmatrix([[1, 0, 0, -2], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			group() {
+				difference() {
+					cube(size = [1, 1, 1], center = true);
+					cylinder($fn = 0, $fa = 12, $fs = 2, h = 2, r1 = 0.4, r2 = 0.4, center = true);
+				}
+			}
+		}
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			sphere($fn = 16, $fa = 12, $fs = 2, r = 1);
+		}
+	}
+