diff options
| author | Marius Kintel <marius@kintel.net> | 2012-10-07 19:24:08 (GMT) | 
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-10-07 19:24:08 (GMT) | 
| commit | 0cea83a35d302929d22ddddbaa60280af62bf4dc (patch) | |
| tree | 554d284a761cf37704a43de8b034df5ff784aa60 /tests/regression/dumptest | |
| parent | fa9811c0f3314a0f343385c2cba7e691fa814b08 (diff) | |
Fixed weakness in parser causing modifier characters not to work in front of 'if' statements. Fixes #197
Diffstat (limited to 'tests/regression/dumptest')
5 files changed, 29 insertions, 0 deletions
| diff --git a/tests/regression/dumptest/background-modifier-expected.txt b/tests/regression/dumptest/background-modifier-expected.txt index 6e9ca57..ed769b3 100644 --- a/tests/regression/dumptest/background-modifier-expected.txt +++ b/tests/regression/dumptest/background-modifier-expected.txt @@ -2,4 +2,7 @@  		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() { +		cube(size = [25, 6, 3], center = true); +	} diff --git a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt index a525d68..20c82cc 100644 --- a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt +++ b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt @@ -1,11 +1,17 @@  	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() { +			cube(size = [6, 25, 3], center = true); +		}  	}  	multmatrix([[1, 0, 0, 13], [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); +			%group() { +				cube(size = [6, 25, 3], center = true); +			}  		}  	} diff --git a/tests/regression/dumptest/highlight-modifier-expected.txt b/tests/regression/dumptest/highlight-modifier-expected.txt index c0f1da2..c6204bd 100644 --- a/tests/regression/dumptest/highlight-modifier-expected.txt +++ b/tests/regression/dumptest/highlight-modifier-expected.txt @@ -2,4 +2,7 @@  		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() { +		cube(size = [25, 6, 3], center = true); +	} diff --git a/tests/regression/dumptest/hull3-tests-expected.txt b/tests/regression/dumptest/hull3-tests-expected.txt index af48b7f..4c05e2c 100644 --- a/tests/regression/dumptest/hull3-tests-expected.txt +++ b/tests/regression/dumptest/hull3-tests-expected.txt @@ -17,4 +17,14 @@  			}  		}  	} +	multmatrix([[1, 0, 0, -5], [0, 1, 0, -5], [0, 0, 1, -5], [0, 0, 0, 1]]) { +		hull() { +			intersection() { +				cube(size = [1, 1, 1], center = false); +				multmatrix([[1, 0, 0, -1], [0, 1, 0, -1], [0, 0, 1, -1], [0, 0, 0, 1]]) { +					cube(size = [1, 1, 1], center = false); +				} +			} +		} +	} diff --git a/tests/regression/dumptest/root-modifier-if-expected.txt b/tests/regression/dumptest/root-modifier-if-expected.txt new file mode 100644 index 0000000..dfcd15a --- /dev/null +++ b/tests/regression/dumptest/root-modifier-if-expected.txt @@ -0,0 +1,7 @@ +	group() { +		sphere($fn = 0, $fa = 12, $fs = 2, r = 5); +	} +	group() { +		cube(size = [5, 5, 5], center = false); +	} + | 
