Commit a438c7b1 authored by Geoff Simmons's avatar Geoff Simmons

rename the .backref_named() method to .namedref()

parent 425244ba
......@@ -32,8 +32,8 @@ CONTENTS
* STRING namedref(PRIV_TASK, STRING, STRING)
* Object regex
* STRING regex.backref(INT, STRING)
* STRING regex.backref_named(STRING, STRING)
* BOOL regex.match(STRING)
* STRING regex.namedref(STRING, STRING)
* STRING version()
.. _obj_regex:
......@@ -58,13 +58,13 @@ STRING regex.backref(INT, STRING)
Prototype
STRING regex.backref(INT ref, STRING fallback)
.. _func_regex.backref_named:
.. _func_regex.namedref:
STRING regex.backref_named(STRING, STRING)
------------------------------------------
STRING regex.namedref(STRING, STRING)
-------------------------------------
Prototype
STRING regex.backref_named(STRING name, STRING fallback)
STRING regex.namedref(STRING name, STRING fallback)
.. _func_match:
......
......@@ -139,34 +139,30 @@ varnish v1 -vcl+backend {
}
sub vcl_deliver {
# Call to backref_named() before match()
set resp.http.nomatch = barbaz.backref_named("bar", "fallback");
# Call to namedref() before match()
set resp.http.nomatch = barbaz.namedref("bar", "fallback");
if (frobnitz.match(resp.http.foo)) {
set resp.http.frob = "nitz";
}
set resp.http.frob1 = frobnitz.backref_named("frob",
"fallback1");
set resp.http.frob2 = frobnitz.backref_named("nitz",
"fallback2");
set resp.http.frob1 = frobnitz.namedref("frob", "fallback1");
set resp.http.frob2 = frobnitz.namedref("nitz", "fallback2");
if (barbaz.match(resp.http.foo)) {
set resp.http.foo1 = barbaz.backref_named("bar",
"error1");
set resp.http.foo2 = barbaz.backref_named("baz",
"error2");
set resp.http.foo1 = barbaz.namedref("bar", "error1");
set resp.http.foo2 = barbaz.namedref("baz", "error2");
}
if (barbaz.match(resp.http.barf)) {
set resp.http.puke = "match";
}
set resp.http.barf1 = barbaz.backref_named("bar", "fallback1");
set resp.http.barf2 = barbaz.backref_named("baz", "fallback2");
set resp.http.barf1 = barbaz.namedref("bar", "fallback1");
set resp.http.barf2 = barbaz.namedref("baz", "fallback2");
if (azbc.match("abc")) {
set resp.http.abc1 = azbc.backref_named("a", "error1");
set resp.http.abc2 = azbc.backref_named("z", "none");
set resp.http.abc3 = azbc.backref_named("bc", "error3");
set resp.http.abc1 = azbc.namedref("a", "error1");
set resp.http.abc2 = azbc.namedref("z", "none");
set resp.http.abc3 = azbc.namedref("bc", "error3");
} else {
set resp.http.abc = "fail";
}
......@@ -174,16 +170,16 @@ varnish v1 -vcl+backend {
if (never.match(resp.http.foo)) {
set resp.http.never = "match";
}
set resp.http.never1 = never.backref_named("bar", "fallback1");
set resp.http.never2 = never.backref_named("baz", "fallback2");
set resp.http.never1 = never.namedref("bar", "fallback1");
set resp.http.never2 = never.namedref("baz", "fallback2");
}
}
logexpect l2 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod re2 error: backref 1, fallback .fallback.: backref called without prior match$"
expect * = VCL_Error "^vmod re2 error: never.backref_named.name=.bar., fallback=.fallback1..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.backref_named.name=.baz., fallback=.fallback2..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.namedref.name=.bar., fallback=.fallback1..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.namedref.name=.baz., fallback=.fallback2..: never_capture is true for object never$"
expect * = End
} -start
......
# looks like -*- vcl -*-
varnishtest "backref_named()"
varnishtest "namedref()"
varnish v1 -vcl {
import re2 from "${vmod_topbuild}/src/.libs/libvmod_re2.so";
......@@ -21,21 +21,19 @@ varnish v1 -vcl {
set resp.http.num0 = barbaz.backref(0, "error0");
set resp.http.num1 = barbaz.backref(1, "error1");
set resp.http.num2 = barbaz.backref(2, "error2");
set resp.http.bar
= barbaz.backref_named("bar", "error_bar");
set resp.http.baz
= barbaz.backref_named("baz", "error_baz");
set resp.http.bar = barbaz.namedref("bar", "error_bar");
set resp.http.baz = barbaz.namedref("baz", "error_baz");
set resp.http.quux
= barbaz.backref_named("quux", "error_quux");
= barbaz.namedref("quux", "error_quux");
}
if (never.match("barbaz")) {
set resp.http.never = "match";
set resp.http.neverbar
= never.backref_named("bar", "error_bar");
= never.namedref("bar", "error_bar");
set resp.http.neverbaz
= never.backref_named("baz", "error_baz");
= never.namedref("baz", "error_baz");
set resp.http.neverquux
= never.backref_named("quux", "error_quux");
= never.namedref("quux", "error_quux");
}
if (re2.match("(?P<bar>bar)(?P<baz>baz)", "barbaz")) {
......@@ -90,9 +88,9 @@ client c1 {
logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod re2 error: namedref name=.quux., fallback=.error_quux.: no such named group$"
expect * = VCL_Error "^vmod re2 error: never.backref_named.name=.bar., fallback=.error_bar..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.backref_named.name=.baz., fallback=.error_baz..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.backref_named.name=.quux., fallback=.error_quux..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.namedref.name=.bar., fallback=.error_bar..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.namedref.name=.baz., fallback=.error_baz..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: never.namedref.name=.quux., fallback=.error_quux..: never_capture is true for object never$"
expect * = VCL_Error "^vmod re2 error: namedref name=.quux., fallback=.error_quux.: no such named group$"
expect * = VCL_Error "^vmod re2 error: re2.namedref.name=.bar., fallback=.error_bar..: never_capture was true in previous match$"
expect * = VCL_Error "^vmod re2 error: re2.namedref.name=.baz., fallback=.error_baz..: never_capture was true in previous match$"
......
......@@ -341,11 +341,11 @@ vmod_regex_backref(VRT_CTX, struct vmod_re2_regex *re, VCL_INT refnum,
#undef ERR_PREFIX
#define ERR_PREFIX "%s.backref_named(name=\"%s\", fallback=\"%s\"): "
#define ERR_PREFIX "%s.namedref(name=\"%s\", fallback=\"%s\"): "
VCL_STRING
vmod_regex_backref_named(VRT_CTX, struct vmod_re2_regex *re, VCL_STRING name,
VCL_STRING fallback)
vmod_regex_namedref(VRT_CTX, struct vmod_re2_regex *re, VCL_STRING name,
VCL_STRING fallback)
{
void *groups;
......
......@@ -17,10 +17,10 @@ $Object regex(STRING pattern, BOOL utf8=0, BOOL posix_syntax=0,
$Method BOOL .match(STRING)
$Method STRING .backref(INT ref, STRING fallback = "**BACKREF FAILED**")
$Method STRING .backref(INT ref, STRING fallback = "**BACKREF METHOD FAILED**")
$Method STRING .backref_named(STRING name,
STRING fallback = "**BACKREF FAILED**")
$Method STRING .namedref(STRING name,
STRING fallback = "**NAMEDREF METHOD FAILED**")
$Function BOOL match(PRIV_TASK, STRING pattern, STRING subject, BOOL utf8=0,
BOOL posix_syntax=0, BOOL longest_match=0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment