Fix super keyword parsing for arrow functions.

This patch fixes #2657.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik [email protected]

Author: rerobika

jerry-core/parser/js/js-parser-expr.c

@@ -560,8 +560,6 @@ parser_parse_class (parser_context_t *context_p, /**< context */
 {
   JERRY_ASSERT (context_p->token.type == LEXER_KEYW_CLASS);
 
-  context_p->status_flags &= (uint32_t) ~PARSER_CLASS_HAS_SUPER;
-
   uint16_t class_ident_index = PARSER_MAXIMUM_NUMBER_OF_LITERALS;
 
   if (is_statement)
@@ -1407,7 +1405,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
     {
       if ((lexer_check_next_character (context_p, LIT_CHAR_DOT)
             || lexer_check_next_character (context_p, LIT_CHAR_LEFT_SQUARE))
-          && context_p->status_flags & (PARSER_CLASS_HAS_SUPER | PARSER_IS_ARROW_FUNCTION))
+          && context_p->status_flags & (PARSER_CLASS_HAS_SUPER))
       {
         if (!LEXER_IS_BINARY_LVALUE_TOKEN (context_p->stack_top_uint8))
         {
@@ -1426,8 +1424,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
       }
 
       if (lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)
-          && (context_p->status_flags & PARSER_CLASS_HAS_SUPER)
-          && (context_p->status_flags & (PARSER_IS_ARROW_FUNCTION | PARSER_CLASS_CONSTRUCTOR)))
+          && ((context_p->status_flags & PARSER_CLASS_CONSTRUCTOR_SUPER) == PARSER_CLASS_CONSTRUCTOR_SUPER))
       {
         parser_emit_cbc_ext (context_p, CBC_EXT_PUSH_CONSTRUCTOR_SUPER);
         break;

tests/jerry/es2015/regression-test-issue-2657.js

@@ -0,0 +1,20 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+try {
+  eval ("var Mixin1 = (superclass) => class extends super.lass {};");
+  assert (false);
+} catch (e) {
+  assert (e instanceof SyntaxError);
+}

tests/jerry/es2015/regression-test-issue-2669.js

@@ -0,0 +1,33 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var mustBeCalled = false;
+
+class C1 {
+  f () {
+    mustBeCalled = true;
+    return function () {};
+  }
+}
+
+class C2 extends C1 {
+  f () {
+    return class extends super.f() {}
+  }
+}
+
+var c = new C2;
+c.f ();
+
+assert (mustBeCalled);