X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=stdlib%2Fprelude.gl;h=f4ab20ee08f2615f78cf7c392727179bc99f448b;hb=d513d8b6aa8c70191deb3e1a8392819c9181a8f9;hp=7e6cbd532f8ac89e836c21224a60f851ae080a2c;hpb=50da8152f0cfceeea7c92d55c8bc2f75cecd98ef;p=goals.git diff --git a/stdlib/prelude.gl b/stdlib/prelude.gl index 7e6cbd5..f4ab20e 100644 --- a/stdlib/prelude.gl +++ b/stdlib/prelude.gl @@ -21,7 +21,7 @@ # tactics. # The only tactic that ‘make’ has. -tactic *file (filename) = { +tactic *file (filename) = @{ # Rebuild if the target file doesn't exist at all. test -f %filename || exit 99 @@ -33,7 +33,7 @@ tactic *file (filename) = { # This is a simpler tactic than the above since it will # rebuild if the file is missing, but not if it is older. -tactic *exists (filename) = { +tactic *exists (filename) = @{ test -f %filename || exit 99 } @@ -41,7 +41,7 @@ tactic *exists (filename) = { # Text functions. # Sort + uniq a list. -function sort (xs) = { +pure function sort (xs) returning strings = @{ for f in %xs; do echo "$f"; done | sort -u } @@ -49,12 +49,15 @@ function sort (xs) = { # File functions. # Expand a wildcard into a list of filenames. -function wildcard (wc) = { +# +# This function is probably not "pure" since it depends on the +# current working directory and also files may be created in +# the directory while goals is running which would affect the +# result. +function wildcard (wc) returning strings = @{ shopt -s nullglob # Note that the substitution is quoted by goals, so to expand # it we must assign it to a variable and then use it unquoted. wc=%wc - for f in $wc; do - echo "$f" - done + for f in $wc; do echo "$f"; done }