Fix up location of manager and other bits

Author: znicholls

meson.build

@@ -52,6 +52,7 @@ if pyprojectwheelbuild_enabled
   # Injected with `script/inject-srcs-into-meson-build.py`
   srcs = files(
     'src/example_fgen_basic/error_v/creation_wrapper.f90',
+    'src/example_fgen_basic/error_v/error_v_wrapper.f90',
     'src/example_fgen_basic/get_wavelength_wrapper.f90',
   )
 

src/example_fgen_basic/error_v/creation_wrapper.f90

@@ -17,7 +17,7 @@ module m_error_v_creation_w
     implicit none
     private
 
-    public :: create_error, iget_code, iget_message
+    public :: create_error
 
 contains
 
@@ -51,42 +51,4 @@ subroutine create_error(inv, res_instance_index)
 
     end subroutine create_error
 
-    ! Full set of wrapping strategies to pass different types in e.g.
-    ! https://gitlab.com/magicc/fgen/-/blob/switch-to-uv/tests/test-data/exposed_attrs/src/exposed_attrs/exposed_attrs_wrapped.f90
-    ! (we will do a full re-write of the code which generates this,
-    ! but the strategies will probably stay as they are)
-    subroutine iget_code( &
-        instance_index, &
-        code &
-        )
-
-        integer, intent(in) :: instance_index
-
-        integer, intent(out) :: code
-
-        type(ErrorV), pointer :: instance
-
-        call error_v_manager_associate_pointer_with_instance(instance_index, instance)
-
-        code = instance % code
-
-    end subroutine iget_code
-
-    subroutine iget_message( &
-        instance_index, &
-        message &
-        )
-
-        integer, intent(in) :: instance_index
-
-        character(len=128), intent(out) :: message
-
-        type(ErrorV), pointer :: instance
-
-        call error_v_manager_associate_pointer_with_instance(instance_index, instance)
-
-        message = instance % message
-
-    end subroutine iget_message
-
 end module m_error_v_creation_w

src/example_fgen_basic/error_v/error_v.py

@@ -16,10 +16,10 @@
 
 try:
     from example_fgen_basic._lib import (  # type: ignore
-        m_error_v_creation_w,
+        m_error_v_w,
     )
 except (ModuleNotFoundError, ImportError) as exc:  # pragma: no cover
-    raise CompiledExtensionNotFoundError("example._lib.m_error_v_creation_w") from exc
+    raise CompiledExtensionNotFoundError("example._lib.m_error_v_w") from exc
 
 
 @define
@@ -57,7 +57,7 @@ def code(self) -> int:
         :
             Error code, retrieved from Fortran
         """
-        code: int = m_error_v_creation_w.iget_code(instance_index=self.instance_index)
+        code: int = m_error_v_w.iget_code(instance_index=self.instance_index)
 
         return code
 
@@ -72,7 +72,7 @@ def message(self) -> str:
         :
             Error message, retrieved from Fortran
         """
-        message: str = m_error_v_creation_w.iget_message(
+        message: str = m_error_v_w.iget_message(
             instance_index=self.instance_index
         ).decode()
 

src/example_fgen_basic/error_v/error_v_wrapper.f90

@@ -0,0 +1,61 @@
+!> Wrapper for interfacing `m_error_v` with Python
+!>
+!> Written by hand here.
+!> Generation to be automated in future (including docstrings of some sort).
+module m_error_v_w
+
+    ! => allows us to rename on import to avoid clashes
+    use m_error_v, only: ErrorV
+
+    ! The manager module, which makes this all work
+    use m_error_v_manager, only: &
+        get_free_instance_number, &
+        error_v_manager_associate_pointer_with_instance => associate_pointer_with_instance
+        ! TODO: build and finalisation
+
+    implicit none
+    private
+
+    public :: get_free_instance_number, iget_code, iget_message
+
+contains
+
+    ! Full set of wrapping strategies to pass different types in e.g.
+    ! https://gitlab.com/magicc/fgen/-/blob/switch-to-uv/tests/test-data/exposed_attrs/src/exposed_attrs/exposed_attrs_wrapped.f90
+    ! (we will do a full re-write of the code which generates this,
+    ! but the strategies will probably stay as they are)
+    subroutine iget_code( &
+        instance_index, &
+        code &
+        )
+
+        integer, intent(in) :: instance_index
+
+        integer, intent(out) :: code
+
+        type(ErrorV), pointer :: instance
+
+        call error_v_manager_associate_pointer_with_instance(instance_index, instance)
+
+        code = instance % code
+
+    end subroutine iget_code
+
+    subroutine iget_message( &
+        instance_index, &
+        message &
+        )
+
+        integer, intent(in) :: instance_index
+
+        character(len=128), intent(out) :: message
+
+        type(ErrorV), pointer :: instance
+
+        call error_v_manager_associate_pointer_with_instance(instance_index, instance)
+
+        message = instance % message
+
+    end subroutine iget_message
+
+end module m_error_v_w