Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing http://bugzilla.mozilla.org/show_bug.cgi?id=210682 :

Browse Source 
A slightly modified version of Brian Gugliemetti fix for bad interaction in TokenStream.getToken()/peekTokenSameLine() when dealing with EOL.
This commit is contained in:
igor%mir2.org 2003-06-30 19:18:31 +00:00
parent ed3d11ddae
commit 6d1229405a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/rhino/src/org/mozilla/javascript/TokenStream.java
View File

@ -719,11 +719,7 @@ public class TokenStream {
public final int peekTokenSameLine() throws IOException {
flags |= TSF_NEWLINES; // SCAN_NEWLINES from jsscan.h
int result = getToken();
if (result == EOL) {
this.pushbackToken = EOF;
} else {
this.pushbackToken = result;
}
this.pushbackToken = result;
tokenno--;
flags &= ~TSF_NEWLINES; // HIDE_NEWLINES from jsscan.h
return result;
@ -737,7 +733,9 @@ public class TokenStream {
if (this.pushbackToken != EOF) {
int result = this.pushbackToken;
this.pushbackToken = EOF;
return result;
if (result != EOL || (flags & TSF_NEWLINES) != 0) {
return result;
}
}
retry: