njs_generator_t *generator, njs_parser_node_t *node);
static njs_int_t njs_generate_statement(njs_vm_t *vm,
njs_generator_t *generator, njs_parser_node_t *node);
+static njs_int_t njs_generate_statement_name(njs_vm_t *vm,
+ njs_generator_t *generator, njs_parser_node_t *node);
static njs_int_t njs_generate_block_statement(njs_vm_t *vm,
njs_generator_t *generator, njs_parser_node_t *node);
static njs_int_t njs_generate_block_statement_end(njs_vm_t *vm,
njs_generate_statement(njs_vm_t *vm, njs_generator_t *generator,
njs_parser_node_t *node)
{
- njs_int_t ret;
- njs_variable_t *var;
- njs_queue_link_t *link;
- njs_parser_node_t *right;
- njs_vmcode_variable_t *code;
+ njs_int_t ret;
+ njs_queue_link_t *link;
+ njs_parser_node_t *right;
right = node->right;
if (right != NULL && right->token_type == NJS_TOKEN_NAME) {
- var = njs_variable_reference(vm, generator->mem_pool, right);
- if (njs_slow_path(var == NULL)) {
- goto statement;
- }
-
- if (!var->init && (var->type == NJS_VARIABLE_LET
- || var->type == NJS_VARIABLE_CONST))
- {
- njs_generate_code(generator, njs_vmcode_variable_t, code,
- NJS_VMCODE_INITIALIZATION_TEST, right);
- code->dst = right->index;
- }
+ njs_generator_next(generator, njs_generate, node->left);
- if (node->left == NULL) {
- return njs_generator_stack_pop(vm, generator, NULL);
+ ret = njs_generator_after(vm, generator,
+ njs_queue_first(&generator->stack), right,
+ njs_generate_statement_name, NULL, 0);
+ if (njs_slow_path(ret != NJS_OK)) {
+ return ret;
}
- node = node->left;
+ return njs_generator_after(vm, generator,
+ njs_queue_first(&generator->stack),
+ node->left,
+ njs_generate_node_index_release_pop, NULL, 0);
}
-statement:
-
link = njs_queue_first(&generator->stack);
ret = njs_generate_children(vm, generator, node);
njs_generate_node_index_release_pop, NULL, 0);
}
+
+static njs_int_t
+njs_generate_statement_name(njs_vm_t *vm, njs_generator_t *generator,
+ njs_parser_node_t *node)
+{
+ njs_variable_t *var;
+ njs_vmcode_variable_t *code;
+
+ var = njs_variable_reference(vm, generator->mem_pool, node);
+ if (njs_slow_path(var == NULL)) {
+ return njs_generate_name(vm, generator, node);
+ }
+
+ if (!var->init && (var->type == NJS_VARIABLE_LET
+ || var->type == NJS_VARIABLE_CONST))
+ {
+ njs_generate_code(generator, njs_vmcode_variable_t, code,
+ NJS_VMCODE_INITIALIZATION_TEST, node);
+ code->dst = node->index;
+ }
+
+ return njs_generator_stack_pop(vm, generator, NULL);
+}
+
+
static njs_int_t
njs_generate_block_statement(njs_vm_t *vm, njs_generator_t *generator,
njs_parser_node_t *node)
{ njs_str("let x = [123]; x"),
njs_str("123") },
+ { njs_str("function f() {let x = 1; x; return x} f()"),
+ njs_str("1") },
+
+ { njs_str("function f() {const x = 1; x; return x} f()"),
+ njs_str("1") },
+
+ { njs_str("var result; {let x = 1; x; result = x} result"),
+ njs_str("1") },
+
+ { njs_str("function f() {let x; x; return x} f()"),
+ njs_str("undefined") },
+
+ { njs_str("function f() {let x = 1; x; x++; x; return x} f()"),
+ njs_str("2") },
+
+ { njs_str("function f() {let x = 1; {const x = 2; x;} x; return x}"
+ "f()"),
+ njs_str("1") },
+
+ { njs_str("function f() {let x = 1; return () => {x; return x}}"
+ "f()()"),
+ njs_str("1") },
+
+ { njs_str("function f() {let x = 1; if (true) {x;} return x} f()"),
+ njs_str("1") },
+
+ { njs_str("function f() {x; let x = 1} f()"),
+ njs_str("ReferenceError: cannot access variable before initialization") },
+
+ { njs_str("function f() {x; const x = 1} f()"),
+ njs_str("ReferenceError: cannot access variable before initialization") },
+
+ { njs_str("function f() {let x = 1; {x; let x = 2}} f()"),
+ njs_str("ReferenceError: cannot access variable before initialization") },
+
+ { njs_str("function f() {function g() {x;} g(); let x = 1} f()"),
+ njs_str("ReferenceError: cannot access variable before initialization") },
+
+ { njs_str("function f() {var result = 0;"
+ "try {result = 1; x; let x = 2} catch (e) {return result}}"
+ "f()"),
+ njs_str("1") },
+
{ njs_str("let x = () => x; x()"),
njs_str("[object Function]") },