Var: separating nxt_tstr_t from nxt_var_t.

It's for the introduction of njs support.
For each option that supports native variable and JS template literals introduced next,
it's unified as template string.

No functional changes.

1 files changed, 24 insertions, 20 deletions

diff --git a/src/nxt_http_route.c b/src/nxt_http_route.c
index 1f2fe883..77a59e9c 100644
--- a/src/nxt_http_route.c
+++ b/src/nxt_http_route.c
@@ -193,8 +193,8 @@ static nxt_int_t nxt_http_action_resolve(nxt_task_t *task,
     nxt_router_temp_conf_t *tmcf, nxt_http_action_t *action);
 static nxt_http_action_t *nxt_http_pass_var(nxt_task_t *task,
     nxt_http_request_t *r, nxt_http_action_t *action);
-static void nxt_http_pass_var_ready(nxt_task_t *task, void *obj, void *data);
-static void nxt_http_pass_var_error(nxt_task_t *task, void *obj, void *data);
+static void nxt_http_pass_query_ready(nxt_task_t *task, void *obj, void *data);
+static void nxt_http_pass_query_error(nxt_task_t *task, void *obj, void *data);
 static nxt_int_t nxt_http_pass_find(nxt_mp_t *mp, nxt_router_conf_t *rtcf,
     nxt_str_t *pass, nxt_http_action_t *action);
 static nxt_int_t nxt_http_route_find(nxt_http_routes_t *routes, nxt_str_t *name,
@@ -673,8 +673,8 @@ nxt_http_action_init(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
 
     nxt_conf_get_string(acf.pass, &pass);
 
-    action->u.var = nxt_var_compile(&pass, mp, rtcf->var_fields, 0);
-    if (nxt_slow_path(action->u.var == NULL)) {
+    action->u.tstr = nxt_tstr_compile(rtcf->tstr_state, &pass, 0);
+    if (nxt_slow_path(action->u.tstr == NULL)) {
         return NXT_ERROR;
     }
 
@@ -1272,8 +1272,8 @@ nxt_http_action_resolve(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
         return NXT_OK;
     }
 
-    if (nxt_var_is_const(action->u.var)) {
-        nxt_var_raw(action->u.var, &pass);
+    if (nxt_tstr_is_const(action->u.tstr)) {
+        nxt_tstr_str(action->u.tstr, &pass);
 
         ret = nxt_http_pass_find(tmcf->mem_pool, tmcf->router_conf, &pass,
                                  action);
@@ -1293,17 +1293,21 @@ static nxt_http_action_t *
 nxt_http_pass_var(nxt_task_t *task, nxt_http_request_t *r,
     nxt_http_action_t *action)
 {
-    nxt_int_t  ret;
-    nxt_str_t  str;
-    nxt_var_t  *var;
+    nxt_int_t          ret;
+    nxt_str_t          str;
+    nxt_tstr_t         *tstr;
+    nxt_router_conf_t  *rtcf;
 
-    var = action->u.var;
+    tstr = action->u.tstr;
 
-    nxt_var_raw(var, &str);
+    nxt_tstr_str(tstr, &str);
 
     nxt_debug(task, "http pass: \"%V\"", &str);
 
-    ret = nxt_var_query_init(&r->var_query, r, r->mem_pool);
+    rtcf = r->conf->socket_conf->router_conf;
+
+    ret = nxt_tstr_query_init(&r->tstr_query, rtcf->tstr_state, &r->var_cache,
+                              r, r->mem_pool);
     if (nxt_slow_path(ret != NXT_OK)) {
         goto fail;
     }
@@ -1316,10 +1320,10 @@ nxt_http_pass_var(nxt_task_t *task, nxt_http_request_t *r,
 
     action->u.pass = nxt_pointer_to(action, sizeof(nxt_http_action_t));
 
-    nxt_var_query(task, r->var_query, var, action->u.pass);
-    nxt_var_query_resolve(task, r->var_query, action,
-                          nxt_http_pass_var_ready,
-                          nxt_http_pass_var_error);
+    nxt_tstr_query(task, r->tstr_query, tstr, action->u.pass);
+    nxt_tstr_query_resolve(task, r->tstr_query, action,
+                           nxt_http_pass_query_ready,
+                           nxt_http_pass_query_error);
     return NULL;
 
 fail:
@@ -1330,7 +1334,7 @@ fail:
 
 
 static void
-nxt_http_pass_var_ready(nxt_task_t *task, void *obj, void *data)
+nxt_http_pass_query_ready(nxt_task_t *task, void *obj, void *data)
 {
     nxt_int_t           ret;
     nxt_router_conf_t   *rtcf;
@@ -1359,7 +1363,7 @@ nxt_http_pass_var_ready(nxt_task_t *task, void *obj, void *data)
 
 
 static void
-nxt_http_pass_var_error(nxt_task_t *task, void *obj, void *data)
+nxt_http_pass_query_error(nxt_task_t *task, void *obj, void *data)
 {
     nxt_http_request_t  *r;
 
@@ -1497,8 +1501,8 @@ nxt_http_action_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
         return NULL;
     }
 
-    action->u.var = nxt_var_compile(pass, mp, rtcf->var_fields, 0);
-    if (nxt_slow_path(action->u.var == NULL)) {
+    action->u.tstr = nxt_tstr_compile(rtcf->tstr_state, pass, 0);
+    if (nxt_slow_path(action->u.tstr == NULL)) {
         return NULL;
     }