Commit 2362b42f authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Try INTERFACE blocks instead of type-bound procedures

parent 9dad4ba5

src/ParameterLists.f90

+1 −0
Original line number Diff line number Diff line
@@ -3845,6 +3845,7 @@ SUBROUTINE verifyTest_Paramtype(thisParam,reqParams,isMatch) 
  IF(ASSOCIATED(reqParams%pdat)) THEN

    CALL validateReq_ParamType(thisParam,reqParams,'',VALIDTYPE_VERIFYTEST, &

        isValid,isMatch,eParams)

WRITE(*,*) CHAR(thisParam%name),':',CHAR(reqParams%name),isValid,isMatch

  ELSE

    isMatch=.NOT.ASSOCIATED(thisParam%pdat)

  ENDIF

src/Strings.f90

+17 −8
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ PUBLIC :: OPERATOR(<) 
PUBLIC :: OPERATOR(>)

PUBLIC :: OPERATOR(<=)

PUBLIC :: OPERATOR(>=)

PUBLIC :: READ(FORMATTED)

PUBLIC :: READ(UNFORMATTED)

PUBLIC :: WRITE(FORMATTED)

PUBLIC :: WRITE(UNFORMATTED)



!> Derived type for an arbitrary length string

TYPE :: StringType
@@ -129,14 +133,6 @@ TYPE :: StringType 
    !> copybrief Strings::clear_str

    !> copydetails Strings::clear_str

    PROCEDURE,PASS :: clear => clear_str

    PROCEDURE :: read_formatted_StringType

    GENERIC :: READ(FORMATTED) => read_formatted_StringType

    PROCEDURE :: read_unformatted_StringType

    GENERIC :: READ(UNFORMATTED) => read_unformatted_StringType

    PROCEDURE :: write_formatted_StringType

    GENERIC :: WRITE(FORMATTED) => write_formatted_StringType

    PROCEDURE :: write_unformatted_StringType

    GENERIC :: WRITE(UNFORMATTED) => write_unformatted_StringType

ENDTYPE StringType



INTERFACE StringType
@@ -319,6 +315,19 @@ INTERFACE OPERATOR(>=) 
  !> @copydetails Strings::greaterthanequal_StringType_StringType

  MODULE PROCEDURE greaterthanequal_StringType_StringType

ENDINTERFACE



INTERFACE READ(FORMATTED)

  MODULE PROCEDURE read_formatted_StringType

ENDINTERFACE

INTERFACE READ(UNFORMATTED)

  MODULE PROCEDURE read_unformatted_StringType

ENDINTERFACE

INTERFACE WRITE(FORMATTED)

  MODULE PROCEDURE write_formatted_StringType

ENDINTERFACE

INTERFACE WRITE(UNFORMATTED)

  MODULE PROCEDURE write_unformatted_StringType

ENDINTERFACE

!

!===============================================================================

CONTAINS

unit_tests/testParameterLists/testParameterLists.f90

+3 −0
Original line number Diff line number Diff line
@@ -9658,6 +9658,9 @@ SUBROUTINE testInitFromXML() 
  CALL testParam%initFromXML('testInit.xml')

  CALL testParam%verify(testParam2,bool)

  ASSERT(bool,"init from XML file")

CALL testParam%edit(6)

WRITE(*,*)

CALL testParam2%edit(6)



  CALL testParam%clear()

  CALL testParam2%clear()