correct iterator example

Author: scivision

test/iterator/CMakeLists.txt

@@ -1,3 +1,5 @@
+set_property(DIRECTORY PROPERTY LABELS iterator)
+
 include(CheckCXXSymbolExists)
 
 check_cxx_symbol_exists(__cpp_lib_to_address "memory" cpp20_to_address)
@@ -8,18 +10,15 @@ endif()
 add_library(int_iterator OBJECT lib.cpp)
 target_include_directories(int_iterator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-# glitch in arm64 GitHub Actions. Happened on other projects too (h5fortran-mpi)
-if(NOT (APPLE AND "$ENV{GITHUB_ACTIONS}"))
 add_executable(int_iterator_fortran main.f90)
 target_link_libraries(int_iterator_fortran PRIVATE int_iterator)
 set_property(TARGET int_iterator_fortran PROPERTY LINKER_LANGUAGE ${linker_lang})
 add_test(NAME IntegerIteratorFortran COMMAND int_iterator_fortran)
-endif()
 
 add_executable(int_iterator_cpp main.cpp)
 target_link_libraries(int_iterator_cpp PRIVATE int_iterator)
 add_test(NAME IntegerIteratorCpp COMMAND int_iterator_cpp)
 
-get_property(tests DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY TESTS)
-# in work, may not be correct algorithms
-set_tests_properties(${tests} PROPERTIES DISABLED true)
+# get_property(tests DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY TESTS)
+# # in work, may not be correct algorithms
+# set_tests_properties(${tests} PROPERTIES DISABLED true)

test/iterator/int_iter.h

@@ -6,6 +6,7 @@ extern "C" {
 void* initIterator_C();
 void incrementIterator_C(void*);
 int getIteratorValue_C(void*);
+void destroyIterator_C(void*);
 
 #ifdef __cplusplus
 }

test/iterator/lib.cpp

@@ -1,14 +1,9 @@
 #include <vector>
-#include <memory>
 
 extern "C" void* initIterator_C();
 extern "C" void incrementIterator_C(void*);
 extern "C" int getIteratorValue_C(void*);
-
-auto initIterator(){
-    std::vector<int> vec{0, 1, 2};
-    return vec;
-}
+extern "C" void destroyIterator_C(void*);
 
 void incrementIterator(std::vector<int>::iterator &it) {
     ++it;
@@ -18,19 +13,29 @@ int getIteratorValue(std::vector<int>::iterator &it) {
     return *it;
 }
 
+struct IteratorState {
+    std::vector<int> vec{0, 1, 2};
+    std::vector<int>::iterator it = vec.begin();
+};
+
 
 void* initIterator_C(){
-    auto it = initIterator();
-    void* ptr = std::to_address(it.begin());
-    return ptr;
+    auto* state = new IteratorState();
+    state->it = state->vec.begin();
+    return state;
 }
 
 void incrementIterator_C(void* ptr){
-    auto it = static_cast<std::vector<int>::iterator*>(ptr);
-    incrementIterator(*it);
+    auto state = static_cast<IteratorState*>(ptr);
+    incrementIterator(state->it);
 }
 
 int getIteratorValue_C(void* ptr){
-    auto it = static_cast<std::vector<int>::iterator*>(ptr);
-    return getIteratorValue(*it);
+    auto state = static_cast<IteratorState*>(ptr);
+    return getIteratorValue(state->it);
+}
+
+void destroyIterator_C(void* ptr){
+    auto state = static_cast<IteratorState*>(ptr);
+    delete state;
 }

test/iterator/main.cpp

@@ -10,6 +10,7 @@ void* it = initIterator_C();
 std::cout << getIteratorValue_C(it) << "\n";
 
 incrementIterator_C(it);
+destroyIterator_C(it);
 
 std::cout << "OK: c++: iterator\n";
 }

test/iterator/main.f90

@@ -16,6 +16,10 @@ integer(C_INT) FUNCTION getIteratorValue_C(pit) BIND(C, NAME='getIteratorValue_C
   import C_INT, C_PTR
   type(C_PTR), value, intent(in) :: pit
 end function
+subroutine destroyIterator_C(pit) BIND(C, NAME='destroyIterator_C')
+  import C_PTR
+  type(C_PTR), value, intent(in) :: pit
+end subroutine
 end interface
 
 type(C_PTR) :: it
@@ -25,6 +29,7 @@ integer(C_INT) FUNCTION getIteratorValue_C(pit) BIND(C, NAME='getIteratorValue_C
 print *, getIteratorValue_C(it)
 
 call incrementIterator_C(it)
+call destroyIterator_C(it)
 
 print *, "OK: iterator"