1 files changed, 14 insertions, 12 deletions

diff --git a/build.conf b/build.conf
index 2115fb0..47bbba5 100644
--- a/build.conf
+++ b/build.conf
@@ -1,38 +1,40 @@
+# build.conf for build, kind of whacky, eh?
+
 default action: check "build", check "cleanup"
 
 ["build", "cleanup"]:
         rule "exe",
         target file,
         set "CXXFLAGS" = "-lBob",
-        input [files("src/{target}" ), files("src/shared")]
+        input [filesIn("src/{target}"), filesIn("src/shared")]
 
-[directoryName("src/tests")] filter /src\/tests/(.*)/tests\/{re:1}/:
+[directoriesIn("src/tests")] filter regexp("src/tests/(.*)", "tests/{re:1}"):
         rule "exe",
         target prefix "tests/",
         target file,
-        input files("src/tests/{target}")
+        input filesIn("src/tests/{target}")
 
-[directories("src/tests"), aoeua]:
+[directoriesIn("src/tests"), "aoeua"]:
         rule "exe",
         target file,
-        input files("src/{target}")
+        input filesIn("src/{target}")
 
 "build":
-        input [files("src"), "boy.cpp"] filter /.*\.cpp$/,
-        input filter /.*\.cpp$/,
+        input [filesIn("src"), "boy.cpp"] filter regexp(".*\\.cpp$"),
+        input filter regexp(".*\\.cpp$"),
         requires ["bob.cpp", "libbuild.a", "libbu++/libbu++.a"]
 
 "bob.cpp": set "aoeu" = "food", requires "bob.bastard"
 
-rule "exe"
-        matches /(.*)\.o$/,
-        input filter toSpaces(),
+rule "exe":
+        matches regexp("(.*)\\.o$"),
+        input filter toString(),
         perform command("stuff")
 
 rule "cpp":
-        matches /(.*)\.cpp$/,
+        matches regexp("(.*)\\.cpp$"),
         produces "{re:1}.o",
-        requires commandToList( make, "g++ -M {match}"),
+        requires commandToList("make", "g++ -M {match}"),
         perform command("stuff")