Skip to content

Commit

Permalink
Merge pull request #408 from wclodius2/sorting2
Browse files Browse the repository at this point in the history
  • Loading branch information
awvwgk committed Jun 3, 2021
2 parents 1df277f + 1fc5cd9 commit 888b5d3
Show file tree
Hide file tree
Showing 14 changed files with 4,128 additions and 3 deletions.
1 change: 1 addition & 0 deletions doc/specs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ This is and index/directory of the specifications (specs) for each new module/fe
- [logger](./stdlib_logger.html) - Runtime logging system
- [optval](./stdlib_optval.html) - Fallback value for optional arguments
- [quadrature](./stdlib_quadrature.html) - Numerical integration
- [sorting](./stdlib_sorting.html) - Sorting of rank one arrays
- [stats](./stdlib_stats.html) - Descriptive Statistics
- [stats_distribution_PRNG](./stdlib_stats_distribution_PRNG.html) - Probability Distributions random number generator
- [string\_type](./stdlib_string_type.html) - Basic string support
Expand Down
619 changes: 619 additions & 0 deletions doc/specs/stdlib_sorting.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ set(fppFiles
stdlib_linalg.fypp
stdlib_linalg_diag.fypp
stdlib_optval.fypp
stdlib_sorting.fypp
stdlib_sorting_ord_sort.fypp
stdlib_sorting_sort.fypp
stdlib_sorting_sort_index.fypp
stdlib_stats.fypp
stdlib_stats_corr.fypp
stdlib_stats_cov.fypp
Expand Down
13 changes: 13 additions & 0 deletions src/Makefile.manual
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ SRCFYPP =\
stdlib_quadrature.fypp \
stdlib_quadrature_trapz.fypp \
stdlib_quadrature_simps.fypp \
stdlib_sorting.fypp \
stdlib_sorting_ord_sort.fypp \
stdlib_sorting_sort.fypp \
stdlib_sorting_sort_index.fypp \
stdlib_stats.fypp \
stdlib_stats_corr.fypp \
stdlib_stats_cov.fypp \
Expand Down Expand Up @@ -81,6 +85,15 @@ stdlib_quadrature_trapz.o: \
stdlib_quadrature.o \
stdlib_error.o \
stdlib_kinds.o
stdlib_sorting.o: \
stdlib_kinds.o \
stdlib_string_type.o
stdlib_sorting_ord_sort.o: \
stdlib_sorting.o
stdlib_sorting_sort.o: \
stdlib_sorting.o
stdlib_sorting_sort_index.o: \
stdlib_sorting.o
stdlib_stats.o: \
stdlib_kinds.o
stdlib_stats_corr.o: \
Expand Down
15 changes: 12 additions & 3 deletions src/common.fypp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#! Real kinds to be considered during templating
#:set REAL_KINDS = ["sp", "dp", "qp"]

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

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

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

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

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

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

#! Derived type string_type
#:set STRING_KINDS = ["string_type"]

#! String types to be considered during templating
#:set STRING_TYPES = ["type({})".format(k) for k in STRING_KINDS]

#! Collected (kind, type) tuples for string derived types
#:set STRING_KINDS_TYPES = list(zip(STRING_KINDS, STRING_TYPES))


#! Whether Fortran 90 compatible code should be generated
#:set VERSION90 = defined('VERSION90')
Expand Down
Loading

0 comments on commit 888b5d3

Please sign in to comment.