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

strings reorg

Browse source
This commit is contained in:
Adrian Mariano 2022-01-10 19:46:51 -05:00
parent 8bbc139c6c
commit ec900943df
8 changed files with 242 additions and 263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linalg.scad
View file

@ -73,9 +73,9 @@ function is_matrix_symmetric(A,eps=1e-12) =
function echo_matrix(M,description,sig=4,eps=1e-9) =
let(
horiz_line = chr(8213),
matstr = matrix_strings(M,sig=sig,eps=eps),
matstr = _format_matrix(M,sig=sig,eps=eps),
separator = str_join(repeat(horiz_line,10)),
dummy=echo(str(separator," ",is_def(description) ? description : ""))
dummy=echo(str(separator,is_def(description) ? str(" ",description) : ""))
[for(row=matstr) echo(row)]
)
echo(separator);

2
regions.scad
View file

@ -971,6 +971,8 @@ function offset(
sharpcorners = [for(i=[0:len(goodsegs)-1]) _segment_extension(select(goodsegs,i-1), select(goodsegs,i))],
// If some segments are parallel then the extended segments are undefined. This case is not handled
// Note if !closed the last corner doesn't matter, so exclude it
fd= echo(sharpcorners=sharpcorners)echo(alldef=all_defined(sharpcorners))echo(goodsegs=goodsegs),
parallelcheck =
(len(sharpcorners)==2 && !closed) ||
all_defined(closed? sharpcorners : select(sharpcorners, 1,-2))

20
screws.scad
View file

@ -30,16 +30,16 @@ Torx values: https://www.stanleyengineeredfastening.com/-/media/web/sef/resourc
function _parse_screw_name(name) =
let( commasplit = str_split(name,","),
length = str_num(commasplit[1]),
length = parse_num(commasplit[1]),
xdash = str_split(commasplit[0], "-x"),
type = xdash[0],
thread = str_float(xdash[1])
thread = parse_float(xdash[1])
)
type[0] == "M" || type[0] == "m" ? ["metric", str_float(substr(type,1)), thread, length] :
type[0] == "M" || type[0] == "m" ? ["metric", parse_float(substr(type,1)), thread, length] :
let(
diam = type[0] == "#" ? type :
suffix(type,2)=="''" ? str_float(substr(type,0,len(type)-2)) :
let(val=str_num(type))
suffix(type,2)=="''" ? parse_float(substr(type,0,len(type)-2)) :
let(val=parse_num(type))
val == floor(val) && val>=0 && val<=12 ? str("#",type) : val
)
["english", diam, thread, u_mul(25.4,length)];
@ -51,8 +51,8 @@ function _parse_drive(drive=undef, drive_size=undef) =
is_undef(drive) ? ["none",undef] :
let(drive = downcase(drive))
in_list(drive,["hex","phillips", "slot", "torx", "phillips", "none"]) ? [drive, drive_size] :
drive[0]=="t" ? ["torx", str_int(substr(drive,1))] :
substr(drive,0,2)=="ph" ? ["phillips", str_int(substr(drive,2))] :
drive[0]=="t" ? ["torx", parse_int(substr(drive,1))] :
substr(drive,0,2)=="ph" ? ["phillips", parse_int(substr(drive,2))] :
assert(str("Unknown screw drive type ",drive));
@ -178,7 +178,7 @@ function screw_info(name, head, thread="coarse", drive, drive_size=undef, oversi
function _screw_info_english(diam, threadcount, head, thread, drive) =
let(
diameter = is_string(diam) ? str_int(substr(diam,1))*0.013 +0.06 :
diameter = is_string(diam) ? parse_int(substr(diam,1))*0.013 +0.06 :
diam,
pitch =
is_def(threadcount) ? INCH/threadcount :
@ -1121,8 +1121,8 @@ function _ISO_thread_tolerance(diameter, pitch, internal=false, tolerance=undef)
assert(internalok,str("Invalid internal thread tolerance, ",tolerance,". Must have form <digit><letter>"))
assert(externalok,str("invalid external thread tolerance, ",tolerance,". Must have form <digit><letter> or <digit><letter><digit><letter>"))
let(
tol_num_pitch = str_num(tol_str[0]),
tol_num_crest = str_num(tol_str[2]),
tol_num_pitch = parse_num(tol_str[0]),
tol_num_crest = parse_num(tol_str[2]),
tol_letter = tol_str[1]
)
assert(tol_letter==tol_str[3],str("Invalid tolerance, ",tolerance,". Cannot mix different letters"))

2
shapes3d.scad
View file

@ -2083,7 +2083,7 @@ module atext(text, h=1, size=9, font="Courier", anchor="baseline", spin=0, orien
anch = !any([for (c=anchor) c=="["])? anchor :
let(
parts = str_split(str_split(str_split(anchor,"]")[0],"[")[1],","),
vec = [for (p=parts) str_float(str_strip(p," ",start=true))]
vec = [for (p=parts) parse_float(str_strip(p," ",start=true))]
) vec;
ha = anchor=="baseline"? "left" :
anchor==anch && is_string(anchor)? "center" :

255
strings.scad
View file

@ -334,11 +334,11 @@ function upcase(str) =
// Section: Converting strings to numbers
// Section: Parsing strings into numbers
// Function: str_int()
// Function: parse_int()
// Usage:
// str_int(str, [base])
// parse_int(str, [base])
// Description:
// Converts a string into an integer with any base up to 16. Returns NaN if
// conversion fails. Digits above 9 are represented using letters A-F in either
@ -347,62 +347,62 @@ function upcase(str) =
// str = String to convert.
// base = Base for conversion, from 2-16. Default: 10
// Example:
// str_int("349"); // Returns 349
// str_int("-37"); // Returns -37
// str_int("+97"); // Returns 97
// str_int("43.9"); // Returns nan
// str_int("1011010",2); // Returns 90
// str_int("13",2); // Returns nan
// str_int("dead",16); // Returns 57005
// str_int("CEDE", 16); // Returns 52958
// str_int(""); // Returns 0
function str_int(str,base=10) =
// parse_int("349"); // Returns 349
// parse_int("-37"); // Returns -37
// parse_int("+97"); // Returns 97
// parse_int("43.9"); // Returns nan
// parse_int("1011010",2); // Returns 90
// parse_int("13",2); // Returns nan
// parse_int("dead",16); // Returns 57005
// parse_int("CEDE", 16); // Returns 52958
// parse_int(""); // Returns 0
function parse_int(str,base=10) =
str==undef ? undef :
len(str)==0 ? 0 :
let(str=downcase(str))
str[0] == "-" ? -_str_int_recurse(substr(str,1),base,len(str)-2) :
str[0] == "+" ? _str_int_recurse(substr(str,1),base,len(str)-2) :
_str_int_recurse(str,base,len(str)-1);
str[0] == "-" ? -_parse_int_recurse(substr(str,1),base,len(str)-2) :
str[0] == "+" ? _parse_int_recurse(substr(str,1),base,len(str)-2) :
_parse_int_recurse(str,base,len(str)-1);
function _str_int_recurse(str,base,i) =
function _parse_int_recurse(str,base,i) =
let(
digit = search(str[i],"0123456789abcdef"),
last_digit = digit == [] || digit[0] >= base ? (0/0) : digit[0]
) i==0 ? last_digit :
_str_int_recurse(str,base,i-1)*base + last_digit;
_parse_int_recurse(str,base,i-1)*base + last_digit;
// Function: str_float()
// Function: parse_float()
// Usage:
// str_float(str)
// parse_float(str)
// Description:
// Converts a string to a floating point number. Returns NaN if the
// conversion fails.
// Arguments:
// str = String to convert.
// Example:
// str_float("44"); // Returns 44
// str_float("3.4"); // Returns 3.4
// str_float("-99.3332"); // Returns -99.3332
// str_float("3.483e2"); // Returns 348.3
// str_float("-44.9E2"); // Returns -4490
// str_float("7.342e-4"); // Returns 0.0007342
// str_float(""); // Returns 0
function str_float(str) =
// parse_float("44"); // Returns 44
// parse_float("3.4"); // Returns 3.4
// parse_float("-99.3332"); // Returns -99.3332
// parse_float("3.483e2"); // Returns 348.3
// parse_float("-44.9E2"); // Returns -4490
// parse_float("7.342e-4"); // Returns 0.0007342
// parse_float(""); // Returns 0
function parse_float(str) =
str==undef ? undef :
len(str) == 0 ? 0 :
in_list(str[1], ["+","-"]) ? (0/0) : // Don't allow --3, or +-3
str[0]=="-" ? -str_float(substr(str,1)) :
str[0]=="+" ? str_float(substr(str,1)) :
str[0]=="-" ? -parse_float(substr(str,1)) :
str[0]=="+" ? parse_float(substr(str,1)) :
let(esplit = str_split(str,"eE") )
len(esplit)==2 ? str_float(esplit[0]) * pow(10,str_int(esplit[1])) :
len(esplit)==2 ? parse_float(esplit[0]) * pow(10,parse_int(esplit[1])) :
let( dsplit = str_split(str,["."]))
str_int(dsplit[0])+str_int(dsplit[1])/pow(10,len(dsplit[1]));
parse_int(dsplit[0])+parse_int(dsplit[1])/pow(10,len(dsplit[1]));
// Function: str_frac()
// Function: parse_frac()
// Usage:
// str_frac(str,[mixed],[improper],[signed])
// parse_frac(str,[mixed],[improper],[signed])
// Description:
// Converts a string fraction to a floating point number. A string fraction has the form `[-][# ][#/#]` where each `#` is one or more of the
// digits 0-9, and there is an optional sign character at the beginning.
@ -418,64 +418,64 @@ function str_float(str) =
// improper = set to true to accept improper fractions, false to reject them. Default: true
// signed = set to true to accept a leading sign character, false to reject. Default: true
// Example:
// str_frac("3/4"); // Returns 0.75
// str_frac("-77/9"); // Returns -8.55556
// str_frac("+1/3"); // Returns 0.33333
// str_frac("19"); // Returns 19
// str_frac("2 3/4"); // Returns 2.75
// str_frac("-2 12/4"); // Returns -5
// str_frac(""); // Returns 0
// str_frac("3/0"); // Returns inf
// str_frac("0/0"); // Returns nan
// str_frac("-77/9",improper=false); // Returns nan
// str_frac("-2 12/4",improper=false); // Returns nan
// str_frac("-2 12/4",signed=false); // Returns nan
// str_frac("-2 12/4",mixed=false); // Returns nan
// str_frac("2 1/4",mixed=false); // Returns nan
function str_frac(str,mixed=true,improper=true,signed=true) =
// parse_frac("3/4"); // Returns 0.75
// parse_frac("-77/9"); // Returns -8.55556
// parse_frac("+1/3"); // Returns 0.33333
// parse_frac("19"); // Returns 19
// parse_frac("2 3/4"); // Returns 2.75
// parse_frac("-2 12/4"); // Returns -5
// parse_frac(""); // Returns 0
// parse_frac("3/0"); // Returns inf
// parse_frac("0/0"); // Returns nan
// parse_frac("-77/9",improper=false); // Returns nan
// parse_frac("-2 12/4",improper=false); // Returns nan
// parse_frac("-2 12/4",signed=false); // Returns nan
// parse_frac("-2 12/4",mixed=false); // Returns nan
// parse_frac("2 1/4",mixed=false); // Returns nan
function parse_frac(str,mixed=true,improper=true,signed=true) =
str == undef ? undef :
len(str)==0 ? 0 :
signed && str[0]=="-" ? -str_frac(substr(str,1),mixed=mixed,improper=improper,signed=false) :
signed && str[0]=="+" ? str_frac(substr(str,1),mixed=mixed,improper=improper,signed=false) :
signed && str[0]=="-" ? -parse_frac(substr(str,1),mixed=mixed,improper=improper,signed=false) :
signed && str[0]=="+" ? parse_frac(substr(str,1),mixed=mixed,improper=improper,signed=false) :
mixed ? (
!in_list(str_find(str," "), [undef,0]) || is_undef(str_find(str,"/"))? (
let(whole = str_split(str,[" "]))
_str_int_recurse(whole[0],10,len(whole[0])-1) + str_frac(whole[1], mixed=false, improper=improper, signed=false)
) : str_frac(str,mixed=false, improper=improper)
_parse_int_recurse(whole[0],10,len(whole[0])-1) + parse_frac(whole[1], mixed=false, improper=improper, signed=false)
) : parse_frac(str,mixed=false, improper=improper)
) : (
let(split = str_split(str,"/"))
len(split)!=2 ? (0/0) :
let(
numerator = _str_int_recurse(split[0],10,len(split[0])-1),
denominator = _str_int_recurse(split[1],10,len(split[1])-1)
numerator = _parse_int_recurse(split[0],10,len(split[0])-1),
denominator = _parse_int_recurse(split[1],10,len(split[1])-1)
) !improper && numerator>=denominator? (0/0) :
denominator<0 ? (0/0) : numerator/denominator
);
// Function: str_num()
// Function: parse_num()
// Usage:
// str_num(str)
// parse_num(str)
// Description:
// Converts a string to a number. The string can be either a fraction (two integers separated by a "/") or a floating point number.
// Returns NaN if the conversion fails.
// Example:
// str_num("3/4"); // Returns 0.75
// str_num("3.4e-2"); // Returns 0.034
function str_num(str) =
// parse_num("3/4"); // Returns 0.75
// parse_num("3.4e-2"); // Returns 0.034
function parse_num(str) =
str == undef ? undef :
let( val = str_frac(str) )
let( val = parse_frac(str) )
val == val ? val :
str_float(str);
parse_float(str);
// Section: Formatting data
// Section: Formatting numbers into strings
// Function: fmt_int()
// Function: format_int()
// Usage:
// fmt_int(i, [mindigits]);
// format_int(i, [mindigits]);
// Description:
// Formats an integer number into a string. This can handle larger numbers than `str()`.
// Arguments:
@ -483,10 +483,10 @@ function str_num(str) =
// mindigits = If the number has fewer than this many digits, pad the front with zeros until it does. Default: 1.
// Example:
// str(123456789012345); // Returns "1.23457e+14"
// fmt_int(123456789012345); // Returns "123456789012345"
// fmt_int(-123456789012345); // Returns "-123456789012345"
function fmt_int(i,mindigits=1) =
i<0? str("-", fmt_int(-i,mindigits)) :
// format_int(123456789012345); // Returns "123456789012345"
// format_int(-123456789012345); // Returns "-123456789012345"
function format_int(i,mindigits=1) =
i<0? str("-", format_int(-i,mindigits)) :
let(i=floor(i), e=floor(log(i)))
i==0? str_join([for (j=[0:1:mindigits-1]) "0"]) :
str_join(
@ -497,33 +497,33 @@ function fmt_int(i,mindigits=1) =
);
// Function: fmt_fixed()
// Function: format_fixed()
// Usage:
// s = fmt_fixed(f, [digits]);
// s = format_fixed(f, [digits]);
// Description:
// Given a floating point number, formats it into a string with the given number of digits after the decimal point.
// Arguments:
// f = The floating point number to format.
// digits = The number of digits after the decimal to show. Default: 6
function fmt_fixed(f,digits=6) =
function format_fixed(f,digits=6) =
assert(is_int(digits))
assert(digits>0)
is_list(f)? str("[",str_join(sep=", ", [for (g=f) fmt_fixed(g,digits=digits)]),"]") :
is_list(f)? str("[",str_join(sep=", ", [for (g=f) format_fixed(g,digits=digits)]),"]") :
str(f)=="nan"? "nan" :
str(f)=="inf"? "inf" :
f<0? str("-",fmt_fixed(-f,digits=digits)) :
f<0? str("-",format_fixed(-f,digits=digits)) :
assert(is_num(f))
let(
sc = pow(10,digits),
scaled = floor(f * sc + 0.5),
whole = floor(scaled/sc),
part = floor(scaled-(whole*sc))
) str(fmt_int(whole),".",fmt_int(part,digits));
) str(format_int(whole),".",format_int(part,digits));
// Function: fmt_float()
// Function: format_float()
// Usage:
// fmt_float(f,[sig]);
// format_float(f,[sig]);
// Description:
// Formats the given floating point number `f` into a string with `sig` significant digits.
// Strips trailing `0`s after the decimal point. Strips trailing decimal point.
@ -533,22 +533,22 @@ function fmt_fixed(f,digits=6) =
// f = The floating point number to format.
// sig = The number of significant digits to display. Default: 12
// Example:
// fmt_float(PI,12); // Returns: "3.14159265359"
// fmt_float([PI,-16.75],12); // Returns: "[3.14159265359, -16.75]"
function fmt_float(f,sig=12) =
// format_float(PI,12); // Returns: "3.14159265359"
// format_float([PI,-16.75],12); // Returns: "[3.14159265359, -16.75]"
function format_float(f,sig=12) =
assert(is_int(sig))
assert(sig>0)
is_list(f)? str("[",str_join(sep=", ", [for (g=f) fmt_float(g,sig=sig)]),"]") :
is_list(f)? str("[",str_join(sep=", ", [for (g=f) format_float(g,sig=sig)]),"]") :
f==0? "0" :
str(f)=="nan"? "nan" :
str(f)=="inf"? "inf" :
f<0? str("-",fmt_float(-f,sig=sig)) :
f<0? str("-",format_float(-f,sig=sig)) :
assert(is_num(f))
let(
e = floor(log(f)),
mv = sig - e - 1
) mv == 0? fmt_int(floor(f + 0.5)) :
(e<-sig/2||mv<0)? str(fmt_float(f*pow(10,-e),sig=sig),"e",e) :
) mv == 0? format_int(floor(f + 0.5)) :
(e<-sig/2||mv<0)? str(format_float(f*pow(10,-e),sig=sig),"e",e) :
let(
ff = f + pow(10,-mv)*0.5,
whole = floor(ff),
@ -559,26 +559,26 @@ function fmt_float(f,sig=12) =
str_strip(end=true,
str_join([
".",
fmt_int(part, mindigits=mv)
format_int(part, mindigits=mv)
]),
"0."
)
]);
// Function: matrix_strings()
// Usage:
// matrix_strings(M, [sig], [eps])
// Description:
// Convert a numerical matrix into a matrix of strings where every column
// is the same width so it will display in neat columns when printed.
// Values below eps will display as zero. The matrix can include nans, infs
// or undefs and the rows can be different lengths.
// Arguments:
// M = numerical matrix to convert
// sig = significant digits to display. Default: 4
// eps = values smaller than this are shown as zero. Default: 1e-9
function matrix_strings(M, sig=4, eps=1e-9) =
/// Function: _format_matrix()
/// Usage:
/// _format_matrix(M, [sig], [eps])
/// Description:
/// Convert a numerical matrix into a matrix of strings where every column
/// is the same width so it will display in neat columns when printed.
/// Values below eps will display as zero. The matrix can include nans, infs
/// or undefs and the rows can be different lengths.
/// Arguments:
/// M = numerical matrix to convert
/// sig = significant digits to display. Default: 4
/// eps = values smaller than this are shown as zero. Default: 1e-9
function _format_matrix(M, sig=4, eps=1e-9) =
let(
columngap = 1,
figure_dash = chr(8210),
@ -590,7 +590,7 @@ function matrix_strings(M, sig=4, eps=1e-9) =
let(
text = is_undef(entry) ? "und"
: abs(entry) < eps ? "0" // Replace hyphens with figure dashes
: str_replace_char(fmt_float(entry, sig),"-",figure_dash),
: str_replace_char(format_float(entry, sig),"-",figure_dash),
have_dot = is_def(str_find(text, "."))
)
// If the text lacks a dot we add a space the same width as a dot to
@ -616,9 +616,9 @@ function matrix_strings(M, sig=4, eps=1e-9) =
// Function: str_format()
// Function: format()
// Usage:
// s = str_format(fmt, vals);
// s = format(fmt, vals);
// Description:
// Given a format string and a list of values, inserts the values into the placeholders in the format string and returns it.
// Formatting placeholders have the following syntax:
@ -645,13 +645,13 @@ function matrix_strings(M, sig=4, eps=1e-9) =
// fmt = The formatting string, with placeholders to format the values into.
// vals = The list of values to format.
// Example(NORENDER):
// str_format("The value of {} is {:.14f}.", ["pi", PI]); // Returns: "The value of pi is 3.14159265358979."
// str_format("The value {1:f} is known as {0}.", ["pi", PI]); // Returns: "The value 3.141593 is known as pi."
// str_format("We use a very small value {1:.6g} as {0}.", ["EPSILON", EPSILON]); // Returns: "We use a very small value 1e-9 as EPSILON."
// str_format("{:-5s}{:i}{:b}", ["foo", 12e3, 5]); // Returns: "foo 12000true"
// str_format("{:-10s}{:.3f}", ["plecostamus",27.43982]); // Returns: "plecostamus27.440"
// str_format("{:-10.9s}{:.3f}", ["plecostamus",27.43982]); // Returns: "plecostam 27.440"
function str_format(fmt, vals) =
// format("The value of {} is {:.14f}.", ["pi", PI]); // Returns: "The value of pi is 3.14159265358979."
// format("The value {1:f} is known as {0}.", ["pi", PI]); // Returns: "The value 3.141593 is known as pi."
// format("We use a very small value {1:.6g} as {0}.", ["EPSILON", EPSILON]); // Returns: "We use a very small value 1e-9 as EPSILON."
// format("{:-5s}{:i}{:b}", ["foo", 12e3, 5]); // Returns: "foo 12000true"
// format("{:-10s}{:.3f}", ["plecostamus",27.43982]); // Returns: "plecostamus27.440"
// format("{:-10.9s}{:.3f}", ["plecostamus",27.43982]); // Returns: "plecostam 27.440"
function format(fmt, vals) =
let(
parts = str_split(fmt,"{")
) str_join([
@ -666,7 +666,7 @@ function str_format(fmt, vals) =
assert(i<99)
is_undef(fmta)? "" : let(
fmtb = str_split(fmta,":"),
num = is_digit(fmtb[0])? str_int(fmtb[0]) : (i-1),
num = is_digit(fmtb[0])? parse_int(fmtb[0]) : (i-1),
left = fmtb[1][0] == "-",
fmtb1 = default(fmtb[1],""),
fmtc = left? substr(fmtb1,1) : fmtb1,
@ -676,21 +676,21 @@ function str_format(fmt, vals) =
typ = hastyp? lch : "s",
fmtd = hastyp? substr(fmtc,0,len(fmtc)-1) : fmtc,
fmte = str_split((zero? substr(fmtd,1) : fmtd), "."),
wid = str_int(fmte[0]),
prec = str_int(fmte[1]),
wid = parse_int(fmte[0]),
prec = parse_int(fmte[1]),
val = assert(num>=0&&num<len(vals)) vals[num],
unpad = typ=="s"? (
let( sval = str(val) )
is_undef(prec)? sval :
substr(sval, 0, min(len(sval)-1, prec))
) :
(typ=="d" || typ=="i")? fmt_int(val) :
(typ=="d" || typ=="i")? format_int(val) :
typ=="b"? (val? "true" : "false") :
typ=="B"? (val? "TRUE" : "FALSE") :
typ=="f"? downcase(fmt_fixed(val,default(prec,6))) :
typ=="F"? upcase(fmt_fixed(val,default(prec,6))) :
typ=="g"? downcase(fmt_float(val,default(prec,6))) :
typ=="G"? upcase(fmt_float(val,default(prec,6))) :
typ=="f"? downcase(format_fixed(val,default(prec,6))) :
typ=="F"? upcase(format_fixed(val,default(prec,6))) :
typ=="g"? downcase(format_float(val,default(prec,6))) :
typ=="G"? upcase(format_float(val,default(prec,6))) :
assert(false,str("Unknown format type: ",typ)),
padlen = max(0,wid-len(unpad)),
padfill = str_join([for (i=[0:1:padlen-1]) zero? "0" : " "]),
@ -701,29 +701,6 @@ function str_format(fmt, vals) =
]);
// Function&Module: echofmt()
// Usage:
// echofmt(fmt,vals);
// Description:
// Formats the given `vals` with the given format string `fmt` using [`str_format()`](#str_format), and echos the resultant string.
// Arguments:
// fmt = The formatting string, with placeholders to format the values into.
// vals = The list of values to format.
// Example(NORENDER):
// echofmt("The value of {} is {:.14f}.", ["pi", PI]); // ECHO: "The value of pi is 3.14159265358979."
// echofmt("The value {1:f} is known as {0}.", ["pi", PI]); // ECHO: "The value 3.141593 is known as pi."
// echofmt("We use a very small value {1:.6g} as {0}.", ["EPSILON", EPSILON]); // ECHO: "We use a ver small value 1e-9 as EPSILON."
// echofmt("{:-5s}{:i}{:b}", ["foo", 12e3, 5]); // ECHO: "foo 12000true"
// echofmt("{:-10s}{:.3f}", ["plecostamus",27.43982]); // ECHO: "plecostamus27.440"
// echofmt("{:-10.9s}{:.3f}", ["plecostamus",27.43982]); // ECHO: "plecostam 27.440"
function echofmt(fmt, vals) = echo(str_format(fmt,vals));
module echofmt(fmt, vals) {
no_children($children);
echo(str_format(fmt,vals));
}
// Section: Checking character class

4
tests/test_mutators.scad
View file

@ -16,7 +16,7 @@ module test_HSL() {
h<=300? [x,0,c] :
[c,0,x]
);
assert_approx(HSL(h,s,l), rgb, str_format("h={}, s={}, l={}", [h,s,l]));
assert_approx(HSL(h,s,l), rgb, format("h={}, s={}, l={}", [h,s,l]));
}
}
}
@ -39,7 +39,7 @@ module test_HSV() {
h<=300? [x,0,c] :
[c,0,x]
);
assert_approx(HSV(h,s,v), rgb, str_format("h={}, s={}, v={}", [h,s,v]));
assert_approx(HSV(h,s,v), rgb, format("h={}, s={}, v={}", [h,s,v]));
}
}
}

214
tests/test_strings.scad
View file

@ -46,50 +46,50 @@ module test_ends_with() {
test_ends_with();
module test_fmt_int() {
assert(fmt_int(0,6) == "000000");
assert(fmt_int(3,6) == "000003");
assert(fmt_int(98765,6) == "098765");
assert(fmt_int(-3,6) == "-000003");
assert(fmt_int(-98765,6) == "-098765");
module test_format_int() {
assert(format_int(0,6) == "000000");
assert(format_int(3,6) == "000003");
assert(format_int(98765,6) == "098765");
assert(format_int(-3,6) == "-000003");
assert(format_int(-98765,6) == "-098765");
}
test_fmt_int();
test_format_int();
module test_fmt_fixed() {
assert(fmt_fixed(-PI*100,8) == "-314.15926536");
assert(fmt_fixed(-PI,8) == "-3.14159265");
assert(fmt_fixed(-3,8) == "-3.00000000");
assert(fmt_fixed(3,8) == "3.00000000");
assert(fmt_fixed(PI*100,8) == "314.15926536");
assert(fmt_fixed(PI,8) == "3.14159265");
assert(fmt_fixed(0,8) == "0.00000000");
assert(fmt_fixed(-PI*100,3) == "-314.159");
assert(fmt_fixed(-PI,3) == "-3.142");
assert(fmt_fixed(-3,3) == "-3.000");
assert(fmt_fixed(3,3) == "3.000");
assert(fmt_fixed(PI*100,3) == "314.159");
assert(fmt_fixed(PI,3) == "3.142");
module test_format_fixed() {
assert(format_fixed(-PI*100,8) == "-314.15926536");
assert(format_fixed(-PI,8) == "-3.14159265");
assert(format_fixed(-3,8) == "-3.00000000");
assert(format_fixed(3,8) == "3.00000000");
assert(format_fixed(PI*100,8) == "314.15926536");
assert(format_fixed(PI,8) == "3.14159265");
assert(format_fixed(0,8) == "0.00000000");
assert(format_fixed(-PI*100,3) == "-314.159");
assert(format_fixed(-PI,3) == "-3.142");
assert(format_fixed(-3,3) == "-3.000");
assert(format_fixed(3,3) == "3.000");
assert(format_fixed(PI*100,3) == "314.159");
assert(format_fixed(PI,3) == "3.142");
}
test_fmt_fixed();
test_format_fixed();
module test_fmt_float() {
assert(fmt_float(-PI*100,8) == "-314.15927");
assert(fmt_float(-PI,8) == "-3.1415927");
assert(fmt_float(-3,8) == "-3");
assert(fmt_float(3,8) == "3");
assert(fmt_float(PI*100,8) == "314.15927");
assert(fmt_float(PI,8) == "3.1415927");
assert(fmt_float(0,8) == "0");
assert(fmt_float(-PI*100,3) == "-314");
assert(fmt_float(-PI,3) == "-3.14");
assert(fmt_float(-3,3) == "-3");
assert(fmt_float(3,3) == "3");
assert(fmt_float(PI*100,3) == "314");
assert(fmt_float(PI,3) == "3.14");
module test_format_float() {
assert(format_float(-PI*100,8) == "-314.15927");
assert(format_float(-PI,8) == "-3.1415927");
assert(format_float(-3,8) == "-3");
assert(format_float(3,8) == "3");
assert(format_float(PI*100,8) == "314.15927");
assert(format_float(PI,8) == "3.1415927");
assert(format_float(0,8) == "0");
assert(format_float(-PI*100,3) == "-314");
assert(format_float(-PI,3) == "-3.14");
assert(format_float(-3,3) == "-3");
assert(format_float(3,3) == "3");
assert(format_float(PI*100,3) == "314");
assert(format_float(PI,3) == "3.14");
}
test_fmt_float();
test_format_float();
module test_is_digit() {
@ -173,78 +173,78 @@ module test_is_upper() {
test_is_upper();
module test_str_float() {
assert(str_float("3.1416") == 3.1416);
assert(str_float("-3.1416") == -3.1416);
assert(str_float("3.000") == 3.0);
assert(str_float("-3.000") == -3.0);
assert(str_float("3") == 3.0);
assert(str_float("0") == 0.0);
module test_parse_float() {
assert(parse_float("3.1416") == 3.1416);
assert(parse_float("-3.1416") == -3.1416);
assert(parse_float("3.000") == 3.0);
assert(parse_float("-3.000") == -3.0);
assert(parse_float("3") == 3.0);
assert(parse_float("0") == 0.0);
}
test_str_float();
test_parse_float();
module test_str_frac() {
assert(str_frac("") == 0);
assert(str_frac("1/2") == 1/2);
assert(str_frac("+1/2") == 1/2);
assert(str_frac("-1/2") == -1/2);
assert(str_frac("7/8") == 7/8);
assert(str_frac("+7/8") == 7/8);
assert(str_frac("-7/8") == -7/8);
assert(str_frac("1 1/2") == 1 + 1/2);
assert(str_frac("+1 1/2") == 1 + 1/2);
assert(str_frac("-1 1/2") == -(1 + 1/2));
assert(str_frac("768 3/4") == 768 + 3/4);
assert(str_frac("+768 3/4") == 768 + 3/4);
assert(str_frac("-768 3/4") == -(768 + 3/4));
assert(str_frac("19") == 19);
assert(str_frac("+19") == 19);
assert(str_frac("-19") == -19);
assert(str_frac("3/0") == INF);
assert(str_frac("-3/0") == -INF);
assert(is_nan(str_frac("0/0")));
module test_parse_frac() {
assert(parse_frac("") == 0);
assert(parse_frac("1/2") == 1/2);
assert(parse_frac("+1/2") == 1/2);
assert(parse_frac("-1/2") == -1/2);
assert(parse_frac("7/8") == 7/8);
assert(parse_frac("+7/8") == 7/8);
assert(parse_frac("-7/8") == -7/8);
assert(parse_frac("1 1/2") == 1 + 1/2);
assert(parse_frac("+1 1/2") == 1 + 1/2);
assert(parse_frac("-1 1/2") == -(1 + 1/2));
assert(parse_frac("768 3/4") == 768 + 3/4);
assert(parse_frac("+768 3/4") == 768 + 3/4);
assert(parse_frac("-768 3/4") == -(768 + 3/4));
assert(parse_frac("19") == 19);
assert(parse_frac("+19") == 19);
assert(parse_frac("-19") == -19);
assert(parse_frac("3/0") == INF);
assert(parse_frac("-3/0") == -INF);
assert(is_nan(parse_frac("0/0")));
}
test_str_frac();
test_parse_frac();
module test_str_num() {
assert(str_num("") == 0);
assert(str_num("1/2") == 1/2);
assert(str_num("+1/2") == 1/2);
assert(str_num("-1/2") == -1/2);
assert(str_num("7/8") == 7/8);
assert(str_num("+7/8") == 7/8);
assert(str_num("-7/8") == -7/8);
assert(str_num("1 1/2") == 1 + 1/2);
assert(str_num("+1 1/2") == 1 + 1/2);
assert(str_num("-1 1/2") == -(1 + 1/2));
assert(str_num("768 3/4") == 768 + 3/4);
assert(str_num("+768 3/4") == 768 + 3/4);
assert(str_num("-768 3/4") == -(768 + 3/4));
assert(str_num("19") == 19);
assert(str_num("+19") == 19);
assert(str_num("-19") == -19);
assert(str_num("3/0") == INF);
assert(str_num("-3/0") == -INF);
assert(str_num("3.14159") == 3.14159);
assert(str_num("-3.14159") == -3.14159);
assert(is_nan(str_num("0/0")));
module test_parse_num() {
assert(parse_num("") == 0);
assert(parse_num("1/2") == 1/2);
assert(parse_num("+1/2") == 1/2);
assert(parse_num("-1/2") == -1/2);
assert(parse_num("7/8") == 7/8);
assert(parse_num("+7/8") == 7/8);
assert(parse_num("-7/8") == -7/8);
assert(parse_num("1 1/2") == 1 + 1/2);
assert(parse_num("+1 1/2") == 1 + 1/2);
assert(parse_num("-1 1/2") == -(1 + 1/2));
assert(parse_num("768 3/4") == 768 + 3/4);
assert(parse_num("+768 3/4") == 768 + 3/4);
assert(parse_num("-768 3/4") == -(768 + 3/4));
assert(parse_num("19") == 19);
assert(parse_num("+19") == 19);
assert(parse_num("-19") == -19);
assert(parse_num("3/0") == INF);
assert(parse_num("-3/0") == -INF);
assert(parse_num("3.14159") == 3.14159);
assert(parse_num("-3.14159") == -3.14159);
assert(is_nan(parse_num("0/0")));
}
test_str_num();
test_parse_num();
module test_str_int() {
assert(str_int("0") == 0);
assert(str_int("3") == 3);
assert(str_int("7655") == 7655);
assert(str_int("+3") == 3);
assert(str_int("+7655") == 7655);
assert(str_int("-3") == -3);
assert(str_int("-7655") == -7655);
assert(str_int("ffff",16) == 65535);
module test_parse_int() {
assert(parse_int("0") == 0);
assert(parse_int("3") == 3);
assert(parse_int("7655") == 7655);
assert(parse_int("+3") == 3);
assert(parse_int("+7655") == 7655);
assert(parse_int("-3") == -3);
assert(parse_int("-7655") == -7655);
assert(parse_int("ffff",16) == 65535);
}
test_str_int();
test_parse_int();
module test_str_join() {
@ -342,15 +342,15 @@ module test_str_find() {
test_str_find();
module test_str_format() {
assert(str_format("The value of {} is {:.14f}.", ["pi", PI]) == "The value of pi is 3.14159265358979.");
assert(str_format("The value {1:f} is known as {0}.", ["pi", PI]) == "The value 3.141593 is known as pi.");
assert(str_format("We use a very small value {1:.6g} as {0}.", ["EPSILON", EPSILON]) == "We use a very small value 1e-9 as EPSILON.");
assert(str_format("{:-5s}{:i}{:b}", ["foo", 12e3, 5]) == "foo 12000true");
assert(str_format("{:-10s}{:.3f}", ["plecostamus",27.43982]) == "plecostamus27.440");
assert(str_format("{:-10.9s}{:.3f}", ["plecostamus",27.43982]) == "plecostam 27.440");
module test_format() {
assert(format("The value of {} is {:.14f}.", ["pi", PI]) == "The value of pi is 3.14159265358979.");
assert(format("The value {1:f} is known as {0}.", ["pi", PI]) == "The value 3.141593 is known as pi.");
assert(format("We use a very small value {1:.6g} as {0}.", ["EPSILON", EPSILON]) == "We use a very small value 1e-9 as EPSILON.");
assert(format("{:-5s}{:i}{:b}", ["foo", 12e3, 5]) == "foo 12000true");
assert(format("{:-10s}{:.3f}", ["plecostamus",27.43982]) == "plecostamus27.440");
assert(format("{:-10.9s}{:.3f}", ["plecostamus",27.43982]) == "plecostam 27.440");
}
test_str_format();
test_format();
/*

4
utility.scad
View file

@ -584,8 +584,8 @@ module no_module() {
function _valstr(x) =
is_string(x)? str("\"",str_replace_char(x, "\"", "\\\""),"\"") :
is_list(x)? str("[",str_join([for (xx=x) _valstr(xx)],","),"]") :
is_num(x) && x==floor(x)? fmt_int(x) :
is_finite(x)? fmt_float(x,12) : x;
is_num(x) && x==floor(x)? format_int(x) :
is_finite(x)? format_float(x,12) : x;
// Module: assert_approx()