Index: head/bin/sh/tests/parser/Makefile
===================================================================
--- head/bin/sh/tests/parser/Makefile	(revision 360991)
+++ head/bin/sh/tests/parser/Makefile	(revision 360992)
@@ -1,89 +1,91 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 ${PACKAGE}FILES+=	alias1.0
 ${PACKAGE}FILES+=	alias2.0
 ${PACKAGE}FILES+=	alias3.0
 ${PACKAGE}FILES+=	alias4.0
 ${PACKAGE}FILES+=	alias5.0
 ${PACKAGE}FILES+=	alias6.0
 ${PACKAGE}FILES+=	alias7.0
 ${PACKAGE}FILES+=	alias8.0
 ${PACKAGE}FILES+=	alias9.0
 ${PACKAGE}FILES+=	alias10.0
 ${PACKAGE}FILES+=	alias11.0
 ${PACKAGE}FILES+=	alias12.0
 ${PACKAGE}FILES+=	alias13.0
 ${PACKAGE}FILES+=	alias14.0
 ${PACKAGE}FILES+=	alias15.0 alias15.0.stdout
 ${PACKAGE}FILES+=	alias16.0
 ${PACKAGE}FILES+=	alias17.0
 ${PACKAGE}FILES+=	alias18.0
+${PACKAGE}FILES+=	alias19.0 alias19.0.stdout
+${PACKAGE}FILES+=	alias20.0 alias20.0.stdout
 ${PACKAGE}FILES+=	and-pipe-not.0
 ${PACKAGE}FILES+=	case1.0
 ${PACKAGE}FILES+=	case2.0
 ${PACKAGE}FILES+=	comment1.0
 ${PACKAGE}FILES+=	comment2.42
 ${PACKAGE}FILES+=	dollar-quote1.0
 ${PACKAGE}FILES+=	dollar-quote2.0
 ${PACKAGE}FILES+=	dollar-quote3.0
 ${PACKAGE}FILES+=	dollar-quote4.0
 ${PACKAGE}FILES+=	dollar-quote5.0
 ${PACKAGE}FILES+=	dollar-quote6.0
 ${PACKAGE}FILES+=	dollar-quote7.0
 ${PACKAGE}FILES+=	dollar-quote8.0
 ${PACKAGE}FILES+=	dollar-quote9.0
 ${PACKAGE}FILES+=	dollar-quote10.0
 ${PACKAGE}FILES+=	dollar-quote11.0
 ${PACKAGE}FILES+=	dollar-quote12.0
 ${PACKAGE}FILES+=	dollar-quote13.0
 ${PACKAGE}FILES+=	empty-braces1.0
 ${PACKAGE}FILES+=	empty-cmd1.0
 ${PACKAGE}FILES+=	for1.0
 ${PACKAGE}FILES+=	for2.0
 ${PACKAGE}FILES+=	func1.0
 ${PACKAGE}FILES+=	func2.0
 ${PACKAGE}FILES+=	func3.0
 ${PACKAGE}FILES+=	heredoc1.0
 ${PACKAGE}FILES+=	heredoc2.0
 ${PACKAGE}FILES+=	heredoc3.0
 ${PACKAGE}FILES+=	heredoc4.0
 ${PACKAGE}FILES+=	heredoc5.0
 ${PACKAGE}FILES+=	heredoc6.0
 ${PACKAGE}FILES+=	heredoc7.0
 ${PACKAGE}FILES+=	heredoc8.0
 ${PACKAGE}FILES+=	heredoc9.0
 ${PACKAGE}FILES+=	heredoc10.0
 ${PACKAGE}FILES+=	heredoc11.0
 ${PACKAGE}FILES+=	heredoc12.0
 ${PACKAGE}FILES+=	heredoc13.0
 ${PACKAGE}FILES+=	line-cont1.0
 ${PACKAGE}FILES+=	line-cont2.0
 ${PACKAGE}FILES+=	line-cont3.0
 ${PACKAGE}FILES+=	line-cont4.0
 ${PACKAGE}FILES+=	line-cont5.0
 ${PACKAGE}FILES+=	line-cont6.0
 ${PACKAGE}FILES+=	line-cont7.0
 ${PACKAGE}FILES+=	line-cont8.0
 ${PACKAGE}FILES+=	line-cont9.0
 ${PACKAGE}FILES+=	line-cont10.0
 ${PACKAGE}FILES+=	line-cont11.0
 ${PACKAGE}FILES+=	line-cont12.0
 ${PACKAGE}FILES+=	no-space1.0
 ${PACKAGE}FILES+=	no-space2.0
 ${PACKAGE}FILES+=	nul1.0
 ${PACKAGE}FILES+=	only-redir1.0
 ${PACKAGE}FILES+=	only-redir2.0
 ${PACKAGE}FILES+=	only-redir3.0
 ${PACKAGE}FILES+=	only-redir4.0
 ${PACKAGE}FILES+=	pipe-not1.0
 ${PACKAGE}FILES+=	set-v1.0 set-v1.0.stderr
 ${PACKAGE}FILES+=	var-assign1.0
 
 .include <bsd.test.mk>
Index: head/bin/sh/tests/parser/alias19.0
===================================================================
--- head/bin/sh/tests/parser/alias19.0	(nonexistent)
+++ head/bin/sh/tests/parser/alias19.0	(revision 360992)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+alias begin={ end=}
+begin
+cat <<EOF
+$(echo ok)
+EOF
+end

Property changes on: head/bin/sh/tests/parser/alias19.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/bin/sh/tests/parser/alias19.0.stdout
===================================================================
--- head/bin/sh/tests/parser/alias19.0.stdout	(nonexistent)
+++ head/bin/sh/tests/parser/alias19.0.stdout	(revision 360992)
@@ -0,0 +1 @@
+ok

Property changes on: head/bin/sh/tests/parser/alias19.0.stdout
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+y
\ No newline at end of property
Index: head/bin/sh/tests/parser/alias20.0
===================================================================
--- head/bin/sh/tests/parser/alias20.0	(nonexistent)
+++ head/bin/sh/tests/parser/alias20.0	(revision 360992)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+alias begin={ end=}
+: <<EOF &&
+$(echo bad1)
+EOF
+begin
+echo ok
+end

Property changes on: head/bin/sh/tests/parser/alias20.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/bin/sh/tests/parser/alias20.0.stdout
===================================================================
--- head/bin/sh/tests/parser/alias20.0.stdout	(nonexistent)
+++ head/bin/sh/tests/parser/alias20.0.stdout	(revision 360992)
@@ -0,0 +1 @@
+ok

Property changes on: head/bin/sh/tests/parser/alias20.0.stdout
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+y
\ No newline at end of property