Skip to content

fix: loop to parse all derive attributes separated by a comma #5

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

Open
MarcAntoine-Arnaud wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: loop to parse all derive attributes separated by a comma #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
133 changes: 69 additions & 64 deletions derive/src/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,50 +228,67 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
syn::Meta::List(list) => {
let mut tokens = list.tokens.into_iter();

match tokens.next() {
Some(TokenTree::Ident(id)) => {
if id == "prefix" {
match tokens.next() {
Some(TokenTree::Group(g)) => {
let (prefix, suffix) =
parse_prefix_binding(g.stream(), span)?;
result.prefixes.insert(prefix, suffix);
}
Some(token) => {
return Err(Error::InvalidAttribute(
AttributeError::UnexpectedToken,
token.span(),
))
}
None => {
return Err(Error::InvalidAttribute(
AttributeError::MissingPrefixBinding,
span,
))
while let Some(token) = tokens.next() {
match token {
TokenTree::Ident(id) => {
if id == "prefix" {
match tokens.next() {
Some(TokenTree::Group(g)) => {
let (prefix, suffix) =
parse_prefix_binding(g.stream(), span)?;
result.prefixes.insert(prefix, suffix);
}
Some(token) => {
return Err(Error::InvalidAttribute(
AttributeError::UnexpectedToken,
token.span(),
))
}
None => {
return Err(Error::InvalidAttribute(
AttributeError::MissingPrefixBinding,
span,
))
}
}
}
} else if id == "type" {
match tokens.next() {
Some(TokenTree::Punct(p)) if p.as_char() == '=' => match tokens
.next()
{
Some(TokenTree::Literal(l)) => {
let span = l.span();
match syn::Lit::new(l) {
syn::Lit::Str(s) => match IriBuf::new(s.value()) {
Ok(iri) => {
result.type_ = Some(CompactIri(iri, span))
}
Err(_) => {
return Err(Error::InvalidAttribute(
AttributeError::InvalidType,
span,
))
} else if id == "type" {
match tokens.next() {
Some(TokenTree::Punct(p)) if p.as_char() == '=' => {
match tokens.next() {
Some(TokenTree::Literal(l)) => {
let span = l.span();
match syn::Lit::new(l) {
syn::Lit::Str(s) => {
match IriBuf::new(s.value()) {
Ok(iri) => {
result.type_ =
Some(CompactIri(iri, span))
}
Err(_) => return Err(
Error::InvalidAttribute(
AttributeError::InvalidType,
span,
),
),
}
}
_ => {
return Err(Error::InvalidAttribute(
AttributeError::InvalidType,
span,
))
}
}
},
_ => {
}
Some(token) => {
return Err(Error::InvalidAttribute(
AttributeError::UnexpectedToken,
token.span(),
))
}
None => {
return Err(Error::InvalidAttribute(
AttributeError::InvalidType,
AttributeError::MissingType,
span,
))
}
Expand All @@ -289,34 +306,22 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
span,
))
}
},
Some(token) => {
return Err(Error::InvalidAttribute(
AttributeError::UnexpectedToken,
token.span(),
))
}
None => {
return Err(Error::InvalidAttribute(
AttributeError::MissingType,
span,
))
}
} else {
return Err(Error::InvalidAttribute(
AttributeError::UnknownIdent,
id.span(),
));
}
} else {
}
TokenTree::Punct(p) if p.as_char() == ',' => {}
token => {
return Err(Error::InvalidAttribute(
AttributeError::UnknownIdent,
id.span(),
));
AttributeError::UnexpectedToken,
token.span(),
))
}
}
Some(token) => {
return Err(Error::InvalidAttribute(
AttributeError::UnexpectedToken,
token.span(),
))
}
None => return Err(Error::InvalidAttribute(AttributeError::Empty, span)),
}
}
_ => {
Expand Down