[es6] implement default parameters via desugaring

src/preparser.h

Index: src/preparser.h
diff --git a/src/preparser.h b/src/preparser.h
index 116a8eac9b891721e208bea92d9f3b7e4ad30528..f416f1caf5edd5f0fd06a5d4ba953fa4c9957235 100644
--- a/src/preparser.h
+++ b/src/preparser.h
@@ -66,6 +66,7 @@ class ParserBase : public Traits {
  public:
   // Shorten type names defined by Traits.
   typedef typename Traits::Type::Expression ExpressionT;
+  typedef typename Traits::Type::ExpressionList ExpressionListT;
   typedef typename Traits::Type::Identifier IdentifierT;
   typedef typename Traits::Type::FormalParameter FormalParameterT;
   typedef typename Traits::Type::FormalParameterScope FormalParameterScopeT;
@@ -97,6 +98,7 @@ class ParserBase : public Traits {
         allow_harmony_computed_property_names_(false),
         allow_harmony_rest_params_(false),
         allow_harmony_spreadcalls_(false),
+        allow_harmony_default_parameters_(false),
         allow_strong_mode_(false) {}
 
   // Getters that indicate whether certain syntactical constructs are
@@ -123,6 +125,9 @@ class ParserBase : public Traits {
   bool allow_harmony_destructuring() const {
     return allow_harmony_destructuring_;
   }
+  bool allow_harmony_default_parameters() const {
+    return allow_harmony_default_parameters_;
+  }
 
   bool allow_strong_mode() const { return allow_strong_mode_; }
 
@@ -161,6 +166,9 @@ class ParserBase : public Traits {
   void set_allow_harmony_destructuring(bool allow) {
     allow_harmony_destructuring_ = allow;
   }
+  void set_allow_harmony_default_parameters(bool allow) {
+    allow_harmony_default_parameters_ = allow;
+  }
 
 
  protected:
@@ -909,7 +917,9 @@ class ParserBase : public Traits {
 
   void ParseFormalParameter(FormalParameterScopeT* scope, bool is_rest,
                             ExpressionClassifier* classifier, bool* ok);
-  int ParseFormalParameterList(FormalParameterScopeT* scope, bool* has_rest,
+  int ParseFormalParameterList(FormalParameterScopeT* scope,
+                               ExpressionListT initializers,
+                               bool* hasParameterExpressions, bool* has_rest,
                                ExpressionClassifier* classifier, bool* ok);
   void CheckArityRestrictions(
       int param_count, FunctionLiteral::ArityRestriction arity_restriction,
@@ -1011,6 +1021,7 @@ class ParserBase : public Traits {
   bool allow_harmony_rest_params_;
   bool allow_harmony_spreadcalls_;
   bool allow_harmony_destructuring_;
+  bool allow_harmony_default_parameters_;
   bool allow_strong_mode_;
 };
 
@@ -1787,8 +1798,8 @@ class PreParserTraits {
   }
 
   V8_INLINE bool DeclareFormalParameter(DuplicateFinder* scope,
-                                        PreParserIdentifier param,
-                                        bool is_rest);
+                                        PreParserIdentifier param, bool is_rest,
+                                        int pos);
 
   void CheckConflictingVarDeclarations(Scope* scope, bool* ok) {}
 
@@ -1984,7 +1995,7 @@ PreParserExpression PreParserTraits::SpreadCallNew(PreParserExpression function,
 
 bool PreParserTraits::DeclareFormalParameter(
     DuplicateFinder* duplicate_finder, PreParserIdentifier current_identifier,
-    bool is_rest) {
+    bool is_rest, int pos) {
   return pre_parser_->scanner()->FindSymbol(duplicate_finder, 1) != 0;
 }
 
@@ -3641,10 +3652,11 @@ void ParserBase<Traits>::ParseFormalParameter(FormalParameterScopeT* scope,
                                               bool* ok) {
   // FormalParameter[Yield,GeneratorParameter] :
   //   BindingElement[?Yield, ?GeneratorParameter]
+  int pos = peek_position();
   IdentifierT name = ParseAndClassifyIdentifier(classifier, ok);
   if (!*ok) return;
 
-  bool was_declared = Traits::DeclareFormalParameter(scope, name, is_rest);
+  bool was_declared = Traits::DeclareFormalParameter(scope, name, is_rest, pos);
   if (was_declared) {
     classifier->RecordDuplicateFormalParameterError(scanner()->location());
   }
@@ -3653,7 +3665,8 @@ void ParserBase<Traits>::ParseFormalParameter(FormalParameterScopeT* scope,
 
 template <class Traits>
 int ParserBase<Traits>::ParseFormalParameterList(
-    FormalParameterScopeT* scope, bool* is_rest,
+    FormalParameterScopeT* scope, ExpressionListT initializers,
+    bool* hasParameterExpressions, bool* is_rest,
     ExpressionClassifier* classifier, bool* ok) {
   // FormalParameters[Yield,GeneratorParameter] :
   //   [empty]
@@ -3673,14 +3686,41 @@ int ParserBase<Traits>::ParseFormalParameterList(
 
   if (peek() != Token::RPAREN) {
     do {
+      Scope* param_scope = NewScope(scope_, BLOCK_SCOPE);
+      BlockState param_state(&scope_, param_scope);
       if (++parameter_count > Code::kMaxArguments) {
         ReportMessage(MessageTemplate::kTooManyParameters);
         *ok = false;
         return -1;
       }
+
+      int start_pos = peek_position();
       *is_rest = allow_harmony_rest_params() && Check(Token::ELLIPSIS);
       ParseFormalParameter(scope, *is_rest, classifier, ok);
       if (!*ok) return -1;
+
+      // TODO(caitp, dslomov): set *hasParameterExpressions to true if
+      // formal parameter is an ObjectBindingPattern containing computed
+      // property keys
+
+      ExpressionT initializer = this->EmptyExpression();
+      if (allow_harmony_default_parameters() && Check(Token::ASSIGN)) {
+        // Default parameter initializer
+        static const bool accept_IN = true;
+        ExpressionClassifier classifier;
+        initializer = ParseAssignmentExpression(accept_IN, &classifier, ok);
+        if (!*ok) return -1;
+        *hasParameterExpressions = true;
+
+        // A rest parameter cannot be initialized.
+        if (*is_rest) {
+          Scanner::Location loc(start_pos, scanner()->location().end_pos);
+          ReportMessageAt(loc, MessageTemplate::kBadRestParameterInitializer);
+          *ok = false;
+          return -1;
+        }
+      }
+      initializers->Add(initializer, zone());
     } while (!*is_rest && Check(Token::COMMA));
 
     if (*is_rest && peek() == Token::COMMA) {