[asperl] integrate mainline changes

p4raw-id: //depot/asperl@1055

1 files changed, 1 insertions, 6 deletions

diff --git a/toke.c b/toke.c
index d39f2da0c2..e9e3f0057d 100644
--- a/toke.c
+++ b/toke.c
@@ -2221,13 +2221,8 @@ yylex(void)
 		else
 		    lex_brackstack[lex_brackets++] = XOPERATOR;
 		s = skipspace(s);
-		if (*s == '}') {
-		    if (expect == XSTATE) {
-			lex_brackstack[lex_brackets-1] = XSTATE;
-			break;
-		    }
+		if (*s == '}')
 		    OPERATOR(HASHBRACK);
-		}
 		/* This hack serves to disambiguate a pair of curlies
 		 * as being a block or an anon hash.  Normally, expectation
 		 * determines that, but in cases where we're not in a