Fix regeneration of multi-file dependencies

[hcoop/domtool2.git] / src / main.sml

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