_forEachIndex

BrettMayson · Oct 9, 2024 · 86db383 · 86db383
1 parent 8047f7c
commit 86db383
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/libs/sqf/src/analyze/inspector/commands.rs b/libs/sqf/src/analyze/inspector/commands.rs
@@ -177,7 +177,7 @@ impl SciptScope {
     pub fn cmd_generic_call_magic(
         &mut self,
         code_possibilities: &HashSet<GameValue>,
-        magic: &Vec<&str>,
+        magic: Vec<(&str, GameValue)>,
         source: &Range<usize>,
         database: &Database,
     ) -> HashSet<GameValue> {
@@ -192,11 +192,11 @@ impl SciptScope {
                 continue;
             }
             self.push();
-            for var in magic {
+            for (var, value) in magic.iter() {
                 self.var_assign(
                     var,
                     true,
-                    HashSet::from([GameValue::Anything]),
+                    HashSet::from([value.clone()]),
                     VarSource::Magic(source.clone()),
                 );
             }
@@ -363,7 +363,7 @@ impl SciptScope {
     ) -> HashSet<GameValue> {
         let mut return_value = cmd_set.clone();
         // Check: `array select expression`
-        let _ = self.cmd_generic_call_magic(rhs, &vec!["_x"], source, database);
+        let _ = self.cmd_generic_call_magic(rhs, vec![("_x", GameValue::Anything)], source, database);
         // if lhs is array, and rhs is bool/number then put array into return
         if lhs.len() == 1
             && rhs

diff --git a/libs/sqf/src/analyze/inspector/mod.rs b/libs/sqf/src/analyze/inspector/mod.rs
@@ -334,14 +334,14 @@ impl SciptScope {
                         "then" => Some(self.cmd_b_then(&lhs_set, &rhs_set, database)),
                         "foreach" | "foreachreversed" => Some(self.cmd_generic_call_magic(
                             &lhs_set,
-                            &vec!["_x", "_y", "_forEachIndex"],
+                            vec![("_x", GameValue::Anything), ("_y", GameValue::Anything), ("_forEachIndex", GameValue::Number(None))],
                             source,
                             database,
                         )),
                         "count" => {
                             let _ = self.cmd_generic_call_magic(
                                 &lhs_set,
-                                &vec!["_x"],
+                                vec![("_x", GameValue::Anything)],
                                 source,
                                 database,
                             );
@@ -350,7 +350,7 @@ impl SciptScope {
                         "findif" | "apply" => {
                             let _ = self.cmd_generic_call_magic(
                                 &rhs_set,
-                                &vec!["_x"],
+                                vec![("_x", GameValue::Anything)],
                                 source,
                                 database,
                             );

diff --git a/libs/sqf/tests/inspector/test_0.sqf b/libs/sqf/tests/inspector/test_0.sqf
@@ -0,0 +1,3 @@
+{
+    _forEachIndex + "A";
+} forEach z;