OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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/v8.h" | 5 #include "src/v8.h" |
6 | 6 |
7 #include "src/rewriter.h" | 7 #include "src/rewriter.h" |
8 | 8 |
9 #include "src/ast.h" | 9 #include "src/ast.h" |
10 #include "src/compiler.h" | 10 #include "src/compiler.h" |
11 #include "src/scopes.h" | 11 #include "src/scopes.h" |
12 | 12 |
13 namespace v8 { | 13 namespace v8 { |
14 namespace internal { | 14 namespace internal { |
15 | 15 |
16 class Processor: public AstVisitor { | 16 class Processor: public AstVisitor { |
17 public: | 17 public: |
18 Processor(Variable* result, AstValueFactory* ast_value_factory) | 18 Processor(Variable* result, Zone* zone, AstNode::IdGen* ast_node_id_gen) |
19 : result_(result), | 19 : result_(result), |
20 result_assigned_(false), | 20 result_assigned_(false), |
21 is_set_(false), | 21 is_set_(false), |
22 in_try_(false), | 22 in_try_(false), |
23 factory_(ast_value_factory) { | 23 // Passing a null AstValueFactory is fine, because Processor doesn't |
24 InitializeAstVisitor(ast_value_factory->zone()); | 24 // need to create strings or literals. |
| 25 factory_(zone, NULL, ast_node_id_gen) { |
| 26 InitializeAstVisitor(zone); |
25 } | 27 } |
26 | 28 |
27 virtual ~Processor() { } | 29 virtual ~Processor() { } |
28 | 30 |
29 void Process(ZoneList<Statement*>* statements); | 31 void Process(ZoneList<Statement*>* statements); |
30 bool result_assigned() const { return result_assigned_; } | 32 bool result_assigned() const { return result_assigned_; } |
31 | 33 |
32 AstNodeFactory<AstNullVisitor>* factory() { | 34 AstNodeFactory<AstNullVisitor>* factory() { |
33 return &factory_; | 35 return &factory_; |
34 } | 36 } |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 Scope* scope = function->scope(); | 233 Scope* scope = function->scope(); |
232 DCHECK(scope != NULL); | 234 DCHECK(scope != NULL); |
233 if (!scope->is_global_scope() && !scope->is_eval_scope()) return true; | 235 if (!scope->is_global_scope() && !scope->is_eval_scope()) return true; |
234 | 236 |
235 ZoneList<Statement*>* body = function->body(); | 237 ZoneList<Statement*>* body = function->body(); |
236 if (!body->is_empty()) { | 238 if (!body->is_empty()) { |
237 Variable* result = | 239 Variable* result = |
238 scope->NewTemporary(info->ast_value_factory()->dot_result_string()); | 240 scope->NewTemporary(info->ast_value_factory()->dot_result_string()); |
239 // The name string must be internalized at this point. | 241 // The name string must be internalized at this point. |
240 DCHECK(!result->name().is_null()); | 242 DCHECK(!result->name().is_null()); |
241 Processor processor(result, info->ast_value_factory()); | 243 Processor processor(result, info->zone(), info->ast_node_id_gen()); |
242 processor.Process(body); | 244 processor.Process(body); |
243 if (processor.HasStackOverflow()) return false; | 245 if (processor.HasStackOverflow()) return false; |
244 | 246 |
245 if (processor.result_assigned()) { | 247 if (processor.result_assigned()) { |
246 DCHECK(function->end_position() != RelocInfo::kNoPosition); | 248 DCHECK(function->end_position() != RelocInfo::kNoPosition); |
247 // Set the position of the assignment statement one character past the | 249 // Set the position of the assignment statement one character past the |
248 // source code, such that it definitely is not in the source code range | 250 // source code, such that it definitely is not in the source code range |
249 // of an immediate inner scope. For example in | 251 // of an immediate inner scope. For example in |
250 // eval('with ({x:1}) x = 1'); | 252 // eval('with ({x:1}) x = 1'); |
251 // the end position of the function generated for executing the eval code | 253 // the end position of the function generated for executing the eval code |
252 // coincides with the end of the with scope which is the position of '1'. | 254 // coincides with the end of the with scope which is the position of '1'. |
253 int pos = function->end_position(); | 255 int pos = function->end_position(); |
254 VariableProxy* result_proxy = | 256 VariableProxy* result_proxy = |
255 processor.factory()->NewVariableProxy(result, pos); | 257 processor.factory()->NewVariableProxy(result, pos); |
256 Statement* result_statement = | 258 Statement* result_statement = |
257 processor.factory()->NewReturnStatement(result_proxy, pos); | 259 processor.factory()->NewReturnStatement(result_proxy, pos); |
258 body->Add(result_statement, info->zone()); | 260 body->Add(result_statement, info->zone()); |
259 } | 261 } |
260 } | 262 } |
261 | 263 |
262 return true; | 264 return true; |
263 } | 265 } |
264 | 266 |
265 | 267 |
266 } } // namespace v8::internal | 268 } } // namespace v8::internal |
OLD | NEW |