Changeset 189439 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Sep 5, 2015, 12:45:58 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, fix the module name resolution in Windows
​https://bugs.webkit.org/show_bug.cgi?id=148689

Attempt to fix the module name resolution in Windows.
A module name is represented as the UNIX path under the current module tests.
This fix split the module name with '/' instead of pathSeparator().

This is only utilized by the jsc.cpp for the local module tests.
So, WebKit production and JavaScriptCore framework are not affected by this change.

• jsc.cpp:

(ModuleName::startsWithRoot):
(ModuleName::ModuleName):
(resolvePath):
(GlobalObject::moduleLoaderResolve):

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -748 +748 @@
 };
 
+struct ModuleName {
+    ModuleName(const String& moduleName);
+
+    bool startsWithRoot() const
+    {
+        return !queries.isEmpty() && queries[0].isEmpty();
+    }
+
+    Vector<String> queries;
+};
+
+ModuleName::ModuleName(const String& moduleName)
+{
+    // A module name given from code is represented as the UNIX style path. Like, `./A/B.js`.
+    moduleName.split('/', true, queries);
+}
+
 static bool extractDirectoryName(const String& absolutePathToFile, DirectoryName& directoryName)
 {
@@ -787 +804 @@
 }
 
-static String resolvePath(const DirectoryName& directoryName, const String& query)
+static String resolvePath(const DirectoryName& directoryName, const ModuleName& moduleName)
 {
     Vector<String> directoryPieces;
     directoryName.queryName.split(pathSeparator(), false, directoryPieces);
 
-    Vector<String> queryPieces;
-    query.split(pathSeparator(), true, queryPieces);
-
     // Only first '/' is recognized as the path from the root.
-    if (!queryPieces.isEmpty() && queryPieces[0].isEmpty())
+    if (moduleName.startsWithRoot())
         directoryPieces.clear();
 
-    for (const auto& query : queryPieces) {
+    for (const auto& query : moduleName.queries) {
         if (query == String(ASCIILiteral(".."))) {
             if (!directoryPieces.isEmpty())
@@ -851 +865 @@
     }
 
-    return deferred->resolve(exec, jsString(exec, resolvePath(directoryName, key.impl())));
+    return deferred->resolve(exec, jsString(exec, resolvePath(directoryName, ModuleName(key.impl()))));
 }