From 33ba24e9334d5dac423947de62baef5d94213542 Mon Sep 17 00:00:00 2001 From: yuyi Date: Mon, 3 Apr 2023 19:35:27 +0800 Subject: [PATCH] scanner: fix nested multiline comments (#17859) --- vlib/v/scanner/scanner.v | 2 +- vlib/v/tests/nested_multiline_comments_test.v | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v index f2fc9e97b..3898945d4 100644 --- a/vlib/v/scanner/scanner.v +++ b/vlib/v/scanner/scanner.v @@ -1071,7 +1071,7 @@ fn (mut s Scanner) text_scan() token.Token { s.inc_line_number() continue } - if s.expect('/*', s.pos) { + if s.expect('/*', s.pos) && s.text[s.pos + 2] != `/` { nest_count++ continue } diff --git a/vlib/v/tests/nested_multiline_comments_test.v b/vlib/v/tests/nested_multiline_comments_test.v index f61aac349..640a982ff 100644 --- a/vlib/v/tests/nested_multiline_comments_test.v +++ b/vlib/v/tests/nested_multiline_comments_test.v @@ -1,5 +1,19 @@ -fn test_nested_multiline_comments() { +fn test_nested_multiline_comments_1() { /*//println(os.args) */ assert true } + +fn test_nested_multiline_comments_2() { + tt() + assert true +} + +/* +fn tt() { +} +//*/ + +fn tt() { + println('hello, world') +} -- 2.39.5