From 278cd32830add1b069d1400d70aba942e90e96f0 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Sat, 20 Apr 2024 16:51:00 +0300 Subject: [PATCH] add pipe, lambda shorts --- lib.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib.nix b/lib.nix index a57a57d..78a5374 100644 --- a/lib.nix +++ b/lib.nix @@ -119,8 +119,8 @@ let local = expr: spaceBetween [ kw_local expr ]; set = variable: value: join " = " [ (raw variable) value ]; - func = fnName: params: body: - (concatLines + func' = fnName: params: body: + (spaceBetween ([ (concat [ (spaceBetween [ kw_function (validFuncName fnName) ]) @@ -130,7 +130,10 @@ let ++ body ++ [ kw_end ]) ); - lambda = func ""; + func = fnName: params: body: + func' fnName params (concatLines body); + lambda = func' ""; + lambda0 = lambda [ ]; return = expr: spaceBetween ([ kw_return expr ]); return_void = return null; @@ -195,8 +198,13 @@ in inherit toLua; inherit LuaNil; - inherit raw join concat concatLines pipe; - inherit namedField call require local set func ifelse if'; + inherit raw join concat concatLines; + inherit pipe pipe1; + + inherit namedField require local set ifelse if'; + + inherit call call0 call1; + inherit func lambda lambda0; inherit op; inherit eq ne gt lt gte lte; @@ -208,8 +216,6 @@ in # useful aliases var = raw; vars = map raw; - inherit call0 call1; - inherit lambda; inherit validString; }