From a6b6753fda9745f316f3236462b74794b35b85c9 Mon Sep 17 00:00:00 2001 From: Li Jin Date: Mon, 26 Sep 2022 17:38:37 +0800 Subject: fix ending white space parsing. --- src/yuescript/yue_parser.cpp | 10 +++++----- src/yuescript/yue_parser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp index c5cae0b..9fca97e 100755 --- a/src/yuescript/yue_parser.cpp +++ b/src/yuescript/yue_parser.cpp @@ -659,20 +659,20 @@ YueParser::YueParser() { Body = InBlock | Space >> Statement; - empty_line_stop = ( + empty_line_break = ( check_indent >> (MultiLineComment >> Space | Comment) | advance >> ensure(MultiLineComment >> Space | Comment, PopIndent) | - plain_space) >> and_(Stop); + plain_space) >> and_(Break); Line = CheckIndent >> Statement | Advance >> ensure(Space >> and_(PipeOperator) >> Statement, PopIndent) | - empty_line_stop; + empty_line_break; Block = Seperator >> Line >> *(+Break >> Line); Shebang = expr("#!") >> *(not_(Stop) >> Any); - BlockEnd = Block >> Stop; - File = -Shebang >> -Block >> Stop; + BlockEnd = Block >> White >> Stop; + File = -Shebang >> -Block >> White >> Stop; } // clang-format on diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h index 7085d04..62f507e 100755 --- a/src/yuescript/yue_parser.h +++ b/src/yuescript/yue_parser.h @@ -195,7 +195,7 @@ private: rule expo_exp; rule exp_not_tab; rule local_const_item; - rule empty_line_stop; + rule empty_line_break; rule yue_comment; rule yue_line_comment; rule yue_multiline_comment; -- cgit v1.2.3-55-g6feb