Changeset 278185 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

May 27, 2021, 6:26:23 PM (4 years ago)

Author:

Darin Adler

Message:

Next step toward using std::optional directly instead of through WTF::Optional typedef
​https://bugs.webkit.org/show_bug.cgi?id=226280

Reviewed by Chris Dumez.

Source/JavaScriptCore:

• <many files>: Accept the renaming done by do-webcore-rename.

• yarr/YarrSyntaxChecker.cpp: Since the style checker complained about this file,

tweaked style to make it happy after the renaming done by do-webcore-rename, and
also hand-updated Optional to std::optional as long as we were touching it.

Source/WebCore:

• <many files>: Accept the renaming done by do-webcore-rename.

• Modules/webauthn/fido/DeviceRequestConverter.h: Since style checker complained

about the names of some arguments, fixed them, and also hand-updated Optional to
std::optional as long as we were touching it.

• loader/EmptyClients.cpp: Since style checker complained about the mix of

WEBCORE_EXPORT and inlined functions, moved them out of line, and
also hand-updated Optional to std::optional as long as we were touching it.
Also removed is<EmptyFrameLoaderClient>().

• loader/EmptyFrameLoaderClient.h: Ditto.

Source/WebCore/PAL:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebDriver:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKit:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy:

• Storage/StorageTracker.cpp:

(WebKit::StorageTracker::diskUsageForOrigin): Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy/mac:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy/win:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WTF:

• <many files>: Accept the renaming done by do-webcore-rename.

• wtf/Optional.h: Remove WTF::nullopt_t and WTF::makeOptional.

• wtf/URLHelpers.cpp:

(WTF::URLHelpers::mapHostName): Convert from nullopt to std::nullopt.

Tools:

• Scripts/do-webcore-rename: Use script to rename valueOr, WTF::nullopt, WTF::nullopt_t,

WTF::Optional, WTF::makeOptional, and makeOptional. Other renamings can't necessarily
be done by the script and so will be done in later passes.

• <many files>: Accept the renaming done by do-webcore-rename.

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (11 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1540 +1540 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIHexDigit(peek(1))))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1567 +1567 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIHexDigit(peek(1))))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1598 +1598 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIBinaryDigit(peek(1))))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1618 +1618 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIBinaryDigit(peek(1))))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1631 +1631 @@
 
     if (isASCIIDigit(m_current))
-        return WTF::nullopt;
+        return std::nullopt;
 
     return NumberParseResult { parseIntOverflow(m_buffer8.data(), m_buffer8.size(), 2) };
@@ -1654 +1654 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIOctalDigit(peek(1)) || isLegacyLiteral))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1674 +1674 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIOctalDigit(peek(1)) || isLegacyLiteral))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1687 +1687 @@
 
     if (isASCIIDigit(m_current))
-        return WTF::nullopt;
+        return std::nullopt;
 
     return NumberParseResult { parseIntOverflow(m_buffer8.data(), m_buffer8.size(), 8) };
@@ -1713 +1713 @@
             if (m_current == '_') {
                 if (UNLIKELY(!isASCIIDigit(peek(1)) || isLegacyLiteral))
-                    return WTF::nullopt;
+                    return std::nullopt;
 
                 shift();
@@ -1734 +1734 @@
         if (m_current == '_') {
             if (UNLIKELY(!isASCIIDigit(peek(1)) || isLegacyLiteral))
-                return WTF::nullopt;
+                return std::nullopt;
 
             shift();
@@ -1746 +1746 @@
         return NumberParseResult { makeIdentifier(m_buffer8.data(), m_buffer8.size()) };
 
-    return WTF::nullopt;
+    return std::nullopt;
 }