Style.

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 780ac101f0a30ac3c69efed001a62a604cb327e1..1fb3106cdee47ae79b4602f39e7628d07c4b3329 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -2431,7 +2431,7 @@ njs_generate_argument_closures(njs_vm_t *vm, njs_generator_t *generator,
             n--;
         }
 
-    } while(n != 0);
+    } while (n != 0);
 
     return NXT_OK;
 }
@@ -2611,7 +2611,7 @@ njs_generate_method_call(njs_vm_t *vm, njs_generator_t *generator,
 
 static nxt_noinline nxt_int_t
 njs_generate_call(njs_vm_t *vm, njs_generator_t *generator,
-                  njs_parser_node_t *node)
+    njs_parser_node_t *node)
 {
     nxt_int_t                   ret;
     nxt_uint_t                  nargs;

diff --git a/njs/njs_lexer.c b/njs/njs_lexer.c
index 82ddc4a1943069ab5e66c9a22bbd9ce148e1dd6f..c28cddea656d8c15076a76e2e55066582a2f3485 100644 (file)
--- a/njs/njs_lexer.c
+++ b/njs/njs_lexer.c
@@ -404,7 +404,7 @@ njs_lexer_token_name_resolve(njs_lexer_t *lexer, njs_lexer_token_t *lt)
 
         if (lexer->property) {
             lexer->property_token = lt->token;
-            return NJS_TOKEN_NAME;
+            lt->token = NJS_TOKEN_NAME;
         }
     }
 

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 5babf67f4ee56075bfbf98805a449f9fe176210a..e69915e7f3044a7edf5b5734acf8a3d63171bdeb 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -639,7 +639,7 @@ njs_parser_function_declaration(njs_vm_t *vm, njs_parser_t *parser)
     }
 
     if (token != NJS_TOKEN_NAME) {
-        if (token == NJS_TOKEN_ARGUMENTS || token ==  NJS_TOKEN_EVAL) {
+        if (token == NJS_TOKEN_ARGUMENTS || token == NJS_TOKEN_EVAL) {
             njs_parser_syntax_error(vm, parser, "Identifier \"%V\" "
                                     "is forbidden in function declaration",
                                     njs_parser_text(parser));
@@ -1023,7 +1023,7 @@ njs_parser_var_statement(njs_vm_t *vm, njs_parser_t *parser)
         }
 
         if (token != NJS_TOKEN_NAME) {
-            if (token == NJS_TOKEN_ARGUMENTS || token ==  NJS_TOKEN_EVAL) {
+            if (token == NJS_TOKEN_ARGUMENTS || token == NJS_TOKEN_EVAL) {
                 njs_parser_syntax_error(vm, parser, "Identifier \"%V\" "
                                         "is forbidden in var declaration",
                                         njs_parser_text(parser));
@@ -1475,7 +1475,7 @@ njs_parser_for_var_statement(njs_vm_t *vm, njs_parser_t *parser)
         }
 
         if (token != NJS_TOKEN_NAME) {
-            if (token == NJS_TOKEN_ARGUMENTS || token ==  NJS_TOKEN_EVAL) {
+            if (token == NJS_TOKEN_ARGUMENTS || token == NJS_TOKEN_EVAL) {
                 njs_parser_syntax_error(vm, parser, "Identifier \"%V\" "
                                        "is forbidden in for-in var declaration",
                                        njs_parser_text(parser));

diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index a087b5d47089ef3abbc295a7eb42cde0cae0403c..746ffc8f746325cee9b3b66b10bd0e53869b4468 100644 (file)
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -354,7 +354,7 @@ njs_parser_assignment_expression(njs_vm_t *vm, njs_parser_t *parser,
         if (!njs_parser_is_lvalue(parser->node)) {
             token = parser->node->token;
 
-            if (token == NJS_TOKEN_ARGUMENTS || token ==  NJS_TOKEN_EVAL) {
+            if (token == NJS_TOKEN_ARGUMENTS || token == NJS_TOKEN_EVAL) {
                 njs_parser_syntax_error(vm, parser, "Identifier \"%s\" "
                                       "is forbidden as left-hand in assignment",
                                        (token == NJS_TOKEN_EVAL) ? "eval"