grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed version testing for assert() and functional echo() to >20190100

Browse source
This commit is contained in:
Revar Desmera 2019-03-27 22:11:12 -07:00
parent 8161172dbd
commit 8a0dc9ebb2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
compat.scad
View file

@ -52,27 +52,27 @@ function default(v,dflt=undef) = v==undef? dflt : v;
// Function: is_def()
// Description: Returns true if given value is not `undef`.
function is_def(v) = (version_num() >= 20190100)? !is_undef(v) : (v != undef);
function is_def(v) = (version_num() > 20190100)? !is_undef(v) : (v != undef);
// Function: is_str()
// Description: Given a value, returns true if it is a string.
function is_str(v) = (version_num() >= 20190100)? is_string(v) : (is_def(v) && is_def(len(v)) && (len(str(v,v)) == len(v)*2));
function is_str(v) = (version_num() > 20190100)? is_string(v) : (is_def(v) && is_def(len(v)) && (len(str(v,v)) == len(v)*2));
// Function: is_boolean()
// Description: Given a value, returns true if it is a boolean.
function is_boolean(v) = (version_num() >= 20190100)? is_bool(v) : (!is_str(v) && (str(v) == "true" || str(v) == "false"));
function is_boolean(v) = (version_num() > 20190100)? is_bool(v) : (!is_str(v) && (str(v) == "true" || str(v) == "false"));
// Function: is_scalar()
// Description: Given a value, returns true if it is a scalar number.
function is_scalar(v) = (version_num() >= 20190100)? is_num(v) : (!is_boolean(v) && is_def(v+0));
function is_scalar(v) = (version_num() > 20190100)? is_num(v) : (!is_boolean(v) && is_def(v+0));
// Function: is_array()
// Description: Given a value, returns true if it is an array/list/vector.
function is_array(v) = (version_num() >= 20190100)? is_list(v) : (!is_str(v) && is_def(len(v)));
function is_array(v) = (version_num() > 20190100)? is_list(v) : (!is_str(v) && is_def(len(v)));
// Function: get_radius()
@ -140,7 +140,7 @@ function scalar_vec3(v, dflt=undef) =
// Function: f_echo()
// Description: If possible, echo a message from a function.
function f_echo(msg) = (version_num() >= 20190100)? echo(msg) : 0;
function f_echo(msg) = (version_num() > 20190100)? echo(msg) : 0;
// Section: Modules
@ -193,7 +193,7 @@ function assert_in_list(argname, val, l, idx=undef) =
// succ = If this is `false`, trigger the assertion.
// msg = The message to emit if `succ` is `false`.
module assertion(succ, msg) {
if (version_num() >= 20190100) {
if (version_num() > 20190100) {
// assert() will echo the variable name, and `succ` looks confusing there. So we store it in FAILED.
FAILED = succ;
assert(FAILED, msg);
@ -203,7 +203,7 @@ module assertion(succ, msg) {
}
function assertion(succ, msg) =
(version_num() >= 20190100)? let(FAILED=succ) assert(FAILED, msg) : 0;
(version_num() > 20190100)? let(FAILED=succ) assert(FAILED, msg) : 0;
// Module: echo_error()