JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

• fix empty input

Browse Source 
• fix input without trailing newline for integer-base-one-3{A,W}r
This commit is contained in:
tg
2011-06-09 21:53:12 +00:00
parent 1fbd3e5ee0
commit 5aa22cff70
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.464 2011/06/09 21:26:21 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.465 2011/06/09 21:53:12 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -6585,8 +6585,9 @@ stdin:
'\U\V\W\X\Y\Z\[\\\]\^\_\`\a\b \d\e\f\g\h\i\j\k\l\m\n\o\p' \ '\U\V\W\X\Y\Z\[\\\]\^\_\`\a\b \d\e\f\g\h\i\j\k\l\m\n\o\p' \
'\q\r\s\t\u\v\w\x\y\z\{\|\}\~' '\u20acd' '\U20acd' '\x123' \ '\q\r\s\t\u\v\w\x\y\z\{\|\}\~' '\u20acd' '\U20acd' '\x123' \
'\0x' '\0123' '\01234' | { '\0x' '\0123' '\01234' | {
# integer-base-one-3As
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z5 hv typeset -Uui16 -Z5 hv=2147483647
typeset -i1 wc=0x0A typeset -i1 wc=0x0A
dasc= dasc=
nl=${wc#1#} nl=${wc#1#}
@ -6613,7 +6614,7 @@ stdin:
print -n ' ' print -n ' '
(( (pos++ & 15) == 7 )) && print -n -- '- ' (( (pos++ & 15) == 7 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 5C 20 5C 21 5C 22 5C 23 - 5C 24 5C 25 5C 26 5C 27 |\ \!\"\#\$\%\&\'| 00000000 5C 20 5C 21 5C 22 5C 23 - 5C 24 5C 25 5C 26 5C 27 |\ \!\"\#\$\%\&\'|
@ -6657,8 +6658,9 @@ stdin:
$'\u20acd' $'\U20acd' $'\x123' $'fn\x0rd' $'\0234' $'\234' \ $'\u20acd' $'\U20acd' $'\x123' $'fn\x0rd' $'\0234' $'\234' \
$'\2345' $'\ca' $'\c!' $'\c?' $'\c€' $'a\ $'\2345' $'\ca' $'\c!' $'\c?' $'\c€' $'a\
b' | { b' | {
# integer-base-one-3As
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z5 hv typeset -Uui16 -Z5 hv=2147483647
typeset -i1 wc=0x0A typeset -i1 wc=0x0A
dasc= dasc=
nl=${wc#1#} nl=${wc#1#}
@ -6685,7 +6687,7 @@ stdin:
print -n ' ' print -n ' '
(( (pos++ & 15) == 7 )) && print -n -- '- ' (( (pos++ & 15) == 7 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 20 21 22 23 24 25 26 27 - 28 29 2A 2B 2C 2D 2E 2F | !"#$%&'()*+,-./| 00000000 20 21 22 23 24 25 26 27 - 28 29 2A 2B 2C 2D 2E 2F | !"#$%&'()*+,-./|
@ -6925,6 +6927,7 @@ expected-exit: e != 0
name: integer-base-one-3As name: integer-base-one-3As
description: description:
some sample code for hexdumping some sample code for hexdumping
not NUL safe; input lines must be NL terminated
stdin: stdin:
{ {
print 'Hello, World!\\\nこんにちは！' print 'Hello, World!\\\nこんにちは！'
@ -6936,8 +6939,9 @@ stdin:
done done
print '\0z' print '\0z'
} | { } | {
# integer-base-one-3As
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z5 hv typeset -Uui16 -Z5 hv=2147483647
typeset -i1 wc=0x0A typeset -i1 wc=0x0A
dasc= dasc=
nl=${wc#1#} nl=${wc#1#}
@ -6964,7 +6968,7 @@ stdin:
print -n ' ' print -n ' '
(( (pos++ & 15) == 7 )) && print -n -- '- ' (( (pos++ & 15) == 7 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 48 65 6C 6C 6F 2C 20 57 - 6F 72 6C 64 21 5C 0A E3 |Hello, World!\..| 00000000 48 65 6C 6C 6F 2C 20 57 - 6F 72 6C 64 21 5C 0A E3 |Hello, World!\..|
@ -6990,6 +6994,7 @@ expected-stdout:
name: integer-base-one-3Ws name: integer-base-one-3Ws
description: description:
some sample code for hexdumping Unicode some sample code for hexdumping Unicode
not NUL safe; input lines must be NL terminated
stdin: stdin:
set -U set -U
{ {
@ -7009,6 +7014,7 @@ stdin:
print '<27>￾￿' # end of range print '<27>￾￿' # end of range
print '\0z' # embedded NUL print '\0z' # embedded NUL
} | { } | {
# integer-base-one-3Ws
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z7 hv typeset -Uui16 -Z7 hv
typeset -i1 wc=0x0A typeset -i1 wc=0x0A
@ -7047,7 +7053,7 @@ stdin:
print -n ' ' print -n ' '
(( (pos++ & 7) == 3 )) && print -n -- '- ' (( (pos++ & 7) == 3 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 0048 0065 006C 006C - 006F 002C 0020 0057 |Hello, W| 00000000 0048 0065 006C 006C - 006F 002C 0020 0057 |Hello, W|
@ -7091,7 +7097,7 @@ expected-stdout:
--- ---
name: integer-base-one-3Ar name: integer-base-one-3Ar
description: description:
some sample code for hexdumping some sample code for hexdumping; NUL and binary safe
stdin: stdin:
{ {
print 'Hello, World!\\\nこんにちは！' print 'Hello, World!\\\nこんにちは！'
@ -7103,12 +7109,12 @@ stdin:
done done
print '\0z' print '\0z'
} | { } | {
# integer-base-one-3Ar
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z5 hv typeset -Uui16 -Z5 hv=2147483647
dasc= dasc=
while read -ar line; do if read -arN -1 line; then
typeset -i1 line typeset -i1 line
line[${#line[*]}]=10
i=0 i=0
while (( i < ${#line[*]} )); do while (( i < ${#line[*]} )); do
hv=${line[i++]} hv=${line[i++]}
@ -7125,12 +7131,12 @@ stdin:
fi fi
(( (pos++ & 15) == 7 )) && print -n -- '- ' (( (pos++ & 15) == 7 )) && print -n -- '- '
done done
done fi
while (( pos & 15 )); do while (( pos & 15 )); do
print -n ' ' print -n ' '
(( (pos++ & 15) == 7 )) && print -n -- '- ' (( (pos++ & 15) == 7 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 48 65 6C 6C 6F 2C 20 57 - 6F 72 6C 64 21 5C 0A E3 |Hello, World!\..| 00000000 48 65 6C 6C 6F 2C 20 57 - 6F 72 6C 64 21 5C 0A E3 |Hello, World!\..|
@ -7155,7 +7161,7 @@ expected-stdout:
--- ---
name: integer-base-one-3Wr name: integer-base-one-3Wr
description: description:
some sample code for hexdumping Unicode some sample code for hexdumping Unicode; NUL and binary safe
stdin: stdin:
set -U set -U
{ {
@ -7175,12 +7181,12 @@ stdin:
print '<27>￾￿' # end of range print '<27>￾￿' # end of range
print '\0z' # embedded NUL print '\0z' # embedded NUL
} | { } | {
# integer-base-one-3Wr
typeset -Uui16 -Z11 pos=0 typeset -Uui16 -Z11 pos=0
typeset -Uui16 -Z7 hv typeset -Uui16 -Z7 hv=2147483647
dasc= dasc=
while read -ar line; do if read -arN -1 line; then
typeset -i1 line typeset -i1 line
line[${#line[*]}]=10
i=0 i=0
while (( i < ${#line[*]} )); do while (( i < ${#line[*]} )); do
hv=${line[i++]} hv=${line[i++]}
@ -7205,12 +7211,12 @@ stdin:
print -n -- '- ' print -n -- '- '
dasc=$dasc$dch dasc=$dasc$dch
done done
done fi
while (( pos & 7 )); do while (( pos & 7 )); do
print -n ' ' print -n ' '
(( (pos++ & 7) == 3 )) && print -n -- '- ' (( (pos++ & 7) == 3 )) && print -n -- '- '
done done
print "$dasc|" (( hv == 2147483647 )) || print "$dasc|"
} }
expected-stdout: expected-stdout:
00000000 0048 0065 006C 006C - 006F 002C 0020 0057 |Hello, W| 00000000 0048 0065 006C 006C - 006F 002C 0020 0057 |Hello, W|