 @@ -1,14 +1,14 @@
-# $NetBSD: t_here.sh,v 1.8 2021/09/09 00:04:51 kre Exp $
+# $NetBSD: t_here.sh,v 1.9 2021/11/22 05:21:54 kre Exp $
+#
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -505,41 +505,81 @@ quoting_body() {
 	check 'p=AB??; cat <<-EOF
 		${p%B?D}
 		${p%B\??}
 		${p%"B??"}
 		"${p%??}"
 		${p#"${p%??}"}
 		"${p#"${p%?"?"}"}"
 	EOF
 	'	'AB?? A A "AB" ?? "??"'	0
 	results
+}
+#
 # This next test is really just testing what our shell happens to do.
 # There doesn't seem to be any spec on in which context expansions
 # in redirects are processed.   Most shells do them in the parent
 # shell context, meaning that side effects of the expansion become
 # visible to the shell - a couple process redirect expansions in
 # a subshell, meaning that side effects are lost.
+#
 # Before PR bin/53550 was fixed, the NetBSD sh evaluated all redirect
 # expansions, except here documents, in the context of the shell, and
 # here document redirects in a subshell context.   That distinction
 # makes no real sense (and only an old, and maybe still current, FreeBSD
 # shell shares that pecadillo.)   Afer that fix, the NetBSD shell joins
 # almost all others in expanding redirects (all of them) in the shell
 # context, meaning that side effects of here documenty expansions become
 # visible in the shell.
+#
 # Before the fix, we used to get "2\n1\n" as the output from this
 # test, now the variable assignment in the here document persists
 # and we get "2\n2\n" as do most other shells.  (bash is a notable
 # exception, but it does all redirect expansions in a subshell context)
+#
 atf_test_case side_effects
 side_effects_head() {
 	atf_set "descr" "Tests how side effects in here documents are handled"
+}
 side_effects_body() {
-	atf_check -s exit:0 -o inline:'2\n1\n' -e empty ${TEST_SH} -c '
+	atf_check -s exit:0 -o inline:'2\n2\n' -e empty ${TEST_SH} -c '
 		unset X
 		cat <<-EOF
 		${X=2}
 		EOF
 		echo "${X-1}"
+		'
+}
 # This is a test for the specific bug reported in PR bin/53550
 # This should work in any shell.
 atf_test_case exit_status
 exit_status_head() {
 	atf_set descr "Tests exit status of a command substitution in a heredoc"
+}
 exit_status_body() {
 	# PR bin/53550 test
 	atf_check -s exit:7 -o empty -e empty ${TEST_SH} -c '
 		<<-EOF
 		$(exit 7)
 		EOF
+		'
+}
 # The following tests a problem reported on the austin-list 2021-09-08
 # by oguzismailuysal@gmail.com ... it affected all ash derived shells
 atf_test_case hard_cases
 hard_cases_head() {
 	atf_set "descr" \
 		"Tests here docs in positions that have confised our parser"
+}
 hard_cases_body() {
 	atf_check -s exit:0 -o inline:'xxx\n' -e empty ${TEST_SH} -c '
 		: <<- do | for x in xxx
 		do
 		do echo $x
 @@ -613,22 +653,23 @@ vicious_body() {
 		echo line 5
 		DASH_CODE
 	END_SCRIPT
 	# we will just verify that the shell can parse the
 	# script somehow, and doesn't fall over completely...
 	atf_check -s exit:0 -o ignore -e empty ${TEST_SH} script
+}
 atf_init_test_cases() {
 	atf_add_test_case do_simple	# not worthy of a comment
 	atf_add_test_case end_markers	# the mundane, the weird, the bizarre
 	atf_add_test_case exit_status	# PR bin/53550, cmdsub in heredoc
 	atf_add_test_case incomplete	# where the end marker isn't...
 	atf_add_test_case lineends	# test weird line endings in heredocs
 	atf_add_test_case multiple	# multiple << operators on one cmd
 	atf_add_test_case nested	# here docs inside here docs
 	atf_add_test_case quoting	# stuff quoted inside
 	atf_add_test_case side_effects	# here docs that modify environment
 	atf_add_test_case hard_cases	# here doc bodies appearing mid command
 	atf_add_test_case vicious	# evil test from the austin-l list...
+}