Merge branch 'release/1.1.8'

Author: szaghi

fobos

@@ -118,6 +118,7 @@ cflags_heritage = True
 compiler        = gnu
 cflags          = $CSHARED_GNU $DEBUG_GNU
 lflags          = $LSHARED $DEBUG_GNU
+preproc         = -D_R16P -D_ASCII_SUPPORTED -D_UCS4_SUPPORTED
 mod_dir         = ./mod/
 obj_dir         = ./obj/
 src             = ./src/
@@ -131,6 +132,7 @@ cflags_heritage = True
 compiler        = gnu
 cflags          = $CSTATIC_GNU $DEBUG_GNU
 lflags          = $DEBUG_GNU
+preproc         = -D_R16P -D_ASCII_SUPPORTED -D_UCS4_SUPPORTED
 mod_dir         = ./mod/
 obj_dir         = ./obj/
 src             = ./src/
@@ -220,15 +222,15 @@ rule = tar --xform="s%^%PENF/%" -czf PENF.tar.gz *
 [rule-makecoverage]
 help   = Perform coverage analysis
 rule_1 = FoBiS.py clean -mode tests-gnu-debug
-rule_2 = FoBiS.py build -mode tests-gnu-debug -coverage --preproc ' -Dr16p'
+rule_2 = FoBiS.py build -mode tests-gnu-debug -coverage
 rule_3 = ./scripts/run_tests.sh
 rule_4 = gcov -o exe/obj/ src/lib/*
 rule_5 = rm -f *.gcov
 
 [rule-makecoverage-analysis]
 help   = Perform coverage analysis and saving reports in markdown
 rule_1 = FoBiS.py clean -mode tests-gnu-debug
-rule_2 = FoBiS.py build -mode tests-gnu-debug -coverage --preproc ' -Dr16p'
+rule_2 = FoBiS.py build -mode tests-gnu-debug -coverage
 rule_3 = ./scripts/run_tests.sh
 rule_4 = gcov -o exe/obj/ src/lib/*
 rule_5 = FoBiS.py rule -gcov_analyzer wiki/ Coverage-Analysis -verbose

src/lib/CMakeLists.txt

@@ -11,4 +11,3 @@ SET(LIB_SRC ${LIB_SRC} PARENT_SCOPE)
 ADD_LIBRARY(${LIB} ${LIB_SRC})
 
 SET_TARGET_PROPERTIES(${LIB} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_SOVERSION})
-

src/lib/penf.F90

@@ -8,13 +8,14 @@ module penf
 #else
 use penf_b_size
 #endif
-use penf_stringify, only : str, strz, cton, bstr, bcton
+use penf_stringify, only : str_ascii, str_ucs4, str, strz, cton, bstr, bcton
 
 implicit none
 private
 save
 ! global parameters and variables
 public :: endianL, endianB, endian, is_initialized
+public :: ASCII, UCS4
 public :: R16P, FR16P, DR16P, MinR16P, MaxR16P, BIR16P, BYR16P, smallR16P, ZeroR16
 public :: R8P,  FR8P,  DR8P,  MinR8P,  MaxR8P,  BIR8P,  BYR8P,  smallR8P,  ZeroR8
 public :: R4P,  FR4P,  DR4P,  MinR4P,  MaxR4P,  BIR4P,  BYR4P,  smallR4P,  ZeroR4
@@ -29,6 +30,7 @@ module penf
 ! bit/byte size functions
 public :: bit_size, byte_size
 ! stringify facility
+public :: str_ascii, str_ucs4
 public :: str, strz, cton
 public :: bstr, bcton
 ! miscellanea facility
@@ -114,14 +116,10 @@ subroutine penf_init()
   !< Initialize PENF's variables that are not initialized into the definition specification.
 
   call check_endian
-  BIR8P  = bit_size(MaxR8P)     ; BYR8P  = BIR8P/8_I1P
-  BIR4P  = bit_size(MaxR4P)     ; BYR4P  = BIR4P/8_I1P
-  BIR_P  = bit_size(MaxR_P)     ; BYR_P  = BIR_P/8_I1P
-! #ifdef r16p
-  BIR16P = bit_size(MaxR16P)    ; BYR16P = BIR16P/8_I2P
-! #else
-  ! BIR16P = int(BIR8P, kind=I2P) ; BYR16P = BIR16P/8_I2P
-! #endif
+  BIR8P  = bit_size(MaxR8P)  ; BYR8P  = BIR8P/8_I1P
+  BIR4P  = bit_size(MaxR4P)  ; BYR4P  = BIR4P/8_I1P
+  BIR_P  = bit_size(MaxR_P)  ; BYR_P  = BIR_P/8_I1P
+  BIR16P = bit_size(MaxR16P) ; BYR16P = BIR16P/8_I2P
   is_initialized = .true.
   endsubroutine penf_init
 

src/lib/penf_b_size.F90

@@ -12,7 +12,7 @@ module penf_b_size
 interface bit_size
   !< Overloading of the intrinsic *bit_size* function for computing the number of bits of (also) real and character variables.
   module procedure                &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    bit_size_R16P, &
 #endif
                    bit_size_R8P,  &
@@ -27,7 +27,7 @@ module penf_b_size
                    byte_size_I4P,  &
                    byte_size_I2P,  &
                    byte_size_I1P,  &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    byte_size_R16p, &
 #endif
                    byte_size_R8P,  &

src/lib/penf_global_parameters_variables.F90

@@ -15,33 +15,43 @@ module penf_global_parameters_variables
 integer            :: endian         = endianL !< Bit ordering: Little endian (endianL), or Big endian (endianB).
 
 ! portable kind parameters
-#ifdef r16p
-integer, parameter :: R16P = selected_real_kind(33,4931) !< 33 digits, range \([10^{-4931}, 10^{+4931} - 1]\); 128 bits.
+#ifdef _ASCII_SUPPORTED
+integer, parameter :: ASCII = selected_char_kind('ascii')     !< ASCII character set kind.
 #else
-integer, parameter :: R16P = selected_real_kind(15,307)  !< Defined as R8P; 64 bits.
+integer, parameter :: ASCII = selected_char_kind('default')   !< ASCII character set kind defined as default set.
 #endif
-integer, parameter :: R8P  = selected_real_kind(15,307)  !< 15 digits, range \([10^{-307} , 10^{+307}  - 1]\); 64 bits.
-integer, parameter :: R4P  = selected_real_kind(6,37)    !< 6  digits, range \([10^{-37}  , 10^{+37}   - 1]\); 32 bits.
-#ifdef r16p
-integer, parameter :: R_P  = R16P                        !< Default real precision.
+#ifdef _UCS4_SUPPORTED
+integer, parameter :: UCS4  = selected_char_kind('iso_10646') !< Unicode character set kind.
 #else
-integer, parameter :: R_P  = R8P                         !< Default real precision.
+integer, parameter :: UCS4  = selected_char_kind('default')   !< Unicode character set kind defined as default set.
 #endif
-integer, parameter :: I8P  = selected_int_kind(18)       !< Range \([-2^{63},+2^{63} - 1]\), 19 digits plus sign; 64 bits.
-integer, parameter :: I4P  = selected_int_kind(9)        !< Range \([-2^{31},+2^{31} - 1]\), 10 digits plus sign; 32 bits.
-integer, parameter :: I2P  = selected_int_kind(4)        !< Range \([-2^{15},+2^{15} - 1]\), 5  digits plus sign; 16 bits.
-integer, parameter :: I1P  = selected_int_kind(2)        !< Range \([-2^{7} ,+2^{7}  - 1]\), 3  digits plus sign; 8  bits.
-integer, parameter :: I_P  = I4P                         !< Default integer precision.
+#ifdef _R16P_SUPPORTED
+integer, parameter :: R16P = selected_real_kind(33,4931)      !< 33 digits, range \([10^{-4931}, 10^{+4931} - 1]\); 128 bits.
+#else
+integer, parameter :: R16P = selected_real_kind(15,307)       !< Defined as R8P; 64 bits.
+#endif
+integer, parameter :: R8P  = selected_real_kind(15,307)       !< 15 digits, range \([10^{-307} , 10^{+307}  - 1]\); 64 bits.
+integer, parameter :: R4P  = selected_real_kind(6,37)         !< 6  digits, range \([10^{-37}  , 10^{+37}   - 1]\); 32 bits.
+#ifdef _R16P_SUPPORTED
+integer, parameter :: R_P  = R16P                             !< Default real precision.
+#else
+integer, parameter :: R_P  = R8P                              !< Default real precision.
+#endif
+integer, parameter :: I8P  = selected_int_kind(18)            !< Range \([-2^{63},+2^{63} - 1]\), 19 digits plus sign; 64 bits.
+integer, parameter :: I4P  = selected_int_kind(9)             !< Range \([-2^{31},+2^{31} - 1]\), 10 digits plus sign; 32 bits.
+integer, parameter :: I2P  = selected_int_kind(4)             !< Range \([-2^{15},+2^{15} - 1]\), 5  digits plus sign; 16 bits.
+integer, parameter :: I1P  = selected_int_kind(2)             !< Range \([-2^{7} ,+2^{7}  - 1]\), 3  digits plus sign; 8  bits.
+integer, parameter :: I_P  = I4P                              !< Default integer precision.
 
 ! format parameters
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
 character(*), parameter :: FR16P  = '(E42.33E4)' !< Output format for kind=R16P real.
 #else
 character(*), parameter :: FR16P  = '(E23.15E3)' !< Output format for kind=R16P real.
 #endif
 character(*), parameter :: FR8P   = '(E23.15E3)' !< Output format for kind=R8P real.
 character(*), parameter :: FR4P   = '(E13.6E2)'  !< Output format for kind=R4P real.
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
 character(*), parameter :: FR_P   = FR16P        !< Output format for kind=R_P real.
 #else
 character(*), parameter :: FR_P   = FR8P         !< Output format for kind=R_P real.
@@ -58,14 +68,14 @@ module penf_global_parameters_variables
 character(*), parameter :: FI_PZP = FI4PZP       !< Output format for kind=I_P integer with zero prefixing.
 
 ! length (number of digits) of formatted numbers
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
 integer, parameter :: DR16P = 42    !< Number of digits of output format FR16P.
 #else
 integer, parameter :: DR16P = 23    !< Number of digits of output format FR16P.
 #endif
 integer, parameter :: DR8P  = 23    !< Number of digits of output format FR8P.
 integer, parameter :: DR4P  = 13    !< Number of digits of output format FR4P.
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
 integer, parameter :: DR_P  = DR16P !< Number of digits of output format FR_P.
 #else
 integer, parameter :: DR_P  = DR8P  !< Number of digits of output format FR_P.

src/lib/penf_stringify.F90

@@ -9,13 +9,36 @@ module penf_stringify
 implicit none
 private
 save
+public :: str_ascii, str_ucs4
 public :: str, strz, cton
 public :: bstr, bcton
 
+interface str_ascii
+   !< Convert string of any kind to ASCII string.
+   module procedure str_ascii_default
+#if defined _ASCII_SUPPORTED && defined _ASCII_NEQ_DEFAULT
+   module procedure str_ascii_ascii
+#endif
+#ifdef _UCS4_SUPPORTED
+   module procedure str_ascii_ucs4
+#endif
+endinterface
+
+interface str_ucs4
+   !< Convert string of any kind to UCS4 string.
+   module procedure str_ucs4_default
+#if defined _ASCII_SUPPORTED && defined _ASCII_NEQ_DEFAULT
+   module procedure str_ucs4_ascii
+#endif
+#ifdef _UCS4_SUPPORTED
+   module procedure str_ucs4_ucs4
+#endif
+endinterface
+
 interface str
   !< Convert number (real and integer) to string (number to string type casting).
   module procedure                       &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    strf_R16P,str_R16P,   &
 #endif
                    strf_R8P ,str_R8P,    &
@@ -25,7 +48,7 @@ module penf_stringify
                    strf_I2P ,str_I2P,    &
                    strf_I1P ,str_I1P,    &
                              str_bol,    &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                              str_a_R16P, &
 #endif
                              str_a_R8P,  &
@@ -44,7 +67,7 @@ module penf_stringify
 interface cton
   !< Convert string to number (real and integer, string to number type casting).
   module procedure            &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    ctor_R16P, &
 #endif
                    ctor_R8P,  &
@@ -58,7 +81,7 @@ module penf_stringify
 interface bstr
   !< Convert number (real and integer) to bit-string (number to bit-string type casting).
   module procedure            &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    bstr_R16P, &
 #endif
                    bstr_R8P,  &
@@ -72,7 +95,7 @@ module penf_stringify
 interface bcton
   !< Convert bit-string to number (real and integer, bit-string to number type casting).
   module procedure             &
-#ifdef r16p
+#ifdef _R16P_SUPPORTED
                    bctor_R16P, &
 #endif
                    bctor_R8P,  &
@@ -84,6 +107,54 @@ module penf_stringify
 endinterface
 
 contains
+   pure function str_ascii_default(input) result(output)
+   !< Convert string of default kind to ASCII string.
+   character(len=*), intent(in)              :: input  !< Input string of default kind.
+   character(len=:, kind=ASCII), allocatable :: output !< Output string of ASCII kind.
+
+   output = input
+   endfunction str_ascii_default
+
+   pure function str_ascii_ascii(input) result(output)
+   !< Convert string of ASCII kind to ASCII string, just for convenience in sanitize strings.
+   character(len=*, kind=ASCII), intent(in)  :: input  !< Input string of ASCII kind.
+   character(len=:, kind=ASCII), allocatable :: output !< Output string of ASCII kind.
+
+   output = input
+   endfunction str_ascii_ascii
+
+   pure function str_ascii_ucs4(input) result(output)
+   !< Convert string of UCS4 kind to ASCII string.
+   character(len=*, kind=UCS4), intent(in)   :: input  !< Input string of UCS4 kind.
+   character(len=:, kind=ASCII), allocatable :: output !< Output string of ASCII kind.
+
+   output = input
+   endfunction str_ascii_ucs4
+
+   pure function str_ucs4_default(input) result(output)
+   !< Convert string of default kind to UCS4 string.
+   character(len=*), intent(in)             :: input  !< Input string of default kind.
+   character(len=:, kind=UCS4), allocatable :: output !< Output string of UCS4 kind.
+
+   output = input
+   endfunction str_ucs4_default
+
+   pure function str_ucs4_ascii(input) result(output)
+   !< Convert string of ASCII kind to UCS4 string.
+   character(len=*, kind=ASCII), intent(in) :: input  !< Input string of ASCII kind.
+   character(len=:, kind=UCS4), allocatable :: output !< Output string of UCS4 kind.
+
+   output = input
+   endfunction str_ucs4_ascii
+
+   pure function str_ucs4_ucs4(input) result(output)
+   !< Convert string of UCS4 kind to UCS4 string, just for convenience in sanitize strings.
+   character(len=*, kind=UCS4), intent(in)  :: input  !< Input string of UCS4 kind.
+   character(len=:, kind=UCS4), allocatable :: output !< Output string of UCS4 kind.
+
+   output = input
+   endfunction str_ucs4_ucs4
+
   elemental function strf_R16P(fm, n) result(str)
   !< Convert real to string.
   character(*), intent(in) :: fm  !< Format different from the standard for the kind.

src/tests/CMakeLists.txt

@@ -15,6 +15,3 @@ FOREACH(TEST_SRC ${TESTS_SRC})
     TARGET_LINK_LIBRARIES(${EXE_NAME} ${LIB})
     ADD_TEST(${EXE_NAME}_TEST ${EXECUTABLE_OUTPUT_PATH}/${EXE_NAME})
 ENDFOREACH()
-
-
-

src/tests/compact_real.f90

@@ -0,0 +1,39 @@
+!< PENF's testing program.
+program penf_test_all
+!< PENF's testing program.
+!<
+!<### Usage
+!<```bash
+!< ./penf_test_all
+!<```
+use penf
+use, intrinsic :: iso_fortran_env, only : stdout=>output_unit
+
+implicit none
+
+call penf_init
+call penf_print(unit=stdout)
+print "(A)", ''
+print "(A)", 'Testing PENF tools'
+print "(A)", ASCII_'Casting string_default-to-string_ascii: '//str_ascii('I was DEFAULT kind')
+print "(A)", ASCII_'Casting string_ascii-to-string_ascii: '//str_ascii(ASCII_'I was ASCII kind')
+print "(A)", ASCII_'Casting string_ucs4-to-string_ascii: '//str_ascii(UCS4_'I was UCS4 kind')
+print "(A)", UCS4_'Casting string_default-to-string_ucs4: '//str_ucs4('I was DEFAULT kind')
+print "(A)", UCS4_'Casting string_ascii-to-string_ucs4: '//str_ucs4(ASCII_'I was ASCII kind')
+print "(A)", UCS4_'Casting string_ucs4-to-string_ucs4: '//str_ucs4(UCS4_'I was UCS4 kind')
+print "(A)", 'Casting real-to-string: '//str(n=1._R8P)
+print "(A)", 'Casting integer-to-string: '//str(n=11_I8P)
+print "(A,"//FR8P//")", 'Casting string-to-real: ', cton(str='2.2d0', knd=1._R8P)
+print "(A,"//FI4P//")", 'Casting integer-to-string: ', cton(str='43', knd=1_I4P)
+print "(A)", 'Casting integer-to-string with zero padding: '//trim(strz(nz_pad=3, n=34_I8P))
+#ifndef __GFORTRAN__
+print "(A)", 'Casting real-to-bit_string: '//bstr(n=1._R4P)
+#endif
+print "(A)", 'Casting integer-to-bit_string: '//bstr(n=1_I4P)
+#ifndef __GFORTRAN__
+print "(A,"//FR4P//")", 'Casting bit_string-to-real: ', bcton(bstr='00111111100000000000000000000000', knd=1._R4P)
+#endif
+print "(A,"//FI4P//")", 'Casting bit_string-to-integer: ', bcton(bstr='00000000000000000000000000000001', knd=1_I4P)
+print "(A)", 'Number of digit of 1023: '//str(n=digit(1023_I4P))
+write(stdout, "(A,L1)") new_line('a')//'Are all tests passed? ', .true.
+endprogram penf_test_all