Skip to content

Commit e6a376f

Browse files
committed
Merge branch 'SortingStdlibPullRequest' into sorting2
I accepted some of Jeremie's proposed changes while implementing some in my local copy so they became inconsistent.
2 parents 8b9be81 + 7c8ed79 commit e6a376f

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/stdlib_sorting.fypp

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#! Integer kinds to be considered during templating
2-
#:set INT_KINDS = ["int8", "int16", "int32", "int64"]
3-
4-
#! Real kinds to be considered during templating
5-
#:set REAL_KINDS = ["sp", "dp", "qp"]
1+
#:include "common.fypp"
62

73
!! Licensing:
84
!!
@@ -88,7 +84,7 @@ module stdlib_sorting
8884
!!
8985
!! `SORT_INDEX` is a modification of `ORD_SORT` so that in addition to
9086
!! sorting the input array, it returns the indices that map to a
91-
!! stable sort of the original array. These indices are intended to be
87+
!! stable sort of the original array. These indices are
9288
!! intended to be used to sort data that is correlated with the input
9389
!! array, e.g., different arrays in a database, different columns of a
9490
!! rank 2 array, different elements of a derived type. It is less
@@ -132,10 +128,10 @@ module stdlib_sorting
132128
log(1.6180339887_dp) ) )
133129

134130
type run_type
135-
! Version: experimental
136-
!
137-
! Used to pass state around in a stack among helper functions for the
138-
! `ORD_SORT` and `SORT_INDEX` algorithms
131+
!! Version: experimental
132+
!!
133+
!! Used to pass state around in a stack among helper functions for the
134+
!! `ORD_SORT` and `SORT_INDEX` algorithms
139135
integer(int_size) :: base = 0
140136
integer(int_size) :: len = 0
141137
end type run_type

0 commit comments

Comments
 (0)