From f31b04a303607cd82757e7c4f60bb536658c8a30 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 18 Nov 2019 12:20:44 +0100 Subject: Issue #1284 - Implement /s (dotAll) for regular expressions. Resolves #1284. --- js/src/frontend/TokenStream.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/src/frontend/TokenStream.cpp') diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index b8623d545..e07f8df8a 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -1843,6 +1843,8 @@ TokenStream::getTokenInternal(TokenKind* ttp, Modifier modifier) reflags = RegExpFlag(reflags | StickyFlag); else if (c == 'u' && !(reflags & UnicodeFlag)) reflags = RegExpFlag(reflags | UnicodeFlag); + else if (c == 's' && !(reflags & DotAllFlag)) + reflags = RegExpFlag(reflags | DotAllFlag); else break; getChar(); -- cgit v1.2.3 From bd529c60c67af685de029e2408da3d2bc6980291 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 18 Nov 2019 13:34:18 +0100 Subject: Revert "Issue #1284 - Implement /s (dotAll) for regular expressions." This reverts commit f31b04a303607cd82757e7c4f60bb536658c8a30. --- js/src/frontend/TokenStream.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/src/frontend/TokenStream.cpp') diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index e07f8df8a..b8623d545 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -1843,8 +1843,6 @@ TokenStream::getTokenInternal(TokenKind* ttp, Modifier modifier) reflags = RegExpFlag(reflags | StickyFlag); else if (c == 'u' && !(reflags & UnicodeFlag)) reflags = RegExpFlag(reflags | UnicodeFlag); - else if (c == 's' && !(reflags & DotAllFlag)) - reflags = RegExpFlag(reflags | DotAllFlag); else break; getChar(); -- cgit v1.2.3 From 122e1ee6cd24b5de80a1702313db732c8961202a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 18 Nov 2019 16:50:40 +0100 Subject: Issue #1284 - Implement /s (dotAll) for regular expressions, v2. Resolves #1284. --- js/src/frontend/TokenStream.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/src/frontend/TokenStream.cpp') diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index b8623d545..e07f8df8a 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -1843,6 +1843,8 @@ TokenStream::getTokenInternal(TokenKind* ttp, Modifier modifier) reflags = RegExpFlag(reflags | StickyFlag); else if (c == 'u' && !(reflags & UnicodeFlag)) reflags = RegExpFlag(reflags | UnicodeFlag); + else if (c == 's' && !(reflags & DotAllFlag)) + reflags = RegExpFlag(reflags | DotAllFlag); else break; getChar(); -- cgit v1.2.3