Changeset 236499 in webkit

Timestamp:

Sep 26, 2018, 3:45:37 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[JSC] offlineasm parser should handle CRLF in asm files
​https://bugs.webkit.org/show_bug.cgi?id=189949

Patch by Koby Boyango <​koby.b@mce.systems> on 2018-09-26
Reviewed by Mark Lam.

• offlineasm/parser.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/parser.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-09-26  Koby Boyango  <koby.b@mce.systems>
+
+        [JSC] offlineasm parser should handle CRLF in asm files
+        https://bugs.webkit.org/show_bug.cgi?id=189949
+
+        Reviewed by Mark Lam.
+
+        * offlineasm/parser.rb:
+
 2018-09-20  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -841 +841 @@
 end
 
+def readTextFile(fileName)
+    data = IO::read(fileName)
+
+    # On Windows, files may contain CRLF line endings (for example, git client might
+    # automatically replace \n with \r\n on Windows) which will fail our parsing.
+    # Thus, we'll just remove all \r from the data (keeping just the \n characters)
+    data.delete!("\r")
+
+    return data
+end
+
 def parseData(data, fileName)
     parser = Parser.new(data, SourceFile.new(fileName))
@@ -847 +858 @@
 
 def parse(fileName)
-    parseData(IO::read(fileName), fileName)
+    parseData(readTextFile(fileName), fileName)
 end
 
 def parseHash(fileName)
-    parser = Parser.new(IO::read(fileName), SourceFile.new(fileName))
+    parser = Parser.new(readTextFile(fileName), SourceFile.new(fileName))
     fileList = parser.parseIncludes(nil, "")
     fileListHash(fileList)