-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#476 working GRASS + qt5webkit patch (3h)
- Loading branch information
1 parent
88356d3
commit edecf42
Showing
6 changed files
with
1,718 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- Source/JavaScriptCore/offlineasm/parser.rb.orig 2024-12-19 13:20:31.710087000 +0100 | ||
+++ Source/JavaScriptCore/offlineasm/parser.rb 2024-12-19 13:21:13.276547000 +0100 | ||
@@ -584,7 +584,8 @@ | ||
firstCodeOrigin = @tokens[@idx].codeOrigin | ||
list = [] | ||
loop { | ||
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) | ||
+ token_str = @tokens[@idx].is_a?(Annotation) ? @tokens[@idx].string : @tokens[@idx].to_s | ||
+ if (@idx == @tokens.length && !final) || (final && token_str =~ final) | ||
break | ||
elsif @tokens[@idx].is_a? Annotation | ||
# This is the only place where we can encounter a global | ||
@@ -790,7 +791,8 @@ | ||
fileList = [] | ||
fileList << @tokens[@idx].codeOrigin.fileName | ||
loop { | ||
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) | ||
+ token_str = @tokens[@idx].is_a?(Annotation) ? @tokens[@idx].string : @tokens[@idx].to_s | ||
+ if (@idx == @tokens.length && !final) || (final && token_str =~ final) | ||
break | ||
elsif @tokens[@idx] == "include" | ||
@idx += 1 |
Oops, something went wrong.