mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Back port ksh93v- float, int, and exp10 changes from math.tab (#299)
src/cmd/ksh93/data/math.tab: - Added exp10(). - Remove int() as being an alias to floor(). - Created entries for local float() and local int() which are defined in features/math.sh. src/cmd/ksh93/features/math.sh: - Backport floor() and int() related code from ksh93v-. src/cmd/ksh93/sh.1: - Sync man page to math.tab's potential functions.
This commit is contained in:
hyenias
GitHub
parent
6b3805724d
commit
92f7ca5423
7 changed files with 84 additions and 9 deletions
7
NEWS
7
NEWS
|
|
@ -3,6 +3,13 @@ For full details, see the git log at: https://github.com/ksh93/ksh
|
|||
|
||||
Any uppercase BUG_* names are modernish shell bug IDs.
|
||||
|
||||
2021-05-07:
|
||||
|
||||
- Backported three ksh 93v- math.tab changes, allowing for an exp10()
|
||||
arithmetic function if one exists in the C library, a new float()
|
||||
function, and lastly an updated int() function that rounds to zero
|
||||
instead of being an alias to floor().
|
||||
|
||||
2021-05-05:
|
||||
|
||||
- Fixed: a preceding variable assignment like foo=bar in 'foo=bar command'
|
||||
|
|
|
|||
|
|
@ -138,6 +138,10 @@ For more details, see the NEWS file and for complete details, see the git log.
|
|||
$RANDOM sequence in the parent environment. In addition, upon
|
||||
invoking a subshell, $RANDOM is now reseeded (as mksh and bash do).
|
||||
|
||||
26. The built-in arithmetic function int() has changed to round towards
|
||||
zero instead of negative infinity. Previously, int() was an alias to
|
||||
floor(), but now it behaves like trunc().
|
||||
|
||||
____________________________________________________________________________
|
||||
|
||||
KSH-93 VS. KSH-88
|
||||
|
|
|
|||
|
|
@ -1,6 +1,27 @@
|
|||
########################################################################
|
||||
# #
|
||||
# This software is part of the ast package #
|
||||
# Copyright (c) 1982-2013 AT&T Intellectual Property #
|
||||
# Copyright (c) 2020-2021 Contributors to ksh 93u+m #
|
||||
# and is licensed under the #
|
||||
# Eclipse Public License, Version 1.0 #
|
||||
# by AT&T Intellectual Property #
|
||||
# #
|
||||
# A copy of the License is available at #
|
||||
# http://www.eclipse.org/org/documents/epl-v10.html #
|
||||
# (with md5 checksum b35adb5213ca9657e911e9befb180842) #
|
||||
# #
|
||||
# Information and Software Systems Research #
|
||||
# AT&T Research #
|
||||
# Florham Park NJ #
|
||||
# #
|
||||
# David Korn <dgk@research.att.com> #
|
||||
# #
|
||||
########################################################################
|
||||
|
||||
# <return type: i:integer f:floating-point> <#floating-point-args> <function-name> [<alias> ...]
|
||||
# <function-name>l variants are handled by features/math.sh
|
||||
# @(#)math.tab (AT&T Research) 2010-10-26
|
||||
# @(#)math.tab (AT&T Research) 2013-08-11
|
||||
f 1 acos
|
||||
f 1 acosh
|
||||
f 1 asin
|
||||
|
|
@ -17,11 +38,13 @@ f 1 erf
|
|||
f 1 erfc
|
||||
f 1 exp
|
||||
f 1 exp2
|
||||
f 1 exp10
|
||||
f 1 expm1
|
||||
f 1 fabs abs
|
||||
f 2 fdim
|
||||
f 1 finite
|
||||
f 1 floor int
|
||||
f 1 float
|
||||
f 1 floor
|
||||
f 3 fma
|
||||
f 2 fmax
|
||||
f 2 fmin
|
||||
|
|
@ -30,6 +53,7 @@ i 1 fpclassify
|
|||
i 1 fpclass
|
||||
f 2 hypot
|
||||
i 1 ilogb
|
||||
f 1 int
|
||||
i 1 isfinite
|
||||
i 2 isgreater
|
||||
i 2 isgreaterequal
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
########################################################################
|
||||
# #
|
||||
# This software is part of the ast package #
|
||||
# Copyright (c) 1982-2012 AT&T Intellectual Property #
|
||||
# Copyright (c) 1982-2013 AT&T Intellectual Property #
|
||||
# Copyright (c) 2020-2021 Contributors to ksh 93u+m #
|
||||
# and is licensed under the #
|
||||
# Eclipse Public License, Version 1.0 #
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
: generate the ksh math builtin table
|
||||
: include math.tab
|
||||
|
||||
# @(#)math.sh (AT&T Research) 2012-06-13
|
||||
# @(#)math.sh (AT&T Research) 2013-08-11
|
||||
|
||||
case $ZSH_VERSION in
|
||||
?*) emulate ksh ;;
|
||||
|
|
@ -164,6 +164,10 @@ do eval x='$'_lib_${name}l y='$'_lib_${name} r='$'TYPE_${name} a='$'ARGS_${name}
|
|||
x) L=Sfdouble_t R=4 ;;
|
||||
*) L=Sfdouble_t R=0 ;;
|
||||
esac
|
||||
# some identifiers can't be functions in C but can in ksh #
|
||||
case $name in
|
||||
float|int) x=0 y=1 ;;
|
||||
esac
|
||||
F=local_$name
|
||||
case $x:$y in
|
||||
1:*) f=${name}l
|
||||
|
|
@ -172,7 +176,10 @@ do eval x='$'_lib_${name}l y='$'_lib_${name} r='$'TYPE_${name} a='$'ARGS_${name}
|
|||
;;
|
||||
*:1) f=${name}
|
||||
t=double
|
||||
local=$_typ_long_double
|
||||
case $name in
|
||||
float|int) local=1 ;;
|
||||
*) local=$_typ_long_double ;;
|
||||
esac
|
||||
;;
|
||||
*) body=
|
||||
for k in $aka
|
||||
|
|
@ -298,7 +305,15 @@ do eval x='$'_lib_${name}l y='$'_lib_${name} r='$'TYPE_${name} a='$'ARGS_${name}
|
|||
esac
|
||||
sep=","
|
||||
done
|
||||
code="$code){return $f($args);}"
|
||||
code="$code)"
|
||||
|
||||
# catch functions not in the math lib here #
|
||||
|
||||
case $f in
|
||||
float) code="$code{return $args;}" ;;
|
||||
int) code="$code{return ($args < LDBL_LLONG_MIN || $args > LDBL_ULLONG_MAX) ? (Sfdouble_t)0 : ($args < 0) ? (Sfdouble_t)((Sflong_t)$args) : (Sfdouble_t)((Sfulong_t)$args);}" ;;
|
||||
*) code="$code{return $f($args);}" ;;
|
||||
esac
|
||||
echo "$code"
|
||||
f=local_$f
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#define SH_RELEASE_FORK "93u+m" /* only change if you develop a new ksh93 fork */
|
||||
#define SH_RELEASE_SVER "1.0.0-alpha" /* semantic version number: https://semver.org */
|
||||
#define SH_RELEASE_DATE "2021-05-05" /* must be in this format for $((.sh.version)) */
|
||||
#define SH_RELEASE_DATE "2021-05-07" /* must be in this format for $((.sh.version)) */
|
||||
#define SH_RELEASE_CPYR "(c) 2020-2021 Contributors to ksh " SH_RELEASE_FORK
|
||||
|
||||
/* Scripts sometimes field-split ${.sh.version}, so don't change amount of whitespace. */
|
||||
|
|
|
|||
|
|
@ -2973,8 +2973,8 @@ can be used within an arithmetic expression:
|
|||
.PP
|
||||
.if t .RS
|
||||
.B
|
||||
.if n abs acos acosh asin asinh atan atan2 atanh cbrt ceil copysign cos cosh erf erfc exp exp2 expm1 fabs fpclassify fdim finite floor fma fmax fmin fmod hypot ilogb int isfinite sinf isnan isnormal issubnormal issubordered iszero j0 j1 jn lgamma log log10 log2 logb nearbyint nextafter nexttoward pow remainder rint round scanb signbit sin sinh sqrt tan tanh tgamma trunc y0 y1 yn
|
||||
.if t abs acos acosh asin asinh atan atan2 atanh cbrt ceil copysign cos cosh erf erfc exp exp2 expm1 fabs fpclassify fdim finite floor fma fmax fmod j0 j1 jn hypot ilogb int isfinite isinf isnan isnormal issubnormal issubordered iszero lgamma log log10 log2 logb nearbyint nextafter nexttoward pow rint round scalb signbit sin sinh sqrt tan tanh tgamma trunc y0 y1 yn
|
||||
.if n abs acos acosh asin asinh atan atan2 atanh cbrt ceil copysign cos cosh erf erfc exp exp10 exp2 expm1 fabs fdim finite float floor fma fmax fmin fmod fpclass fpclassify hypot ilogb int isfinite isgreater isgreaterequal isinf isinfinite isless islessequal islessgreater isnan isnormal issubnormal isunordered iszero j0 j1 jn ldexp lgamma log log10 log1p log2 logb nearbyint nextafter nexttoward pow remainder rint round scalb scalbn signbit sin sinh sqrt tan tanh tgamma trunc y0 y1 yn
|
||||
.if t abs acos acosh asin asinh atan atan2 atanh cbrt ceil copysign cos cosh erf erfc exp exp10 exp2 expm1 fabs fdim finite float floor fma fmax fmin fmod fpclass fpclassify hypot ilogb int isfinite isgreater isgreaterequal isinf isinfinite isless islessequal islessgreater isnan isnormal issubnormal isunordered iszero j0 j1 jn ldexp lgamma log log10 log1p log2 logb nearbyint nextafter nexttoward pow remainder rint round scalb scalbn signbit sin sinh sqrt tan tanh tgamma trunc y0 y1 yn
|
||||
.if t .RE
|
||||
|
||||
In addition, arithmetic functions can be defined as shell functions with a
|
||||
|
|
|
|||
|
|
@ -849,5 +849,30 @@ got=$(
|
|||
)
|
||||
[[ $got == *recursion* ]] && err_exit "recursion level not reset on readonly error (subshell)"
|
||||
|
||||
# ======
|
||||
# Some math function tests and only error if function exits
|
||||
unset got
|
||||
got=0
|
||||
if ( (( exp10(3) )) ) 2> /dev/null
|
||||
then
|
||||
(( (got=exp10(3)) == 1000 )) || err_exit "exp10(3) != 1000, got '$got'"
|
||||
fi
|
||||
got=0
|
||||
if ( (( int(6.89) )) ) 2> /dev/null
|
||||
then
|
||||
(( (got=int(6.89)) == 6 )) || err_exit "int(6.89) != 6, got '$got'"
|
||||
fi
|
||||
got=0
|
||||
if ( (( int(-6.89) )) ) 2> /dev/null
|
||||
then
|
||||
(( (got=int(-6.89)) == -6 )) || err_exit "int(-6.89) != -6, got '$got'"
|
||||
fi
|
||||
float got=-1
|
||||
if ( (( float(2./3) )) ) 2> /dev/null
|
||||
then
|
||||
(( (got=float(2./3)) == 2./3 )) || err_exit "float(2./3) != 2./3, got '$got'"
|
||||
fi
|
||||
unset got
|
||||
|
||||
# ======
|
||||
exit $((Errors<125?Errors:125))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue