[es6] support `get` and `set` in shorthand properties

src/preparser.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_PREPARSER_H
 #define V8_PREPARSER_H
 
 #include "src/bailout-reason.h"
 #include "src/expression-classifier.h"
 #include "src/func-name-inferrer.h"
@@ skipping 2638 matching lines @@
 
     return factory()->NewObjectLiteralProperty(name_expression, value,
                                                ObjectLiteralProperty::COMPUTED,
                                                is_static, *is_computed_name);
 
   } else if (in_class && name_is_static && !is_static) {
     // static MethodDefinition
     return ParsePropertyDefinition(checker, true, has_extends, true,
                                    is_computed_name, nullptr, classifier, ok);
   } else if (is_get || is_set) {
+    name_token = peek();
+    if (!in_class &&
+        (name_token == Token::ASSIGN || name_token == Token::COMMA ||
+         name_token == Token::RBRACE)) {
+      goto shorthand_property;

[adamk, 2015/09/08 23:17:17]

Can't you just do without the goto?

} else if ((is_get || is_set) &&
           (in_class ||
            (peek() != Token::ASSIGN &&
             peek() != Token::COMMA &&
             peek() != Token::RBRACE)) {


that'll fall through to the next else/if.

[caitp (gmail), 2015/09/08 23:35:13]

That's true. I think this is still a confusing hack which mixes up the different
productions, but it seems like a reasonable way to split off from the
refactoring. I'll do that.

+    }
+
     // Accessor
     name = this->EmptyIdentifier();
     bool dont_care = false;
-    name_token = peek();
 
     name_expression = ParsePropertyName(
         &name, &dont_care, &dont_care, &dont_care, is_computed_name, classifier,
         CHECK_OK_CUSTOM(EmptyObjectLiteralProperty));
 
     if (!*is_computed_name) {
       checker->CheckProperty(name_token, kAccessorProperty, is_static,
                              is_generator,
                              CHECK_OK_CUSTOM(EmptyObjectLiteralProperty));
     }
@@ skipping 14 matching lines @@
           factory()->NewStringLiteral(name, name_expression->position());
     }
 
     return factory()->NewObjectLiteralProperty(
         name_expression, value,
         is_get ? ObjectLiteralProperty::GETTER : ObjectLiteralProperty::SETTER,
         is_static, *is_computed_name);
 
   } else if (!in_class && Token::IsIdentifier(name_token, language_mode(),
                                               this->is_generator())) {
+  shorthand_property:
     DCHECK(!*is_computed_name);
     DCHECK(!is_static);
 
     if (classifier->duplicate_finder() != nullptr &&
         scanner()->FindSymbol(classifier->duplicate_finder(), 1) != 0) {
       classifier->RecordDuplicateFormalParameterError(scanner()->location());
     }
 
     ExpressionT lhs = this->ExpressionFromIdentifier(
         name, next_beg_pos, next_end_pos, scope_, factory());
@@ skipping 1450 matching lines @@
       *ok = false;
       return;
     }
     has_seen_constructor_ = true;
     return;
   }
 }
 } }  // v8::internal
 
 #endif  // V8_PREPARSER_H