From: Adam Chlipala <adamc@hcoop.net>
Date: Sun, 24 Feb 2008 18:23:44 +0000 (+0000)
Subject: Put files called lib.dtl first in dependency orderings
X-Git-Tag: release_2010-11-19~55
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/525183a2c03bec98373a081d5989eee1431f9e6d

Put files called lib.dtl first in dependency orderings
---

diff --git a/src/order.sml b/src/order.sml
index 599c62a..14bd01e 100644
--- a/src/order.sml
+++ b/src/order.sml
@@ -300,6 +300,25 @@ fun order basisOpt fnames =
 	    order basisOpt (List.filter (fn fname => not (SS.member (!naughtyFiles, fname))) fnames)
     end
 
+fun order basisOpt fnames =
+    let
+	val (providers, fnames) = order basisOpt fnames
+
+	val (hasLib, fnames) = foldl (fn (fname, (hasLib, fnames)) =>
+					 if OS.Path.file fname = "lib.dtl" then
+					     (SOME fname, fnames)
+					 else
+					     (hasLib, fname :: fnames))
+			       (NONE, []) fnames
+
+	val fnames = rev fnames
+	val fnames = case hasLib of
+			 NONE => fnames
+		       | SOME hasLib => hasLib :: fnames
+    in
+	(providers, fnames)
+    end
+
 type providers = {provideC : string SM.map,
 		  provideT : string SM.map,
 		  provideV : string SM.map}