Skip to content

Commit 7cc17ba

Browse files
committed
refac(string): eliminate redundant nomenclature
1 parent 51f1a01 commit 7cc17ba

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/sourcery/sourcery_string_m.f90

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ module sourcery_string_m
1414
generic :: string => as_character
1515
procedure :: is_allocated
1616
procedure :: get_json_key
17-
procedure :: get_json_real_value
18-
procedure :: get_json_string_value
19-
procedure :: get_json_logical_value
20-
procedure :: get_json_integer_value
21-
procedure :: get_json_integer_array_value
17+
procedure :: get_json_real
18+
procedure :: get_json_string
19+
procedure :: get_json_logical
20+
procedure :: get_json_integer
21+
procedure :: get_json_integer_array
2222
generic :: get_json_value => &
23-
get_json_string_value, get_json_logical_value, get_json_integer_array_value, get_json_integer_value, get_json_real_value
23+
get_json_string, get_json_logical, get_json_integer_array, get_json_integer, get_json_real
2424
procedure :: equivalent
2525
generic :: operator(==) => equivalent
2626
end type
@@ -61,34 +61,34 @@ elemental module function get_json_key(self) result(unquoted_key)
6161
type(string_t) unquoted_key
6262
end function
6363

64-
elemental module function get_json_real_value(self, key, mold) result(value_)
64+
elemental module function get_json_real(self, key, mold) result(value_)
6565
implicit none
6666
class(string_t), intent(in) :: self, key
6767
real, intent(in) :: mold
6868
real value_
6969
end function
7070

71-
elemental module function get_json_string_value(self, key, mold) result(value_)
71+
elemental module function get_json_string(self, key, mold) result(value_)
7272
implicit none
7373
class(string_t), intent(in) :: self, key, mold
7474
type(string_t) :: value_
7575
end function
7676

77-
elemental module function get_json_integer_value(self, key, mold) result(value_)
77+
elemental module function get_json_integer(self, key, mold) result(value_)
7878
implicit none
7979
class(string_t), intent(in) :: self, key
8080
integer, intent(in) :: mold
8181
integer value_
8282
end function
8383

84-
elemental module function get_json_logical_value(self, key, mold) result(value_)
84+
elemental module function get_json_logical(self, key, mold) result(value_)
8585
implicit none
8686
class(string_t), intent(in) :: self, key
8787
logical, intent(in) :: mold
8888
logical value_
8989
end function
9090

91-
pure module function get_json_integer_array_value(self, key, mold) result(value_)
91+
pure module function get_json_integer_array(self, key, mold) result(value_)
9292
implicit none
9393
class(string_t), intent(in) :: self, key
9494
integer, intent(in) :: mold(:)

src/sourcery/sourcery_string_s.f90

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151

5252
end procedure
5353

54-
module procedure get_json_real_value
54+
module procedure get_json_real
5555
character(len=:), allocatable :: raw_line, string_value
5656

57-
call assert(key==self%get_json_key(), "string_s(get_json_real_value): key==self%get_json_key()", key)
57+
call assert(key==self%get_json_key(), "string_s(get_json_real): key==self%get_json_key()", key)
5858

5959
raw_line = self%string()
6060
associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
@@ -70,11 +70,11 @@
7070

7171
end procedure
7272

73-
module procedure get_json_string_value
73+
module procedure get_json_string
7474

7575
character(len=:), allocatable :: raw_line
7676

77-
call assert(key==self%get_json_key(), "key==self%get_string_json_value()", key)
77+
call assert(key==self%get_json_key(), "key==self%get_string_json()", key)
7878

7979
raw_line = self%string()
8080
associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
@@ -91,10 +91,10 @@
9191

9292
end procedure
9393

94-
module procedure get_json_logical_value
94+
module procedure get_json_logical
9595
character(len=:), allocatable :: raw_line, string_value
9696

97-
call assert(key==self%get_json_key(), "string_s(get_json_logical_value): key==self%get_json_key()", key)
97+
call assert(key==self%get_json_key(), "string_s(get_json_logical): key==self%get_json_key()", key)
9898

9999
raw_line = self%string()
100100
associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
@@ -105,17 +105,17 @@
105105
string_value = trim(adjustl((text_after_colon(:trailing_comma-1))))
106106
end if
107107
call assert(string_value=="true" .or. string_value=="false", &
108-
'string_s(get_json_logical_value): string_value=="true" .or. string_value="false"', string_value)
108+
'string_s(get_json_logical): string_value=="true" .or. string_value="false"', string_value)
109109
value_ = string_value == "true"
110110
end associate
111111
end associate
112112

113113
end procedure
114114

115-
module procedure get_json_integer_value
115+
module procedure get_json_integer
116116
character(len=:), allocatable :: raw_line, string_value
117117

118-
call assert(key==self%get_json_key(), "string_s(get_json_logical_value): key==self%get_json_key()", key)
118+
call assert(key==self%get_json_key(), "string_s(get_json_logical): key==self%get_json_key()", key)
119119

120120
raw_line = self%string()
121121
associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
@@ -131,12 +131,12 @@
131131

132132
end procedure
133133

134-
module procedure get_json_integer_array_value
134+
module procedure get_json_integer_array
135135
character(len=:), allocatable :: raw_line
136136
real, allocatable :: real_array(:)
137137
integer i
138138

139-
call assert(key==self%get_json_key(), "string_s(get_json_integer_array_value): key==self%get_json_key()", key)
139+
call assert(key==self%get_json_key(), "string_s(get_json_integer_array): key==self%get_json_key()", key)
140140

141141
raw_line = self%string()
142142
associate(colon => index(raw_line, ":"))

0 commit comments

Comments
 (0)