From f72d43b0e595988329d70dd7afa2de62931a76f0 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org" <brendan%mozilla.org>
Date: Wed, 13 Sep 2006 04:45:09 +0000
Subject: [PATCH] Replace bogus assertion in js_PeekTokenSameLine with
 necessary test and return (352372, r=mrbkap).

---
 js/src/jsscan.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/js/src/jsscan.c b/js/src/jsscan.c
index 3d2ee0a25a65..5796c19697fc 100644
--- a/js/src/jsscan.c
+++ b/js/src/jsscan.c
@@ -1011,11 +1011,8 @@ js_PeekTokenSameLine(JSContext *cx, JSTokenStream *ts)
 {
     JSTokenType tt;
 
-    JS_ASSERT(ts->lookahead == 0 ||
-              (ts->flags & TSF_ERROR) ||
-              ON_CURRENT_LINE(ts, CURRENT_TOKEN(ts).pos) ||
-              (tt = ts->tokens[(ts->cursor+ts->lookahead) & NTOKENS_MASK].type,
-               tt == TOK_EOL || tt == TOK_EOF));
+    if (!ON_CURRENT_LINE(ts, CURRENT_TOKEN(ts).pos))
+        return TOK_EOL;
     ts->flags |= TSF_NEWLINES;
     tt = js_PeekToken(cx, ts);
     ts->flags &= ~TSF_NEWLINES;