From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 22 Nov 2018 15:12:26 +0000 (+0300)
Subject: Backed out changeset b3691d847ff4, reimplemented properly.
X-Git-Tag: 0.2.6~5
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=465b72fae3f7f1667fd29d50ab36c6675a5a2ade;p=njs.git

Backed out changeset b3691d847ff4, reimplemented properly.
---

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 1252df69..14fffe4c 100644
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -1696,23 +1696,7 @@ njs_parser_try_statement(njs_vm_t *vm, njs_parser_t *parser)
 
     parser->node = try;
 
-    switch (token) {
-
-    case NJS_TOKEN_SEMICOLON:
-    case NJS_TOKEN_LINE_END:
-        return njs_parser_token(parser);
-
-    case NJS_TOKEN_CLOSE_BRACE:
-    case NJS_TOKEN_END:
-        return token;
-
-    default:
-        if (parser->lexer->prev_token == NJS_TOKEN_LINE_END) {
-            return token;
-        }
-
-        return NJS_TOKEN_ILLEGAL;
-    }
+    return token;
 }
 
 
@@ -1758,7 +1742,23 @@ njs_parser_throw_statement(njs_vm_t *vm, njs_parser_t *parser)
 
     parser->code_size += sizeof(njs_vmcode_throw_t);
 
-    return token;
+    switch (token) {
+
+    case NJS_TOKEN_SEMICOLON:
+    case NJS_TOKEN_LINE_END:
+        return njs_parser_token(parser);
+
+    case NJS_TOKEN_CLOSE_BRACE:
+    case NJS_TOKEN_END:
+        return token;
+
+    default:
+        if (parser->lexer->prev_token == NJS_TOKEN_LINE_END) {
+            return token;
+        }
+
+        return NJS_TOKEN_ILLEGAL;
+    }
 }