Changeset 63055 in webkit for trunk/JavaScriptCore/parser/JSParser.h

Timestamp:

Jul 10, 2010, 5:11:08 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-10 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Remove switches from inner expression loops in the parser
​https://bugs.webkit.org/show_bug.cgi?id=42035

Use bitmasks and flags on the token types to identify unary and
binary operators, rather than switching on the token type to
identify them.

• parser/JSParser.cpp: (JSC::isUnaryOp): (JSC::JSParser::isBinaryOperator):
• parser/JSParser.h: (JSC::):

File:

• trunk/JavaScriptCore/parser/JSParser.h (modified) (4 diffs)

trunk/JavaScriptCore/parser/JSParser.h

@@ -33 +33 @@
 class SourceCode;
 
+enum {
+    UnaryOpTokenFlag = 64,
+    BinaryOpTokenPrecedenceShift = 7,
+    BinaryOpTokenAllowsInPrecedenceAdditionalShift = 4,
+    BinaryOpTokenPrecedenceMask = 15 << BinaryOpTokenPrecedenceShift
+};
+
+#define BINARY_OP_PRECEDENCE(prec) (((prec) << BinaryOpTokenPrecedenceShift) | ((prec) << (BinaryOpTokenPrecedenceShift + BinaryOpTokenAllowsInPrecedenceAdditionalShift)))
+#define IN_OP_PRECEDENCE(prec) ((prec) << (BinaryOpTokenPrecedenceShift + BinaryOpTokenAllowsInPrecedenceAdditionalShift))
+
 enum JSTokenType {
     NULLTOKEN,
@@ -47 +57 @@
     FUNCTION,
     RETURN,
-    VOIDTOKEN,
-    DELETETOKEN,
     IF,
     THISTOKEN,
     DO,
     WHILE,
-    INTOKEN,
-    INSTANCEOF,
-    TYPEOF,
     SWITCH,
     WITH,
@@ -64 +69 @@
     FINALLY,
     DEBUGGER,
-    IF_WITHOUT_ELSE,
     ELSE,
+    OPENBRACE,
+    CLOSEBRACE,
+    OPENPAREN,
+    CLOSEPAREN,
+    OPENBRACKET,
+    CLOSEBRACKET,
+    COMMA,
+    QUESTION,
+    NUMBER,
+    IDENT,
+    STRING,
+    SEMICOLON,
+    COLON,
+    DOT,
+    ERRORTOK,
+    EOFTOK,
     EQUAL,
-    EQEQ,
-    NE,
-    STREQ,
-    STRNEQ,
-    LT,
-    GT,
-    LE,
-    GE,
-    OR,
-    AND,
-    PLUSPLUS,
-    MINUSMINUS,
-    LSHIFT,
-    RSHIFT,
-    URSHIFT,
     PLUSEQUAL,
     MINUSEQUAL,
@@ -93 +98 @@
     XOREQUAL,
     OREQUAL,
-    BITOR,
-    BITAND,
-    BITXOR,
-    PLUS,
-    MINUS,
-    TIMES,
-    DIVIDE,
-    MOD,
-    OPENBRACE,
-    CLOSEBRACE,
-    OPENPAREN,
-    CLOSEPAREN,
-    OPENBRACKET,
-    CLOSEBRACKET,
-    COMMA,
-    QUESTION,
-    TILDE,
-    EXCLAMATION,
-    NUMBER,
-    IDENT,
-    STRING,
-    AUTOPLUSPLUS,
-    AUTOMINUSMINUS,
-    SEMICOLON,
-    COLON,
-    DOT,
-    ERRORTOK,
-    EOFTOK
+    LastUntaggedToken,
+
+    // Begin tagged tokens
+    PLUSPLUS = 0 | UnaryOpTokenFlag,
+    MINUSMINUS = 1 | UnaryOpTokenFlag,
+    EXCLAMATION = 2 | UnaryOpTokenFlag,
+    TILDE = 3 | UnaryOpTokenFlag,
+    AUTOPLUSPLUS = 4 | UnaryOpTokenFlag,
+    AUTOMINUSMINUS = 5 | UnaryOpTokenFlag,
+    TYPEOF = 6 | UnaryOpTokenFlag,
+    VOIDTOKEN = 7 | UnaryOpTokenFlag,
+    DELETETOKEN = 8 | UnaryOpTokenFlag,
+    OR = 0 | BINARY_OP_PRECEDENCE(1),
+    AND = 1 | BINARY_OP_PRECEDENCE(2),
+    BITOR = 2 | BINARY_OP_PRECEDENCE(3),
+    BITXOR = 3 | BINARY_OP_PRECEDENCE(4),
+    BITAND = 4 | BINARY_OP_PRECEDENCE(5),
+    EQEQ = 5 | BINARY_OP_PRECEDENCE(6),
+    NE = 6 | BINARY_OP_PRECEDENCE(6),
+    STREQ = 7 | BINARY_OP_PRECEDENCE(6),
+    STRNEQ = 8 | BINARY_OP_PRECEDENCE(6),
+    LT = 9 | BINARY_OP_PRECEDENCE(7),
+    GT = 10 | BINARY_OP_PRECEDENCE(7),
+    LE = 11 | BINARY_OP_PRECEDENCE(7),
+    GE = 12 | BINARY_OP_PRECEDENCE(7),
+    INSTANCEOF = 13 | BINARY_OP_PRECEDENCE(7),
+    INTOKEN = 14 | IN_OP_PRECEDENCE(7),
+    LSHIFT = 15 | BINARY_OP_PRECEDENCE(8),
+    RSHIFT = 16 | BINARY_OP_PRECEDENCE(8),
+    URSHIFT = 17 | BINARY_OP_PRECEDENCE(8),
+    PLUS = 18 | BINARY_OP_PRECEDENCE(9) | UnaryOpTokenFlag,
+    MINUS = 19 | BINARY_OP_PRECEDENCE(9) | UnaryOpTokenFlag,
+    TIMES = 20 | BINARY_OP_PRECEDENCE(10),
+    DIVIDE = 21 | BINARY_OP_PRECEDENCE(10),
+    MOD = 22 | BINARY_OP_PRECEDENCE(10)
 };