mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
e072e7c170
Depending on the OS, the heredoc.sh regression tests, and possibly others, still crashed with the -x option (xtrace) on. Analysis: The lexer crashes in lex_advance(). Something has caused an inconsistent lexer state, and it happened earlier on, so the backtrace is useless for figuring out where that happened. But I think I've found it. It's the sh_mactry() call here: src/cmd/ksh93/sh/xec.c, lines 2800 to 2807 inf7213f032800: if(!(cp=nv_getval(sh_scoped(shp,PS4NOD)))) 2801: cp = "+ "; 2802: else 2803: { 2804: sh_offoption(SH_XTRACE); 2805: cp = sh_mactry(shp,cp); 2806: sh_onoption(SH_XTRACE); 2807: } sh_mactry() needs to parse the contents of $PS4 to perform expansions and command substitutions in it, which involves the lexer. If that happens in a here-document, the lexer is in the C function call stack, in the middle of parsing the here-document. Result: inconsistent lexer state. Solution: save and restore lexer state in sh_mactry(). After this commit, all regression tests should pass with the '-x'/'--xtrace' option in use, with no errors or crashes. Note for backporters: this fix depends both on ond7cada7band on the consistency fix for the Lex_t type's size applied in a7ed5d9f. src/cmd/ksh93/include/shlex.h: - Cosmetic fix: remove a copied & pasted backslash. (re: a7ed5d9f) src/cmd/ksh93/sh/macro.c: sh_mactry(): - Save and restore the lexer state before letting sh_mactrim() indirectly parse and execute code. src/cmd/ksh93/tests/*.sh: - Turn off xtrace in various command substitutions that contain 2>&1 redirections, so that the xtrace output is not caught by the command substitutions, causing tests to fail incorrectly. - Turn off xtrace for a few code blocks with 2>&1 redirections, stopping xtrace output from being written to standard output. Resolves: https://github.com/ksh93/ksh/issues/306 (again)
165 lines
7.9 KiB
Bash
Executable file
165 lines
7.9 KiB
Bash
Executable file
########################################################################
|
|
# #
|
|
# This software is part of the ast package #
|
|
# Copyright (c) 1982-2012 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> #
|
|
# #
|
|
########################################################################
|
|
|
|
. "${SHTESTS_COMMON:-${0%/*}/_common}"
|
|
|
|
enum Color_t=(red green blue orange yellow)
|
|
enum -i Bool_t=(False True)
|
|
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
|
|
Bool_t x
|
|
[[ $x == False ]] || err_exit 'Bool_t not defaulting to False'
|
|
x=true
|
|
[[ $x == True ]] || err_exit 'Bool_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 enumeration 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'
|
|
|
|
# ======
|
|
# Various fixed bugs with associative and indexed arrays of a type created by 'enum'
|
|
# https://github.com/ksh93/ksh/issues/87
|
|
|
|
# values not specified by the enum type should be blocked
|
|
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")"
|
|
|
|
# associative enum array
|
|
Color_t -A Colors=([foo]=red [bar]=blue [bad]=green [zut]=orange [blauw]=blue [rood]=red [groen]=green [geel]=yellow)
|
|
exp='green blue blue red yellow green red orange'
|
|
got=${Colors[@]}
|
|
[[ $got == "$exp" ]] || err_exit "\${array[@]} doesn't yield all values for associative enum arrays" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
exp='Color_t -A Colors=([bad]=green [bar]=blue [blauw]=blue [foo]=red [geel]=yellow [groen]=green [rood]=red [zut]=orange)'
|
|
got=$(typeset -p Colors)
|
|
[[ $got == "$exp" ]] || err_exit "'typeset -p' doesn't yield all values for associative enum arrays" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
unset Colors
|
|
got=$(typeset -p Colors)
|
|
[[ -n $got ]] && err_exit "unsetting associative enum array does not work (got $(printf %q "$got"))"
|
|
|
|
# indexed enum array
|
|
Color_t -a iColors=(red blue green orange blue red green yellow)
|
|
exp='red blue green orange blue red green yellow'
|
|
got=${iColors[@]}
|
|
[[ $got == "$exp" ]] || err_exit "\${array[@]} doesn't yield all values for indexed enum arrays" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
exp='Color_t -a iColors=(red blue green orange blue red green yellow)'
|
|
got=$(typeset -p iColors)
|
|
[[ $got == "$exp" ]] || err_exit "'typeset -p' doesn't yield all values for indexed enum arrays" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
unset iColors
|
|
got=$(typeset -p iColors)
|
|
[[ -n $got ]] && err_exit "unsetting indexed enum array does not work (got $(printf %q "$got"))"
|
|
|
|
# assigning the first enum type element should work
|
|
Color_t -a testarray
|
|
testarray[3]=red
|
|
exp="red red"
|
|
got="${testarray[3]:-BUG} ${testarray[@]:-BUG}"
|
|
[[ $got == "$exp" ]] || err_exit "assigning first enum element to indexed array failed" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
|
|
# ======
|
|
# https://github.com/ksh93/ksh/issues/256
|
|
cmd='enum Color_t=(red green blue); Color_t -A Colors=([rubie]=red [verde]=green [blau]=blue); typeset -p Colors'
|
|
exp='Color_t -A Colors=([blau]=blue [rubie]=red [verde]=green)'
|
|
got=$("$SHELL" -c "$cmd" 2>&1)
|
|
[[ $got == "$exp" ]] || err_exit "-c failed" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
got=$("$SHELL" -c "eval '$cmd'" 2>&1)
|
|
[[ $got == "$exp" ]] || err_exit "-c script with eval failed" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
print "$cmd" >cmd.sh
|
|
got=$("$SHELL" -c '. ./cmd.sh' 2>&1)
|
|
[[ $got == "$exp" ]] || err_exit "dotted script failed" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
got=$("$SHELL" -c 'source ./cmd.sh' 2>&1)
|
|
[[ $got == "$exp" ]] || err_exit "sourced script failed" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
|
|
# ======
|
|
# https://github.com/ksh93/ksh/issues/335
|
|
unset a
|
|
Color_t a
|
|
|
|
let "a=5" 2>/dev/null && err_exit "arithmetic can assign out of range (positive)"
|
|
let "a=-1" 2>/dev/null && err_exit "arithmetic can assign out of range (negative)"
|
|
a=yellow; let "a++" 2>/dev/null && err_exit "arithmetic can assign out of range (increment)"
|
|
a=red; let "a--" 2>/dev/null && err_exit "arithmetic can assign out of range (decrement)"
|
|
a=orange; let "a+=2" 2>/dev/null && err_exit "arithmetic can assign out of range (add)"
|
|
a=green; let "a-=2" 2>/dev/null && err_exit "arithmetic can assign out of range (subtract)"
|
|
a=blue; let "a*=3" 2>/dev/null && err_exit "arithmetic can assign out of range (multiply)"
|
|
|
|
# ======
|
|
# Enum types should parse with 'command' prefix(es) and options and instantly
|
|
# recognise subsequent builtins it creates, even as a oneliner, even with
|
|
# shcomp. (This requires an ugly parser hack that this tests for.)
|
|
got=$(set +x; eval 2>&1 'command command command enum -i -i -iii --igno -ii PARSER_t=(r g b); '\
|
|
'command command PARSER_t -r -rrAAA -A -rArArA -Arrrrrrr hack=([C]=G); typeset -p hack')
|
|
exp='PARSER_t -r -A hack=([C]=g)'
|
|
[[ $got == "$exp" ]] || err_exit "incorrect typeset output for enum with command prefix and options" \
|
|
"(expected $(printf %q "$exp"); got $(printf %q "$got"))"
|
|
PATH=/dev/null command -v PARSER_t >/dev/null && err_exit "PARSER_t leaked out of subshell"
|
|
if false
|
|
then enum PARSER2_t=(a b)
|
|
fi
|
|
PATH=/dev/null command -v PARSER2_t >/dev/null && err_exit "PARSER2_t incompletely defined though definition was never executed"
|
|
|
|
# ======
|
|
exit $((Errors<125?Errors:125))
|