From 011e1fea88c227e0623a992edcd8a1a886a95922 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 3 Jul 2024 11:14:41 -0700 Subject: [PATCH] segment: Use 'nest' as a counter instead of 'substate'. Signed-off-by: Ben Pfaff --- src/language/lexer/segment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/language/lexer/segment.c b/src/language/lexer/segment.c index 346910898c..096383f5df 100644 --- a/src/language/lexer/segment.c +++ b/src/language/lexer/segment.c @@ -1414,7 +1414,7 @@ segmenter_parse_do_repeat_1__ (struct segmenter *s, { /* We reached the body. */ s->state = S_DO_REPEAT_3; - s->substate = 1; + s->nest = 1; } return ofs; @@ -1435,7 +1435,7 @@ segmenter_parse_do_repeat_2__ (struct segmenter *s, { /* We reached the body. */ s->state = S_DO_REPEAT_3; - s->substate = 1; + s->nest = 1; } return ofs; @@ -1468,7 +1468,7 @@ check_repeat_command (struct segmenter *s, return false; if (lex_id_match (ss_cstr ("REPEAT"), ss_cstr (id))) - s->substate += direction; + s->nest += direction; return true; } @@ -1494,7 +1494,7 @@ segmenter_parse_full_line__ (const char *input, size_t n, bool eof, be repeated. Report each line of syntax as a single SEG_DO_REPEAT_COMMAND. DO REPEAT can be nested, so we look for DO REPEAT...END REPEAT blocks inside - the lines we're segmenting. s->substate counts the nesting level, starting + the lines we're segmenting. s->nest counts the nesting level, starting at 1. */ static int segmenter_parse_do_repeat_3__ (struct segmenter *s, @@ -1508,7 +1508,7 @@ segmenter_parse_do_repeat_3__ (struct segmenter *s, return ofs; else if (!check_repeat_command (s, input, n, eof) && !eof) return -1; - else if (s->substate == 0) + else if (s->nest == 0) { /* Nesting level dropped to 0, so we've finished reading the DO REPEAT body. */ -- 2.30.2