| Index: src/ast.h
|
| diff --git a/src/ast.h b/src/ast.h
|
| index 330aa9eec7e72a11f190ae174c71deda15851522..a686f91307e5190b6d8e66414ecc6a17a91a17a2 100644
|
| --- a/src/ast.h
|
| +++ b/src/ast.h
|
| @@ -42,18 +42,11 @@ namespace internal {
|
| #define DECLARATION_NODE_LIST(V) \
|
| V(VariableDeclaration) \
|
| V(FunctionDeclaration) \
|
| - V(ModuleDeclaration) \
|
| V(ImportDeclaration) \
|
| V(ExportDeclaration)
|
|
|
| -#define MODULE_NODE_LIST(V) \
|
| - V(ModuleLiteral) \
|
| - V(ModulePath) \
|
| - V(ModuleUrl)
|
| -
|
| #define STATEMENT_NODE_LIST(V) \
|
| V(Block) \
|
| - V(ModuleStatement) \
|
| V(ExpressionStatement) \
|
| V(EmptyStatement) \
|
| V(IfStatement) \
|
| @@ -99,7 +92,6 @@ namespace internal {
|
|
|
| #define AST_NODE_LIST(V) \
|
| DECLARATION_NODE_LIST(V) \
|
| - MODULE_NODE_LIST(V) \
|
| STATEMENT_NODE_LIST(V) \
|
| EXPRESSION_NODE_LIST(V)
|
|
|
| @@ -617,25 +609,6 @@ class FunctionDeclaration final : public Declaration {
|
| };
|
|
|
|
|
| -class ModuleDeclaration final : public Declaration {
|
| - public:
|
| - DECLARE_NODE_TYPE(ModuleDeclaration)
|
| -
|
| - Module* module() const { return module_; }
|
| - InitializationFlag initialization() const override {
|
| - return kCreatedInitialized;
|
| - }
|
| -
|
| - protected:
|
| - ModuleDeclaration(Zone* zone, VariableProxy* proxy, Module* module,
|
| - Scope* scope, int pos)
|
| - : Declaration(zone, proxy, CONST, scope, pos), module_(module) {}
|
| -
|
| - private:
|
| - Module* module_;
|
| -};
|
| -
|
| -
|
| class ImportDeclaration final : public Declaration {
|
| public:
|
| DECLARE_NODE_TYPE(ImportDeclaration)
|
| @@ -695,64 +668,6 @@ class Module : public AstNode {
|
| };
|
|
|
|
|
| -class ModuleLiteral final : public Module {
|
| - public:
|
| - DECLARE_NODE_TYPE(ModuleLiteral)
|
| -
|
| - protected:
|
| - ModuleLiteral(Zone* zone, Block* body, ModuleDescriptor* descriptor, int pos)
|
| - : Module(zone, descriptor, pos, body) {}
|
| -};
|
| -
|
| -
|
| -class ModulePath final : public Module {
|
| - public:
|
| - DECLARE_NODE_TYPE(ModulePath)
|
| -
|
| - Module* module() const { return module_; }
|
| - Handle<String> name() const { return name_->string(); }
|
| -
|
| - protected:
|
| - ModulePath(Zone* zone, Module* module, const AstRawString* name, int pos)
|
| - : Module(zone, pos), module_(module), name_(name) {}
|
| -
|
| - private:
|
| - Module* module_;
|
| - const AstRawString* name_;
|
| -};
|
| -
|
| -
|
| -class ModuleUrl final : public Module {
|
| - public:
|
| - DECLARE_NODE_TYPE(ModuleUrl)
|
| -
|
| - Handle<String> url() const { return url_; }
|
| -
|
| - protected:
|
| - ModuleUrl(Zone* zone, Handle<String> url, int pos)
|
| - : Module(zone, pos), url_(url) {
|
| - }
|
| -
|
| - private:
|
| - Handle<String> url_;
|
| -};
|
| -
|
| -
|
| -class ModuleStatement final : public Statement {
|
| - public:
|
| - DECLARE_NODE_TYPE(ModuleStatement)
|
| -
|
| - Block* body() const { return body_; }
|
| -
|
| - protected:
|
| - ModuleStatement(Zone* zone, Block* body, int pos)
|
| - : Statement(zone, pos), body_(body) {}
|
| -
|
| - private:
|
| - Block* body_;
|
| -};
|
| -
|
| -
|
| class IterationStatement : public BreakableStatement {
|
| public:
|
| // Type testing & conversion.
|
| @@ -3241,13 +3156,6 @@ class AstNodeFactory final BASE_EMBEDDED {
|
| return new (zone_) FunctionDeclaration(zone_, proxy, mode, fun, scope, pos);
|
| }
|
|
|
| - ModuleDeclaration* NewModuleDeclaration(VariableProxy* proxy,
|
| - Module* module,
|
| - Scope* scope,
|
| - int pos) {
|
| - return new (zone_) ModuleDeclaration(zone_, proxy, module, scope, pos);
|
| - }
|
| -
|
| ImportDeclaration* NewImportDeclaration(VariableProxy* proxy,
|
| const AstRawString* import_name,
|
| const AstRawString* module_specifier,
|
| @@ -3262,19 +3170,6 @@ class AstNodeFactory final BASE_EMBEDDED {
|
| return new (zone_) ExportDeclaration(zone_, proxy, scope, pos);
|
| }
|
|
|
| - ModuleLiteral* NewModuleLiteral(Block* body, ModuleDescriptor* descriptor,
|
| - int pos) {
|
| - return new (zone_) ModuleLiteral(zone_, body, descriptor, pos);
|
| - }
|
| -
|
| - ModulePath* NewModulePath(Module* origin, const AstRawString* name, int pos) {
|
| - return new (zone_) ModulePath(zone_, origin, name, pos);
|
| - }
|
| -
|
| - ModuleUrl* NewModuleUrl(Handle<String> url, int pos) {
|
| - return new (zone_) ModuleUrl(zone_, url, pos);
|
| - }
|
| -
|
| Block* NewBlock(ZoneList<const AstRawString*>* labels,
|
| int capacity,
|
| bool is_initializer_block,
|
| @@ -3308,10 +3203,6 @@ class AstNodeFactory final BASE_EMBEDDED {
|
| return NULL;
|
| }
|
|
|
| - ModuleStatement* NewModuleStatement(Block* body, int pos) {
|
| - return new (zone_) ModuleStatement(zone_, body, pos);
|
| - }
|
| -
|
| ExpressionStatement* NewExpressionStatement(Expression* expression, int pos) {
|
| return new (zone_) ExpressionStatement(zone_, expression, pos);
|
| }
|
|
|