[release] merge previous version into master to avoid the increased version number

This commit is contained in:
Sławomir Śledź 2019-08-31 01:55:31 +02:00
commit 14dd7c3993
3 changed files with 22 additions and 5 deletions

View file

@ -1 +1 @@
2.1 2.2

View file

@ -66,10 +66,22 @@ lambda() {
} }
map() { map() {
local x if [[ $1 != "λ" ]] && [[ $1 != "lambda" ]]; then
while read x; do
echo "$x" | "$@" local has_dollar=$(list $@ | grep '\$' | wc -l)
done
if [[ $has_dollar -ne 0 ]]; then
args=$(echo $@ | sed -e 's/\$/\$a/g')
map λ a . $args
else
map λ a . "$@"' $a'
fi
else
local x
while read x; do
echo "$x" | "$@"
done
fi
} }
foldl() { foldl() {

View file

@ -30,4 +30,9 @@ testFlatMap() {
assertEquals "d e h l l l o o r w" "$(list hello world | map lambda x . 'command fold -w 1 <<< $x' | sort | unlist)" assertEquals "d e h l l l o o r w" "$(list hello world | map lambda x . 'command fold -w 1 <<< $x' | sort | unlist)"
} }
testMapNoLambdaSyntax() {
assertEquals "1 2 3" "$(list 1 2 3 | map echo | unlist)"
assertEquals "1 is a number 2 is a number 3 is a number" "$(list 1 2 3 | map 'echo $ is a number' | unlist)"
}
. ./shunit2-init.sh . ./shunit2-init.sh