more c++ enhancements

Author: scivision

CMakeLists.txt

@@ -46,6 +46,7 @@ foreach(a IN ITEMS
   iso_fortran_binding
   allocate contiguous
   array bool error exception
+  iterator
   glibc malloc
   opaque pointer poly_function poly_type real struct
   sleep string submodule

src/allocate/my_alloc.h

@@ -2,17 +2,17 @@
 extern "C" {
 #endif
 
-void alloc1(float**, float**, size_t*);
-void alloc2(float**, float**, size_t*);
-void alloc3(float**, float**, size_t*);
-void alloc4(float**, float**, size_t*);
+void alloc1(float**, float**, const size_t*);
+void alloc2(float**, float**, const size_t*);
+void alloc3(float**, float**, const size_t*);
+void alloc4(float**, float**, const size_t*);
 
-void dealloc1(float**, float**, size_t*);
-void dealloc2(float**, float**, size_t*);
-void dealloc3(float**, float**, size_t*);
-void dealloc4(float**, float**, size_t*);
+void dealloc1(float**, float**, const size_t*);
+void dealloc2(float**, float**, const size_t*);
+void dealloc3(float**, float**, const size_t*);
+void dealloc4(float**, float**, const size_t*);
 
-void falloc1(float**, size_t*);
+void falloc1(float**, const size_t*);
 void fdealloc1(float**);
 
 #ifdef __cplusplus

src/contiguous/contiguous.h

@@ -2,7 +2,7 @@
 extern "C" {
 #endif
 
-void asub(float [], size_t*);
+void asub(float [], const size_t*);
 
 #ifdef __cplusplus
 }

test/allocate/main.cpp

@@ -1,40 +1,41 @@
 #include <iostream>
 #include <cstdlib>
+#include <vector>
 
 #include "my_alloc.h"
 
 int main(){
 
-  size_t d1[1] = {1};
-  size_t d2[2] = {1,1};
-  size_t d3[3] = {1,1,1};
-  size_t d4[4] = {1,1,1,1};
+  const std::vector<size_t> d1 = {1};
+  const std::vector<size_t> d2 = {1,1};
+  const std::vector<size_t> d3 = {1,1,1};
+  const std::vector<size_t> d4 = {1,1,1,1};
 
   float *A1, *B1, *A2, *B2, *A3, *B3, *A4, *B4;
 
 
-  alloc1(&A1, &B1, d1);
+  alloc1(&A1, &B1, &d1.front());
   std::cout << "1D: A and B allocated\n";
 
-  dealloc1(&A1, &B1, d1);
+  dealloc1(&A1, &B1, &d1.front());
   std::cout << "1D: A and B deallocated\n";
 
-  alloc2(&A2, &B2, d2);
+  alloc2(&A2, &B2, &d2.front());
   std::cout << "2D: A and B allocated\n";
 
-  dealloc2(&A2, &B2, d2);
+  dealloc2(&A2, &B2, &d2.front());
   std::cout << "2D: A and B deallocated\n";
 
-  alloc3(&A3, &B3, d3);
+  alloc3(&A3, &B3, &d3.front());
   std::cout << "3D: A and B allocated\n";
 
-  dealloc3(&A3, &B3, d3);
+  dealloc3(&A3, &B3, &d3.front());
   std::cout << "3D: A and B deallocated\n";
 
-  alloc4(&A4, &B4, d4);
+  alloc4(&A4, &B4, &d4.front());
   std::cout << "4D: A and B allocated\n";
 
-  dealloc4(&A4, &B4, d4);
+  dealloc4(&A4, &B4, &d4.front());
   std::cout << "4D: A and B deallocated\n";
 
   std::cout << "OK: allocate test\n";

test/contiguous/main.cpp

@@ -10,14 +10,14 @@
 
 int main(){
 
-size_t dims[1] = {3};
+const std::vector<size_t> dims = {3};
 
 std::vector<float> a(3);
 
 for (size_t i = 0; i < 3; ++i)
   a[i] = i+1;
 
-asub(&a[0], dims);
+asub(&a[0], &dims.front());
 
 std::cout << "OK: C++ contiguous array\n";
 

test/iterator/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_library(int_iterator OBJECT lib.cpp)
-set_property(TARGET int_iterator PROPERTY CXX_STANDARD 14)
+target_compile_features(int_iterator PUBLIC cxx_std_20)
 target_include_directories(int_iterator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(int_iterator_fortran main.f90)
@@ -10,3 +10,7 @@ add_test(NAME IntegerIteratorFortran COMMAND int_iterator_fortran)
 add_executable(int_iterator_cpp main.cpp)
 target_link_libraries(int_iterator_cpp PRIVATE int_iterator)
 add_test(NAME IntegerIteratorCpp COMMAND int_iterator_cpp)
+
+set_tests_properties(IntegerIteratorFortran IntegerIteratorCpp
+  PROPERTIES DISABLED true
+  )

test/iterator/lib.cpp

@@ -1,4 +1,5 @@
 #include <vector>
+#include <memory>
 
 extern "C" void* initIterator_C();
 extern "C" void incrementIterator_C(void*);
@@ -20,7 +21,7 @@ int getIteratorValue(std::vector<int>::iterator &it) {
 
 void* initIterator_C(){
     auto it = initIterator();
-    void* ptr = &(*it.begin());
+    void* ptr = std::to_address(it.begin());
     return ptr;
 }
 

test/iterator/standalone.cpp

@@ -1,15 +1,16 @@
 #include <cstdlib>
 #include <string>
 #include <iostream>
+#include <memory>
 
 
 char* iter_ptr(char* c){
 
     std::string s(c);
 
-    std::string::iterator it(s.begin());
+    auto it(s.begin());
 
-    return &(*it);
+    return std::to_address(it);
 }
 
 int main(){

test/time/strptime.cpp

@@ -3,8 +3,8 @@
 #include <iomanip>
 #include <sstream>
 
-extern "C" char* strptime(const char* s,
-                          const char* f,
+extern "C" char* strptime(char* s,
+                          const char* format,
                           struct tm* tm) {
   // Isn't the C++ standard lib nice? std::get_time is defined such that its
   // format parameters are the exact same as strptime. Of course, we have to
@@ -14,9 +14,9 @@ extern "C" char* strptime(const char* s,
   // of the versions in any of the C standard libraries.
   std::istringstream input(s);
   input.imbue(std::locale(setlocale(LC_ALL, nullptr)));
-  input >> std::get_time(tm, f);
-  if (input.fail()) {
+  input >> std::get_time(tm, format);
+  if (input.fail())
     return nullptr;
-  }
-  return (char*)(s + input.tellg());
+
+  return s + input.tellg();
 }