From e931c8ab830d0ab630e5cf0e2c7aaf17a1aa7602 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 17 May 2014 11:53:11 -0400
Subject: [PATCH] bugfix: Dumptest failed to dump the highlight modifier

---
 src/nodedumper.cc                                      |  1 +
 testdata/scad/features/for-tests.scad                  |  3 +++
 .../dumptest/difference-2d-tests-expected.csg          |  2 +-
 .../regression/dumptest/difference-tests-expected.csg  |  2 +-
 tests/regression/dumptest/for-tests-expected.csg       |  2 ++
 .../highlight-and-background-modifier-expected.csg     | 10 +++++-----
 .../dumptest/highlight-modifier-expected.csg           |  6 +++---
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/nodedumper.cc b/src/nodedumper.cc
index d2905c0f..4defddab 100644
--- a/src/nodedumper.cc
+++ b/src/nodedumper.cc
@@ -49,6 +49,7 @@ std::string NodeDumper::dumpChildren(const AbstractNode &node)
 				 iter++) {
 			assert(isCached(**iter));
 			if ((*iter)->modinst->isBackground()) dump << "%";
+			if ((*iter)->modinst->isHighlight()) dump << "#";
 			dump << this->cache[**iter] << "\n";
 		}
 		
diff --git a/testdata/scad/features/for-tests.scad b/testdata/scad/features/for-tests.scad
index 6bb7f697..07ddea06 100644
--- a/testdata/scad/features/for-tests.scad
+++ b/testdata/scad/features/for-tests.scad
@@ -2,6 +2,9 @@
 for();
 // No children
 for(i=2) { }
+// Modifier and no children
+%for(i=2) { }
+#for(i=2) { }
 
 // Null
 translate([-10,0,0]) for() cylinder(r=4);
diff --git a/tests/regression/dumptest/difference-2d-tests-expected.csg b/tests/regression/dumptest/difference-2d-tests-expected.csg
index 7bc257dc..29be8a21 100644
--- a/tests/regression/dumptest/difference-2d-tests-expected.csg
+++ b/tests/regression/dumptest/difference-2d-tests-expected.csg
@@ -17,7 +17,7 @@ group() {
 	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			square(size = [0, 10], center = true);
-			circle($fn = 0, $fa = 12, $fs = 2, r = 4);
+#			circle($fn = 0, $fa = 12, $fs = 2, r = 4);
 		}
 	}
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
diff --git a/tests/regression/dumptest/difference-tests-expected.csg b/tests/regression/dumptest/difference-tests-expected.csg
index 8ff8a243..5694788b 100644
--- a/tests/regression/dumptest/difference-tests-expected.csg
+++ b/tests/regression/dumptest/difference-tests-expected.csg
@@ -33,7 +33,7 @@ group() {
 	multmatrix([[1, 0, 0, 24], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			cube(size = [0, 10, 10], center = true);
-			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
+#			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 		}
 	}
 	multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
diff --git a/tests/regression/dumptest/for-tests-expected.csg b/tests/regression/dumptest/for-tests-expected.csg
index 4f79afcb..84244ad2 100644
--- a/tests/regression/dumptest/for-tests-expected.csg
+++ b/tests/regression/dumptest/for-tests-expected.csg
@@ -1,6 +1,8 @@
 group() {
 	group();
 	group();
+%	group();
+#	group();
 	multmatrix([[1, 0, 0, -10], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group();
 	}
diff --git a/tests/regression/dumptest/highlight-and-background-modifier-expected.csg b/tests/regression/dumptest/highlight-and-background-modifier-expected.csg
index eaf9b1f0..2d6f7b7b 100644
--- a/tests/regression/dumptest/highlight-and-background-modifier-expected.csg
+++ b/tests/regression/dumptest/highlight-and-background-modifier-expected.csg
@@ -1,12 +1,12 @@
 group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
-%		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
-%		group() {
+%#		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+%#		group() {
 			cube(size = [25, 6, 3], center = true);
 		}
 	}
-%	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+%#	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			color([0, 0.501961, 0, 1]) {
 				cube(size = [10, 4, 10], center = true);
@@ -26,7 +26,7 @@ group() {
 				cube(size = [25, 6, 3], center = true);
 			}
 		}
-		multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+#		multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			difference() {
 				color([0, 0.501961, 0, 1]) {
 					cube(size = [10, 4, 10], center = true);
@@ -39,7 +39,7 @@ group() {
 			}
 		}
 	}
-	multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+#	multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
diff --git a/tests/regression/dumptest/highlight-modifier-expected.csg b/tests/regression/dumptest/highlight-modifier-expected.csg
index 70f3d193..684f30ac 100644
--- a/tests/regression/dumptest/highlight-modifier-expected.csg
+++ b/tests/regression/dumptest/highlight-modifier-expected.csg
@@ -1,12 +1,12 @@
 group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
-		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+#		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 	}
-	group() {
+#	group() {
 		cube(size = [25, 6, 3], center = true);
 	}
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+#	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			color([0, 0.501961, 0, 1]) {
 				cube(size = [10, 4, 10], center = true);