Changeset 209632 in webkit for trunk/Source/JavaScriptCore/parser/SourceCode.h

Timestamp:

Dec 9, 2016, 2:59:52 PM (8 years ago)

Author:

[email protected]

Message:

Deploy OrdinalNumber in JSC::SourceCode
​https://bugs.webkit.org/show_bug.cgi?id=165687

Reviewed by Michael Saboff.

Source/JavaScriptCore:

We have a lot of confusion between 1-based and 0-based counting in line
and column numbers. Let's use OrdinalNumber to clear up the confusion.

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
(JSC::UnlinkedFunctionExecutable::link):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::emitExpressionInfo):

• inspector/JSInjectedScriptHost.cpp:

(Inspector::JSInjectedScriptHost::functionDetails):

• parser/Lexer.cpp:

(JSC::Lexer<T>::setCode):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::Parser):

• parser/Parser.h:

(JSC::Parser<LexerType>::parse):

• parser/SourceCode.h:

(JSC::SourceCode::SourceCode):
(JSC::SourceCode::firstLine):
(JSC::SourceCode::startColumn):

• runtime/CodeCache.cpp:

(JSC::CodeCache::getUnlinkedGlobalCodeBlock):

• runtime/ScriptExecutable.h:

(JSC::ScriptExecutable::firstLine):
(JSC::ScriptExecutable::startColumn):

• tools/CodeProfile.h:

(JSC::CodeProfile::CodeProfile):

Source/WebCore:

Updated for interface changes.

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::evaluateModule):

• bindings/js/ScriptSourceCode.h:

(WebCore::ScriptSourceCode::startLine):

Source/WTF:

• wtf/text/OrdinalNumber.h:

(WTF::OrdinalNumber::operator>): Added a >.

File:

• trunk/Source/JavaScriptCore/parser/SourceCode.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/parser/SourceCode.h

@@ -37 +37 @@
         SourceCode()
             : UnlinkedSourceCode()
-            , m_firstLine(0)
-            , m_startColumn(0)
+            , m_firstLine(OrdinalNumber::beforeFirst())
+            , m_startColumn(OrdinalNumber::beforeFirst())
         {
         }
@@ -44 +44 @@
         SourceCode(PassRefPtr<SourceProvider> provider)
             : UnlinkedSourceCode(provider)
-            , m_firstLine(1)
-            , m_startColumn(1)
         {
         }
@@ -51 +49 @@
         SourceCode(PassRefPtr<SourceProvider> provider, int firstLine, int startColumn)
             : UnlinkedSourceCode(provider)
-            , m_firstLine(std::max(firstLine, 1))
-            , m_startColumn(std::max(startColumn, 1))
+            , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
+            , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
         {
         }
@@ -58 +56 @@
         SourceCode(PassRefPtr<SourceProvider> provider, int startOffset, int endOffset, int firstLine, int startColumn)
             : UnlinkedSourceCode(provider, startOffset, endOffset)
-            , m_firstLine(std::max(firstLine, 1))
-            , m_startColumn(std::max(startColumn, 1))
+            , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
+            , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
         {
         }
 
-        int firstLine() const { return m_firstLine; }
-        int startColumn() const { return m_startColumn; }
+        OrdinalNumber firstLine() const { return m_firstLine; }
+        OrdinalNumber startColumn() const { return m_startColumn; }
 
         intptr_t providerID() const
@@ -78 +76 @@
 
     private:
-        int m_firstLine;
-        int m_startColumn;
+        OrdinalNumber m_firstLine;
+        OrdinalNumber m_startColumn;
     };