wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 564369 - streamline TokenStream::getChar(), part 9. r=cdleary.

Browse Source 
--HG--
extra : rebase_source : c9315a103358ec76fb572c67c7ba5ca2e049a22b
This commit is contained in:
Nicholas Nethercote 2010-05-12 21:43:01 -07:00
parent a952b563f2
commit 81464e51c8
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/jsscan.cpp
View File

@ -177,7 +177,7 @@ js_IsIdentifier(JSString *str)
/* Initialize members that aren't initialized in |init|. */
TokenStream::TokenStream(JSContext *cx)
: cx(cx), tokens(), cursor(), lookahead(), ungetpos(), ungetbuf(), flags(),
linelen(), linepos(), file(), listenerTSData(), tokenbuf(cx)
linepos(), lineposNext(), file(), listenerTSData(), tokenbuf(cx)
{}
#ifdef _MSC_VER
@ -395,17 +395,11 @@ TokenStream::getChar()
linebuf.limit = linebuf.base + ulen + llenAdjust;
/* Update position of linebuf within physical userbuf line. */
if (!(flags & TSF_NLFLAG))
linepos += linelen;
else
linepos = 0;
linepos = lineposNext;
if (linebuf.limit[-1] == '\n')
flags |= TSF_NLFLAG;
lineposNext = 0;
else
flags &= ~TSF_NLFLAG;
/* Update linelen from un-normalized length. */
linelen = ulen;
lineposNext += ulen;
}
c = *linebuf.ptr++;
}

13
js/src/jsscan.h
View File

@ -255,7 +255,8 @@ enum TokenStreamFlags
TSF_EOF = 0x02, /* hit end of file */
TSF_NEWLINES = 0x04, /* tokenize newlines */
TSF_OPERAND = 0x08, /* looking for operand, not operator */
TSF_NLFLAG = 0x20, /* last linebuf ended with \n */
TSF_UNEXPECTED_EOF = 0x10, /* unexpected end of input, i.e. TOK_EOF not at top-level. */
TSF_KEYWORD_IS_NAME = 0x20, /* Ignore keywords and return TOK_NAME instead to the parser. */
TSF_STRICT_MODE_CODE = 0x40,/* Tokenize as appropriate for strict mode code. */
TSF_DIRTYLINE = 0x80, /* non-whitespace since start of line */
TSF_OWNFILENAME = 0x100, /* ts->filename is malloc'd */
@ -263,9 +264,6 @@ enum TokenStreamFlags
TSF_XMLTEXTMODE = 0x400, /* scanning XMLText terminal from E4X */
TSF_XMLONLYMODE = 0x800, /* don't scan {expr} within text/tag */
/* Flag indicating unexpected end of input, i.e. TOK_EOF not at top-level. */
TSF_UNEXPECTED_EOF = 0x1000,
/*
* To handle the hard case of contiguous HTML comments, we want to clear the
* TSF_DIRTYINPUT flag at the end of each such comment. But we'd rather not
@ -285,10 +283,7 @@ enum TokenStreamFlags
* It does not cope with malformed comment hiding hacks where --> is hidden
* by C-style comments, or on a dirty line. Such cases are already broken.
*/
TSF_IN_HTML_COMMENT = 0x2000,
/* Ignore keywords and return TOK_NAME instead to the parser. */
TSF_KEYWORD_IS_NAME = 0x4000
TSF_IN_HTML_COMMENT = 0x2000
};
#define t_op u.s.op
@ -487,8 +482,8 @@ class TokenStream
uintN ungetpos; /* next free char slot in ungetbuf */
jschar ungetbuf[6]; /* at most 6, for \uXXXX lookahead */
uintN flags; /* flags -- see above */
uint32 linelen; /* physical linebuf segment length */
uint32 linepos; /* linebuf offset in physical line */
uint32 lineposNext; /* the next value of linepos */
TokenBuf linebuf; /* line buffer for diagnostics */
TokenBuf userbuf; /* user input buffer if !file */
const char *filename; /* input filename or null */