Removed obsolete function call interface.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 6cf048231bd223cbda84c67624b84c39b3cbd762..104ca71f8fe65c5709d177b8b2e8541ba6b98494 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -1322,7 +1322,7 @@ ngx_http_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    rc = njs_vm_compile(jlcf->vm, &start, end, NULL, &export);
+    rc = njs_vm_compile(jlcf->vm, &start, end, &export);
 
     if (rc != NJS_OK) {
         njs_vm_exception(jlcf->vm, &text);

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index d1b670fb1c437fc1026643fe8f0666484608a8f6..43fb84dfcc14021df259c2ba6ec085d31fc4df2e 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -1030,7 +1030,7 @@ ngx_stream_js_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    rc = njs_vm_compile(jscf->vm, &start, end, NULL, &export);
+    rc = njs_vm_compile(jscf->vm, &start, end, &export);
 
     if (rc != NJS_OK) {
         njs_vm_exception(jscf->vm, &text);

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 805159cb3516b4b1fc4141abf574f21bc1fca595..5476ab5da6c41671f72cc20d4fa23a6e84de498c 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -170,9 +170,6 @@ njs_generator(njs_vm_t *vm, njs_parser_t *parser, njs_parser_node_t *node)
     case NJS_TOKEN_END:
         return njs_generate_stop_statement(vm, parser, node);
 
-    case NJS_TOKEN_CALL:
-        return njs_generate_children(vm, parser, node);
-
     case NJS_TOKEN_COMMA:
         return njs_generate_comma_expression(vm, parser, node);
 

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 6d881f1bdceea66f26339f7f8553081a38e510d3..f45bb635cc76bf3cbaed53b7dd647a5632f9e8f7 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -123,14 +123,7 @@ njs_parser(njs_vm_t *vm, njs_parser_t *parser)
 
     node = parser->node;
 
-    if (node != NULL && node->right != NULL) {
-        if (node->right->token == NJS_TOKEN_FUNCTION) {
-            node->token = NJS_TOKEN_CALL;
-            node->scope = parser->scope;
-            return node;
-        }
-
-    } else {
+    if (node == NULL) {
         /* Empty string, just semicolons or variables declarations. */
 
         node = njs_parser_node_alloc(vm);

diff --git a/njs/njs_parser.h b/njs/njs_parser.h
index e4942369634805d9b99e779b7c8af57352e55227..502efa93f63f7d048932cb439e1dc768419570f4 100644 (file)
--- a/njs/njs_parser.h
+++ b/njs/njs_parser.h
@@ -14,7 +14,6 @@ typedef enum {
     NJS_TOKEN_ILLEGAL = 0,
 
     NJS_TOKEN_END,
-    NJS_TOKEN_CALL,
     NJS_TOKEN_SPACE,
     NJS_TOKEN_LINE_END,
 

diff --git a/njs/njscript.c b/njs/njscript.c
index aab1ea5d35efe234f149881e01574042b0db8a6a..6b1b261b5b83dc4eea454b353ad39e099646b5a2 100644 (file)
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -184,13 +184,11 @@ njs_vm_destroy(njs_vm_t *vm)
 
 
 nxt_int_t
-njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end,
-    njs_function_t **function, nxt_str_t **export)
+njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end, nxt_str_t **export)
 {
     nxt_int_t          ret;
     njs_lexer_t        *lexer;
     njs_parser_t       *parser;
-    njs_variable_t     *var;
     njs_parser_node_t  *node;
 
     parser = nxt_mem_cache_zalloc(vm->mem_cache_pool, sizeof(njs_parser_t));
@@ -219,20 +217,6 @@ njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end,
         return NJS_ERROR;
     }
 
-    if (function != NULL) {
-        if (node->token == NJS_TOKEN_CALL) {
-            var = njs_variable_get(vm, node->right, NJS_NAME_DECLARATION);
-            if (nxt_slow_path(var == NULL)) {
-                return NJS_ERROR;
-            }
-
-            *function = var->value.data.u.function;
-
-        } else {
-            *function = NULL;
-        }
-    }
-
     *start = parser->lexer->start;
 
     ret = njs_generate_scope(vm, parser, node);

diff --git a/njs/njscript.h b/njs/njscript.h
index f1726c5f5d936760c1199b7b888dfbe1f0e42d64..668f44b5ff287cf186c47304c2d154b2026fe28c 100644 (file)
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -84,7 +84,7 @@ NXT_EXPORT njs_vm_t *njs_vm_create(nxt_mem_cache_pool_t *mcp,
 NXT_EXPORT void njs_vm_destroy(njs_vm_t *vm);
 
 NXT_EXPORT nxt_int_t njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end,
-    njs_function_t **function, nxt_str_t **export);
+    nxt_str_t **export);
 NXT_EXPORT njs_vm_t *njs_vm_clone(njs_vm_t *vm, nxt_mem_cache_pool_t *mcp,
     void **external);
 NXT_EXPORT nxt_int_t njs_vm_call(njs_vm_t *vm, njs_function_t *function,

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index f8e0471c73408320edf5791fd40bd453297b352f..0a2e8ee2274a81bdd5b7d7ce152bb0eb525d2fac 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -6758,11 +6758,6 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("parseFloat('12345abc')"),
       nxt_string("12345") },
 
-    /* External interface. */
-
-    { nxt_string("function f(req) { return req.uri }"),
-      nxt_string("АБВ") },
-
     /* Trick: number to boolean. */
 
     { nxt_string("var a = 0; !!a"),
@@ -7056,14 +7051,12 @@ njs_unit_test(nxt_bool_t disassemble)
     u_char                *start;
     njs_vm_t              *vm, *nvm;
     nxt_int_t             ret;
-    nxt_str_t             s, r_name, *export;
+    nxt_str_t             s, *export;
     nxt_uint_t            i;
     nxt_bool_t            success;
     nxt_lvlhsh_t          externals;
-    njs_function_t        *function;
     njs_vm_shared_t       *shared;
     njs_unit_test_req     r;
-    njs_opaque_value_t    value;
     nxt_mem_cache_pool_t  *mcp;
 
     /*
@@ -7105,7 +7098,7 @@ njs_unit_test(nxt_bool_t disassemble)
         start = njs_test[i].script.start;
 
         ret = njs_vm_compile(vm, &start, start + njs_test[i].script.length,
-                             &function, &export);
+                             &export);
 
         if (ret == NXT_OK) {
             if (disassemble) {
@@ -7121,20 +7114,7 @@ njs_unit_test(nxt_bool_t disassemble)
             r.uri.length = 6;
             r.uri.start = (u_char *) "АБВ";
 
-            if (function != NULL) {
-                r_name.length = 2;
-                r_name.start = (u_char *) "$r";
-
-                ret = njs_vm_external(nvm, NULL, &r_name, &value);
-                if (ret != NXT_OK) {
-                    return NXT_ERROR;
-                }
-
-                ret = njs_vm_call(nvm, function, &value, 1);
-
-            } else {
-                ret = njs_vm_run(nvm);
-            }
+            ret = njs_vm_run(nvm);
 
             if (ret == NXT_OK) {
                 if (njs_vm_retval(nvm, &s) != NXT_OK) {
@@ -7219,7 +7199,7 @@ njs_unit_test_benchmark(nxt_str_t *script, nxt_str_t *result, const char *msg,
 
     start = script->start;
 
-    ret = njs_vm_compile(vm, &start, start + script->length, NULL, &export);
+    ret = njs_vm_compile(vm, &start, start + script->length, &export);
     if (ret != NXT_OK) {
         return NXT_ERROR;
     }
@@ -7232,7 +7212,6 @@ njs_unit_test_benchmark(nxt_str_t *script, nxt_str_t *result, const char *msg,
         }
 
         if (njs_vm_run(nvm) == NXT_OK) {
-
             if (njs_vm_retval(nvm, &s) != NXT_OK) {
                 return NXT_ERROR;
             }