From 7b379c724999c4b415b1c3826db748450c7a6571 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Sun, 7 Feb 2016 20:41:34 -0500
Subject: Finish removing PWild; only load a library once, even if referenced
 multiple times in a .urp tree

---
 src/compiler.sml | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/compiler.sml')

diff --git a/src/compiler.sml b/src/compiler.sml
index e269c8b9..7580c5e4 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -1,4 +1,4 @@
-(* Copyright (c) 2008-2012, 2014, Adam Chlipala
+(* Copyright (c) 2008-2012, 2014, 2016, Adam Chlipala
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -412,6 +412,14 @@ fun inputCommentableLine inf =
 
 val lastUrp = ref ""
 
+structure SK = struct
+type ord_key = string
+val compare = String.compare
+end
+
+structure SS = BinarySetFn(SK)
+structure SM = BinaryMapFn(SK)
+
 fun parseUrp' accLibs fname =
     (lastUrp := fname;
      if not (Posix.FileSys.access (fname ^ ".urp", []) orelse Posix.FileSys.access (fname ^ "/lib.urp", []))
@@ -459,6 +467,7 @@ fun parseUrp' accLibs fname =
          let
              val pathmap = ref (!pathmap)
              val bigLibs = ref []
+             val libSet = ref SS.empty
 
              fun pu filename =
                  let
@@ -822,10 +831,19 @@ fun parseUrp' accLibs fname =
                                               fkind := {action = Settings.Deny, kind = kind, pattern = pattern} :: !fkind
                                           end
                                         | _ => ErrorMsg.error "Bad 'deny' syntax")
-                                   | "library" => if accLibs then
-                                                      libs := pu (libify (relify arg)) :: !libs
-                                                  else
-                                                      bigLibs := libify' arg :: !bigLibs
+                                   | "library" =>
+                                     if accLibs then
+                                         let
+                                             val arg = libify (relify arg)
+                                         in
+                                             if SS.member (!libSet, arg) then
+                                                 ()
+                                             else
+                                                 (libs := pu arg :: !libs;
+                                                  libSet := SS.add (!libSet, arg))
+                                         end
+                                     else
+                                         bigLibs := libify' arg :: !bigLibs
                                    | "path" =>
                                      (case String.fields (fn ch => ch = #"=") arg of
                                           [n, v] => ((pathmap := M.insert (!pathmap, n, OS.Path.mkAbsolute {path = v, relativeTo = dir}))
@@ -936,14 +954,6 @@ fun addModuleRoot (k, v) = moduleRoots :=
                                                 relativeTo = OS.FileSys.getDir ()},
                             v) :: !moduleRoots
 
-structure SK = struct
-type ord_key = string
-val compare = String.compare
-end
-
-structure SS = BinarySetFn(SK)
-structure SM = BinaryMapFn(SK)
-
 exception MissingFile of string
 
 val parse = {
-- 
cgit v1.2.3