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

relax starts_with and end_with error checking

Browse source
This commit is contained in:
Adrian Mariano 2025-01-07 22:03:09 -05:00
parent 93b99159e2
commit f9be26fe5a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
strings.scad
View file

@ -150,6 +150,7 @@ function _str_find_all(str,pattern) =
// comparison methods were slower. // comparison methods were slower.
function substr_match(str,start,pattern) = function substr_match(str,start,pattern) =
assert(is_str(str)) assert(is_str(str))
assert(is_str(pattern))
len(str)-start <len(pattern)? false len(str)-start <len(pattern)? false
: _substr_match_recurse(str,start,pattern,len(pattern)); : _substr_match_recurse(str,start,pattern,len(pattern));
@ -167,7 +168,7 @@ function _substr_match_recurse(str,sindex,pattern,plen,pindex=0,) =
// bool = starts_with(str,pattern); // bool = starts_with(str,pattern);
// Description: // Description:
// Returns true if the input string `str` starts with the specified string pattern, `pattern`. // Returns true if the input string `str` starts with the specified string pattern, `pattern`.
// Otherwise returns false. // Otherwise returns false. (If the input is not a string, returns false.)
// Arguments: // Arguments:
// str = String to search. // str = String to search.
// pattern = String pattern to search for. // pattern = String pattern to search for.
@ -175,7 +176,7 @@ function _substr_match_recurse(str,sindex,pattern,plen,pindex=0,) =
// starts_with("abcdef","abc"); // Returns true // starts_with("abcdef","abc"); // Returns true
// starts_with("abcdef","def"); // Returns false // starts_with("abcdef","def"); // Returns false
// starts_with("abcdef",""); // Returns true // starts_with("abcdef",""); // Returns true
function starts_with(str,pattern) = substr_match(str,0,pattern); function starts_with(str,pattern) = is_string(str) && substr_match(str,0,pattern);
// Function: ends_with() // Function: ends_with()
@ -186,7 +187,7 @@ function starts_with(str,pattern) = substr_match(str,0,pattern);
// bool = ends_with(str,pattern); // bool = ends_with(str,pattern);
// Description: // Description:
// Returns true if the input string `str` ends with the specified string pattern, `pattern`. // Returns true if the input string `str` ends with the specified string pattern, `pattern`.
// Otherwise returns false. // Otherwise returns false. (If the input is not a string, returns false.)
// Arguments: // Arguments:
// str = String to search. // str = String to search.
// pattern = String pattern to search for. // pattern = String pattern to search for.
@ -194,7 +195,7 @@ function starts_with(str,pattern) = substr_match(str,0,pattern);
// ends_with("abcdef","def"); // Returns true // ends_with("abcdef","def"); // Returns true
// ends_with("abcdef","de"); // Returns false // ends_with("abcdef","de"); // Returns false
// ends_with("abcdef",""); // Returns true // ends_with("abcdef",""); // Returns true
function ends_with(str,pattern) = substr_match(str,len(str)-len(pattern),pattern); function ends_with(str,pattern) = is_str(str) && substr_match(str,len(str)-len(pattern),pattern);