From 78838d736cb002f2d7eb214c01a4fbd41b8b36be Mon Sep 17 00:00:00 2001 From: Florian Prill <m300196@mlogin105.hpc.dkrz.de> Date: Fri, 9 Sep 2016 14:58:36 +0200 Subject: [PATCH] cleaned up the mixture of camelCase and underscore-separated compounds. IMO camelCase just does not make sense in a case-insensitive programming language. --- src/libmtime_hl.f90 | 78 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/libmtime_hl.f90 b/src/libmtime_hl.f90 index 5fdaa8c1..8d0a0d54 100644 --- a/src/libmtime_hl.f90 +++ b/src/libmtime_hl.f90 @@ -37,26 +37,26 @@ module mtime_hl ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! final :: t_datetime_deallocate - procedure :: toString => t_datetime_toString - procedure :: assignString => t_datetime_assignString - procedure :: addTimedelta => t_datetime_addTimedelta - procedure :: subDatetime => t_datetime_subDatetime - procedure :: equalDatetime => t_datetime_equal - procedure :: not_equalDatetime => t_datetime_not_equal - procedure :: less_thanDatetime => t_datetime_less_than - procedure :: greater_thanDatetime => t_datetime_greater_than - procedure :: less_or_equalDatetime => t_datetime_less_or_equal - procedure :: greater_or_equalDatetime => t_datetime_greater_or_equal - - generic :: assignment(=) => assignString - generic :: operator(+) => addTimedelta - generic :: operator(-) => subDatetime - generic :: operator(==) => equalDatetime - generic :: operator(/=) => not_equalDatetime - generic :: operator(<) => less_thanDatetime - generic :: operator(>) => greater_thanDatetime - generic :: operator(<=) => less_or_equalDatetime - generic :: operator(>=) => greater_or_equalDatetime + procedure :: to_string => t_datetime_to_string + procedure :: assign_string => t_datetime_assign_string + procedure :: add_timedelta => t_datetime_add_timedelta + procedure :: sub_datetime => t_datetime_sub_datetime + procedure :: equal_datetime => t_datetime_equal + procedure :: not_equal_datetime => t_datetime_not_equal + procedure :: less_than_datetime => t_datetime_less_than + procedure :: greater_than_datetime => t_datetime_greater_than + procedure :: less_or_equal_datetime => t_datetime_less_or_equal + procedure :: greater_or_equal_datetime => t_datetime_greater_or_equal + + generic :: assignment(=) => assign_string + generic :: operator(+) => add_timedelta + generic :: operator(-) => sub_datetime + generic :: operator(==) => equal_datetime + generic :: operator(/=) => not_equal_datetime + generic :: operator(<) => less_than_datetime + generic :: operator(>) => greater_than_datetime + generic :: operator(<=) => less_or_equal_datetime + generic :: operator(>=) => greater_or_equal_datetime end type t_datetime @@ -75,10 +75,10 @@ module mtime_hl final :: t_timedelta_deallocate - procedure :: toString => t_timedelta_toString - procedure :: assignString => t_timedelta_assignString + procedure :: to_string => t_timedelta_to_string + procedure :: assign_string => t_timedelta_assign_string - generic :: assignment(=) => assignString + generic :: assignment(=) => assign_string end type t_timedelta @@ -102,29 +102,29 @@ contains ! Convert t_datetime object to string. ! - function t_datetime_toString(this) - character(len=max_datetime_str_len) :: t_datetime_toString + function t_datetime_to_string(this) + character(len=max_datetime_str_len) :: t_datetime_to_string class (t_datetime) :: this type(datetime), pointer :: dt_tmp dt_tmp => newDatetime(this%dt) - call datetimeToString(dt_tmp, t_datetime_toString) + call datetimeToString(dt_tmp, t_datetime_to_string) call deallocateDatetime(dt_tmp) - end function t_datetime_toString + end function t_datetime_to_string ! Assignment operator: this = "date string". ! - subroutine t_datetime_assignString(this, dt_string) + subroutine t_datetime_assign_string(this, dt_string) class (t_datetime), intent(out) :: this character(len=*), intent(in) :: dt_string type(datetime), pointer :: dt_tmp dt_tmp => newDatetime(dt_string) this%dt = dt_tmp call deallocateDatetime(dt_tmp) - end subroutine t_datetime_assignString + end subroutine t_datetime_assign_string ! Addition of time interval to datetime object. ! - function t_datetime_addTimedelta(this, td) result(dt_td_sum) + function t_datetime_add_timedelta(this, td) result(dt_td_sum) type (t_datetime) :: dt_td_sum class (t_datetime), intent(in) :: this class (t_timedelta), intent(in) :: td @@ -136,16 +136,16 @@ contains dt_td_sum%dt = dt_tmp call deallocateDatetime(dt_tmp) call deallocateTimedelta(td_tmp) - end function t_datetime_addTimedelta + end function t_datetime_add_timedelta ! Subtraction of two dates. ! - function t_datetime_subDatetime(this, dt) result(dt_dt_diff) + function t_datetime_sub_datetime(this, dt) result(dt_dt_diff) type (t_timedelta) :: dt_dt_diff class (t_datetime), intent(in) :: this class (t_datetime), intent(in) :: dt dt_dt_diff%td = getTimeDeltaFromDateTime(this%dt, dt%dt) - end function t_datetime_subDatetime + end function t_datetime_sub_datetime ! Overloaded operator: test for equivalence. ! @@ -194,18 +194,18 @@ contains ! Convert t_timedelta object to string. ! - function t_timedelta_toString(this) - character(len=max_timedelta_str_len) :: t_timedelta_toString + function t_timedelta_to_string(this) + character(len=max_timedelta_str_len) :: t_timedelta_to_string class (t_timedelta) :: this type(timedelta), pointer :: td_tmp td_tmp => newTimedelta(this%td) - call timedeltaToString(td_tmp, t_timedelta_toString) + call timedeltaToString(td_tmp, t_timedelta_to_string) call deallocateTimedelta(td_tmp) - end function t_timedelta_toString + end function t_timedelta_to_string ! Assignment operator: this = "time interval string". ! - subroutine t_timedelta_assignString(this, td_string) + subroutine t_timedelta_assign_string(this, td_string) class (t_timedelta), intent(out) :: this character(len=*), intent(in) :: td_string type(timedelta), pointer :: td_tmp @@ -213,7 +213,7 @@ contains this%td = td_tmp this%td%sign = td_tmp%sign call deallocateTimedelta(td_tmp) - end subroutine t_timedelta_assignString + end subroutine t_timedelta_assign_string end module mtime_hl !> -- GitLab