Introduce await

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 "platform/assert.h"
@@ skipping 29 matching lines @@
  public:
   ParsedFunction(Isolate* isolate, const Function& function)
       : function_(function),
         code_(Code::Handle(isolate, function.unoptimized_code())),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle(isolate, Array::null())),
         saved_current_context_var_(NULL),
         saved_entry_context_var_(NULL),
         expression_temp_var_(NULL),
+        await_temps_scope_(NULL),
         deferred_prefixes_(new ZoneGrowableArray<const LibraryPrefix*>()),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0),
+        num_awaits_(0),
+        seen_await_expr_(false),
         isolate_(isolate) {
     ASSERT(function.IsZoneHandle());
   }
 
   const Function& function() const { return function_; }
   const Code& code() const { return code_; }
 
   SequenceNode* node_sequence() const { return node_sequence_; }
   void SetNodeSequence(SequenceNode* node_sequence);
 
@@ skipping 51 matching lines @@
   }
   void AddDeferredPrefix(const LibraryPrefix& prefix);
 
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
+  void set_await_temps_scope(LocalScope* scope) {
+    ASSERT(await_temps_scope_ == NULL);
+    await_temps_scope_ = scope;
+  }
+  LocalScope* await_temps_scope() const {
+    ASSERT(await_temps_scope_ != NULL);
+    return await_temps_scope_;
+  }
+
+  int num_awaits() const { return num_awaits_; }
+  void record_await() {
+    num_awaits_++;
+    seen_await_expr_ = true;
+  }
+  void reset_seen_await() { seen_await_expr_ = false; }
+  bool seen_await() const { return seen_await_expr_; }

[hausner, 2014/08/07 21:48:43]

I'd prefer have_seen_await() and have_seen_await_expr_

[Michael Lippautz (Google), 2014/08/08 18:12:18]

Done.

+
   Isolate* isolate() const { return isolate_; }
 
  private:
   const Function& function_;
   Code& code_;
   SequenceNode* node_sequence_;
   LocalVariable* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* saved_current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
+  LocalScope* await_temps_scope_;
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
+  int num_awaits_;
+  bool seen_await_expr_;
 
   Isolate* isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
 class Parser : public ValueObject {
  public:
   // Parse the top level of a whole script file and register declared classes
@@ skipping 326 matching lines @@
   SequenceNode* ParseInvokeFieldDispatcher(const Function& func,
                                            Array* default_values);
   void BuildDispatcherScope(const Function& func,
                             const ArgumentsDescriptor& desc,
                             Array* default_values);
 
   void ChainNewBlock(LocalScope* outer_scope);
   void OpenBlock();
   void OpenLoopBlock();
   void OpenFunctionBlock(const Function& func);
+  void OpenAsyncClosure();
   RawFunction* OpenAsyncFunction(intptr_t formal_param_pos);
   SequenceNode* CloseBlock();
   SequenceNode* CloseAsyncFunction(const Function& closure,
                                    SequenceNode* closure_node);
   void CloseAsyncClosure(SequenceNode* body);
 
 
   LocalVariable* LookupPhaseParameter();
   LocalVariable* LookupReceiver(LocalScope* from_scope, bool test_only);
   LocalVariable* LookupTypeArgumentsParameter(LocalScope* from_scope,
@@ skipping 64 matching lines @@
   bool IsFunctionLiteral();
   bool IsForInStatement();
   bool IsTopLevelAccessor();
 
   AstNode* ParseBinaryExpr(int min_preced);
   LiteralNode* ParseConstExpr();
   static const bool kRequireConst = true;
   static const bool kAllowConst = false;
   static const bool kConsumeCascades = true;
   static const bool kNoCascades = false;
+  AstNode* ParseAwaitableExpr(bool require_compiletime_const,
+                              bool consume_cascades);
+  AstNode* ParseAwaitExpr();
   AstNode* ParseExpr(bool require_compiletime_const, bool consume_cascades);
   AstNode* ParseExprList();
   AstNode* ParseConditionalExpr();
   AstNode* ParseUnaryExpr();
   AstNode* ParsePostfixExpr();
   AstNode* ParseSelectors(AstNode* primary, bool is_cascade);
   AstNode* ParseCascades(AstNode* expr);
   AstNode* ParsePrimary();
   AstNode* ParseStringLiteral(bool allow_interpolation);
   String* ParseImportStringLiteral();
@@ skipping 157 matching lines @@
   int16_t last_used_try_index_;
 
   bool unregister_pending_function_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_