Skip to content

Commit 916d83d

Browse files
authored
Merge branch 'master' into support-sorting-bitsets
2 parents efbc0cc + 0b00b7b commit 916d83d

6 files changed

+9
-22
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ stdlib = { git="https://github.com/fortran-lang/stdlib", branch="stdlib-fpm" }
205205
> To include the standard library metapackage, change the dependency to:
206206
> `stdlib = "*"`.
207207
>
208-
> [see also](https://fpm.fortran-lang.org/en/spec/metapackages.html)
208+
> [see also](https://fpm.fortran-lang.org/spec/metapackages.html)
209209
210210
## Using stdlib in your project
211211

Diff for: doc/specs/stdlib_bitsets.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ undefined. These procedures are summarized in the following table:
194194

195195
### Assignments
196196

197-
The module defines an assignment operation, `=`, that creates a
198-
duplicate of an original bitset. It also defines assignments to and
197+
The module uses the intrinsic assignment operation, `=`, to create a
198+
duplicate of an original bitset. It additionally defines assignments to and
199199
from rank one arrays of logical type of kinds `int8`, `int16`,
200200
`int32`, and `int64`. In the assignment to and from logical arrays
201201
array index, `i`, is mapped to bit position, `pos=i-1`, and `.true.`

Diff for: src/stdlib_bitsets.fypp

+2-7
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,8 @@ module stdlib_bitsets
11661166
!! end program example_assignment
11671167
!!```
11681168

1169+
1170+
11691171
#:for k1 in INT_KINDS
11701172
pure module subroutine assign_log${k1}$_large( self, logical_vector )
11711173
!! Version: experimental
@@ -1502,13 +1504,6 @@ module stdlib_bitsets
15021504

15031505
interface assignment(=)
15041506

1505-
pure module subroutine assign_64( set1, set2 )
1506-
!! Version: experimental
1507-
!!
1508-
!! Used to define assignment for `bitset_64`.
1509-
type(bitset_64), intent(out) :: set1
1510-
type(bitset_64), intent(in) :: set2
1511-
end subroutine assign_64
15121507

15131508
#:for k1 in INT_KINDS
15141509
module subroutine assign_log${k1}$_64( self, logical_vector )

Diff for: src/stdlib_bitsets_64.fypp

-9
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,6 @@ contains
7272
end function any_64
7373

7474

75-
pure module subroutine assign_64( set1, set2 )
76-
! Used to define assignment for bitset_64
77-
type(bitset_64), intent(out) :: set1
78-
type(bitset_64), intent(in) :: set2
79-
80-
set1 % num_bits = set2 % num_bits
81-
set1 % block = set2 % block
82-
83-
end subroutine assign_64
8475

8576

8677
#:for k1 in INT_KINDS

Diff for: src/stdlib_bitsets_large.fypp

+3
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ contains
8989
end function any_large
9090

9191

92+
93+
94+
9295
#:for k1 in INT_KINDS
9396
pure module subroutine assign_log${k1}$_large( self, logical_vector )
9497
! Used to define assignment from an array of type logical for bitset_large

Diff for: src/stdlib_hash_32bit_water.fypp

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@
4545
!! but also in its use of signed two's complement arithmetic in contrast to
4646
!! the unsigned arithmetic of Ettinger and Wang Yi, and in making some of the
4747
!! uses of `TRANSFER` endian dependent, in an attempt to make the quality of
48-
!! the hash endian independent. The use of signed arithmetic may change with
49-
!! the planned introduction of the unsigned BITS datatype in what is currently
50-
!! known as Fortran 202X.
48+
!! the hash endian independent.
5149
!!
5250
!! To be useful this code must be processed by a processor that implements two
5351
!! Fortran 2008 extensions to Fortran 2003: submodules, and 64 bit (`INT64`)

0 commit comments

Comments
 (0)