Minor cleanup

runtime/vm/parser.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
@@ skipping 55 matching lines @@
     default_parameter_values_ = default_parameter_values.raw();
   }
 
   LocalVariable* saved_current_context_var() const {
     return saved_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;
   }
+  bool has_saved_current_context_var() const {
+    return saved_current_context_var_ != NULL;
+  }
 
   LocalVariable* saved_entry_context_var() const {
     return saved_entry_context_var_;
   }
   void set_saved_entry_context_var(LocalVariable* saved_entry_context_var) {
     ASSERT(saved_entry_context_var != NULL);
     saved_entry_context_var_ = saved_entry_context_var;
   }
 
   // Returns NULL if this function does not save the arguments descriptor on
@@ skipping 34 matching lines @@
   int num_copied_params_;
   int num_stack_locals_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
 class Parser : public ValueObject {
  public:
   Parser(const Script& script, const Library& library);
-  Parser(const Script& script, const Function& function, intptr_t token_pos);
+  Parser(const Script& script, ParsedFunction* function, intptr_t token_pos);
 
   // Parse the top level of a whole script file and register declared classes
   // in the given library.
   static void ParseCompilationUnit(const Library& library,
                                    const Script& script);
 
   static void ParseFunction(ParsedFunction* parsed_function);
 
   // Format and print a message with source location.
   // A null script means no source and a negative token_pos means no position.
@@ skipping 51 matching lines @@
   // function.
   // The function level of the current parsing scope reflects the function
   // nesting. The function level is zero while parsing the body of the
   // current_function(), but is greater than zero while parsing the body of
   // local functions nested in current_function().
 
   // The class being parsed.
   const Class& current_class() const;
   void set_current_class(const Class& value);
 
+  // ParsedFunction accessor.
+  ParsedFunction* parsed_function() const {
+    return parsed_function_;
+  }
+
   // Parsing a library or a regular source script.
   bool is_library_source() const {
     return (script_.kind() == RawScript::kScriptTag) ||
         (script_.kind() == RawScript::kLibraryTag);
   }
 
   bool is_part_source() const {
     return script_.kind() == RawScript::kSourceTag;
   }
 
@@ skipping 405 matching lines @@
 
   // The member currently being parsed during "top level" parsing.
   MemberDesc* current_member_;
 
   // Parser mode to allow/disallow function literals. This is used in
   // constructor initializer expressions to handle ambiguous grammar.
   bool SetAllowFunctionLiterals(bool value);
   bool allow_function_literals_;
 
   // The function currently being compiled.
-  const Function& current_function_;
+  ParsedFunction* parsed_function_;
 
   // The function currently being parsed.
   Function& innermost_function_;
 
   // The class currently being parsed, or the owner class of the
   // function currently being parsed. It is used for primary identifier lookups.
   Class& current_class_;
 
   // The current library (and thus class dictionary) used to resolve names.
   const Library& library_;
 
   // List of try blocks seen so far, this is used to generate inlined finally
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
-  // Allocate temporary only once per function.
-  LocalVariable* expression_temp_;
-
-  // Allocate saved current context only if needed.
-  LocalVariable* saved_current_context_;
-
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_