Fix regeneration of multi-file dependencies

diff --git a/src/main.sig b/src/main.sig
index 29f41b1..01edb0f 100644 (file)
--- a/src/main.sig
+++ b/src/main.sig
@@ -29,7 +29,7 @@ signature MAIN = sig
 
     val basis : unit -> Env.env
 
 
     val basis : unit -> Env.env
 

-    val reduce : Env.env -> string -> (Env.env * Ast.exp) option
+    val reduce : Env.env -> string -> Env.env * Ast.exp option

     val eval : Env.env -> Env.env_vars -> string -> Env.env * Env.env_vars
 
     val request : string -> unit
     val eval : Env.env -> Env.env_vars -> string -> Env.env * Env.env_vars
 
     val request : string -> unit

diff --git a/src/main.sml b/src/main.sml
index db1b52b..381badb 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -175,7 +175,7 @@ fun reduce G fname =
        val (G, body) = check G fname
     in
        if !ErrorMsg.anyErrors then
        val (G, body) = check G fname
     in
        if !ErrorMsg.anyErrors then

-           NONE
+           (G, NONE)

        else
            case body of
                SOME body =>
        else
            case body of
                SOME body =>


@@ -186,16 +186,16 @@ fun reduce G fname =
                                         [PD.string "Result:",
                                          PD.space 1,
                                          p_exp body']))*)
                                         [PD.string "Result:",
                                          PD.space 1,
                                          p_exp body']))*)

-                   SOME (G, body')
+                   (G, SOME body')

                end
                end

-             | _ => NONE
+             | _ => (G, NONE)

     end
 
 (*(Defaults.eInit ())*)
 
 fun eval G evs fname =
     case reduce G fname of
     end
 
 (*(Defaults.eInit ())*)
 
 fun eval G evs fname =
     case reduce G fname of

-       SOME (G, body') =>
+       (G, SOME body') =>

        if !ErrorMsg.anyErrors then
            raise ErrorMsg.Error
        else
        if !ErrorMsg.anyErrors then
            raise ErrorMsg.Error
        else


@@ -204,7 +204,7 @@ fun eval G evs fname =
            in
                (G, evs')
            end
            in
                (G, evs')
            end

-      | NONE => (G, evs)
+      | (G, NONE) => (G, evs)

 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index b34eb56..2d384a9 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -597,9 +597,9 @@ val () = Env.action_three "localProxyRewrite"
         ("from", Env.string, "to", Env.string, "port", Env.int)
         (fn (from, to, port) =>
             (checkRewrite ();
         ("from", Env.string, "to", Env.string, "port", Env.int)
         (fn (from, to, port) =>
             (checkRewrite ();

-             write "\tRewriteRule\t";
+             write "\tRewriteRule\t\"";

              write from;
              write from;

-             write "\thttp://localhost:";
+             write "\"\thttp://localhost:";

              write (Int.toString port);
              write "/";
              write to;
              write (Int.toString port);
              write "/";
              write to;


@@ -627,10 +627,11 @@ val () = Env.action_three "rewriteRule"
         ("from", Env.string, "to", Env.string, "flags", Env.list flag)
         (fn (from, to, flags) =>
             (checkRewrite ();
         ("from", Env.string, "to", Env.string, "flags", Env.list flag)
         (fn (from, to, flags) =>
             (checkRewrite ();

-             write "\tRewriteRule\t";
+             write "\tRewriteRule\t\"";

              write from;
              write from;

-             write "\t";
+             write "\"\t\"";

              write to;
              write to;

+             write "\"";

              case flags of
                  [] => ()
                | flag::rest => (write " [";
              case flags of
                  [] => ()
                | flag::rest => (write " [";


@@ -644,10 +645,11 @@ val () = Env.action_three "rewriteCond"
         ("test", Env.string, "pattern", Env.string, "flags", Env.list cond_flag)
         (fn (from, to, flags) =>
             (checkRewrite ();
         ("test", Env.string, "pattern", Env.string, "flags", Env.list cond_flag)
         (fn (from, to, flags) =>
             (checkRewrite ();

-             write "\tRewriteCond\t";
+             write "\tRewriteCond\t\"";

              write from;
              write from;

-             write "\t";
+             write "\"\t\"";

              write to;
              write to;

+             write "\"";

              case flags of
                  [] => ()
                | flag::rest => (write " [";
              case flags of
                  [] => ()
                | flag::rest => (write " [";


@@ -661,9 +663,9 @@ val () = Env.action_one "rewriteBase"
         ("prefix", Env.string)
         (fn prefix =>
             (checkRewrite ();
         ("prefix", Env.string)
         (fn prefix =>
             (checkRewrite ();

-             write "\tRewriteBase\t";
+             write "\tRewriteBase\t\"";

              write prefix;
              write prefix;

-             write "\n"))
+             write "\"\n"))

 
 val () = Env.action_one "rewriteLogLevel"
         ("level", Env.int)
 
 val () = Env.action_one "rewriteLogLevel"
         ("level", Env.int)