Mercurial > octave
changeset 30216:c2132e0147ff
maint: use ALL_CAPS for static const variables used as constants.
* pr-output.cc (pr_output_traits): Rename "const int" class variable "digits10"
to "DIGITS10". Rename class variable "max_field_width" to "MAX_FIELD_WIDTH".
author | Rik <rik@octave.org> |
---|---|
date | Mon, 27 Sep 2021 20:30:57 -0700 |
parents | 8398d31dab76 |
children | f5aba4d7e651 |
files | libinterp/corefcn/pr-output.cc |
diffstat | 1 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Mon Sep 27 17:53:38 2021 -0400 +++ b/libinterp/corefcn/pr-output.cc Mon Sep 27 20:30:57 2021 -0700 @@ -361,29 +361,29 @@ template <typename> struct pr_output_traits { - static const int digits10; - static const int max_field_width; + static const int DIGITS10; + static const int MAX_FIELD_WIDTH; }; template <> struct pr_output_traits<double> { - static const int digits10; - static const int max_field_width; + static const int DIGITS10; + static const int MAX_FIELD_WIDTH; }; -const int pr_output_traits<double>::digits10 = 16; -const int pr_output_traits<double>::max_field_width = 21; +const int pr_output_traits<double>::DIGITS10 = 16; +const int pr_output_traits<double>::MAX_FIELD_WIDTH = 21; template <> struct pr_output_traits<float> { - static const int digits10; - static const int max_field_width; + static const int DIGITS10; + static const int MAX_FIELD_WIDTH; }; -const int pr_output_traits<float>::digits10 = 8; -const int pr_output_traits<float>::max_field_width = 13; +const int pr_output_traits<float>::DIGITS10 = 8; +const int pr_output_traits<float>::MAX_FIELD_WIDTH = 13; // FIXME: it would be nice to share more code among these functions,.. @@ -395,7 +395,7 @@ { float_format fmt; - int prec = std::min (output_precision (), pr_output_traits<T>::digits10); + int prec = std::min (output_precision (), pr_output_traits<T>::DIGITS10); int fw = 0, ld = 0, rd = 0; @@ -454,8 +454,8 @@ if (! (rat_format || bank_format || hex_format || bit_format) && (print_e || print_g || print_eng - || ld + rd > pr_output_traits<T>::digits10 - || fw > pr_output_traits<T>::max_field_width + || ld + rd > pr_output_traits<T>::DIGITS10 + || fw > pr_output_traits<T>::MAX_FIELD_WIDTH || ld + rd > (1.5 * prec))) { if (print_g) @@ -544,7 +544,7 @@ float_format fmt; - int prec = std::min (output_precision (), pr_output_traits<T>::digits10); + int prec = std::min (output_precision (), pr_output_traits<T>::DIGITS10); int fw = 0, ld = 0, rd = 0; @@ -637,8 +637,8 @@ if (! (rat_format || bank_format || hex_format || bit_format) && (print_e || print_eng || print_g || (! Vfixed_point_format - && (ld + rd > pr_output_traits<T>::digits10 - || fw > pr_output_traits<T>::max_field_width + && (ld + rd > pr_output_traits<T>::DIGITS10 + || fw > pr_output_traits<T>::MAX_FIELD_WIDTH || ld + rd > (1.5 * prec))))) { if (print_g) @@ -726,7 +726,7 @@ float_format r_fmt; float_format i_fmt; - int prec = std::min (output_precision (), pr_output_traits<T>::digits10); + int prec = std::min (output_precision (), pr_output_traits<T>::DIGITS10); int i_fw = 0, r_fw = 0, ld = 0, rd = 0; @@ -823,9 +823,9 @@ if (! (rat_format || bank_format || hex_format || bit_format) && (print_e || print_eng || print_g - || ld + rd > pr_output_traits<T>::digits10 - || r_fw > pr_output_traits<T>::max_field_width - || i_fw > pr_output_traits<T>::max_field_width + || ld + rd > pr_output_traits<T>::DIGITS10 + || r_fw > pr_output_traits<T>::MAX_FIELD_WIDTH + || i_fw > pr_output_traits<T>::MAX_FIELD_WIDTH || ld + rd > (1.5 * prec))) { if (print_g) @@ -952,7 +952,7 @@ float_format r_fmt; float_format i_fmt; - int prec = std::min (output_precision (), pr_output_traits<T>::digits10); + int prec = std::min (output_precision (), pr_output_traits<T>::DIGITS10); int i_fw = 0, r_fw = 0, ld = 0, rd = 0; @@ -1061,9 +1061,9 @@ if (! (rat_format || bank_format || hex_format || bit_format) && (print_e || print_eng || print_g || (! Vfixed_point_format - && (ld + rd > pr_output_traits<T>::digits10 - || r_fw > pr_output_traits<T>::max_field_width - || i_fw > pr_output_traits<T>::max_field_width + && (ld + rd > pr_output_traits<T>::DIGITS10 + || r_fw > pr_output_traits<T>::MAX_FIELD_WIDTH + || i_fw > pr_output_traits<T>::MAX_FIELD_WIDTH || ld + rd > (1.5 * prec))))) { if (print_g) @@ -1195,7 +1195,7 @@ float_format fmt; - int prec = std::min (output_precision (), pr_output_traits<T>::digits10); + int prec = std::min (output_precision (), pr_output_traits<T>::DIGITS10); int fw = 0, ld = 0, rd = 0; @@ -1282,8 +1282,8 @@ if (! (rat_format || bank_format || hex_format || bit_format) && (print_e || print_eng || print_g || (! Vfixed_point_format - && (ld + rd > pr_output_traits<T>::digits10 - || fw > pr_output_traits<T>::max_field_width + && (ld + rd > pr_output_traits<T>::DIGITS10 + || fw > pr_output_traits<T>::MAX_FIELD_WIDTH || ld + rd > (1.5 * prec))))) { if (print_g)