external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Revert "Fix defining types conditionally and/or in subshells (re: 8ced1daa)"

Browse source 
This reverts commit 2b9cbbbc8e.

This is not ready for prime time. Crashses when running a $PS2
discipline function. This needs fixing and more testing in
development before making it into the 1.0 branch. In the meantime,
that terrible problem with types is back, sorry about that.
This commit is contained in:
Martijn Dekker 2021-11-29 20:08:53 +01:00
parent 2b9cbbbc8e
commit f508660ddf
10 changed files with 18 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/ksh93/tests/enum.sh
View file

@ -155,11 +155,6 @@ got=$(eval 2>&1 'command command command enum -i -i -iii --igno -ii PARSER_t=(r
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))

24
src/cmd/ksh93/tests/types.sh
View file

@ -452,24 +452,20 @@ cd "$tmp"
FPATH=$PWD
PATH=$PWD:$PATH
cat > A_t <<- \EOF
if false
then typeset -T Parser_shenanigans=(typeset -i foo)
fi
typeset -T A_t=(
B_t b
)
EOF
cat > B_t <<- \EOF
PATH=/dev/null command -v Parser_shenanigans
typeset -T B_t=(
integer n=5
)
EOF
unset n
if n=$(FPATH=$PWD PATH=$PWD:$PATH "$SHELL" -c 'A_t a; print ${a.b.n}' 2>&1)
then [[ $n == '5' ]] || err_exit "dynamic loading of types gives wrong result (got $(printf %q "$n"))"
else err_exit "unable to load types dynamically (got $(printf %q "$n"))"
if n=$(FPATH=$PWD PATH=$PWD:$PATH $SHELL 2> /dev/null -c 'A_t a; print ${a.b.n}')
then (( n==5 )) || err_exit 'dynamic loading of types gives wrong result'
else err_exit 'unable to load types dynamically'
fi
# check that typeset -T reproduces a type.
@ -643,19 +639,5 @@ got=$($SHELL -c 'enum Foo_t=(foo bar); typeset -T')
[[ -z $got ]] || err_exit "Types created by enum are listed with 'typeset -T'" \
"(got $(printf %q "$got"))"
# ======
# Parser shenanigans.
if false
then typeset -T PARSER_t=(typeset name=foobar)
fi
PATH=/dev/null command -v PARSER_t >/dev/null && err_exit "PARSER_t incompletely defined though definition was never executed"
unset v
got=$( set +x; redirect 2>&1; typeset -T Subsh_t=(typeset -i x); Subsh_t -a v=( (x=1) (x=2) (x=3) ); typeset -p v )
exp='Subsh_t -a v=((typeset -i x=1) (typeset -i x=2) (typeset -i x=3))'
[[ $got == "$exp" ]] || err_exit "bad typeset output for Subsh_t" \
"(expected $(printf %q "$exp"), got $(printf %q "$got"))"
PATH=/dev/null command -v Subsh_t >/dev/null && err_exit "Subsh_t leaked out of subshell"
# ======
exit $((Errors<125?Errors:125))