From 0ab5ddb4da29c7277ff53f4d33c66583453c846c Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Mon, 6 Dec 2004 18:42:30 +0000 Subject: [PATCH] Fiddle with comments and cosmetics. --- js/src/jsscan.c | 40 +++++++++++++++++++--------------------- js/src/jsscan.h | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/js/src/jsscan.c b/js/src/jsscan.c index def45ec53d4..834da2a745e 100644 --- a/js/src/jsscan.c +++ b/js/src/jsscan.c @@ -101,7 +101,7 @@ static struct keyword { {js_this_str, TOK_PRIMARY, JSOP_THIS, JSVERSION_DEFAULT}, {js_true_str, TOK_PRIMARY, JSOP_TRUE, JSVERSION_DEFAULT}, {js_typeof_str, TOK_UNARYOP, JSOP_TYPEOF,JSVERSION_DEFAULT}, - {"var", TOK_VAR, JSOP_DEFVAR,JSVERSION_DEFAULT}, + {js_var_str, TOK_VAR, JSOP_DEFVAR,JSVERSION_DEFAULT}, {js_void_str, TOK_UNARYOP, JSOP_VOID, JSVERSION_DEFAULT}, {"while", TOK_WHILE, JSOP_NOP, JSVERSION_DEFAULT}, {"with", TOK_WITH, JSOP_NOP, JSVERSION_DEFAULT}, @@ -748,6 +748,7 @@ GrowStringBuffer(JSStringBuffer *sb, size_t newlength) static void FreeStringBuffer(JSStringBuffer *sb) { + JS_ASSERT(STRING_BUFFER_OK(sb)); if (sb->base) free(sb->base); } @@ -756,9 +757,9 @@ void js_InitStringBuffer(JSStringBuffer *sb) { sb->base = sb->limit = sb->ptr = NULL; + sb->data = NULL; sb->grow = GrowStringBuffer; sb->free = FreeStringBuffer; - sb->data = NULL; } void @@ -991,11 +992,10 @@ js_GetToken(JSContext *cx, JSTokenStream *ts) #define TOKENBUF_LENGTH() PTRDIFF(ts->tokenbuf.ptr, ts->tokenbuf.base, jschar) #define TOKENBUF_BASE() (ts->tokenbuf.base) #define TOKENBUF_CHAR(i) (ts->tokenbuf.base[i]) -#define TOKENBUF_TO_ATOM() (js_AtomizeChars(cx, \ - TOKENBUF_BASE(), \ - TOKENBUF_LENGTH(), \ - 0)) - +#define TOKENBUF_TO_ATOM() js_AtomizeChars(cx, \ + TOKENBUF_BASE(), \ + TOKENBUF_LENGTH(), \ + 0) #define ADD_TO_TOKENBUF(c) FastAppendChar(&ts->tokenbuf, (jschar) (c)) /* If there was a fatal error, keep returning TOK_ERROR. */ @@ -1115,7 +1115,7 @@ js_GetToken(JSContext *cx, JSTokenStream *ts) } /* - * XML attribute values are double-quoted when pretty-printed + * XML attribute values are double-quoted when pretty-printed, * so escape " if it is expressed directly in a single-quoted * attribute value. */ @@ -1395,19 +1395,16 @@ retry: } switch (c) { - case '\n': - tt = TOK_EOL; - break; - - case ';': tt = TOK_SEMI; break; - case '[': tt = TOK_LB; break; - case ']': tt = TOK_RB; break; - case '{': tt = TOK_LC; break; - case '}': tt = TOK_RC; break; - case '(': tt = TOK_LP; break; - case ')': tt = TOK_RP; break; - case ',': tt = TOK_COMMA; break; - case '?': tt = TOK_HOOK; break; + case '\n': tt = TOK_EOL; break; + case ';': tt = TOK_SEMI; break; + case '[': tt = TOK_LB; break; + case ']': tt = TOK_RB; break; + case '{': tt = TOK_LC; break; + case '}': tt = TOK_RC; break; + case '(': tt = TOK_LP; break; + case ')': tt = TOK_RP; break; + case ',': tt = TOK_COMMA; break; + case '?': tt = TOK_HOOK; break; case '.': #if JS_HAS_XML_SUPPORT @@ -1719,6 +1716,7 @@ skipline: UngetChar(ts, c); goto retry; } + if (MatchChar(ts, '*')) { while ((c = GetChar(ts)) != EOF && !(c == '*' && MatchChar(ts, '/'))) { diff --git a/js/src/jsscan.h b/js/src/jsscan.h index ae8c60b8d03..8057eca65e4 100644 --- a/js/src/jsscan.h +++ b/js/src/jsscan.h @@ -113,7 +113,7 @@ typedef enum JSTokenType { TOK_XMLTAGC = 64, /* XML start or end tag close (>) */ TOK_XMLNAME = 65, /* XML start-tag non-final fragment */ TOK_XMLATTR = 66, /* XML quoted attribute value */ - TOK_XMLSPACE = 67, /* XML whitespace within a tag */ + TOK_XMLSPACE = 67, /* XML whitespace */ TOK_XMLTEXT = 68, /* XML text */ TOK_XMLCOMMENT = 69, /* XML comment */ TOK_XMLCDATA = 70, /* XML CDATA section */