From 70118ca9984d8600684c8a609316f35a617a200b Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Wed, 6 Feb 2002 07:56:29 +0000 Subject: [PATCH] Quick followup to last checkin -- warning fixes (d'oh!) git-svn-id: svn://10.0.0.236/trunk@113772 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsemit.c | 2 +- mozilla/js/src/jsparse.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/js/src/jsemit.c b/mozilla/js/src/jsemit.c index 8e1aba4ae16..6843c7caaa2 100644 --- a/mozilla/js/src/jsemit.c +++ b/mozilla/js/src/jsemit.c @@ -1783,7 +1783,7 @@ js_EmitFunctionBody(JSContext *cx, JSCodeGenerator *cg, JSParseNode *body, * SRC_SETLINE. \ */ \ (cg)->currentLine = line_; \ - if (delta_ >= (int32)(2 + ((line_ > SN_3BYTE_OFFSET_MASK)<<1))) { \ + if (delta_ >= (uintN)(2 + ((line_ > SN_3BYTE_OFFSET_MASK)<<1))) { \ if (js_NewSrcNote2(cx, cg, SRC_SETLINE, (ptrdiff_t)line_) < 0)\ return JS_FALSE; \ } else { \ diff --git a/mozilla/js/src/jsparse.c b/mozilla/js/src/jsparse.c index 192752b6f65..3400096a287 100644 --- a/mozilla/js/src/jsparse.c +++ b/mozilla/js/src/jsparse.c @@ -2553,7 +2553,11 @@ ArgumentList(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc, PN_APPEND(listNode, argNode); } while (js_MatchToken(cx, ts, TOK_COMMA)); - MUST_MATCH_TOKEN(TOK_RP, JSMSG_PAREN_AFTER_ARGS); + if (js_GetToken(cx, ts) != TOK_RP) { + js_ReportCompileErrorNumber(cx, ts, NULL, JSREPORT_ERROR, + JSMSG_PAREN_AFTER_ARGS); + return JS_FALSE; + } } return JS_TRUE; }