diff --git a/documentation/source/pacman.rst b/documentation/source/pacman.rst index 841fe7c..9de4612 100644 --- a/documentation/source/pacman.rst +++ b/documentation/source/pacman.rst @@ -250,7 +250,7 @@ Index and Search .. _minimal version selection: https://research.swtch.com/vgo-mvs .. _principles: https://research.swtch.com/vgo-principles -.. _the deft command: https://opendylan.org/package/deft/ +.. _the deft command: https://package.opendylan.org/deft/ .. _Semantic version: https://semver.org/spec/v2.0.0.html .. _Semantic versions: https://semver.org/spec/v2.0.0.html .. _SemVer 2.0: https://semver.org/spec/v2.0.0.html diff --git a/dylan-package.json b/dylan-package.json index dff2339..db497e6 100644 --- a/dylan-package.json +++ b/dylan-package.json @@ -12,7 +12,7 @@ "json@1.1", "logging@2.2", "regular-expressions@0.2", - "uncommon-dylan@0.2" + "uncommon-dylan@1.0" ], "dev-dependencies": [ "sphinx-extensions", diff --git a/sources/commands/command-line.dylan b/sources/commands/command-line.dylan index bacbef2..cb9b98c 100644 --- a/sources/commands/command-line.dylan +++ b/sources/commands/command-line.dylan @@ -13,7 +13,7 @@ define function deft-command-line make(, help: format-to-string("Dylan dev swiss army knife - %s\n" - "https://opendylan.org/package/deft/index.html", + "https://package.opendylan.org/deft/index.html", $deft-version), options: list(make(, diff --git a/sources/commands/list.dylan b/sources/commands/list.dylan index 227eaf6..3c3fe2c 100644 --- a/sources/commands/list.dylan +++ b/sources/commands/list.dylan @@ -49,8 +49,8 @@ define function list-catalog end; end iterate; case - pos => copy-sequence(text, end: pos); - space => concat(copy-sequence(text, end: space), "..."); + pos => copy-seq(text, end: pos); + space => concat(copy-seq(text, end: space), "..."); otherwise => text; end end if @@ -60,7 +60,7 @@ define function list-catalog end; let cat = pm/catalog(); let packages = pm/load-all-catalog-packages(cat); - let rows = make(); + let rows = make(); for (package in sort(packages, test: package-<)) let name = pm/package-name(package); let versions = pm/installed-versions(name, head?: #f); diff --git a/sources/commands/test.dylan b/sources/commands/test.dylan index 540b6d4..31b0b54 100644 --- a/sources/commands/test.dylan +++ b/sources/commands/test.dylan @@ -68,7 +68,7 @@ define method execute-subcommand end; let exes = #(); let dlls = #(); - let seen-libraries = make(); + let seen-libraries = make(); for (lids keyed-by release in lid-map) let lids = filter-to-command-line-libraries(lids); let _exes = choose(is-exe-library?, lids); diff --git a/sources/library.dylan b/sources/library.dylan index 65ebd5f..eb96589 100644 --- a/sources/library.dylan +++ b/sources/library.dylan @@ -43,6 +43,7 @@ define module deft-shared use standard-io, export: all; use streams, export: all; use strings, export: all; + use table-extensions, export: all; use threads, export: all, import: { dynamic-bind }; use uncommon-dylan, export: all, exclude: { format-out, format-to-string }; use uncommon-utils, export: all; diff --git a/sources/pacman/catalog.dylan b/sources/pacman/catalog.dylan index c6a1e63..fdd6771 100644 --- a/sources/pacman/catalog.dylan +++ b/sources/pacman/catalog.dylan @@ -33,7 +33,7 @@ define constant $uncategorized = "Uncategorized"; define constant $pacman-catalog-release :: = begin - let releases = make(); + let releases = make(); let package = make(, name: "pacman-catalog", releases: releases, @@ -120,7 +120,7 @@ end function; define function load-all-catalog-packages (cat :: ) => (packages :: ) - let packages = make(); + let packages = make(); local method load-one (dir, name, type) select (type) @@ -206,7 +206,7 @@ define function validate-catalog // A reusable memoization cache (release => result). let cache = make(); let packages = if (cached?) - value-sequence(cat.catalog-package-cache) + table-values(cat.catalog-package-cache) else load-all-catalog-packages(cat) end; @@ -253,8 +253,8 @@ define method package-locator 2 => subdirectory-locator(root, "2"); otherwise => subdirectory-locator(root, - copy-sequence(name, end: 2), - copy-sequence(name, start: 2, end: min(4, name.size))) + copy-seq(name, end: 2), + copy-seq(name, start: 2, end: min(4, name.size))) end; file-locator(dir, name) end method; diff --git a/sources/pacman/deps.dylan b/sources/pacman/deps.dylan index 399b42c..a75f041 100644 --- a/sources/pacman/deps.dylan +++ b/sources/pacman/deps.dylan @@ -188,7 +188,7 @@ define function resolve-deps end; end; end; - let releases = as(, value-sequence(maxima)); + let releases = as(, table-values(maxima)); %trace(depth, releases, "<= %s", releases); end method; block () diff --git a/sources/pacman/install.dylan b/sources/pacman/install.dylan index 5bd45ce..c814117 100644 --- a/sources/pacman/install.dylan +++ b/sources/pacman/install.dylan @@ -85,7 +85,7 @@ define function ensure-current-link let exists? = fs/file-exists?(link-source, follow-links?: #f); let target = as(, release-directory(release)); if (ends-with?(target, "/") | ends-with?(target, "\\")) - target := copy-sequence(target, end: target.size - 1); + target := copy-seq(target, end: target.size - 1); end; let existing-target = exists? & fs/link-target(link-source); if (exists? & (target ~= as(, existing-target))) @@ -198,7 +198,7 @@ define function installed-versions exception (fs/) #[] end; - let versions = make(); + let versions = make(); for (file in files) if (instance?(file, )) let name = locator-name(file); diff --git a/sources/pacman/packages.dylan b/sources/pacman/packages.dylan index 6f99c36..e71af8e 100644 --- a/sources/pacman/packages.dylan +++ b/sources/pacman/packages.dylan @@ -273,7 +273,7 @@ define class () // back-pointer to the package it's a part of. Currently it is possible for // the version to be at the beginning of this sequence, but the plan // is to only allow s. - constant slot package-releases :: = make(), + constant slot package-releases :: = make(), init-keyword: releases:; // Description of the package. Should be relatively concise; as yet unclear, diff --git a/sources/pacman/utils.dylan b/sources/pacman/utils.dylan index cf0a5bb..d74d6aa 100644 --- a/sources/pacman/utils.dylan +++ b/sources/pacman/utils.dylan @@ -45,3 +45,10 @@ define function dylan-directory end end function; +define function table-values (t ::
) => (vs :: ) + let vals = make(, size: t.size); + for (i from 0, v in t) + vals[i] := v; + end; + vals +end function; diff --git a/sources/workspaces/lid.dylan b/sources/workspaces/lid.dylan index 3b2f910..85bd0b6 100644 --- a/sources/workspaces/lid.dylan +++ b/sources/workspaces/lid.dylan @@ -20,7 +20,7 @@ define class () // Sequence of other s in which this is included via the "LID:" // keyword. - constant slot lid-included-in :: = make(); + constant slot lid-included-in :: = make(); end class; define method print-object diff --git a/sources/workspaces/registry.dylan b/sources/workspaces/registry.dylan index d240f38..4c545b7 100644 --- a/sources/workspaces/registry.dylan +++ b/sources/workspaces/registry.dylan @@ -50,7 +50,7 @@ define function update-registry => (total :: , written :: , no-platform-libs :: ) let total = 0; let written = 0; - let no-platform = make(); + let no-platform = make(); for (lids keyed-by library in ws.lids-by-library) let candidates = choose(matches-current-platform?, lids); select (candidates.size) diff --git a/sources/workspaces/workspaces.dylan b/sources/workspaces/workspaces.dylan index 843b648..632dd98 100644 --- a/sources/workspaces/workspaces.dylan +++ b/sources/workspaces/workspaces.dylan @@ -355,10 +355,10 @@ define function find-active-package-deps (ws :: , cat :: pm/, #key dev?) => (releases :: , actives :: ) let actives = make(); - let deps = make(); + let deps = make(); // Dev deps could go into deps, above, but they're kept separate so that // pacman can give more specific error messages. - let dev-deps = make(); + let dev-deps = make(); for (lids keyed-by release in ws.lids-by-release) actives[pm/package-name(release)] := release; for (dep in pm/release-dependencies(release))