Changeset 191135 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.h

Timestamp:

Oct 15, 2015, 1:50:02 PM (10 years ago)

Author:

[email protected]

Message:

Web Inspector: JavaScriptCore should parse sourceURL and sourceMappingURL directives
​https://bugs.webkit.org/show_bug.cgi?id=150096

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-10-15
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• inspector/ContentSearchUtilities.cpp:

(Inspector::ContentSearchUtilities::scriptCommentPattern): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceURL): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceMapURL): Deleted.

• inspector/ContentSearchUtilities.h:

No longer need to search script content.

• inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::dispatchDidParseSource):
Carry over the sourceURL and sourceMappingURL from the SourceProvider.

• inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::sourceMapURLForScript):
(Inspector::InspectorDebuggerAgent::didParseSource):
No longer do content searching.

• parser/Lexer.cpp:

(JSC::Lexer<T>::setCode):
(JSC::Lexer<T>::skipWhitespace):
(JSC::Lexer<T>::parseCommentDirective):
(JSC::Lexer<T>::parseCommentDirectiveValue):
(JSC::Lexer<T>::consume):
(JSC::Lexer<T>::lex):

• parser/Lexer.h:

(JSC::Lexer::sourceURL):
(JSC::Lexer::sourceMappingURL):
(JSC::Lexer::sourceProvider): Deleted.
Give lexer the ability to detect script comment directives.
This just consumes characters in single line comments and
ultimately sets the sourceURL or sourceMappingURL found.

• parser/Parser.h:

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

• parser/SourceProvider.h:

(JSC::SourceProvider::url):
(JSC::SourceProvider::sourceURL):
(JSC::SourceProvider::sourceMappingURL):
(JSC::SourceProvider::setSourceURL):
(JSC::SourceProvider::setSourceMappingURL):
After parsing a script, update the Source Provider with the
value of directives that may have been found in the script.

Source/WebInspectorUI:

• UserInterface/Test/InspectorProtocol.js:

(InspectorProtocol._sendMessage):
(InspectorProtocol.dispatchMessageFromBackend):
This is only used for tests, so avoid console.log
and just dump directly to the system console.

LayoutTests:

• inspector/debugger/sourceURLs-expected.txt: Added.
• inspector/debugger/sourceURLs.html: Added.

sourceURL and sourceMappingURL detection.

File:

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

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -89 +89 @@
     bool sawError() const { return m_error; }
     String getErrorMessage() const { return m_lexErrorMessage; }
+    String sourceURL() const { return m_sourceURL; }
+    String sourceMappingURL() const { return m_sourceMappingURL; }
     void clear();
     void setOffset(int offset, int lineStartOffset)
@@ -114 +116 @@
         m_terminator = terminator;
     }
-
-    SourceProvider* sourceProvider() const { return m_source->provider(); }
 
     JSTokenType lexExpectIdentifier(JSToken*, unsigned, bool strictMode);
@@ -153 +153 @@
 
     ALWAYS_INLINE bool lastTokenWasRestrKeyword() const;
+    
+    ALWAYS_INLINE void skipWhitespace();
 
     template <int shiftAmount> void internalShift();
@@ -178 +180 @@
     ALWAYS_INLINE bool parseNumberAfterExponentIndicator();
     ALWAYS_INLINE bool parseMultilineComment();
+
+    ALWAYS_INLINE void parseCommentDirective();
+    ALWAYS_INLINE String parseCommentDirectiveValue();
+
+    template <unsigned length>
+    ALWAYS_INLINE bool consume(const char (&input)[length]);
 
     static const size_t initialReadBufferCapacity = 32;
@@ -204 +212 @@
     String m_lexErrorMessage;
 
+    String m_sourceURL;
+    String m_sourceMappingURL;
+
     T m_current;