From 11cad66cf4cef6bf5fc57fadda85dbdd25bb4778 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Thu, 12 Apr 2012 11:09:16 -0300 Subject: [PATCH] remove new lines and spaces before ] and ) and after [ and ( --- src/fn_lexpp.erl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/fn_lexpp.erl b/src/fn_lexpp.erl index f3a0037..da62214 100644 --- a/src/fn_lexpp.erl +++ b/src/fn_lexpp.erl @@ -94,6 +94,21 @@ pre_cleanup([{open_list, _, _}=Token, {endl, _, _}, {white, _, _}|Tokens], Accum pre_cleanup([{open_list, _, _}=Token, {endl, _, _}|Tokens], Accum) -> pre_cleanup(Tokens, [Token|Accum]); +pre_cleanup([{open, _, _}=Token, {endl, _, _}, {white, _, _}|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); +pre_cleanup([{open, _, _}=Token, {endl, _, _}|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); + +pre_cleanup([{endl, _, _}, {white, _, _}, {close_list, _, _}=Token|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); +pre_cleanup([{endl, _, _}, {close_list, _, _}=Token|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); + +pre_cleanup([{endl, _, _}, {white, _, _}, {close, _, _}=Token|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); +pre_cleanup([{endl, _, _}, {close, _, _}=Token|Tokens], Accum) -> + pre_cleanup(Tokens, [Token|Accum]); + pre_cleanup([{else, _}=Else, {endl, _, _}, {white, _, _}, {'if', _}=Token|Tokens], Accum) -> pre_cleanup(Tokens, [Token|[Else|Accum]]); pre_cleanup([{else, _}=Else, {endl, _, _}, {'if', _}=Token|Tokens], Accum) -> @@ -139,6 +154,7 @@ post_cleanup([{close_block, _, _}=Close, {endl, _, _}, {'case', _}=Token|Tokens] % remove endline between } and , to allow defining lambdas as parameters post_cleanup([{close_block, _, _}=Close, {endl, _, _}, {sep, _, _}=Token|Tokens], Accum) -> post_cleanup(Tokens, [Token|[Close|Accum]]); + % remove endlines between } and ) to allow defining lambdas as last parameter post_cleanup([{close_block, _, _}=Close, {endl, _, _}, {close, _, _}=Token|Tokens], Accum) -> post_cleanup(Tokens, [Token|[Close|Accum]]);