penguin/gentoo-utils
1
0
Fork 0
forked from gentoo-utils/gentoo-utils
Code Pull Requests Activity

represent 4th variant of slots, and disallow empty primary slot names

Browse Source
This commit is contained in:
John Turner
2025-11-22 01:03:14 +00:00
parent bd0fec80f9
commit e9603ce62f
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/atom/mod.rs
View File

@@ -85,8 +85,9 @@ pub struct SlotName(#[get(method = "name", kind = "deref")] String);
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub enum Slot { pub enum Slot {
Wildcard, Wildcard,
Equal { Equal,
primary: Option<SlotName>, NameEqual {
primary: SlotName,
sub: Option<SlotName>, sub: Option<SlotName>,
}, },
Name { Name {
@@ -592,10 +593,11 @@ impl fmt::Display for Slot {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Wildcard => write!(f, "*"), Self::Wildcard => write!(f, "*"),
Self::Equal { primary, sub } => { Self::Equal => {
if let Some(primary) = primary { write!(f, "=")
write!(f, "{primary}")?; }
} Self::NameEqual { primary, sub } => {
write!(f, "{primary}")?;
if let Some(sub) = sub { if let Some(sub) = sub {
write!(f, "/{sub}")?; write!(f, "/{sub}")?;

11
src/atom/parsers.rs
View File

@@ -210,16 +210,16 @@ impl<'a> Parseable<'a, &'a str> for Slot {
fn parser() -> Self::Parser { fn parser() -> Self::Parser {
let wildcard = tag("*").map(|_| Slot::Wildcard); let wildcard = tag("*").map(|_| Slot::Wildcard);
let equals = SlotName::parser() let equal = tag("=").map(|_| Slot::Equal);
.opt() let name_equal = SlotName::parser()
.and(SlotName::parser().preceded_by(tag("/")).opt()) .and(SlotName::parser().preceded_by(tag("/")).opt())
.followed_by(tag("=")) .followed_by(tag("="))
.map(|(primary, sub)| Slot::Equal { primary, sub }); .map(|(primary, sub)| Slot::NameEqual { primary, sub });
let name = SlotName::parser() let name = SlotName::parser()
.and(SlotName::parser().preceded_by(tag("/")).opt()) .and(SlotName::parser().preceded_by(tag("/")).opt())
.map(|(primary, sub)| Slot::Name { primary, sub }); .map(|(primary, sub)| Self::Name { primary, sub });
wildcard.or(equals).or(name) wildcard.or(equal).or(name_equal).or(name)
} }
} }
@@ -585,6 +585,7 @@ mod test {
"<dev-haskell/wai-3.3:=[]", "<dev-haskell/wai-3.3:=[]",
">=kde-frameworks/kcrash-2.16.0:6*", ">=kde-frameworks/kcrash-2.16.0:6*",
"0-f/merreka+m::k+", "0-f/merreka+m::k+",
"iev-a/h:/n=",
]; ];
for atom in atoms { for atom in atoms {