fix(gfortran): work around kind type parameter bug

Author: rouson

include/language-support.F90

@@ -21,3 +21,12 @@
 #define HAVE_MULTI_IMAGE_SUPPORT 0
 #endif
 #endif
+
+#ifndef HAVE_DERIVED_TYPE_KIND_PARAMETERS
+  ! Define whether the compiler has sufficient support for kind type parameters for derived types
+#if defined(_CRAYFTN) || defined(__INTEL_COMPILER) || defined(NAGFOR)
+#define HAVE_DERIVED_TYPE_KIND_PARAMETERS 1
+#else
+#define HAVE_DERIVED_TYPE_KIND_PARAMETERS 0
+#endif
+#endif

…c/julienne/julienne_test_diagnosis_m.f90 …c/julienne/julienne_test_diagnosis_m.F90src/julienne/julienne_test_diagnosis_m.f90 renamed to src/julienne/julienne_test_diagnosis_m.F90 src/julienne/julienne_test_diagnosis_m.f90 renamed to src/julienne/julienne_test_diagnosis_m.F90

@@ -1,5 +1,8 @@
 ! Copyright (c) 2024-2025, The Regents of the University of California and Sourcery Institute
 ! Terms of use are as specified in LICENSE.txt
+
+#include "language-support.F90"
+
 module julienne_test_diagnosis_m
   !! Define an abstraction for describing test outcomes and diagnostic information
   use julienne_string_m, only : string_t
@@ -23,10 +26,20 @@ module julienne_test_diagnosis_m
 
   integer, parameter :: default_real = kind(1.), double_precision = kind(1D0)
 
+#if HAVE_DERIVED_TYPE_KIND_PARAMETERS
   type operands_t(k)
     integer, kind :: k = default_real
     real(k) actual, expected 
   end type
+#else
+  type operands_t
+    real actual, expected 
+  end type
+
+  type double_precision_operands_t
+    double precision actual, expected 
+  end type
+#endif
 
   interface operator(.approximates.)
 
@@ -39,7 +52,11 @@ pure module function approximates_real(actual, expected) result(operands)
     pure module function approximates_double_precision(actual, expected) result(operands)
       implicit none
       double precision, intent(in) :: actual, expected
+#if HAVE_DERIVED_TYPE_KIND_PARAMETERS
       type(operands_t(double_precision)) operands
+#else
+      type(double_precision_operands_t) operands
+#endif
     end function
 
   end interface
@@ -65,7 +82,11 @@ pure module function within_real(operands, tolerance) result(test_diagnosis)
 
     pure module function within_double_precision(operands, tolerance) result(test_diagnosis)
       implicit none
+#if HAVE_DERIVED_TYPE_KIND_PARAMETERS
       type(operands_t(double_precision)), intent(in) :: operands
+#else
+      type(double_precision_operands_t), intent(in) :: operands
+#endif
       double precision, intent(in) :: tolerance
       type(test_diagnosis_t) test_diagnosis
     end function

src/julienne/julienne_test_diagnosis_s.F90

@@ -13,7 +13,11 @@
   end procedure
 
   module procedure approximates_double_precision
+#if HAVE_DERIVED_TYPE_KIND_PARAMETERS
     operands = operands_t(double_precision)(actual, expected) 
+#else
+    operands = double_precision_operands_t(actual, expected) 
+#endif
   end procedure
 
   module procedure equals_expected_integer

test/test_diagnosis_test_m.F90

@@ -48,8 +48,8 @@ function results() result(test_results)
     ] )
 #else
      ! Work around missing Fortran 2008 feature: associating a procedure actual argument with a procedure pointer dummy argument:
-     type(test_diagnosis_t), allocatable :: descriptions(:)
-     procedure(diagnosis_function_i), pointer :: check_real_approximates_ptr, check_double_approximates, check_integer_equals
+     type(test_description_t), allocatable :: descriptions(:)
+     procedure(diagnosis_function_i), pointer :: check_real_approximates_ptr, check_double_approximates_ptr, check_integer_equals_ptr
      check_real_approximates_ptr => check_real_approximates
      check_double_approximates_ptr => check_double_approximates
 
@@ -73,7 +73,7 @@ function results() result(test_results)
     block
       logical substring_in_subject
       logical, allocatable :: substring_in_test_diagnosis(:)
-      type(test_diagnosis_t), allocatable :: matching_descriptions(:)
+      type(test_description_t), allocatable :: matching_descriptions(:)
 
       substring_in_subject = index(subject(), test_description_substring) /= 0
       substring_in_test_diagnosis = descriptions%contains_text(test_description_substring)