OLD | NEW |
1 // Copyright 2015 the V8 project authors. All rights reserved. | 1 // Copyright 2015 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/ast/ast.h" | 5 #include "src/ast/ast.h" |
6 #include "src/messages.h" | 6 #include "src/messages.h" |
7 #include "src/parsing/parameter-initializer-rewriter.h" | 7 #include "src/parsing/parameter-initializer-rewriter.h" |
8 #include "src/parsing/parser.h" | 8 #include "src/parsing/parser.h" |
9 | 9 |
10 namespace v8 { | 10 namespace v8 { |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 // is always bound to the declared variable (independent of possibly | 144 // is always bound to the declared variable (independent of possibly |
145 // surrounding 'with' statements). | 145 // surrounding 'with' statements). |
146 // For let/const declarations in harmony mode, we can also immediately | 146 // For let/const declarations in harmony mode, we can also immediately |
147 // pre-resolve the proxy because it resides in the same scope as the | 147 // pre-resolve the proxy because it resides in the same scope as the |
148 // declaration. | 148 // declaration. |
149 const AstRawString* name = pattern->raw_name(); | 149 const AstRawString* name = pattern->raw_name(); |
150 VariableProxy* proxy = parser_->NewUnresolved(name, descriptor_->mode); | 150 VariableProxy* proxy = parser_->NewUnresolved(name, descriptor_->mode); |
151 Declaration* declaration = factory()->NewVariableDeclaration( | 151 Declaration* declaration = factory()->NewVariableDeclaration( |
152 proxy, descriptor_->mode, descriptor_->scope, | 152 proxy, descriptor_->mode, descriptor_->scope, |
153 descriptor_->declaration_pos); | 153 descriptor_->declaration_pos); |
154 Variable* var = | 154 Variable* var = parser_->Declare(declaration, descriptor_->declaration_kind, |
155 parser_->Declare(declaration, descriptor_->declaration_kind, | 155 ok_, descriptor_->hoist_scope); |
156 descriptor_->mode != VAR, ok_, descriptor_->hoist_scope); | |
157 if (!*ok_) return; | 156 if (!*ok_) return; |
158 DCHECK_NOT_NULL(var); | 157 DCHECK_NOT_NULL(var); |
159 DCHECK(!proxy->is_resolved() || proxy->var() == var); | 158 DCHECK(!proxy->is_resolved() || proxy->var() == var); |
160 var->set_initializer_position(initializer_position_); | 159 var->set_initializer_position(initializer_position_); |
161 | 160 |
162 DCHECK(initializer_position_ != kNoSourcePosition); | 161 DCHECK(initializer_position_ != kNoSourcePosition); |
163 | 162 |
164 Scope* declaration_scope = IsLexicalVariableMode(descriptor_->mode) | 163 Scope* declaration_scope = IsLexicalVariableMode(descriptor_->mode) |
165 ? descriptor_->scope | 164 ? descriptor_->scope |
166 : descriptor_->scope->GetDeclarationScope(); | 165 : descriptor_->scope->GetDeclarationScope(); |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 NOT_A_PATTERN(TryFinallyStatement) | 757 NOT_A_PATTERN(TryFinallyStatement) |
759 NOT_A_PATTERN(UnaryOperation) | 758 NOT_A_PATTERN(UnaryOperation) |
760 NOT_A_PATTERN(VariableDeclaration) | 759 NOT_A_PATTERN(VariableDeclaration) |
761 NOT_A_PATTERN(WhileStatement) | 760 NOT_A_PATTERN(WhileStatement) |
762 NOT_A_PATTERN(WithStatement) | 761 NOT_A_PATTERN(WithStatement) |
763 NOT_A_PATTERN(Yield) | 762 NOT_A_PATTERN(Yield) |
764 | 763 |
765 #undef NOT_A_PATTERN | 764 #undef NOT_A_PATTERN |
766 } // namespace internal | 765 } // namespace internal |
767 } // namespace v8 | 766 } // namespace v8 |
OLD | NEW |