fix: incorrect macro expansion delta

Sarrus1 · Jul 18, 2023 · 8095d45 · 8095d45
1 parent 5a6d579
commit 8095d45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/sourcepawn_preprocessor/src/lib.rs b/src/sourcepawn_preprocessor/src/lib.rs
@@ -18,7 +18,9 @@ mod test {
         _macros: &mut FxHashMap<String, Macro>,
         mut _path: String,
         _document_uri: &Url,
-    ) {
+        _quoted: bool,
+    ) -> anyhow::Result<()> {
+        Ok(())
     }
 
     use super::{evaluator::IfCondition, preprocessor::Macro, SourcepawnPreprocessor};

diff --git a/src/sourcepawn_preprocessor/src/macros.rs b/src/sourcepawn_preprocessor/src/macros.rs
@@ -129,10 +129,10 @@ fn expand_macro(
                     if arg_idx >= 10 {
                         return Err(ParseIntError::new(child.text(), child.range));
                     }
-                    for (i, child) in args[arg_idx as usize].iter().enumerate() {
+                    for (j, sub_child) in args[arg_idx as usize].iter().enumerate() {
                         stack.push((
-                            child.clone(),
-                            if i == 0 { symbol.delta } else { child.delta },
+                            sub_child.clone(),
+                            if j == 0 { child.delta } else { sub_child.delta },
                             d + 1,
                         ));
                     }