Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion documentation/source/pacman.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dylan-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sources/commands/command-line.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define function deft-command-line
make(<command-line-parser>,
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(<flag-option>,
Expand Down
6 changes: 3 additions & 3 deletions sources/commands/list.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -60,7 +60,7 @@ define function list-catalog
end;
let cat = pm/catalog();
let packages = pm/load-all-catalog-packages(cat);
let rows = make(<stretchy-vector>);
let rows = make(<vector*>);
for (package in sort(packages, test: package-<))
let name = pm/package-name(package);
let versions = pm/installed-versions(name, head?: #f);
Expand Down
2 changes: 1 addition & 1 deletion sources/commands/test.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ define method execute-subcommand
end;
let exes = #();
let dlls = #();
let seen-libraries = make(<stretchy-vector>);
let seen-libraries = make(<vector*>);
for (lids keyed-by release in lid-map)
let lids = filter-to-command-line-libraries(lids);
let _exes = choose(is-exe-library?, lids);
Expand Down
1 change: 1 addition & 0 deletions sources/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions sources/pacman/catalog.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define constant $uncategorized = "Uncategorized";

define constant $pacman-catalog-release :: <release>
= begin
let releases = make(<stretchy-vector>);
let releases = make(<vector*>);
let package = make(<package>,
name: "pacman-catalog",
releases: releases,
Expand Down Expand Up @@ -120,7 +120,7 @@ end function;

define function load-all-catalog-packages
(cat :: <catalog>) => (packages :: <seq>)
let packages = make(<stretchy-vector>);
let packages = make(<vector*>);
local
method load-one (dir, name, type)
select (type)
Expand Down Expand Up @@ -206,7 +206,7 @@ define function validate-catalog
// A reusable memoization cache (release => result).
let cache = make(<table>);
let packages = if (cached?)
value-sequence(cat.catalog-package-cache)
table-values(cat.catalog-package-cache)
else
load-all-catalog-packages(cat)
end;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sources/pacman/deps.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ define function resolve-deps
end;
end;
end;
let releases = as(<list>, value-sequence(maxima));
let releases = as(<list>, table-values(maxima));
%trace(depth, releases, "<= %s", releases);
end method;
block ()
Expand Down
4 changes: 2 additions & 2 deletions sources/pacman/install.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ define function ensure-current-link
let exists? = fs/file-exists?(link-source, follow-links?: #f);
let target = as(<string>, 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(<string>, existing-target)))
Expand Down Expand Up @@ -198,7 +198,7 @@ define function installed-versions
exception (fs/<file-system-error>)
#[]
end;
let versions = make(<stretchy-vector>);
let versions = make(<vector*>);
for (file in files)
if (instance?(file, <directory-locator>))
let name = locator-name(file);
Expand Down
2 changes: 1 addition & 1 deletion sources/pacman/packages.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ define class <package> (<object>)
// back-pointer to the package it's a part of. Currently it is possible for
// the <head> version to be at the beginning of this sequence, but the plan
// is to only allow <semantic-version>s.
constant slot package-releases :: <stretchy-vector> = make(<stretchy-vector>),
constant slot package-releases :: <vector*> = make(<vector*>),
init-keyword: releases:;

// Description of the package. Should be relatively concise; as yet unclear,
Expand Down
7 changes: 7 additions & 0 deletions sources/pacman/utils.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,10 @@ define function dylan-directory
end
end function;

define function table-values (t :: <table>) => (vs :: <seq>)
let vals = make(<vector>, size: t.size);
for (i from 0, v in t)
vals[i] := v;
end;
vals
end function;
2 changes: 1 addition & 1 deletion sources/workspaces/lid.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ define class <lid> (<object>)

// Sequence of other <lid>s in which this <lid> is included via the "LID:"
// keyword.
constant slot lid-included-in :: <seq> = make(<stretchy-vector>);
constant slot lid-included-in :: <seq> = make(<vector*>);
end class;

define method print-object
Expand Down
2 changes: 1 addition & 1 deletion sources/workspaces/registry.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ define function update-registry
=> (total :: <int>, written :: <int>, no-platform-libs :: <seq>)
let total = 0;
let written = 0;
let no-platform = make(<stretchy-vector>);
let no-platform = make(<vector*>);
for (lids keyed-by library in ws.lids-by-library)
let candidates = choose(matches-current-platform?, lids);
select (candidates.size)
Expand Down
4 changes: 2 additions & 2 deletions sources/workspaces/workspaces.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,10 @@ define function find-active-package-deps
(ws :: <workspace>, cat :: pm/<catalog>, #key dev?)
=> (releases :: <seq>, actives :: <istring-table>)
let actives = make(<istring-table>);
let deps = make(<stretchy-vector>);
let deps = make(<vector*>);
// 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(<stretchy-vector>);
let dev-deps = make(<vector*>);
for (lids keyed-by release in ws.lids-by-release)
actives[pm/package-name(release)] := release;
for (dep in pm/release-dependencies(release))
Expand Down