Skip to content

fix: expand nested macro arguments #378

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
aspizu merged 1 commit into from
Sep 8, 2026
Merged

fix: expand nested macro arguments #378

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
23 changes: 17 additions & 6 deletions src/pre_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use logos::Span;
use rustc_hash::{
FxHashMap,
FxHashSet,
};
use logos::Span;

use crate::{
diagnostic::{
Expand Down Expand Up @@ -259,7 +259,7 @@ impl<'a> PreProcessor<'a, '_> {
return Ok(false);
}

let (_, args) = self.parse_macro_call_args(span)?;
let (_, mut args) = self.parse_macro_call_args(span)?;

let arity = args.len();
let Some((function_define_params, function_define_body)) = overloads.get(&arity).cloned()
Expand All @@ -273,6 +273,14 @@ impl<'a> PreProcessor<'a, '_> {
});
};

// Expand used arguments before suppressing this macro in its replacement body.
for (param, arg) in function_define_params.iter().zip(&mut args) {
if function_define_body.contains(param) {
*arg =
self.expand_token_list(std::mem::take(arg), suppress, macro_name_span.clone())?;
}
}

let mut i = *self.i;
for token in function_define_body {
if let Some(position) = function_define_params
Expand Down Expand Up @@ -442,9 +450,12 @@ impl<'a> PreProcessor<'a, '_> {
&mut self,
tokens: Vec<Token>,
suppress: &FxHashSet<SmolStr>,
source_span: Span,
) -> Result<Vec<Token>, Diagnostic> {
let mut spanned: Vec<SpannedToken> =
tokens.into_iter().map(|token| (0, token, 0)).collect();
let mut spanned: Vec<SpannedToken> = tokens
.into_iter()
.map(|token| (source_span.start, token, source_span.end))
.collect();

let length = spanned.len();

Expand Down Expand Up @@ -597,8 +608,8 @@ impl<'a> PreProcessor<'a, '_> {
});
}

let left = self.expand_token_list(args[0].clone(), suppress)?;
let right = self.expand_token_list(args[1].clone(), suppress)?;
let left = self.expand_token_list(args[0].clone(), suppress, macro_name_span.clone())?;
let right = self.expand_token_list(args[1].clone(), suppress, macro_name_span.clone())?;

let [left] = &left[..] else {
return Err(Diagnostic {
Expand Down
Loading