Skip to content

ecm 2026-04q: -sort-as- specifier for Unique ID fields, and a user (21.58) #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shidel merged 3 commits into from
Apr 14, 2026
Merged

ecm 2026-04q: -sort-as- specifier for Unique ID fields, and a user (21.58) #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
422a69f
makelist: allow -sort-as- specifier in Unique ID
ecm-pushbx Apr 14, 2026
d87ad7a
fix order of 21.58 DOS entries by adding -sort-as- to their unique IDs
ecm-pushbx Apr 14, 2026
4bae833
Merge branch 'main' into ecm-2026-04q
shidel Apr 14, 2026
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 ...List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
Unique ID: 215800
Unique ID: 2158-sort-as-215800
Category: D DOS kernel
Flag: n/a
--------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
Unique ID: 215802
Unique ID: 2158-sort-as-215802
Category: D DOS kernel
Flag: n/a
--------------------------------------------------------------------------------
Expand Down
23 changes: 15 additions & 8 deletions utilities/makelist/makelist.lpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,13 +632,14 @@ procedure AddSMM(const Name : String; var Data : RawByteString);
end;

procedure FileToSection(const Name : String; var Data : RawByteString;
out ID, Category, Flags : String);
out IDSORT, IDLIST, Category, Flags : String);
var
I : Integer;
I, SORTAS : Integer;
H : TArrayOfString;
K, V : String;
begin
ID:='';
IDSORT:='';
IDLIST:='';
Category:='';
Flags:='';
// Remove Header Stub from Data
Expand All @@ -655,9 +656,15 @@ procedure FileToSection(const Name : String; var Data : RawByteString;
H[I]:=Trim(H[I]);
case UpperCase(K) of
'UNIQUE ID' : begin
ID:=V;
IDSORT:=V;
IDLIST:=V;
if H[I] <> '' then
LogMessage(vbMinimal, 'Extraneous Data in Unique ID for file: '+ Name);
SORTAS := Pos('-sort-as-', IDSORT);
if SORTAS > 0 then begin
IDSORT := Copy(IDSORT, SORTAS + Length('-sort-as-'));
IDLIST := Copy(IDLIST, 1, SORTAS - 1);
end;
end;
'CATEGORY' : begin
if UpperCase(V) = 'N/A' then
Expand Down Expand Up @@ -739,10 +746,10 @@ procedure HighestTable(const Name : String; const Data : RawByteString);

procedure AddStandard(const Name : String; var Data : RawByteString);
var
ID, Category, Flags : String;
IDSORT, IDLIST, Category, Flags : String;
begin
FileToSection(Name, Data, ID, Category, Flags);
if ID='' then begin
FileToSection(Name, Data, IDSORT, IDLIST, Category, Flags);
if IDLIST='' then begin
LogMessage(vbMinimal, TAB + 'No ID found for file: ' + Name);
WriteIssue;
Inc(TotalErrors);
Expand All @@ -763,7 +770,7 @@ procedure AddStandard(const Name : String; var Data : RawByteString);
Inc(TotalErrors);
Exit;
end;
AddToTree(Name, ID + SPACE + CATEGORY, SectionEntry(ID, Category) + Data);
AddToTree(Name, IDSORT, SectionEntry(IDLIST, Category) + Data);
end;

procedure AddDataFiles;
Expand Down