Skip to content

Commit 888b5d3

Browse files
authored
Merge pull request #408 from wclodius2/sorting2
2 parents 1df277f + 1fc5cd9 commit 888b5d3

14 files changed

+4128
-3
lines changed

doc/specs/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This is and index/directory of the specifications (specs) for each new module/fe
1919
- [logger](./stdlib_logger.html) - Runtime logging system
2020
- [optval](./stdlib_optval.html) - Fallback value for optional arguments
2121
- [quadrature](./stdlib_quadrature.html) - Numerical integration
22+
- [sorting](./stdlib_sorting.html) - Sorting of rank one arrays
2223
- [stats](./stdlib_stats.html) - Descriptive Statistics
2324
- [stats_distribution_PRNG](./stdlib_stats_distribution_PRNG.html) - Probability Distributions random number generator
2425
- [string\_type](./stdlib_string_type.html) - Basic string support

doc/specs/stdlib_sorting.md

+619
Large diffs are not rendered by default.

src/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ set(fppFiles
1010
stdlib_linalg.fypp
1111
stdlib_linalg_diag.fypp
1212
stdlib_optval.fypp
13+
stdlib_sorting.fypp
14+
stdlib_sorting_ord_sort.fypp
15+
stdlib_sorting_sort.fypp
16+
stdlib_sorting_sort_index.fypp
1317
stdlib_stats.fypp
1418
stdlib_stats_corr.fypp
1519
stdlib_stats_cov.fypp

src/Makefile.manual

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ SRCFYPP =\
1010
stdlib_quadrature.fypp \
1111
stdlib_quadrature_trapz.fypp \
1212
stdlib_quadrature_simps.fypp \
13+
stdlib_sorting.fypp \
14+
stdlib_sorting_ord_sort.fypp \
15+
stdlib_sorting_sort.fypp \
16+
stdlib_sorting_sort_index.fypp \
1317
stdlib_stats.fypp \
1418
stdlib_stats_corr.fypp \
1519
stdlib_stats_cov.fypp \
@@ -81,6 +85,15 @@ stdlib_quadrature_trapz.o: \
8185
stdlib_quadrature.o \
8286
stdlib_error.o \
8387
stdlib_kinds.o
88+
stdlib_sorting.o: \
89+
stdlib_kinds.o \
90+
stdlib_string_type.o
91+
stdlib_sorting_ord_sort.o: \
92+
stdlib_sorting.o
93+
stdlib_sorting_sort.o: \
94+
stdlib_sorting.o
95+
stdlib_sorting_sort_index.o: \
96+
stdlib_sorting.o
8497
stdlib_stats.o: \
8598
stdlib_kinds.o
8699
stdlib_stats_corr.o: \

src/common.fypp

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#! Real kinds to be considered during templating
44
#:set REAL_KINDS = ["sp", "dp", "qp"]
55

6-
#! Real types to be considere during templating
6+
#! Real types to be considered during templating
77
#:set REAL_TYPES = ["real({})".format(k) for k in REAL_KINDS]
88

99
#! Collected (kind, type) tuples for real types
@@ -12,7 +12,7 @@
1212
#! Complex kinds to be considered during templating
1313
#:set CMPLX_KINDS = ["sp", "dp", "qp"]
1414

15-
#! Complex types to be considere during templating
15+
#! Complex types to be considered during templating
1616
#:set CMPLX_TYPES = ["complex({})".format(k) for k in CMPLX_KINDS]
1717

1818
#! Collected (kind, type) tuples for complex types
@@ -21,12 +21,21 @@
2121
#! Integer kinds to be considered during templating
2222
#:set INT_KINDS = ["int8", "int16", "int32", "int64"]
2323

24-
#! Integer types to be considere during templating
24+
#! Integer types to be considered during templating
2525
#:set INT_TYPES = ["integer({})".format(k) for k in INT_KINDS]
2626

2727
#! Collected (kind, type) tuples for integer types
2828
#:set INT_KINDS_TYPES = list(zip(INT_KINDS, INT_TYPES))
2929

30+
#! Derived type string_type
31+
#:set STRING_KINDS = ["string_type"]
32+
33+
#! String types to be considered during templating
34+
#:set STRING_TYPES = ["type({})".format(k) for k in STRING_KINDS]
35+
36+
#! Collected (kind, type) tuples for string derived types
37+
#:set STRING_KINDS_TYPES = list(zip(STRING_KINDS, STRING_TYPES))
38+
3039

3140
#! Whether Fortran 90 compatible code should be generated
3241
#:set VERSION90 = defined('VERSION90')

0 commit comments

Comments
 (0)