Feature/reserve

.github/workflows/c-cpp.yml

@@ -39,6 +39,7 @@ jobs:
         msystem: MINGW64
         install: mingw-w64-x86_64-gcc
         update: true
+        release: true
 
     - name: build and test
       shell: msys2 {0}

src/TinyJSON.cpp

@@ -6210,10 +6210,17 @@ namespace TinyJSON
 
   std::vector<long double> TJValueArray::get_floats() const
   {
+    const unsigned int count = get_number_of_items();
     std::vector<long double> values = {};
-    for (unsigned int i = 0; i < get_number_of_items(); ++i)
+    values.reserve(count);
+    const unsigned int elements_count = get_number_of_elements();
+    for (unsigned int i = 0; i < elements_count; ++i)
     {
-      auto value = at(i);
+      auto* value = element_at(i);
+      if (value->is_comment())
+      {
+        continue;
+      }
       if (!value->is_number())
       {
         ParseResult _parse_result(_parse_options);
@@ -6228,10 +6235,17 @@ namespace TinyJSON
 
   std::vector<long long> TJValueArray::get_numbers() const
   {
+    const unsigned int count = get_number_of_items();
     std::vector<long long> values = {};
-    for (unsigned int i = 0; i < get_number_of_items(); ++i)
+    values.reserve(count);
+    const unsigned int elements_count = get_number_of_elements();
+    for (unsigned int i = 0; i < elements_count; ++i)
     {
-      auto value = at(i);
+      auto* value = element_at(i);
+      if (value->is_comment())
+      {
+        continue;
+      }
       if (!value->is_number())
       {
         ParseResult _parse_result(_parse_options);

tests/testjson5arrays.cpp

@@ -106,3 +106,39 @@ TEST(TJJSON5Arrays, RemoveAllItemsKeepComment)
 
   delete tj;
 }
+
+TEST(TJJSON5Arrays, GetNumbersWithComments)
+{
+  const TJCHAR* json = TJCHARPREFIX("[\n  1, \n  // comment\n  2\n]");
+  parse_options options;
+  options.specification = parse_options::json5_1_0_0;
+  auto* tj = TJ::parse(json, options);
+  ASSERT_NE(nullptr, tj);
+  auto* jarr = dynamic_cast<TJValueArray*>(tj);
+  ASSERT_NE(nullptr, jarr);
+
+  std::vector<long long> numbers = jarr->get_numbers();
+  ASSERT_EQ(2u, numbers.size());
+  EXPECT_EQ(1, numbers[0]);
+  EXPECT_EQ(2, numbers[1]);
+
+  delete tj;
+}
+
+TEST(TJJSON5Arrays, GetFloatsWithComments)
+{
+  const TJCHAR* json = TJCHARPREFIX("[\n  1.1, \n  // comment\n  2.2\n]");
+  parse_options options;
+  options.specification = parse_options::json5_1_0_0;
+  auto* tj = TJ::parse(json, options);
+  ASSERT_NE(nullptr, tj);
+  auto* jarr = dynamic_cast<TJValueArray*>(tj);
+  ASSERT_NE(nullptr, jarr);
+
+  std::vector<long double> floats = jarr->get_floats();
+  ASSERT_EQ(2u, floats.size());
+  EXPECT_DOUBLE_EQ(1.1, (double)floats[0]);
+  EXPECT_DOUBLE_EQ(2.2, (double)floats[1]);
+
+  delete tj;
+}