diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
| commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
| tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /testdata/scad/features/sub1 | |
| parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'testdata/scad/features/sub1')
4 files changed, 25 insertions, 1 deletions
diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad index 140c4ed..c34632c 100644 --- a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad +++ b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad @@ -4,7 +4,9 @@ include <include-test3.scad> //Test relative file location include <../include-test4.scad> -module test2 () +test2_variable = 0.7; + +module test2() { cube(center=true); } diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad new file mode 100644 index 0000000..68013db --- /dev/null +++ b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad @@ -0,0 +1,14 @@ +//Test nested use +use <use-test3.scad> + +//Test relative file location +use <../use-test4.scad> + +test2_variable = 0.7; + +module test2() +{ + translate([2,0,0]) test3(); + translate([2,-2,0]) test4(); + cube(center=true); +} diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/use-test3.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test3.scad new file mode 100644 index 0000000..6e3537e --- /dev/null +++ b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test3.scad @@ -0,0 +1,4 @@ +module test3() +{ + cylinder(r1=0.7, r2=0.2, center=true); +} diff --git a/testdata/scad/features/sub1/sub2/sub3/use-test4.scad b/testdata/scad/features/sub1/sub2/sub3/use-test4.scad new file mode 100644 index 0000000..c13368c --- /dev/null +++ b/testdata/scad/features/sub1/sub2/sub3/use-test4.scad @@ -0,0 +1,4 @@ +module test4() +{ + cylinder(r=0.5, $fn=10, center=true); +} |