/[jscoverage]/trunk/js/jsscan.h

Diff of /trunk/js/jsscan.h

Parent Directory | Revision Log | View Patch Patch

-revision 459 by siliconforks,
Tue Dec  9 03:37:47 2008 UTC
+revision 460 by siliconforks,
Sat Sep 26 23:15:22 2009 UTC
 Line 137
      TOK_SEQ = 82,                       /* synthetic sequence of statements,
                                             not a block */
      TOK_FORHEAD = 83,                   /* head of for(;;)-style loop */
+     TOK_ARGSBODY = 84,                  /* formal args in list + body at end */
+     TOK_UPVARS = 85,                    /* lexical dependencies as JSAtomList
+                                            of definitions paired with a parse
+                                            tree full of uses of those names */
      TOK_RESERVED,                       /* reserved keywords */
      TOK_LIMIT                           /* domain size */
  } JSTokenType;
-Line 145
+Line 149
      ((uintN)((tt) - TOK_NAME) <= (uintN)(TOK_PRIMARY - TOK_NAME))
  #define TOKEN_TYPE_IS_XML(tt) \
-     (tt == TOK_AT || tt == TOK_DBLCOLON || tt == TOK_ANYNAME)
+     ((tt) == TOK_AT || (tt) == TOK_DBLCOLON || (tt) == TOK_ANYNAME)
+ #define TREE_TYPE_IS_XML(tt)                                                  \
+     ((tt) == TOK_XMLCOMMENT || (tt) == TOK_XMLCDATA || (tt) == TOK_XMLPI ||   \
+      (tt) == TOK_XMLELEM || (tt) == TOK_XMLLIST)
  #if JS_HAS_BLOCK_SCOPE
  # define TOKEN_TYPE_IS_DECL(tt) ((tt) == TOK_VAR || (tt) == TOK_LET)
-Line 172
+Line 180
  extern void
  js_FinishStringBuffer(JSStringBuffer *sb);
+ static inline void
+ js_RewindStringBuffer(JSStringBuffer *sb)
+ {
+     JS_ASSERT(STRING_BUFFER_OK(sb));
+     sb->ptr = sb->base;
+ }
+ #define ENSURE_STRING_BUFFER(sb,n) \
+     ((sb)->ptr + (n) <= (sb)->limit || sb->grow(sb, n))
+ /*
+  * NB: callers are obligated to test STRING_BUFFER_OK(sb) after this returns,
+  * before calling it again -- but not necessarily before calling other sb ops
+  * declared in this header file.
+  *
+  * Thus multiple calls, to ops other than this one that check STRING_BUFFER_OK
+  * and suppress updating sb if true, can consolidate the final STRING_BUFFER_OK
+  * test that conditions a JS_ReportOutOfMemory (if necessary -- the grow hook
+  * can report OOM early, obviating the need for the callers to report).
+  *
+  * This style of error checking is not obviously better, and it could be worse
+  * in efficiency, than the propagated failure return code style used elsewhere
+  * in the engine. I view it as a failed experiment. /be
+  */
+ static inline void
+ js_FastAppendChar(JSStringBuffer *sb, jschar c)
+ {
+     JS_ASSERT(STRING_BUFFER_OK(sb));
+     if (!ENSURE_STRING_BUFFER(sb, 1))
+         return;
+     *sb->ptr++ = c;
+ }
  extern void
  js_AppendChar(JSStringBuffer *sb, jschar c);
-Line 188
+Line 229
  js_AppendJSString(JSStringBuffer *sb, JSString *str);
  struct JSTokenPtr {
-     uint16              index;          /* index of char in physical line */
+     uint32              index;          /* index of char in physical line */
-     uint16              lineno;         /* physical line number */
+     uint32              lineno;         /* physical line number */
+     bool operator <(const JSTokenPtr& bptr) {
+         return lineno < bptr.lineno ||
+                (lineno == bptr.lineno && index < bptr.index);
+     }
+     bool operator <=(const JSTokenPtr& bptr) {
+         return lineno < bptr.lineno ||
+                (lineno == bptr.lineno && index <= bptr.index);
+     }
+     bool operator >(const JSTokenPtr& bptr) {
+         return !(*this <= bptr);
+     }
+     bool operator >=(const JSTokenPtr& bptr) {
+         return !(*this < bptr);
+     }
  };
  struct JSTokenPos {
      JSTokenPtr          begin;          /* first character and line of token */
      JSTokenPtr          end;            /* index 1 past last char, last line */
+     bool operator <(const JSTokenPos& bpos) {
+         return begin < bpos.begin;
+     }
+     bool operator <=(const JSTokenPos& bpos) {
+         return begin <= bpos.begin;
+     }
+     bool operator >(const JSTokenPos& bpos) {
+         return !(*this <= bpos);
+     }
+     bool operator >=(const JSTokenPos& bpos) {
+         return !(*this < bpos);
+     }
  };
  struct JSToken {
-Line 241
+Line 316
      uintN               ungetpos;       /* next free char slot in ungetbuf */
      jschar              ungetbuf[6];    /* at most 6, for \uXXXX lookahead */
      uintN               flags;          /* flags -- see below */
-     ptrdiff_t           linelen;        /* physical linebuf segment length */
+     uint32              linelen;        /* physical linebuf segment length */
-     ptrdiff_t           linepos;        /* linebuf offset in physical line */
+     uint32              linepos;        /* linebuf offset in physical line */
      JSTokenBuf          linebuf;        /* line buffer for diagnostics */
      JSTokenBuf          userbuf;        /* user input buffer if !file */
      JSStringBuffer      tokenbuf;       /* current token string buffer */
-Line 298
+Line 373
  /* Ignore keywords and return TOK_NAME instead to the parser. */
  #define TSF_KEYWORD_IS_NAME 0x4000
+ /* Parsing a destructuring object or array initialiser pattern. */
+ #define TSF_DESTRUCTURING   0x8000
  /* Unicode separators that are treated as line terminators, in addition to \n, \r */
  #define LINE_SEPARATOR  0x2028
  #define PARA_SEPARATOR  0x2029

 Legend:



Removed from v.459
 


changed lines


 
Added in v.460
 Legend:



Removed from v.459
 


changed lines


 
Added in v.460
-Removed from v.459
+Added in v.460

	ViewVC Help
Powered by ViewVC 1.1.24