X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=stdlib%2Fprelude.gl;h=e2d04007c1b895958ccb884fed40ba18da972f86;hb=580298444204f92785a7ac78c4529e95e3cba40d;hp=7e6cbd532f8ac89e836c21224a60f851ae080a2c;hpb=50da8152f0cfceeea7c92d55c8bc2f75cecd98ef;p=goals.git

diff --git a/stdlib/prelude.gl b/stdlib/prelude.gl
index 7e6cbd5..e2d0400 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,28 +33,95 @@ 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.
 
+# Head of a list.
+pure function head (xs) returning string = @{
+    for f in %xs; do
+        echo "$f"
+        exit 0
+    done
+}
+
+# Join two lists.
+pure function join (xs, ys) returning strings = @{
+    for f in %xs %ys; do echo "$f"; done
+}
+
 # Sort + uniq a list.
-function sort (xs) = {
+pure function sort (xs) returning strings = @{
     for f in %xs; do echo "$f"; done | sort -u
 }
 
+# Substitute.
+pure function subst (from, to, text) returning string = @{
+    # We need to replace any / characters in ‘to’ with escaped ones.
+    to="$( echo -n %to | sed 's,/,\\/,g' )"
+    echo %text | sed -E s/%from/$to/g
+}
+
+# Tail of a list.
+pure function tail (xs) returning strings = @{
+    drop=1
+    for f in %xs; do
+        if [ -z "$drop" ]; then echo "$f"; fi
+        drop=
+    done
+}
+
 #----------------------------------------------------------------------
 # File functions.
 
+# Base name.
+pure function basename (name) returning string = @{
+    basename %name
+}
+
+# Directory name.
+pure function dirname (name) returning string = @{
+    dirname %name
+}
+
+# File extension.
+pure function extension (name) returning string = @{
+    name=%name
+    echo "${name##*.}"
+}
+
+# Real path.
+function realpath (filename) returning string = @{
+    realpath -- %filename
+}
+
 # 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
 }