Merge pull request #61 from cgay/dev

Fix workspace/registry bugs

Author: cgay

documentation/source/index.rst

@@ -304,6 +304,19 @@ package dependencies for you.
           registry files specifically for the current platform, e.g.,
           ``x86_64-linux``.
 
+Git Submodules
+--------------
+
+It generally shouldn't be necessary to use Git submodules when using Deft. In fact, if
+your workspace has a submodule which is also pulled in as a package dependency it will
+confuse Deft because it will find multiple LID files for the same library. In that case
+Deft will issue a warning and choose one arbitrarily.  Use the package instead of a
+submodule.
+
+If you need to pull in some code from another repository that doesn't have a Deft package
+there should be no conflict.
+
+
 Platform-specific Libraries
 ---------------------------
 

sources/workspaces/lid.dylan

@@ -81,27 +81,30 @@ end function;
 define function matches-current-platform?
     (lid :: <lid>) => (matches? :: <bool>)
   let current-platform = as(<string>, os/$platform-name);
-  let platform = lid-value(lid, $platforms-key);
-  // Assume that if the LID is included in another LID then it contains the
+  let platforms = lid-values(lid, $platforms-key) | #[];
+  // Assume that if the LID is included in another LID then it contains only the
   // platform-independent attributes of a multi-platform project and is not a top-level
   // library.
-  platform = current-platform
-    | (~platform & lid.library-name & empty?(lid.lid-included-in))
+  member?(current-platform, platforms, test: \=)
+    | (empty?(platforms) & lid.library-name & empty?(lid.lid-included-in))
 end function;
 
 define function add-lid
     (ws :: <workspace>, active-package :: false-or(pm/<release>), lid :: <lid>)
  => ()
   if (matches-current-platform?(lid))
-    let library = lid-value(lid, $library-key);
-    if (library)
-      let lids = element(ws.%lids-by-library, library, default: #());
-      ws.%lids-by-library[library] := pair(lid, lids);
-    end;
-    ws.%lids-by-pathname[as(<string>, lid.lid-locator)] := lid;
-    if (active-package)
-      let lids = element(ws.%lids-by-release, active-package, default: #());
-      ws.%lids-by-release[active-package] := pair(lid, lids);
+    let path = as(<string>, lid.lid-locator);
+    unless (element(ws.%lids-by-pathname, path, default: #f))
+      ws.%lids-by-pathname[path] := lid;
+      let library = lid-value(lid, $library-key);
+      if (library)
+        let lids = element(ws.%lids-by-library, library, default: #());
+        ws.%lids-by-library[library] := pair(lid, lids);
+      end;
+      if (active-package)
+        let lids = element(ws.%lids-by-release, active-package, default: #());
+        ws.%lids-by-release[active-package] := pair(lid, lids);
+      end;
     end;
   end;
 end function;