summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-15 17:37:54 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-15 17:37:54 -0500
commit556349010e01d0a3b7896f858d503781ea837b46 (patch)
treef003183732dc3cda4ad880407880da282ca4b0c5 /js
parentf3d462c6049bd2f35571c2a0e2a7c4df4f3ca81c (diff)
parent3492ad65236209e741ca3641789efeaa22a6b8a4 (diff)
downloadUXP-556349010e01d0a3b7896f858d503781ea837b46.tar
UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.gz
UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.lz
UXP-556349010e01d0a3b7896f858d503781ea837b46.tar.xz
UXP-556349010e01d0a3b7896f858d503781ea837b46.zip
Merge branch 'master' into mailnews-work
Diffstat (limited to 'js')
-rw-r--r--js/src/builtin/TestingFunctions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 4363c7aed..072a72b75 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -3900,10 +3900,10 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
return nullptr;
return obj;
}
- if (tree->IsLookahead()) {
- if (!StringProp(cx, obj, "type", "Lookahead"))
+ if (tree->IsLookaround()) {
+ if (!StringProp(cx, obj, "type", "Lookaround"))
return nullptr;
- irregexp::RegExpLookahead* t = tree->AsLookahead();
+ irregexp::RegExpLookaround* t = tree->AsLookaround();
if (!BooleanProp(cx, obj, "is_positive", t->is_positive()))
return nullptr;
if (!TreeProp(cx, obj, "body", t->body()))