2 files changed, 71 insertions, 5 deletions

diff --git a/build.conf b/build.conf
index 0b51acd..b31d1d3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,19 +1,23 @@
 # build.conf for build, kind of whacky, eh?
 
-default action: check "build"
-"clean" action: clean targets()
-"rebuild" action: clean "build", check "build"
+default action: check targets()
 
 set "CXXFLAGS" += "-ggdb"
-set "LDFLAGS" += "-Llibbu++ -lbu++ -ldl"
 
 "build":
         rule "exe",
         target file,
         requires "libbu++/libbu++.a",
+        set "LDFLAGS" += "-Llibbu++ -lbu++ -ldl",
         set "CXXFLAGS" += "-Ilibbu++/src",
+        set "FLEXFLAGS" = "--bison-bridge --bison-locations",
         input filesIn("src") filter regexp(".*\\.(cpp|y|l)$")
 
+"c++filt":
+        rule "exe",
+        target file,
+        input filesIn("c++filt") filter regexp(".*\\.(cpp|y|l)$")
+
 rule "exe":
         matches regexp("(.*)\\.o$"),
         aggregate toString(" "),
@@ -33,5 +37,5 @@ rule "bison":
 rule "flex":
         matches regexp("(.*)\\.l$"),
         produces "{re:1}.yy.c",
-        perform command("flex --bison-bridge --bison-locations -o {target} {match}")
+        perform command("flex {FLEXFLAGS} -o {target} {match}")
 
diff --git a/c++filt/c++filt.l b/c++filt/c++filt.l
new file mode 100644
index 0000000..af12cac
--- /dev/null
+++ b/c++filt/c++filt.l
@@ -0,0 +1,62 @@
+%{
+# include <string>
+
+int nBC = 0;
+%}
+
+%s hasT
+%x inWith
+%x inT
+%option noyywrap nounput batch
+
+%%
+
+"operator<<"                                            { ECHO; }
+"operator>>"                                            { ECHO; }
+"operator".                                                     { ECHO; }
+
+"<<"                                                            { ECHO; }
+">>"                                                            { ECHO; }
+" <<"                                                           { ECHO; }
+" >>"                                                           { ECHO; }
+
+"<anonymous>"                                           { ECHO; }
+
+\n+                                                                     {
+        BEGIN( INITIAL );
+        nBC = false;
+        ECHO;
+}
+
+" <"                                                            { ECHO; }
+
+"<"                                                                     {
+        BEGIN( inT );
+        printf("<...>");
+        nBC++;
+}
+
+<inT>"<"                                                        {
+        nBC++;
+
+}
+<inT>[^<>]*                                                     { }
+<inT>">"                                                        {
+        nBC--;
+        if( nBC == 0 )
+                BEGIN( hasT );
+}
+
+<hasT>" [with"[^\]]*"]"                                 { }
+
+%%
+
+int main()
+{
+        yyin = stdin;
+
+        yylex();
+
+        return 0;
+}
+