1 files changed, 9 insertions, 20 deletions

diff --git a/src/njs_parser.c b/src/njs_parser.c
index 50cee672..cfaad740 100644
--- a/src/njs_parser.c
+++ b/src/njs_parser.c
@@ -839,10 +839,9 @@ njs_inline njs_int_t
 njs_parser_expect_semicolon(njs_parser_t *parser, njs_lexer_token_t *token)
 {
     if (token->type != NJS_TOKEN_SEMICOLON) {
-        if (parser->strict_semicolon
-            || (token->type != NJS_TOKEN_END
-                && token->type != NJS_TOKEN_CLOSE_BRACE
-                && parser->lexer->prev_type != NJS_TOKEN_LINE_END))
+        if (token->type != NJS_TOKEN_END
+            && token->type != NJS_TOKEN_CLOSE_BRACE
+            && parser->lexer->prev_type != NJS_TOKEN_LINE_END)
         {
             return NJS_DECLINED;
         }
@@ -5408,10 +5407,6 @@ static njs_int_t
 njs_parser_do_while_semicolon(njs_parser_t *parser, njs_lexer_token_t *token,
     njs_queue_link_t *current)
 {
-    if (parser->strict_semicolon) {
-        return njs_parser_failed(parser);
-    }
-
     parser->target->right = parser->node;
     parser->node = parser->target;
 
@@ -6257,10 +6252,9 @@ njs_parser_break_continue(njs_parser_t *parser, njs_lexer_token_t *token,
             break;
         }
 
-        if (parser->strict_semicolon
-            || (token->type != NJS_TOKEN_END
-                && token->type != NJS_TOKEN_CLOSE_BRACE
-                && parser->lexer->prev_type != NJS_TOKEN_LINE_END))
+        if (token->type != NJS_TOKEN_END
+            && token->type != NJS_TOKEN_CLOSE_BRACE
+            && parser->lexer->prev_type != NJS_TOKEN_LINE_END)
         {
             return njs_parser_failed(parser);
         }
@@ -6314,9 +6308,7 @@ njs_parser_return_statement(njs_parser_t *parser, njs_lexer_token_t *token,
         return njs_parser_failed(parser);
 
     default:
-        if (!parser->strict_semicolon
-            && parser->lexer->prev_type == NJS_TOKEN_LINE_END)
-        {
+        if (parser->lexer->prev_type == NJS_TOKEN_LINE_END) {
             break;
         }
 
@@ -6702,7 +6694,6 @@ njs_parser_labelled_statement_after(njs_parser_t *parser,
     njs_int_t          ret;
     njs_str_t          str;
     uintptr_t          atom_id;
-    njs_value_t        entry;
     njs_parser_node_t  *node;
 
     node = parser->node;
@@ -6719,8 +6710,7 @@ njs_parser_labelled_statement_after(njs_parser_t *parser,
 
     atom_id = (uint32_t) (uintptr_t) parser->target;
 
-    njs_atom_to_value(parser->vm, &entry, atom_id);
-    njs_string_get(parser->vm, &entry, &str);
+    njs_atom_string_get(parser->vm, atom_id, &str);
 
     ret = njs_name_copy(parser->vm, &parser->node->name, &str);
     if (ret != NJS_OK) {
@@ -7093,8 +7083,7 @@ njs_parser_function_declaration(njs_parser_t *parser, njs_lexer_token_t *token,
 
     njs_lexer_consume_token(parser->lexer, 1);
 
-    var = njs_variable_function_add(parser, parser->scope, atom_id,
-                                    NJS_VARIABLE_FUNCTION);
+    var = njs_variable_function_add(parser, parser->scope, atom_id);
     if (var == NULL) {
         return NJS_ERROR;
     }