grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1244 from BelfrySCAD/revarbat_dev

Browse source 
Fix for badly formed 1-arg fnliteral factories.
This commit is contained in:
Revar Desmera 2023-08-08 00:14:12 -07:00 committed by GitHub
commit f519b00427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
fnliterals.scad
View file

@ -1566,7 +1566,7 @@ function f_cross(a,b) = f_2arg(function(a,b) cross(a,b))(a,b);
// A factory that returns function literals equivalent to `is_def(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_def(x) = f_1arg(function (x) is_def(x));
function f_is_def(a) = f_1arg(function (a) is_def(a))(a);
// Function: f_is_undef()
@ -1579,7 +1579,7 @@ function f_is_def(x) = f_1arg(function (x) is_def(x));
// A factory that returns function literals equivalent to `is_undef(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_undef(x) = f_1arg(function (x) is_undef(x));
function f_is_undef(a) = f_1arg(function (a) is_undef(a))(a);
// Function: f_is_bool()
@ -1592,7 +1592,7 @@ function f_is_undef(x) = f_1arg(function (x) is_undef(x));
// A factory that returns function literals equivalent to `is_bool(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_bool(x) = f_1arg(function (x) is_bool(x));
function f_is_bool(a) = f_1arg(function (a) is_bool(a))(a);
// Function: f_is_num()
@ -1605,7 +1605,7 @@ function f_is_bool(x) = f_1arg(function (x) is_bool(x));
// A factory that returns function literals equivalent to `is_num(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_num(x) = f_1arg(function (x) is_num(x));
function f_is_num(a) = f_1arg(function (a) is_num(a))(a);
// Function: f_is_int()
@ -1618,7 +1618,7 @@ function f_is_num(x) = f_1arg(function (x) is_num(x));
// A factory that returns function literals equivalent to `is_int(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_int(x) = f_1arg(function (x) is_int(x));
function f_is_int(a) = f_1arg(function (a) is_int(a))(a);
// Function: f_is_nan()
@ -1631,7 +1631,7 @@ function f_is_int(x) = f_1arg(function (x) is_int(x));
// A factory that returns function literals equivalent to `is_nan(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_nan(x) = f_1arg(function (x) is_nan(x));
function f_is_nan(a) = f_1arg(function (a) is_nan(a))(a);
// Function: f_is_finite()
@ -1644,7 +1644,7 @@ function f_is_nan(x) = f_1arg(function (x) is_nan(x));
// A factory that returns function literals equivalent to `is_finite(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_finite(x) = f_1arg(function (x) is_finite(x));
function f_is_finite(a) = f_1arg(function (a) is_finite(a))(a);
// Function: f_is_string()
@ -1657,7 +1657,7 @@ function f_is_finite(x) = f_1arg(function (x) is_finite(x));
// A factory that returns function literals equivalent to `is_string(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_string(x) = f_1arg(function (x) is_string(x));
function f_is_string(a) = f_1arg(function (a) is_string(a))(a);
// Function: f_is_list()
@ -1670,7 +1670,7 @@ function f_is_string(x) = f_1arg(function (x) is_string(x));
// A factory that returns function literals equivalent to `is_list(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_list(x) = f_1arg(function (x) is_list(x));
function f_is_list(a) = f_1arg(function (a) is_list(a))(a);
// Function: f_is_range()
@ -1683,7 +1683,7 @@ function f_is_list(x) = f_1arg(function (x) is_list(x));
// A factory that returns function literals equivalent to `is_range(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_range(x) = f_1arg(function (x) is_range(x));
function f_is_range(a) = f_1arg(function (a) is_range(a))(a);
// Function: f_is_function()
@ -1696,7 +1696,7 @@ function f_is_range(x) = f_1arg(function (x) is_range(x));
// A factory that returns function literals equivalent to `is_function(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_function(x) = f_1arg(function (x) is_function(x));
function f_is_function(a) = f_1arg(function (a) is_function(a))(a);
// Function: f_is_vector()
@ -1709,7 +1709,7 @@ function f_is_function(x) = f_1arg(function (x) is_function(x));
// A factory that returns function literals equivalent to `is_vector(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_vector(a,b) = f_2arg(function (a,b) is_vector(a,b));
function f_is_vector(a,b) = f_2arg(function (a,b) is_vector(a,b))(a,b);
// Function: f_is_path()
@ -1722,7 +1722,7 @@ function f_is_vector(a,b) = f_2arg(function (a,b) is_vector(a,b));
// A factory that returns function literals equivalent to `is_path(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_path(a,b) = f_2arg(function (a,b) is_path(a,b));
function f_is_path(a,b) = f_2arg(function (a,b) is_path(a,b))(a,b);
// Function: f_is_region()
@ -1735,7 +1735,7 @@ function f_is_path(a,b) = f_2arg(function (a,b) is_path(a,b));
// A factory that returns function literals equivalent to `is_region(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_region(a) = f_1arg(function (a) is_region(a));
function f_is_region(a) = f_1arg(function (a) is_region(a))(a);
// Function: f_is_vnf()
@ -1748,7 +1748,7 @@ function f_is_region(a) = f_1arg(function (a) is_region(a));
// A factory that returns function literals equivalent to `is_vnf(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_vnf(a) = f_1arg(function (a) is_vnf(a));
function f_is_vnf(a) = f_1arg(function (a) is_vnf(a))(a);
// Function: f_is_patch()
@ -1761,7 +1761,7 @@ function f_is_vnf(a) = f_1arg(function (a) is_vnf(a));
// A factory that returns function literals equivalent to `is_patch(a)`.
// Arguments:
// a = If given, replaces the argument.
function f_is_patch(a) = f_1arg(function (a) is_patch(a));
function f_is_patch(a) = f_1arg(function (a) is_patch(a))(a);

20
tests/test_fnliterals.scad
View file

@ -806,7 +806,7 @@ module test_f_is_bool() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_bool();
@ -823,7 +823,7 @@ module test_f_is_def() {
["foo", true],
[[4,5,6], true]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_def();
@ -840,7 +840,7 @@ module test_f_is_undef() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_undef();
@ -863,7 +863,7 @@ module test_f_is_num() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_num();
@ -886,7 +886,7 @@ module test_f_is_int() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_int();
@ -909,7 +909,7 @@ module test_f_is_nan() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_nan();
@ -931,7 +931,7 @@ module test_f_is_finite() {
["foo", false],
[[4,5,6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_finite();
@ -955,7 +955,7 @@ module test_f_is_string() {
[[4,5,6], false],
[[4:1:6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_string();
@ -979,7 +979,7 @@ module test_f_is_list() {
[[4,5,6], true],
[[4:1:6], false]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1]);
}
}
test_f_is_list();
@ -1005,7 +1005,7 @@ module test_f_is_path() {
[square(100), true],
[circle(100), true]
]) {
assert(testfn(test[0]), test[1]);
assert(testfn(test[0]) == test[1], str(test[0]," should be ",test[1]));
}
}
test_f_is_path();