diff --git a/src/aeso_ast_infer_types.erl b/src/aeso_ast_infer_types.erl index 0e87869..4ef4403 100644 --- a/src/aeso_ast_infer_types.erl +++ b/src/aeso_ast_infer_types.erl @@ -1941,7 +1941,12 @@ infer_infix({'::', As}) -> infer_infix({'++', As}) -> ElemType = fresh_uvar(As), ListType = {app_t, As, {id, As, "list"}, [ElemType]}, - {fun_t, As, [], [ListType, ListType], ListType}. + {fun_t, As, [], [ListType, ListType], ListType}; +infer_infix({'|>', As}) -> + ArgType = fresh_uvar(As), + ResType = fresh_uvar(As), + FunType = {fun_t, As, [], [ArgType], ResType}, + {fun_t, As, [], [ArgType, FunType], ResType}. infer_prefix({'!',As}) -> Bool = {id, As, "bool"}, diff --git a/src/aeso_ast_to_fcode.erl b/src/aeso_ast_to_fcode.erl index f0ca66a..5194340 100644 --- a/src/aeso_ast_to_fcode.erl +++ b/src/aeso_ast_to_fcode.erl @@ -703,8 +703,11 @@ expr_to_fcode(Env, _Type, {block, _, Stmts}) -> expr_to_fcode(Env, _Type, Expr = {app, _, {Op, _}, [_, _]}) when Op == '&&'; Op == '||' -> Tree = expr_to_decision_tree(Env, Expr), decision_tree_to_fcode(Tree); -expr_to_fcode(Env, _Type, {app, _Ann, {Op, _}, [A, B]}) when is_atom(Op) -> - {op, Op, [expr_to_fcode(Env, A), expr_to_fcode(Env, B)]}; +expr_to_fcode(Env, Type, {app, Ann, {Op, _}, [A, B]}) when is_atom(Op) -> + case Op of + '|>' -> expr_to_fcode(Env, Type, {app, Ann, B, [A]}); + _ -> {op, Op, [expr_to_fcode(Env, A), expr_to_fcode(Env, B)]} + end; expr_to_fcode(Env, _Type, {app, _Ann, {Op, _}, [A]}) when is_atom(Op) -> case Op of '-' -> {op, '-', [{lit, {int, 0}}, expr_to_fcode(Env, A)]}; diff --git a/src/aeso_parser.erl b/src/aeso_parser.erl index 79d7a8b..7e5fa62 100644 --- a/src/aeso_parser.erl +++ b/src/aeso_parser.erl @@ -308,17 +308,18 @@ expr() -> expr100(). expr100() -> Expr100 = ?LAZY_P(expr100()), - Expr200 = ?LAZY_P(expr200()), + Expr150 = ?LAZY_P(expr150()), choice( [ ?RULE(lam_args(), keyword('=>'), body(), {lam, _2, _1, _3}) %% TODO: better location - , {'if', keyword('if'), parens(Expr100), Expr200, right(tok(else), Expr100)} - , ?RULE(Expr200, optional(right(tok(':'), type())), + , {'if', keyword('if'), parens(Expr100), Expr150, right(tok(else), Expr100)} + , ?RULE(Expr150, optional(right(tok(':'), type())), case _2 of none -> _1; {ok, Type} -> {typed, get_ann(_1), _1, Type} end) ]). +expr150() -> infixl(expr200(), binop('|>')). expr200() -> infixr(expr300(), binop('||')). expr300() -> infixr(expr400(), binop('&&')). expr400() -> infix(expr500(), binop(['<', '>', '=<', '>=', '==', '!='])).