Merge branch 'master' into master

Author: jalvesz

API-doc-FORD-file.md

@@ -3,6 +3,7 @@ project: Fortran-lang/stdlib
 summary: A community driven standard library for (modern) Fortran
 src_dir: src
 include: src
+         include
 exclude_dir: src/tests
 output_dir: API-doc
 page_dir: doc

CMakeLists.txt

@@ -65,6 +65,7 @@ list(
   "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
   "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
   "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
+  "-I${PROJECT_SOURCE_DIR}/include"
 )
 
 add_subdirectory(src)

ci/fpm-deployment.sh

@@ -31,7 +31,6 @@ prune=(
   "$destdir/test/test_always_fail.f90"
   "$destdir/test/test_always_skip.f90"
   "$destdir/test/test_hash_functions.f90"
-  "$destdir/src/common.f90"
   "$destdir/src/f18estop.f90"
 )
 
@@ -42,7 +41,7 @@ fi
 major=$(cut -d. -f1 VERSION)
 minor=$(cut -d. -f2 VERSION)
 patch=$(cut -d. -f3 VERSION)
-fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch}"
+fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch} -I include"
 
 mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"
 

example/bitsets/example_bitsets_bit_count.f90

@@ -3,6 +3,9 @@ program example_bit_count
   character(*), parameter :: &
     bits_0 = '0000000000000000000'
   type(bitset_64) :: set0
+  type(bitset_large) :: set1
+  logical, allocatable :: logi(:)
+  
   call set0%from_string(bits_0)
   if (set0%bit_count() == 0) then
     write (*, *) "FROM_STRING interpreted "// &
@@ -12,4 +15,11 @@ program example_bit_count
   if (set0%bit_count() == 1) then
     write (*, *) "BIT_COUNT interpreted SET0's value properly."
   end if
+  
+  allocate( logi(1000), source=.false.)
+  logi(1::7) = .true.
+  set1 = logi
+  if (set1%bit_count() == count(logi)) then
+    write (*, *) "BIT_COUNT interpreted SET1's value properly."
+  end if
 end program example_bit_count

src/common.fypp renamed to include/common.fypp

@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f08estop
 
 implicit none
 
@@ -38,4 +38,4 @@
 endif
 end procedure
 
-end submodule
+end submodule f08estop

src/f08estop.f90

@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f18estop
 
 implicit none
 
@@ -26,4 +26,4 @@
 endif
 end procedure
 
-end submodule estop
+end submodule f18estop

src/f18estop.f90

@@ -100,7 +100,7 @@ module stdlib_bitsets
 !! Parent type for bitset_64 and bitset_large ([Specification](../page/specs/stdlib_bitsets.html#the-stdlib_bitsets-derived-types))
 
         private
-        integer(bits_kind) :: num_bits
+        integer(bits_kind) :: num_bits = 0_bits_kind
 
     contains
 

src/stdlib_bitsets.fypp

@@ -144,19 +144,13 @@ contains
         integer(bits_kind)              ::  bit_count
         class(bitset_large), intent(in) :: self
 
-        integer(bits_kind) :: block_, pos
+        integer(bits_kind) :: nblocks, pos
 
-        bit_count = 0
-        do block_ = 1_bits_kind, size(self % blocks, kind=bits_kind) - 1
-            do pos = 0, block_size-1
-                if ( btest( self % blocks(block_), pos ) ) &
-                    bit_count = bit_count + 1
-            end do
-
-        end do
+        nblocks = size( self % blocks, kind=bits_kind )
+        bit_count = sum( popcnt( self % blocks(1:nblocks-1) ) )
 
-        do pos = 0_bits_kind, self % num_bits - (block_-1)*block_size - 1
-            if ( btest( self % blocks(block_), pos ) ) bit_count = bit_count + 1
+        do pos = 0_bits_kind, self % num_bits - (nblocks-1)*block_size - 1
+            if ( btest( self % blocks(nblocks), pos ) ) bit_count = bit_count + 1
         end do
 
     end function bit_count_large
@@ -1051,7 +1045,7 @@ contains
     pure module subroutine set_range_large(self, start_pos, stop_pos)
 !
 !     Sets all valid bits to 1 from the START_POS to the STOP_POS positions
-!     in SELF. If STOP_POA < START_POS no bits are changed. Positions outside
+!     in SELF. If STOP_POS < START_POS no bits are changed. Positions outside
 !     the range 0 to BITS(SELF)-1 are ignored.
 !
         class(bitset_large), intent(inout) :: self

src/stdlib_bitsets_large.fypp

@@ -10,11 +10,6 @@ macro(ADDTEST name)
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endmacro(ADDTEST)
 
-list(
-  APPEND fyppFlags
-  "-I${PROJECT_SOURCE_DIR}/src"
-)
-
 add_subdirectory(array)
 add_subdirectory(ascii)
 add_subdirectory(bitsets)

test/CMakeLists.txt

@@ -231,6 +231,15 @@ subroutine test_initialization(error)
 
         type(bitset_64) :: set4, set5
 
+        !The following block triggers an issue in gfortran 11 and 12
+        block
+        type(bitset_64) :: set6
+        call check(error, set6 % bits(), 0, &
+            'set6 % bits() returned non-zero value '//&
+            'even though set6 was not initialized.')
+        if (allocated(error)) return
+        end block
+
         set5 = log1
         call check(error, set5%bits(), 64, &
             'initialization with logical(int8) failed to set the right size.')

test/bitsets/test_stdlib_bitset_64.f90

@@ -345,6 +345,15 @@ subroutine test_initialization(error)
         logical(int64), allocatable :: log8(:)
         type(bitset_large) :: set4, set5
 
+        !The following triggers an issue in gfortran 11 and 12
+        block
+        type(bitset_large) :: set6
+        call check(error, set6 % bits(), 0, &
+            'set6 % bits() returned non-zero value '//&
+            'even though set6 was not initialized.')
+        if (allocated(error)) return
+        end block
+
         set5 = log1
         call check(error, set5 % bits(), 64, &
             ' initialization with logical(int8) failed to set' // &

test/bitsets/test_stdlib_bitset_large.f90

@@ -7,7 +7,7 @@ ADDTEST(hash_functions)
 target_sources(
   test_hash_functions
   PRIVATE
-  nmhash_scalar.c
+  nmhash.c
   pengyhash.c
   SpookyV2.cpp
   SpookyV2Test.cpp

test/hash_functions/CMakeLists.txt

@@ -3,7 +3,6 @@
 
 extern "C" {
   #include "nmhash.h"
-  #include "nmhash_scalar.h"
   #include "pengyhash.h"
   #include "waterhash.h"
   int generate_all_c_hash();