Attachment 709122 Details for Bug 568953

[patch] Parser support for import declarations

patch (text/plain), 7.85 KB, created by Eddy Bruel [:ejpbruel]

(hide)

Description:

Filename:

MIME Type:

Creator: Eddy Bruel [:ejpbruel]

Size: 7.85 KB

patch

obsolete

>diff -r a26aba9b607b js/src/frontend/ParseNode.h
>--- a/js/src/frontend/ParseNode.h	Fri Feb 01 19:24:30 2013 +0100
>+++ b/js/src/frontend/ParseNode.h	Fri Feb 01 19:25:51 2013 +0100
>@@ -151,16 +151,20 @@ class UpvarCookie
>     F(SEQ) \
>     F(FORIN) \
>     F(FORHEAD) \
>     F(ARGSBODY) \
>     F(SPREAD) \
>     F(MODULE) \
>     F(EXPORT) \
>     F(EXPORTLIST) \
>+    F(IMPORT) \
>+    F(AS) \
>+    F(FROM) \
>+    F(IMPORTLIST) \
>     \
>     /* Equality operators. */ \
>     F(STRICTEQ) \
>     F(EQ) \
>     F(STRICTNE) \
>     F(NE) \
>     \
>     /* Unary operators. */ \
>diff -r a26aba9b607b js/src/frontend/Parser.cpp
>--- a/js/src/frontend/Parser.cpp	Fri Feb 01 19:24:30 2013 +0100
>+++ b/js/src/frontend/Parser.cpp	Fri Feb 01 19:25:51 2013 +0100
>@@ -2950,16 +2950,86 @@ Parser::specifierSet(ParseNodeKind kind)
>         pn->append(pnelem);
>     } while (tokenStream.matchToken(TOK_COMMA));
> 
>     MUST_MATCH_TOKEN(TOK_RC, JSMSG_SYNTAX_ERROR);
>     return pn;
> }
> 
> ParseNode *
>+Parser::importStatement()
>+{
>+    ParseNode *pn = ListNode::create(PNK_IMPORT, this);
>+    if (!pn)
>+        return NULL;
>+    pn->makeEmpty();
>+
>+    do {
>+        ParseNode *pnelem = NULL;
>+
>+        switch (tokenStream.getToken()) {
>+          case TOK_STRING:
>+          {
>+            pnelem = BinaryNode::create(PNK_AS, this);;
>+            if (!pnelem)
>+                return NULL;
>+
>+            pnelem->pn_left = atomNode(PNK_STRING, JSOP_NOP);
>+            if (!pnelem->pn_left)
>+                return NULL;
>+
>+            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_SYNTAX_ERROR);
>+            if (tokenStream.currentToken().name() != context->names().as) {
>+                reportError(NULL, JSMSG_SYNTAX_ERROR);
>+                return NULL;
>+            }
>+
>+            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_SYNTAX_ERROR);
>+            RootedPropertyName name(context, tokenStream.currentToken().name());
>+            pnelem->pn_right = NameNode::create(PNK_NAME, name, this, this->pc);
>+            if (!pnelem->pn_right)
>+                return NULL;
>+            break;
>+          }
>+
>+          case TOK_LC:
>+          {
>+            pnelem = BinaryNode::create(PNK_FROM, this);;
>+            if (!pnelem)
>+                return NULL;
>+
>+            pnelem->pn_left = specifierSet(PNK_IMPORTLIST);
>+            if (!pnelem->pn_left)
>+                return NULL;
>+
>+            MUST_MATCH_TOKEN(TOK_NAME, JSMSG_SYNTAX_ERROR);
>+            if (tokenStream.currentToken().name() != context->names().from) {
>+                reportError(NULL, JSMSG_SYNTAX_ERROR);
>+                return NULL;
>+            }
>+
>+            MUST_MATCH_TOKEN(TOK_STRING, JSMSG_SYNTAX_ERROR);
>+            pnelem->pn_right = atomNode(PNK_STRING, JSOP_NOP);
>+            if (!pnelem->pn_right)
>+                return NULL;
>+            break;
>+          }
>+
>+          default:
>+            reportError(NULL, JSMSG_SYNTAX_ERROR);
>+            return NULL;
>+        }
>+
>+        pn->append(pnelem);
>+    } while (tokenStream.matchToken(TOK_COMMA));
>+
>+    return MatchOrInsertSemicolon(context, &tokenStream) ? pn : NULL;
>+}
>+
>+ParseNode *
> Parser::switchStatement()
> {
>     JS_ASSERT(tokenStream.currentToken().type == TOK_SWITCH);
>     ParseNode *pn = BinaryNode::create(PNK_SWITCH, this);
>     if (!pn)
>         return NULL;
>     MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_SWITCH);
> 
>@@ -3936,16 +4006,19 @@ Parser::statement()
>         pn->pn_kid2 = pn2;
>         pn->pn_kid3 = pn3;
>         return pn;
>       }
> 
>       case TOK_EXPORT:
>         return exportStatement();
> 
>+      case TOK_IMPORT:
>+        return importStatement();
>+
>       case TOK_SWITCH:
>         return switchStatement();
> 
>       case TOK_WHILE:
>       {
>         pn = BinaryNode::create(PNK_WHILE, this);
>         if (!pn)
>             return NULL;
>diff -r a26aba9b607b js/src/frontend/Parser.h
>--- a/js/src/frontend/Parser.h	Fri Feb 01 19:24:30 2013 +0100
>+++ b/js/src/frontend/Parser.h	Fri Feb 01 19:25:51 2013 +0100
>@@ -379,16 +379,17 @@ struct Parser : private AutoGCRooter
>      * suffix) and a never-inlined version (with an 'n' suffix).
>      */
>     ParseNode *moduleStmt();
>     ParseNode *functionStmt();
>     ParseNode *functionExpr();
>     ParseNode *statements(bool *hasFunctionStmt = NULL);
> 
>     ParseNode *exportStatement();
>+    ParseNode *importStatement();
>     ParseNode *specifierSet(ParseNodeKind kind);
>     ParseNode *switchStatement();
>     ParseNode *forStatement();
>     ParseNode *tryStatement();
>     ParseNode *withStatement();
> #if JS_HAS_BLOCK_SCOPE
>     ParseNode *letDeclaration();
>     ParseNode *letStatement();
>diff -r a26aba9b607b js/src/vm/CommonPropertyNames.h
>--- a/js/src/vm/CommonPropertyNames.h	Fri Feb 01 19:24:30 2013 +0100
>+++ b/js/src/vm/CommonPropertyNames.h	Fri Feb 01 19:25:51 2013 +0100
>@@ -27,16 +27,17 @@
>     macro(tagc, tagc, ">") \
>     macro(XMLList, XMLList, "XMLList")
> #else
> #define FOR_EACH_XML_ONLY_NAME(macro) /* nothing */
> #endif /* JS_HAS_XML_SUPPORT */
> 
> #define FOR_EACH_COMMON_PROPERTYNAME(macro) \
>     macro(anonymous, anonymous, "anonymous") \
>+    macro(as, as, "as") \
>     macro(apply, apply, "apply") \
>     macro(arguments, arguments, "arguments") \
>     macro(buffer, buffer, "buffer") \
>     macro(builder, builder, "builder") \
>     macro(byteLength, byteLength, "byteLength") \
>     macro(byteOffset, byteOffset, "byteOffset") \
>     macro(BYTES_PER_ELEMENT, BYTES_PER_ELEMENT, "BYTES_PER_ELEMENT") \
>     macro(call, call, "call") \
>@@ -67,16 +68,17 @@
>     macro(enumerable, enumerable, "enumerable") \
>     macro(enumerate, enumerate, "enumerate") \
>     macro(escape, escape, "escape") \
>     macro(eval, eval, "eval") \
>     macro(false, false_, "false") \
>     macro(fileName, fileName, "fileName") \
>     macro(fix, fix, "fix") \
>     macro(format, format, "format") \
>+    macro(from, from, "from") \
>     macro(get, get, "get") \
>     macro(getOwnPropertyDescriptor, getOwnPropertyDescriptor, "getOwnPropertyDescriptor") \
>     macro(getOwnPropertyNames, getOwnPropertyNames, "getOwnPropertyNames") \
>     macro(getPropertyDescriptor, getPropertyDescriptor, "getPropertyDescriptor") \
>     macro(global, global, "global") \
>     macro(has, has, "has") \
>     macro(hasOwn, hasOwn, "hasOwn") \
>     macro(hasOwnProperty, hasOwnProperty, "hasOwnProperty") \
>diff -r a26aba9b607b js/src/vm/Keywords.h
>--- a/js/src/vm/Keywords.h	Fri Feb 01 19:24:30 2013 +0100
>+++ b/js/src/vm/Keywords.h	Fri Feb 01 19:25:51 2013 +0100
>@@ -61,21 +61,21 @@
>     macro(throw, throw_, TOK_THROW, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(try, try_, TOK_TRY, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(typeof, typeof, TOK_TYPEOF, JSOP_TYPEOF, JSVERSION_DEFAULT) \
>     macro(var, var, TOK_VAR, JSOP_DEFVAR, JSVERSION_DEFAULT) \
>     macro(void, void_, TOK_VOID, JSOP_VOID, JSVERSION_DEFAULT) \
>     macro(while, while_, TOK_WHILE, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(with, with, TOK_WITH, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(export, export, TOK_EXPORT, JSOP_NOP, JSVERSION_DEFAULT) \
>+    macro(import, import, TOK_IMPORT, JSOP_NOP, JSVERSION_DEFAULT) \
>     /* ES5 reserved keywords reserved in all code. */ \
>     macro(class, class_, TOK_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(enum, enum_, TOK_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(extends, extends, TOK_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>-    macro(import, import, TOK_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(super, super, TOK_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     /* ES5 future reserved keywords in strict mode. */ \
>     macro(implements, implements, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(interface, interface, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(package, package, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(private, private_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(protected, protected_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \
>     macro(public, public_, TOK_STRICT_RESERVED, JSOP_NOP, JSVERSION_DEFAULT) \

Actions: View | Diff | Review

Attachments on bug 568953: 687721 | 702250 | 702254 | 702255 | 702262 | 702295 | 702298 | 703910 | 704548 | 704949 | 704952 | 706900 | 706903 | 706904 | 707407 | 707409 | 707410 | 707411 | 709113 | 709114 | 709118 | 709121 | 709122 | 709124 | 732393 | 732401 | 732432 | 732433 | 779831 | 779834 | 817414 | 8874471