No more catch-all aliases, and default aliases go to a separate file

diff --git a/pcre/mlton/libpcre-h.sml b/pcre/mlton/libpcre-h.sml
index f45d82f..356df39 100644 (file)
--- a/pcre/mlton/libpcre-h.sml
+++ b/pcre/mlton/libpcre-h.sml
@@ -1,4 +1,4 @@
-structure LibpcreiH = struct
+structure LibpcreH = struct

     local
         val lh = DynLinkage.open_lib
              { name = "/usr/local/lib/pcre_sml.so", global = true, lazy = true }
     local
         val lh = DynLinkage.open_lib
              { name = "/usr/local/lib/pcre_sml.so", global = true, lazy = true }

diff --git a/src/plugins/alias.sml b/src/plugins/alias.sml
index 8ed2da6..b96d57d 100644 (file)
--- a/src/plugins/alias.sml
+++ b/src/plugins/alias.sml
@@ -85,12 +85,10 @@ val _ = Env.type_one "email"
 datatype aliasSource =
         User of string
        | Default
 datatype aliasSource =
         User of string
        | Default

-       | CatchAll

 
 val source = fn (EApp ((EVar "userSource", _), e), _) =>
                Option.map User (Env.string e)
              | (EVar "defaultSource", _) => SOME Default
 
 val source = fn (EApp ((EVar "userSource", _), e), _) =>
                Option.map User (Env.string e)
              | (EVar "defaultSource", _) => SOME Default

-             | (EVar "catchAllSource", _) => SOME CatchAll

              | _ => NONE
 
 datatype aliasTarget =
              | _ => NONE
 
 datatype aliasTarget =


@@ -136,16 +134,11 @@ fun writeSource (env, s, t) =
                       write ": ";
                       writeTarget (write, t);
                       write "\n")
                       write ": ";
                       writeTarget (write, t);
                       write "\n")

-         | Default => (write "*@";
-                       writeDom ();
-                       write ": ";
-                       writeTarget (write, t);
-                       write "\n")
-         | CatchAll => (writeD "*@";
-                        writeDomD ();
-                        writeD ": ";
-                        writeTarget (writeD, t);
-                        writeD "\n")
+         | Default => (writeD "*@";
+                       writeDomD ();
+                       writeD ": ";
+                       writeTarget (writeD, t);
+                       writeD "\n")

     end
                        
 val _ = Env.actionV_two "aliasPrim"
     end
                        
 val _ = Env.actionV_two "aliasPrim"