Skip to content

V
V8
Commit 92db073f authored by Mathias Bynens's avatar Mathias Bynens Committed by Commit Bot
Browse files
Options

[parser] Improve error message for unclosed function bodies 

This patch changes the output from:

  function fn() {
                ^
  SyntaxError: Unexpected end of input

to:

  function fn() {
                ^
  SyntaxError: missing '}' after function body

Bug: v8:6513, v8:7321
Change-Id: I4ca8a40fa0be246da2a3ff776b3fb3c87b4ba4e0
Also-By: gsathya@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/1367448
Commit-Queue: Mathias Bynens <mathias@chromium.org>
Reviewed-by: 's avatarMarja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58116}
parent f3cfbd35
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 20 deletions
src/message-template.h
View file @ 92db073f
......@@ -113,6 +113,7 @@ namespace internal {
T(MethodInvokedOnNullOrUndefined, \
"Method invoked on undefined or null value.") \
T(MethodInvokedOnWrongType, "Method invoked on an object that is not %.") \
T(MissingBraceAfterFunctionBody, "missing '}' after function body") \
T(NoAccess, "no access") \
T(NonCallableInInstanceOfCheck, \
"Right-hand side of 'instanceof' is not callable") \
......
src/parsing/parser-base.h
View file @ 92db073f
......@@ -4564,6 +4564,12 @@ ParserBase<Impl>::ParseStatementList(StatementListT* body,
}
while (peek() != end_token) {
if (peek() == Token::EOS) {
DCHECK_EQ(end_token, Token::RBRACE);
ReportMessage(MessageTemplate::kMissingBraceAfterFunctionBody);
return kLazyParsingComplete;
}
StatementT stat = ParseStatementListItem();
if (impl()->IsNull(stat)) return kLazyParsingComplete;
if (stat->IsEmptyStatement()) continue;
......
test/cctest/interpreter/bytecode_expectations/AsyncGenerators.golden
View file @ 92db073f
......@@ -362,7 +362,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(18),
B(LdaConstant), U8(14),
B(Star), R(19),
......
test/cctest/interpreter/bytecode_expectations/ForAwaitOf.golden
View file @ 92db073f
......@@ -119,7 +119,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(15),
B(LdaConstant), U8(11),
B(Star), R(16),
......@@ -336,7 +336,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(15),
B(LdaConstant), U8(11),
B(Star), R(16),
......@@ -571,7 +571,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(15),
B(LdaConstant), U8(11),
B(Star), R(16),
......@@ -771,7 +771,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(13),
B(LdaConstant), U8(9),
B(Star), R(14),
......
test/cctest/interpreter/bytecode_expectations/ForOf.golden
View file @ 92db073f
......@@ -85,7 +85,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(12),
B(LdaConstant), U8(7),
B(Star), R(13),
......@@ -217,7 +217,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(13),
B(LdaConstant), U8(7),
B(Star), R(14),
......@@ -361,7 +361,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(12),
B(LdaConstant), U8(7),
B(Star), R(13),
......@@ -495,7 +495,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(11),
B(LdaConstant), U8(9),
B(Star), R(12),
......
test/cctest/interpreter/bytecode_expectations/ForOfLoop.golden
View file @ 92db073f
......@@ -89,7 +89,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(14),
B(LdaConstant), U8(6),
B(Star), R(15),
......@@ -256,7 +256,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(14),
B(LdaConstant), U8(11),
B(Star), R(15),
......@@ -401,7 +401,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(12),
B(LdaConstant), U8(8),
B(Star), R(13),
......@@ -495,7 +495,7 @@ bytecodes: [
B(JumpIfUndefined), U8(6),
B(Ldar), R(6),
B(JumpIfNotNull), U8(16),
B(LdaSmi), I8(81),
B(LdaSmi), I8(82),
B(Star), R(18),
B(LdaConstant), U8(4),
B(Star), R(19),
......@@ -550,7 +550,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(17),
B(LdaConstant), U8(8),
B(Star), R(18),
......@@ -697,7 +697,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(15),
B(LdaConstant), U8(9),
B(Star), R(16),
......@@ -859,7 +859,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(14),
B(LdaConstant), U8(12),
B(Star), R(15),
......@@ -1008,7 +1008,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(16),
B(LdaConstant), U8(6),
B(Star), R(17),
......@@ -1184,7 +1184,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(15),
B(LdaConstant), U8(7),
B(Star), R(16),
......
test/cctest/interpreter/bytecode_expectations/Generators.golden
View file @ 92db073f
......@@ -203,7 +203,7 @@ bytecodes: [
B(TestTypeOf), U8(6),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(154),
B(Wide), B(LdaSmi), I16(155),
B(Star), R(14),
B(LdaConstant), U8(13),
B(Star), R(15),
......
test/cctest/interpreter/bytecode_expectations/StandardForLoop.golden
View file @ 92db073f
......@@ -228,7 +228,7 @@ bytecodes: [
B(JumpIfUndefined), U8(6),
B(Ldar), R(3),
B(JumpIfNotNull), U8(16),
B(LdaSmi), I8(81),
B(LdaSmi), I8(82),
B(Star), R(4),
B(LdaConstant), U8(1),
B(Star), R(5),
......
test/message/fail/missing-brace-after-arrow-function.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
const fn = () => {
const x = 42;
test/message/fail/missing-brace-after-arrow-function.out 0 → 100644
View file @ 92db073f
*%(basename)s:6: SyntaxError: missing '}' after function body
const x = 42;
^
SyntaxError: missing '}' after function body
test/message/fail/missing-brace-after-function-body.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
function fn() {
const x = 42;
test/message/fail/missing-brace-after-function-body.out 0 → 100644
View file @ 92db073f
*%(basename)s:6: SyntaxError: missing '}' after function body
const x = 42;
^
SyntaxError: missing '}' after function body
test/message/fail/missing-brace-after-if.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
if (true) {
test/message/fail/missing-brace-after-if.out 0 → 100644
View file @ 92db073f
*%(basename)s:6: SyntaxError: Unexpected end of input
SyntaxError: Unexpected end of input
test/message/fail/missing-brace-after-object-literal.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
const { a: b } = {
test/message/fail/missing-brace-after-object-literal.out 0 → 100644
View file @ 92db073f
*%(basename)s:6: SyntaxError: Unexpected end of input
SyntaxError: Unexpected end of input
test/message/fail/missing-paren-after-if-condition.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
if (true
test/message/fail/missing-paren-after-if-condition.out 0 → 100644
View file @ 92db073f
*%(basename)s:6: SyntaxError: Unexpected end of input
SyntaxError: Unexpected end of input
test/message/fail/missing-paren-after-iife.js 0 → 100644
View file @ 92db073f
// Copyright 2018 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.
(function fn() {
const x = 42;
}()
test/message/fail/missing-paren-after-iife.out 0 → 100644
View file @ 92db073f
*%(basename)s:8: SyntaxError: Unexpected end of input
SyntaxError: Unexpected end of input
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment