diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-13 16:40:20 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-13 16:40:20 (GMT) |
| commit | 1f9ce62573b65715e7b134ad4d8c8079fc28aa44 (patch) | |
| tree | 40ac192b4d368cccc12e7b4e36c3dc7da5fba72f /testdata | |
| parent | 3eb466b5a9dcb7507045898efc7ad52226f54782 (diff) | |
| parent | 2cfcdf557d7742422965035a64ef617ac043a429 (diff) | |
Merge branch 'master' into cakebaby
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/dxf/null-polygons.dxf (renamed from testdata/scad/features/null-polygons.dxf) | 0 | ||||
| -rw-r--r-- | testdata/scad/dxf/null-polygons.scad | 2 | ||||
| -rw-r--r-- | testdata/scad/features/null-polygons.scad | 2 | ||||
| -rw-r--r-- | testdata/scad/functions/len-tests.scad | 12 | ||||
| -rw-r--r-- | testdata/scad/minimal/allfunctions.scad | 1 | ||||
| -rw-r--r-- | testdata/scad/misc/dim-all.dxf (renamed from testdata/scad/features/dim-all.dxf) | 0 | ||||
| -rw-r--r-- | testdata/scad/misc/dim-all.scad (renamed from testdata/scad/features/dim-all.scad) | 0 | ||||
| -rw-r--r-- | testdata/scad/misc/dxf-export.scad (renamed from testdata/scad/features/dxf-export.scad) | 0 | ||||
| -rw-r--r-- | testdata/scad/misc/echo-tests.scad (renamed from testdata/scad/features/echo-tests.scad) | 2 | ||||
| -rw-r--r-- | testdata/scad/misc/string-test.scad (renamed from testdata/scad/features/string-test.scad) | 0 |
10 files changed, 17 insertions, 2 deletions
diff --git a/testdata/scad/features/null-polygons.dxf b/testdata/dxf/null-polygons.dxf index 390e42e..390e42e 100644 --- a/testdata/scad/features/null-polygons.dxf +++ b/testdata/dxf/null-polygons.dxf diff --git a/testdata/scad/dxf/null-polygons.scad b/testdata/scad/dxf/null-polygons.scad new file mode 100644 index 0000000..349ab6a --- /dev/null +++ b/testdata/scad/dxf/null-polygons.scad @@ -0,0 +1,2 @@ +linear_extrude(height=1) import_dxf("../../dxf/null-polygons.dxf"); +translate([0,20,0]) linear_extrude("../../dxf/null-polygons.dxf", height=1); diff --git a/testdata/scad/features/null-polygons.scad b/testdata/scad/features/null-polygons.scad deleted file mode 100644 index 4849c15..0000000 --- a/testdata/scad/features/null-polygons.scad +++ /dev/null @@ -1,2 +0,0 @@ -linear_extrude() import_dxf("null-polygons.dxf"); -linear_extrude("null-polygons.dxf"); diff --git a/testdata/scad/functions/len-tests.scad b/testdata/scad/functions/len-tests.scad new file mode 100644 index 0000000..fba7ae1 --- /dev/null +++ b/testdata/scad/functions/len-tests.scad @@ -0,0 +1,12 @@ +a=[1,2,3,4]; +b="abcd"; +c=[]; +d=""; +e=[[1,2,3,4],[1,2,3]]; +echo(len(a)); +echo(len(b)); +echo(len(c)); +echo(len(d)); +echo(len(e)); +echo(len(e[1])); +echo(len(e[2]));
\ No newline at end of file diff --git a/testdata/scad/minimal/allfunctions.scad b/testdata/scad/minimal/allfunctions.scad index ef21a90..2aebe54 100644 --- a/testdata/scad/minimal/allfunctions.scad +++ b/testdata/scad/minimal/allfunctions.scad @@ -24,3 +24,4 @@ a = dxf_dim(); a = dxf_cross(); a = version(); a = version_num(); +a = len(); diff --git a/testdata/scad/features/dim-all.dxf b/testdata/scad/misc/dim-all.dxf index 6ae7610..6ae7610 100644 --- a/testdata/scad/features/dim-all.dxf +++ b/testdata/scad/misc/dim-all.dxf diff --git a/testdata/scad/features/dim-all.scad b/testdata/scad/misc/dim-all.scad index 454ed11..454ed11 100644 --- a/testdata/scad/features/dim-all.scad +++ b/testdata/scad/misc/dim-all.scad diff --git a/testdata/scad/features/dxf-export.scad b/testdata/scad/misc/dxf-export.scad index 7f4b8cb..7f4b8cb 100644 --- a/testdata/scad/features/dxf-export.scad +++ b/testdata/scad/misc/dxf-export.scad diff --git a/testdata/scad/features/echo-tests.scad b/testdata/scad/misc/echo-tests.scad index b07d444..c42a67e 100644 --- a/testdata/scad/features/echo-tests.scad +++ b/testdata/scad/misc/echo-tests.scad @@ -10,3 +10,5 @@ echo(r); echo(vec = [1,2,3]); echo(range = [0:2]); + +echo(str("string generated by str()")); diff --git a/testdata/scad/features/string-test.scad b/testdata/scad/misc/string-test.scad index 5ec4cfb..5ec4cfb 100644 --- a/testdata/scad/features/string-test.scad +++ b/testdata/scad/misc/string-test.scad |