mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-24 23:14:14 +00:00
5491fe9724
This fixes part of https://github.com/ksh93/ksh/issues/87: Scalar arrays (-a) and associative arrays (-A) of a type created by 'enum' did not consistently block values not specified by the enum type, yielding corrupted results. An expansion of type "${array[@]}" yielded random numbers instead of values for associative arrays of a type created by 'enum'. This does not yet fix another problem: ${array[@]} does not yield all values for associative enum arrays. src/cmd/ksh93/bltins/enum.c: put_enum(): - Always throw an error if the value is not in the list of possible values for an enum type. Remove incorrect check for the NV_NOFREE flag. Whatever that was meant to accomplish, I've no idea. src/cmd/ksh93/sh/array.c: nv_arraysettype(): - Instead of sh_eval()ing a shell assignment, use nv_putval() directly. Also use the stack (see src/lib/libast/man/stk.3) instead of malloc to save the value; it's faster and will be auto-freed at some point. This shortens the function and makes it faster by not entering into a whole new shell context -- which also fixes another problem: the error message from put_enum() didn't cause the shell to exit for indexed enum arrays. src/cmd/ksh93/sh/name.c: nv_setlist(): - Apply a patch from David Korn that correctly sets the data type for associative arrays, fixing the ${array[@]} expansion yielding random numbers. Thanks to @JohnoKing for the pointer. https://github.com/ksh93/ksh/issues/87#issuecomment-662613887 https://www.mail-archive.com/ast-developers@lists.research.att.com/msg00697.html src/cmd/ksh93/tests/enum.sh: - Add tests checking that invalid values are correctly blocked for indexed and associative arrays of an enum type. Makes progress on: https://github.com/ksh93/ksh/issues/87
89 lines
3.8 KiB
Bash
Executable file
89 lines
3.8 KiB
Bash
Executable file
########################################################################
|
|
# #
|
|
# This software is part of the ast package #
|
|
# Copyright (c) 1982-2012 AT&T Intellectual Property #
|
|
# 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> #
|
|
# #
|
|
########################################################################
|
|
function err_exit
|
|
{
|
|
print -u2 -n "\t"
|
|
print -u2 -r ${Command}[$1]: "${@:2}"
|
|
(( Errors+=1 ))
|
|
}
|
|
alias err_exit='err_exit $LINENO'
|
|
|
|
Command=${0##*/}
|
|
integer Errors=0
|
|
|
|
[[ -d $tmp && -w $tmp && $tmp == "$PWD" ]] || { err\_exit "$LINENO" '$tmp not set; run this from shtests. Aborting.'; exit 1; }
|
|
|
|
enum Color_t=(red green blue orange yellow)
|
|
enum -i Sex_t=(Male Female)
|
|
for ((i=0; i < 1000; i++))
|
|
do
|
|
Color_t x
|
|
[[ $x == red ]] || err_exit 'Color_t does not default to red'
|
|
x=orange
|
|
[[ $x == orange ]] || err_exit '$x should be orange'
|
|
( x=violet) 2> /dev/null && err_exit 'x=violet should fail'
|
|
x[2]=green
|
|
[[ ${x[2]} == green ]] || err_exit '${x[2]} should be green'
|
|
(( x[2] == 1 )) || err_exit '((x[2]!=1))'
|
|
[[ $((x[2])) == 1 ]] || err_exit '$((x[2]))!=1'
|
|
[[ $x == orange ]] || err_exit '$x is no longer orange'
|
|
Color_t -A y
|
|
y[foo]=yellow
|
|
[[ ${y[foo]} == yellow ]] || err_exit '${y[foo]} != yellow'
|
|
(( y[foo] == 4 )) || err_exit '(( y[foo] != 4))'
|
|
unset y
|
|
typeset -a [Color_t] z
|
|
z[green]=xyz
|
|
[[ ${z[green]} == xyz ]] || err_exit '${z[green]} should be xyz'
|
|
[[ ${z[1]} == xyz ]] || err_exit '${z[1]} should be xyz'
|
|
z[orange]=bam
|
|
[[ ${!z[@]} == 'green orange' ]] || err_exit '${!z[@]} == "green orange"'
|
|
unset x
|
|
Sex_t x
|
|
[[ $x == Male ]] || err_exit 'Sex_t not defaulting to Male'
|
|
x=female
|
|
[[ $x == Female ]] || err_exit 'Sex_t not case sensitive'
|
|
unset x y z
|
|
done
|
|
(
|
|
typeset -T X_t=( typeset name=aha )
|
|
typeset -a[X_t] arr
|
|
) 2> /dev/null
|
|
[[ $? == 1 ]] || err_exit 'typeset -a[X_t] should generate an error message when X-t is not an enumeriation type'
|
|
|
|
typeset -a [Color_t] arr
|
|
arr[green]=foo
|
|
[[ ${arr[1]} == ${arr[green]} ]] || err_exit 'arr[1] != arr[green]'
|
|
read -A arr <<< 'x y z xx yy'
|
|
[[ ${arr[1]} == ${arr[green]} ]] || err_exit 'arr[1] != arr[green] after read'
|
|
|
|
# enum arrays didn't block unspecified values
|
|
# https://github.com/ksh93/ksh/issues/87
|
|
exp=': Color_t: clr[2]: invalid value WRONG'
|
|
got=$(set +x; redirect 2>&1; Color_t -a clr=(red blue WRONG yellow); printf '%s\n' "${clr[@]}")
|
|
(((e = $?) == 1)) && [[ $got == *"$exp" ]] || err_exit "indexed enum array, unspecified value:" \
|
|
"expected status 1, *$(printf %q "$exp"); got status $e, $(printf %q "$got")"
|
|
exp=': clr: invalid value BAD'
|
|
got=$(set +x; redirect 2>&1; Color_t -A clr=([foo]=red [bar]=blue [bad]=BAD); printf '%s\n' "${clr[@]}")
|
|
(((e = $?) == 1)) && [[ $got == *"$exp" ]] || err_exit "associative enum array, unspecified value:" \
|
|
"expected status 1, *$(printf %q "$exp"); got status $e, $(printf %q "$got")"
|
|
|
|
# ======
|
|
exit $((Errors<125?Errors:125))
|