riscv-macros: modularize code
#374
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+94
to
+120
| impl PacEnumItem { | ||
| pub fn new(input: &DeriveInput) -> Self { | ||
| let name = input.ident.clone(); | ||
| let (mut numbers, mut max_number) = (HashMap::new(), 0); | ||
|
|
||
| let variants = match &input.data { | ||
| Data::Enum(data) => &data.variants, | ||
| _ => panic!("Input is not an enum"), | ||
| }; | ||
| for v in variants.iter() { | ||
| let ident = v.ident.clone(); | ||
| let value = match v.discriminant.as_ref() { | ||
| Some((_, syn::Expr::Lit(expr_lit))) => match &expr_lit.lit { | ||
| syn::Lit::Int(lit_int) => { | ||
| lit_int.base10_parse::<usize>().unwrap_or_else(|_| { | ||
| panic!("All variant discriminants must be unsigned integers") | ||
| }) | ||
| } | ||
| _ => panic!("All variant discriminants must be unsigned integers"), | ||
| }, | ||
| None => panic!("Variant must have a discriminant"), | ||
| _ => panic!("All variant discriminants must be literal expressions"), | ||
| }; | ||
|
|
||
| if numbers.insert(value, ident).is_some() { | ||
| panic!("Duplicate discriminant value"); | ||
| } |
Contributor
There was a problem hiding this comment.
Hey! @romancardenas looking at the codes, all of them are mostly great! the only thing that concerns me here is the use of panic!() macro for things like missing discriminants and duplicate discriminant. I feel like it would be better to use something like syn::Error what do you think?
take my reviews with a grain of salt since I am not a actual maintainer of these crate.
Thank you :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of the work for improving the procedural macros used in this repo.
I reduced to the minimum the amount of code in
riscv-macros/src/lib.rs. The idea is leaving there only the public macros, and all the auxiliary code will be in clean modules.Currently,
riscv-macrosonly contain thepac_enummacro, which works in tandem with theriscvcrate. Thus, the auxiliary code has been moved to theriscvmodule.If the
rtfeature is active,pac_enummay also produce code required byriscv-rt. This additional code is now isolated in theriscv::rtmodule.Next steps will be moving code from
riscv-rt/macrostoriscv-macros, under a newriscv_rtmodule.