aboutsummaryrefslogtreecommitdiff
path: root/src/yuescript/yue_parser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuescript/yue_parser.cpp')
-rw-r--r--src/yuescript/yue_parser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index c76b574..30c5598 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -333,9 +333,9 @@ YueParser::YueParser() {
333 expr("not") >> not_(AlphaNum); 333 expr("not") >> not_(AlphaNum);
334 unary_exp = *(Space >> unary_operator) >> expo_exp; 334 unary_exp = *(Space >> unary_operator) >> expo_exp;
335 335
336 BackcallOperator = expr("|>"); 336 PipeOperator = expr("|>");
337 backcall_value = Space >> BackcallOperator >> *SpaceBreak >> unary_exp; 337 pipe_value = Space >> PipeOperator >> *SpaceBreak >> unary_exp;
338 backcall_exp = unary_exp >> *backcall_value; 338 pipe_exp = unary_exp >> *pipe_value;
339 339
340 BinaryOperator = 340 BinaryOperator =
341 (expr("or") >> not_(AlphaNum)) | 341 (expr("or") >> not_(AlphaNum)) |
@@ -350,8 +350,8 @@ YueParser::YueParser() {
350 expr(">>") | 350 expr(">>") |
351 expr("//") | 351 expr("//") |
352 set("+-*/%><|&~"); 352 set("+-*/%><|&~");
353 exp_op_value = Space >> BinaryOperator >> *SpaceBreak >> backcall_exp; 353 exp_op_value = Space >> BinaryOperator >> *SpaceBreak >> pipe_exp;
354 Exp = Seperator >> backcall_exp >> *exp_op_value; 354 Exp = Seperator >> pipe_exp >> *exp_op_value;
355 355
356 DisableChain = pl::user(true_(), [](const item_t& item) { 356 DisableChain = pl::user(true_(), [](const item_t& item) {
357 State* st = reinterpret_cast<State*>(item.user_data); 357 State* st = reinterpret_cast<State*>(item.user_data);
@@ -563,7 +563,7 @@ YueParser::YueParser() {
563 fn_arrow_back = expr('<') >> set("-="); 563 fn_arrow_back = expr('<') >> set("-=");
564 Backcall = -FnArgsDef >> Space >> fn_arrow_back >> Space >> ChainValue; 564 Backcall = -FnArgsDef >> Space >> fn_arrow_back >> Space >> ChainValue;
565 565
566 BackcallBody = Seperator >> Space >> BackcallOperator >> unary_exp >> *(+SpaceBreak >> CheckIndent >> Space >> BackcallOperator >> unary_exp); 566 PipeBody = Seperator >> Space >> PipeOperator >> unary_exp >> *(+SpaceBreak >> CheckIndent >> Space >> PipeOperator >> unary_exp);
567 567
568 ExpList = Seperator >> Exp >> *(sym(',') >> Exp); 568 ExpList = Seperator >> Exp >> *(sym(',') >> Exp);
569 ExpListLow = Seperator >> Exp >> *(Space >> set(",;") >> Exp); 569 ExpListLow = Seperator >> Exp >> *(Space >> set(",;") >> Exp);
@@ -605,14 +605,14 @@ YueParser::YueParser() {
605 Import | While | Repeat | For | ForEach | 605 Import | While | Repeat | For | ForEach |
606 Return | Local | Global | Export | Macro | 606 Return | Local | Global | Export | Macro |
607 Space >> BreakLoop | Label | Goto | Backcall | 607 Space >> BreakLoop | Label | Goto | Backcall |
608 LocalAttrib | BackcallBody | ExpListAssign 608 LocalAttrib | PipeBody | ExpListAssign
609 ) >> Space >> 609 ) >> Space >>
610 -statement_appendix >> -statement_sep; 610 -statement_appendix >> -statement_sep;
611 611
612 Body = InBlock | Statement; 612 Body = InBlock | Statement;
613 613
614 empty_line_stop = Space >> and_(Break); 614 empty_line_stop = Space >> and_(Break);
615 Line = and_(check_indent >> Space >> not_(BackcallOperator)) >> Statement | Advance >> ensure(and_(Space >> BackcallOperator) >> Statement, PopIndent) | empty_line_stop; 615 Line = and_(check_indent >> Space >> not_(PipeOperator)) >> Statement | Advance >> ensure(and_(Space >> PipeOperator) >> Statement, PopIndent) | empty_line_stop;
616 Block = Seperator >> Line >> *(+Break >> Line); 616 Block = Seperator >> Line >> *(+Break >> Line);
617 617
618 Shebang = expr("#!") >> *(not_(Stop) >> Any); 618 Shebang = expr("#!") >> *(not_(Stop) >> Any);