X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=stdlib%2Fprelude.gl;h=f4ab20ee08f2615f78cf7c392727179bc99f448b;hb=d513d8b6aa8c70191deb3e1a8392819c9181a8f9;hp=f9fa6428d5d8211136f873d96b9fb56c2d5c7632;hpb=2ac1b84cb49ad04e27b4543436b0227153fbfb15;p=goals.git

diff --git a/stdlib/prelude.gl b/stdlib/prelude.gl
index f9fa642..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,28 +41,23 @@ tactic *exists (filename) = {
 # Text functions.
 
 # Sort + uniq a list.
-function sort (xs) = {
-    # XXX Quoting
-    echo '['
-    for f in %xs; do echo "$f"; done |
-        sort -u |
-        sed 's/.*/"&",/'
-    echo ']'
+pure function sort (xs) returning strings = @{
+    for f in %xs; do echo "$f"; done | sort -u
 }
 
 #----------------------------------------------------------------------
 # File functions.
 
 # Expand a wildcard into a list of filenames.
-function wildcard (wc) = {
-    # XXX Quoting
+#
+# 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
-    echo '['
-    for f in $wc; do
-        echo "\"$f\","
-    done
-    echo ']'
+    for f in $wc; do echo "$f"; done
 }