Allow passing of user data for callback procedure

fortran-lang · Apr 23, 2022 · 5b00f5f · 5b00f5f
1 parent fa4bcbd
commit 5b00f5f
Show file tree

Hide file tree

Showing 14 changed files with 1,517 additions and 189 deletions.
diff --git a/examples/example_hybrd.f90 b/examples/example_hybrd.f90
@@ -5,7 +5,8 @@
 !>                                 -x(8) + (3-2*x(9))*x(9) = -1
 program example_hybrd
 
-    use minpack_module, only: wp, hybrd, enorm, dpmpar
+    use minpack_legacy, only: hybrd
+    use minpack_module, only: wp, enorm, dpmpar
     use iso_fortran_env, only: nwrite => output_unit
 
     implicit none

diff --git a/examples/example_hybrd1.f90 b/examples/example_hybrd1.f90
@@ -6,7 +6,8 @@
 !>                              -x(8) + (3-2*x(9))*x(9) = -1
 program example_hybrd1
 
-    use minpack_module, only: wp, hybrd1, dpmpar, enorm
+    use minpack_legacy, only: hybrd1
+    use minpack_module, only: wp, dpmpar, enorm
     use iso_fortran_env, only: nwrite => output_unit
 
     implicit none

diff --git a/examples/example_lmder1.f90 b/examples/example_lmder1.f90
@@ -1,6 +1,7 @@
 program example_lmder1
 
-use minpack_module, only: wp, enorm, lmder1, chkder
+use minpack_legacy, only: lmder1, chkder
+use minpack_module, only: wp, enorm
 use iso_fortran_env, only: nwrite => output_unit
 
 implicit none

diff --git a/examples/example_lmdif1.f90 b/examples/example_lmdif1.f90
@@ -1,6 +1,7 @@
 program example_lmdif1
 
-use minpack_module, only: wp, enorm, lmdif1
+use minpack_legacy, only: lmdif1
+use minpack_module, only: wp, enorm
 use iso_fortran_env, only: nwrite => output_unit
 
 implicit none
@@ -56,4 +57,4 @@ subroutine fcn(m, n, x, fvec, iflag)
 
 end subroutine fcn
 
-end program example_lmdif1
+end program example_lmdif1
diff --git a/examples/example_primes.f90 b/examples/example_primes.f90
@@ -3,7 +3,8 @@ module find_fit_module
 !! This module contains a general function find_fit() for a nonlinear least
 !! squares fitting. The function can fit any nonlinear expression to any data.
 
-use minpack_module, only: wp, lmdif1
+use minpack_legacy, only: lmdif1
+use minpack_module, only: wp
 
 implicit none
 

diff --git a/meson.build b/meson.build
@@ -26,6 +26,7 @@ minpack_lib = library(
   meson.project_name(),
   sources: files(
     'src/minpack.f90',
+    'src/minpack_legacy.f90',
     fc_nested_functions ? 'src/minpack_capi.f90' :,
   ),
   install: true,