diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-18 16:50:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-18 16:50:40 +0100 |
| commit | 122e1ee6cd24b5de80a1702313db732c8961202a (patch) | |
| tree | 4c79ac5ab8d11c15375c42867f9c47f575c5e54f /js/src/vm/RegExpObject.cpp | |
| parent | 62a72e3d281ea48e7b311a1c153a0e5ae7586da8 (diff) | |
| download | UXP-122e1ee6cd24b5de80a1702313db732c8961202a.tar UXP-122e1ee6cd24b5de80a1702313db732c8961202a.tar.gz UXP-122e1ee6cd24b5de80a1702313db732c8961202a.tar.lz UXP-122e1ee6cd24b5de80a1702313db732c8961202a.tar.xz UXP-122e1ee6cd24b5de80a1702313db732c8961202a.zip | |
Issue #1284 - Implement /s (dotAll) for regular expressions, v2.
Resolves #1284.
Diffstat (limited to 'js/src/vm/RegExpObject.cpp')
| -rw-r--r-- | js/src/vm/RegExpObject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp index ef97ed816..cd0b54c9d 100644 --- a/js/src/vm/RegExpObject.cpp +++ b/js/src/vm/RegExpObject.cpp @@ -49,6 +49,7 @@ JS_STATIC_ASSERT(GlobalFlag == JSREG_GLOB); JS_STATIC_ASSERT(MultilineFlag == JSREG_MULTILINE); JS_STATIC_ASSERT(StickyFlag == JSREG_STICKY); JS_STATIC_ASSERT(UnicodeFlag == JSREG_UNICODE); +JS_STATIC_ASSERT(DotAllFlag == JSREG_DOTALL); RegExpObject* js::RegExpAlloc(ExclusiveContext* cx, HandleObject proto /* = nullptr */) @@ -267,7 +268,7 @@ RegExpObject::create(ExclusiveContext* cx, HandleAtom source, RegExpFlag flags, tokenStream = dummyTokenStream.ptr(); } - if (!irregexp::ParsePatternSyntax(*tokenStream, alloc, source, flags & UnicodeFlag)) + if (!irregexp::ParsePatternSyntax(*tokenStream, alloc, source, flags & UnicodeFlag, flags & DotAllFlag)) return nullptr; Rooted<RegExpObject*> regexp(cx, RegExpAlloc(cx)); @@ -1017,7 +1018,7 @@ RegExpShared::compile(JSContext* cx, HandleAtom pattern, HandleLinearString inpu irregexp::RegExpCompileData data; if (!irregexp::ParsePattern(dummyTokenStream, cx->tempLifoAlloc(), pattern, multiline(), mode == MatchOnly, unicode(), ignoreCase(), - global(), sticky(), &data)) + global(), sticky(), dotall(), &data)) { return false; } |