X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=stdlib%2Fprelude.gl;h=a73ef1afe0cc809e181338883c88da651106c29c;hb=3c093ea6370b1f07664ded6e8c6aad301a8e2cb5;hp=bfeb0ba21ff1f3fd71b594ccbdae73f7344df3e1;hpb=c07380a3a4dca44a29df4cb09265d10442c1d06f;p=goals.git

diff --git a/stdlib/prelude.gl b/stdlib/prelude.gl
index bfeb0ba..a73ef1a 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,15 +33,29 @@ 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
 }
 
 #----------------------------------------------------------------------
+# Basic functions.
+
+# Wrap list of strings in a call or tactic.
+pure function wrap (wrapper, xs) = @{
+    echo '['
+    for x in %xs; do
+        echo %wrapper "( "
+        quoted_string "$x"
+        echo " ),"
+    done
+    echo ']'
+}
+
+#----------------------------------------------------------------------
 # Text functions.
 
 # Sort + uniq a list.
-function sort (xs) returning strings = {
+pure function sort (xs) returning strings = @{
     for f in %xs; do echo "$f"; done | sort -u
 }
 
@@ -49,7 +63,12 @@ function sort (xs) returning strings = {
 # File functions.
 
 # Expand a wildcard into a list of filenames.
-function wildcard (wc) returning strings = {
+#
+# 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.