Skip to content

Commit fd99700

Browse files
Justin Haygoodwebkit-commit-queue
authored andcommitted
Allow KeywordLookupGenerator.py to work on Windows with Windows style line endings
https://bugs.webkit.org/show_bug.cgi?id=63234 Patch by Justin Haygood <jhaygood@reaktix.com> on 2013-04-08 Reviewed by Oliver Hunt. * KeywordLookupGenerator.py: (parseKeywords): Canonical link: https://commits.webkit.org/132560@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147934 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 67ff8b4 commit fd99700

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2013-04-08 Justin Haygood <jhaygood@reaktix.com>
2+
3+
Allow KeywordLookupGenerator.py to work on Windows with Windows style line endings
4+
https://bugs.webkit.org/show_bug.cgi?id=63234
5+
6+
Reviewed by Oliver Hunt.
7+
8+
* KeywordLookupGenerator.py:
9+
(parseKeywords):
10+
111
2013-04-08 Filip Pizlo <fpizlo@apple.com>
212

313
REGRESSION(r146669): Assertion hit in JSC::DFG::SpeculativeJIT::fillSpeculateCell() running webgl tests

‎Source/JavaScriptCore/KeywordLookupGenerator.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,16 @@ def allWhitespace(str):
6868

6969

7070
def parseKeywords(keywordsText):
71+
72+
if sys.platform == "cygwin":
73+
keywordsText = keywordsText.replace("\r\n", "\n")
74+
7175
lines = keywordsText.split("\n")
7276
lines = [line.split("#")[0] for line in lines]
7377
lines = [line for line in lines if (not allWhitespace(line))]
7478
name = lines[0].split()
7579
terminator = lines[-1]
80+
7681
if not name[0] == "@begin":
7782
raise Exception("expected description beginning with @begin")
7883
if not terminator == "@end":

0 commit comments

Comments
 (0)