[webkit-changes] [209505] trunk/Source/JavaScriptCore

[ggaren]

Title: [209505] trunk/Source/_javascript_Core

Revision

209505

Author

gga...@apple.com

Date

2016-12-07 17:31:43 -0800 (Wed, 07 Dec 2016)

Log Message

Renamed SourceCode members to match their accessor names
https://bugs.webkit.org/show_bug.cgi?id=165573

Reviewed by Keith Miller.

startChar => startOffset
endChar => endOffset

* parser/UnlinkedSourceCode.h:
(JSC::UnlinkedSourceCode::UnlinkedSourceCode):
(JSC::UnlinkedSourceCode::view):
(JSC::UnlinkedSourceCode::startOffset):
(JSC::UnlinkedSourceCode::endOffset):
(JSC::UnlinkedSourceCode::length):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.cpp
• trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.h

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (209504 => 209505)

--- trunk/Source/_javascript_Core/ChangeLog	2016-12-08 01:19:03 UTC (rev 209504)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-12-08 01:31:43 UTC (rev 209505)
@@ -1,3 +1,20 @@
+2016-12-07  Geoffrey Garen  <gga...@apple.com>
+
+        Renamed SourceCode members to match their accessor names
+        https://bugs.webkit.org/show_bug.cgi?id=165573
+
+        Reviewed by Keith Miller.
+
+        startChar => startOffset
+        endChar => endOffset
+
+        * parser/UnlinkedSourceCode.h:
+        (JSC::UnlinkedSourceCode::UnlinkedSourceCode):
+        (JSC::UnlinkedSourceCode::view):
+        (JSC::UnlinkedSourceCode::startOffset):
+        (JSC::UnlinkedSourceCode::endOffset):
+        (JSC::UnlinkedSourceCode::length):
+
 2016-12-07  Keith Miller  <keith_mil...@apple.com>
 
         Add more missing trivial wasm ops.

Modified: trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.cpp (209504 => 209505)

--- trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.cpp	2016-12-08 01:19:03 UTC (rev 209504)
+++ trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.cpp	2016-12-08 01:31:43 UTC (rev 209505)
@@ -36,7 +36,7 @@
     if (!m_provider)
         return CString("", 0);
     
-    return m_provider->source().substring(m_startChar, m_endChar - m_startChar).utf8();
+    return m_provider->source().substring(m_startOffset, m_endOffset - m_startOffset).utf8();
 }
 
 } // namespace JSC

Modified: trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.h (209504 => 209505)

--- trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.h	2016-12-08 01:19:03 UTC (rev 209504)
+++ trunk/Source/_javascript_Core/parser/UnlinkedSourceCode.h	2016-12-08 01:31:43 UTC (rev 209505)
@@ -37,8 +37,8 @@
     public:
         UnlinkedSourceCode()
             : m_provider(0)
-            , m_startChar(0)
-            , m_endChar(0)
+            , m_startOffset(0)
+            , m_endOffset(0)
         {
         }
 
@@ -49,22 +49,22 @@
 
         UnlinkedSourceCode(PassRefPtr<SourceProvider> provider)
             : m_provider(provider)
-            , m_startChar(0)
-            , m_endChar(m_provider->source().length())
+            , m_startOffset(0)
+            , m_endOffset(m_provider->source().length())
         {
         }
 
         UnlinkedSourceCode(PassRefPtr<SourceProvider> provider, int startOffset, int endOffset)
             : m_provider(provider)
-            , m_startChar(startOffset)
-            , m_endChar(endOffset)
+            , m_startOffset(startOffset)
+            , m_endOffset(endOffset)
         {
         }
 
         UnlinkedSourceCode(const UnlinkedSourceCode& other)
             : m_provider(other.m_provider)
-            , m_startChar(other.m_startChar)
-            , m_endChar(other.m_endChar)
+            , m_startOffset(other.m_startOffset)
+            , m_endOffset(other.m_endOffset)
         {
         }
 
@@ -80,20 +80,20 @@
         {
             if (!m_provider)
                 return StringView();
-            return m_provider->getRange(m_startChar, m_endChar);
+            return m_provider->getRange(m_startOffset, m_endOffset);
         }
         
         CString toUTF8() const;
         
         bool isNull() const { return !m_provider; }
-        int startOffset() const { return m_startChar; }
-        int endOffset() const { return m_endChar; }
-        int length() const { return m_endChar - m_startChar; }
+        int startOffset() const { return m_startOffset; }
+        int endOffset() const { return m_endOffset; }
+        int length() const { return m_endOffset - m_startOffset; }
 
     protected:
         RefPtr<SourceProvider> m_provider;
-        int m_startChar;
-        int m_endChar;
+        int m_startOffset;
+        int m_endOffset;
     };
 
 } // namespace JSC

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes