Skip to content

fix: corrupted list in tests #2079

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
mosteo merged 5 commits into from
Feb 18, 2026
Merged

fix: corrupted list in tests #2079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0da700f
Move reserved keywords out of top-level package
mosteo Feb 17, 2026
e64d524
Allocate everything on the stack
mosteo Feb 17, 2026
f90b971
Lazy initializaton
mosteo Feb 17, 2026
829e701
Skip test on gcc 13
mosteo Feb 17, 2026
40fde37
Harden GCC detection by making patch number optional
mosteo Feb 18, 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
104 changes: 104 additions & 0 deletions src/alire/alire-reserved.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package body Alire.Reserved is

type String_Access is access constant String;
type String_Array is array (Positive range <>) of String_Access;

-- list of Ada2022 and GPR keywords
Reserved_Keywords : access String_Array;

----------------
-- Is_Keyword --
----------------

function Is_Keyword (S : String) return Boolean
is
begin
if Reserved_Keywords = null then
Reserved_Keywords :=
new String_Array'
(
new String'("abort"),
new String'("abs"),
new String'("abstract"),
new String'("accept"),
new String'("access"),
new String'("aliased"),
new String'("all"),
new String'("and"),
new String'("array"),
new String'("at"),
new String'("begin"),
new String'("body"),
new String'("case"),
new String'("constant"),
new String'("declare"),
new String'("delay"),
new String'("delta"),
new String'("digits"),
new String'("do"),
new String'("else"),
new String'("elsif"),
new String'("end"),
new String'("entry"),
new String'("exception"),
new String'("exit"),
new String'("extends"),
new String'("external"),
new String'("external_as_list"),
new String'("for"),
new String'("function"),
new String'("generic"),
new String'("goto"),
new String'("if"),
new String'("in"),
new String'("interface"),
new String'("is"),
new String'("limited"),
new String'("loop"),
new String'("mod"),
new String'("new"),
new String'("not"),
new String'("null"),
new String'("of"),
new String'("or"),
new String'("others"),
new String'("out"),
new String'("overriding"),
new String'("package"),
new String'("parallel"),
new String'("pragma"),
new String'("private"),
new String'("procedure"),
new String'("project"),
new String'("protected"),
new String'("raise"),
new String'("range"),
new String'("record"),
new String'("rem"),
new String'("renames"),
new String'("requeue"),
new String'("return"),
new String'("reverse"),
new String'("select"),
new String'("separate"),
new String'("some"),
new String'("subtype"),
new String'("synchronized"),
new String'("tagged"),
new String'("task"),
new String'("terminate"),
new String'("then"),
new String'("type"),
new String'("until"),
new String'("use"),
new String'("when"),
new String'("while"),
new String'("with"),
new String'("xor")
);
end if;

return (for some K of Reserved_Keywords.all => S = K.all);
end Is_Keyword;

end Alire.Reserved;
5 changes: 5 additions & 0 deletions src/alire/alire-reserved.ads
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package Alire.Reserved with Preelaborate is

function Is_Keyword (S : String) return Boolean;

end Alire.Reserved;
3 changes: 2 additions & 1 deletion src/alire/alire.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ with AAA.Debug;

with Alire.Environment;
with Alire.Errors;
with Alire.Reserved;
with Alire.Warnings;
with Alire.Utils.TTY;

Expand Down Expand Up @@ -194,7 +195,7 @@ package body Alire is
Err := +"Identifiers must not begin with an underscore.";
elsif (for some C of S => C not in Crate_Character) then
Err := +"Identifiers must be lowercase ASCII alphanumerical.";
elsif (for some K of Reserved_Keywords => K.all = S) then
elsif Reserved.Is_Keyword (S) then
Err := +"Identifier cannot be reserved keyword.";
end if;

Expand Down
84 changes: 0 additions & 84 deletions src/alire/alire.ads
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,90 +376,6 @@ private
GNAT_Native_Crate : constant Crate_Name :=
(Len => 11, Name => "gnat_native");

-- list of Ada2022 and GPR keywords
Reserved_Keywords : constant array (Positive range <>) of
access constant String :=
(
new String'("abort"),
new String'("abs"),
new String'("abstract"),
new String'("accept"),
new String'("access"),
new String'("aliased"),
new String'("all"),
new String'("and"),
new String'("array"),
new String'("at"),
new String'("begin"),
new String'("body"),
new String'("case"),
new String'("constant"),
new String'("declare"),
new String'("delay"),
new String'("delta"),
new String'("digits"),
new String'("do"),
new String'("else"),
new String'("elsif"),
new String'("end"),
new String'("entry"),
new String'("exception"),
new String'("exit"),
new String'("extends"),
new String'("external"),
new String'("external_as_list"),
new String'("for"),
new String'("function"),
new String'("generic"),
new String'("goto"),
new String'("if"),
new String'("in"),
new String'("interface"),
new String'("is"),
new String'("limited"),
new String'("loop"),
new String'("mod"),
new String'("new"),
new String'("not"),
new String'("null"),
new String'("of"),
new String'("or"),
new String'("others"),
new String'("out"),
new String'("overriding"),
new String'("package"),
new String'("parallel"),
new String'("pragma"),
new String'("private"),
new String'("procedure"),
new String'("project"),
new String'("protected"),
new String'("raise"),
new String'("range"),
new String'("record"),
new String'("rem"),
new String'("renames"),
new String'("requeue"),
new String'("return"),
new String'("reverse"),
new String'("select"),
new String'("separate"),
new String'("some"),
new String'("subtype"),
new String'("synchronized"),
new String'("tagged"),
new String'("task"),
new String'("terminate"),
new String'("then"),
new String'("type"),
new String'("until"),
new String'("use"),
new String'("when"),
new String'("while"),
new String'("with"),
new String'("xor")
);

function U (S : Wide_Wide_String;
Output_BOM : Boolean := False)
return Ada.Strings.UTF_Encoding.UTF_8_String
Expand Down
25 changes: 24 additions & 1 deletion testsuite/tests/with/git-reference/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,31 @@
from drivers.helpers import init_git_repo

import os
import re
import subprocess

# This test triggers a bug (see below) with output:
#
# The following command:
# /home/runner/work/alire/alire/bin/alr -q -d -n with --del remote
# Exited with status code -6
# Output:
# Do you want to proceed?
# Using default: Yes
# corrupted double-linked list
#
# Among possibly other factors, it only happens on gcc^13, so skip in that
# case.

# Check gcc version. The first line of gcc --version looks like this:
# gcc (Ubuntu 13.1.0-2ubuntu1~22.04) 13.1.0
gcc_version = subprocess.check_output(["gcc", "--version"], text=True).splitlines()[0]
# Use a regex to extract the major version number, allowing an optional patch
match = re.match(r".*gcc.*\s+(\d+)\.\d+(?:\.\d+)?", gcc_version)
if match and int(match.group(1)) == 13:
print("SKIP: test on gcc 13 triggers known bug")
exit(0)

# Create a new "remote" repository with a tag that we'll use as reference
init_local_crate("remote")
init_git_repo(".")
Expand All @@ -23,7 +46,7 @@
p.out)

# Remove dependency for next test
alr_with("remote", delete=True, manual=False)
alr_with("remote", delete=True, manual=False) # BUG TRIGGER
p = run_alr("pin")
assert_eq("There are no pins\n", p.out)

Expand Down