[asperl] integrate mainline changes

p4raw-id: //depot/asperl@884

1 files changed, 2 insertions, 1 deletions

diff --git a/toke.c b/toke.c
index 00dbf7fc47..3e681f6f5c 100644
--- a/toke.c
+++ b/toke.c
@@ -2838,7 +2838,8 @@ yylex(void)
 		    s = scan_word(s, tokenbuf + len, sizeof tokenbuf - len,
 				  TRUE, &morelen);
 		    if (!morelen)
-			croak("Bad name after %s::", tokenbuf);
+			croak("Bad name after %s%s", tokenbuf,
+				*s == '\'' ? "'" : "::");
 		    len += morelen;
 		}