Standardize running code in a single function, include prelude.sh.

[goals.git] / stdlib / prelude.gl

diff --git a/stdlib/prelude.gl b/stdlib/prelude.gl
index f9fa642..fdb23e9 100644 (file)
--- a/stdlib/prelude.gl
+++ b/stdlib/prelude.gl
@@ -40,29 +40,21 @@ 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 ']'
-}
+
 
 #----------------------------------------------------------------------
 # File functions.
 
 # Expand a wildcard into a list of filenames.
 function wildcard (wc) = {
-    # XXX Quoting
     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\","
+        quoted_string "$f"
+        echo ','
     done
     echo ']'
 }