Index: runtime/vm/parser.h |
=================================================================== |
--- runtime/vm/parser.h (revision 41393) |
+++ runtime/vm/parser.h (working copy) |
@@ -44,7 +44,7 @@ |
node_sequence_(NULL), |
instantiator_(NULL), |
default_parameter_values_(Array::ZoneHandle(isolate, Array::null())), |
- saved_current_context_var_(NULL), |
+ current_context_var_(NULL), |
saved_entry_context_var_(NULL), |
expression_temp_var_(NULL), |
finally_return_temp_var_(NULL), |
@@ -81,15 +81,15 @@ |
default_parameter_values_ = default_parameter_values.raw(); |
} |
- LocalVariable* saved_current_context_var() const { |
- return saved_current_context_var_; |
+ LocalVariable* current_context_var() const { |
+ return current_context_var_; |
} |
- void set_saved_current_context_var(LocalVariable* saved_current_context_var) { |
- ASSERT(saved_current_context_var != NULL); |
- saved_current_context_var_ = saved_current_context_var; |
+ void set_current_context_var(LocalVariable* current_context_var) { |
+ ASSERT(current_context_var != NULL); |
+ current_context_var_ = current_context_var; |
} |
- bool has_saved_current_context_var() const { |
- return saved_current_context_var_ != NULL; |
+ bool has_current_context_var() const { |
+ return current_context_var_ != NULL; |
} |
LocalVariable* saved_entry_context_var() const { |
@@ -125,8 +125,8 @@ |
} |
void EnsureFinallyReturnTemp(); |
- static LocalVariable* CreateExpressionTempVar(intptr_t token_pos); |
LocalVariable* EnsureExpressionTemp(); |
+ LocalVariable* EnsureSavedCurrentContext(); |
bool HasDeferredPrefixes() const { return deferred_prefixes_->length() != 0; } |
ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes() const { |
@@ -173,7 +173,7 @@ |
SequenceNode* node_sequence_; |
LocalVariable* instantiator_; |
Array& default_parameter_values_; |
- LocalVariable* saved_current_context_var_; |
+ LocalVariable* current_context_var_; |
LocalVariable* saved_entry_context_var_; |
LocalVariable* expression_temp_var_; |
LocalVariable* finally_return_temp_var_; |
@@ -734,6 +734,7 @@ |
void CheckOperatorArity(const MemberDesc& member); |
void EnsureExpressionTemp(); |
+ void EnsureContextVar(); |
void EnsureSavedCurrentContext(); |
bool IsLegalAssignableSyntax(AstNode* expr, intptr_t end_pos); |
AstNode* CreateAssignmentNode(AstNode* original, |