From 94576d2b972b3bd136fbe8057c95690ae36ea8c9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 25 Dec 2018 23:45:57 +0100 Subject: bc: fix interactive handling of comments in strings and quotes in comments function old new delta zbc_lex_next 1965 1979 +14 Signed-off-by: Denys Vlasenko --- miscutils/bc.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'miscutils') diff --git a/miscutils/bc.c b/miscutils/bc.c index 809b4bfc4..9d04ddea3 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -2910,25 +2910,29 @@ static bool bc_lex_more_input(void) string = G.input_buffer.v + prevlen; while (*string) { char c = *string; - if (string == G.input_buffer.v || string[-1] != '\\') { - if (IS_BC) - str ^= (c == '"'); - else { - if (c == ']') - str -= 1; - else if (c == '[') - str += 1; + if (!comment) { + if (string == G.input_buffer.v || string[-1] != '\\') { + if (IS_BC) + str ^= (c == '"'); + else { + if (c == ']') + str -= 1; + else if (c == '[') + str += 1; + } } } string++; - if (c == '/' && *string == '*') { - comment = true; - string++; - continue; - } - if (c == '*' && *string == '/') { - comment = false; - string++; + if (!str) { + if (c == '/' && *string == '*') { + comment = true; + string++; + continue; + } + if (c == '*' && *string == '/') { + comment = false; + string++; + } } } if (str != 0 || comment) { -- cgit v1.2.3