Fixed configClasses returning non-class entities

Author: DarkWanderer

src/operators/ops_config.cpp

@@ -252,7 +252,9 @@ namespace
                 {
                     if (res->is<t_boolean>())
                     {
-                        if (res->data<d_boolean, bool>()) {
+                        auto nav = m_iterator_current.nav();
+                        bool is_class = nav->size() > 0 || (nav->size() == 0 && nav->value.empty());
+                        if (res->data<d_boolean, bool>() && is_class) {
                             m_out_arr->push_back({ *m_iterator_current });
                         }
                     }
@@ -415,4 +417,4 @@ void sqf::operators::ops_config(::sqf::runtime::runtime& runtime)
     runtime.register_sqfop(unary("isNull", t_config(), "Checks whether the tested item is Null.", isnull_config));
     runtime.register_sqfop(binary(4, "configClasses", t_string(), t_config(), "Returns an array of t_config() entries which meet criteria in condition code. Command iterates through all available t_config() sub classes of the given t_config() class. Current looked at t_config() is stored in _x variable (similar to alternative count command implementation). Condition has to return true in order for the looked at t_config() to be added to the resulting array. Slightly faster than configProperties, but doesn't account for t_config() properties or inherited entries.", configclasses_code_config));
     runtime.register_sqfop(unary("configProperties", t_array(), "Returns an array of t_config() entries which meet criteria in condition code. Command iterates through available classes and t_config() properties for given t_config() entry. If 3rd param is true the search also includes inherited properties. Current looked at t_config() is stored in _x variable (similar to alternative count command implementation). Condition has to return true in order for the looked at property to be added to the resulting array. A bit slower than configClasses but allows to access inherited entires.", configproperties_array));
-}
+}

src/runtime/confighost.h

@@ -181,6 +181,12 @@ namespace sqf::runtime
                 auto actual_index = container[m_index];
                 return m_confighost.m_containers[actual_index];
             }
+            inline confignav nav()
+            {
+                auto& container = m_confighost.m_containers[m_id];
+                auto actual_index = container[m_index];
+                return confignav(m_confighost, actual_index);
+            }
         };
         using iterator = iterator_base<false>;
         using iterator_recursive = iterator_base<true>;
@@ -414,4 +420,4 @@ namespace sqf::runtime
     };
     inline confignav config::navigate(confighost& host) const { return { host, m_container_id }; }
     inline confignav confighost::root() { return { *this, 0 }; }
-}
+    }

tests/sqf/config.sqf

@@ -55,5 +55,7 @@
     ["assertEqual",     { ("getNumber (_x >> 'key') == 5" configClasses (configFile >> "flat_tests")) }, [configFile >> "flat_tests" >> "E"]],
     ["assertEqual",     { ("(getNumber (_x >> 'key')) % 2 == 0" configClasses (configFile >> "flat_tests")) }, [configFile >> "flat_tests" >> "B", configFile >> "flat_tests" >> "D"]],
     ["assertEqual",     { configName ((configFile >> "test_select_selects_addon") select 0) }, "addon"],
-    ["assertEqual",     { ("true" configClasses (configFile >> "test_config_classes_only_returns_config_entries")) apply { configName _x } }, ["TestSub"]]
+    ["assertEqual",     { ("true" configClasses (configFile >> "test_config_classes_only_returns_config_entries")) apply { configName _x } }, ["TestSub"]],
+    ["assertEqual",     { ("true" configClasses (configFile >> "nested_tests")) apply { configName _x } }, ["nested1"]],
+    ["assertEqual",     { ("true" configClasses (configFile >> "nested_tests" >> "nested1")) apply { configName _x } }, ["nested2"]]
 ]