Skip to content

Commit 64d7273

Browse files
committed
Conversion to fstrings
1 parent 577172d commit 64d7273

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

fortls/parse_fortran.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,12 +1676,10 @@ def parser_debug_msg(msg: str, line: str, ln: int):
16761676
if name_raw[iparen - 1] == "*":
16771677
iparen -= 1
16781678
if desc_string.find("(") < 0:
1679-
desc_string += "*({0})".format(
1680-
get_paren_substring(name_raw)
1681-
)
1679+
desc_string += f"*({get_paren_substring(name_raw)})"
16821680
else:
16831681
key_tmp.append(
1684-
"dimension({0})".format(get_paren_substring(name_raw))
1682+
f"dimension({get_paren_substring(name_raw)})"
16851683
)
16861684
name_raw = name_raw[:iparen]
16871685
name_stripped = name_raw.strip()
@@ -1769,14 +1767,14 @@ def parser_debug_msg(msg: str, line: str, ln: int):
17691767
name = obj_info
17701768
if name is None:
17711769
block_counter += 1
1772-
name = "#BLOCK{0}".format(block_counter)
1770+
name = f"#BLOCK{block_counter}"
17731771
new_block = fortran_block(file_ast, line_number, name)
17741772
file_ast.add_scope(new_block, END_BLOCK_REGEX, req_container=True)
17751773
parser_debug_msg("BLOCK", line, line_number)
17761774

17771775
elif obj_type == "do":
17781776
do_counter += 1
1779-
name = "#DO{0}".format(do_counter)
1777+
name = f"#DO{do_counter}"
17801778
if obj_info != "":
17811779
block_id_stack.append(obj_info)
17821780
new_do = fortran_do(file_ast, line_number, name)
@@ -1787,14 +1785,14 @@ def parser_debug_msg(msg: str, line: str, ln: int):
17871785
# Add block if WHERE is not single line
17881786
if not obj_info:
17891787
do_counter += 1
1790-
name = "#WHERE{0}".format(do_counter)
1788+
name = f"#WHERE{do_counter}"
17911789
new_do = fortran_where(file_ast, line_number, name)
17921790
file_ast.add_scope(new_do, END_WHERE_REGEX, req_container=True)
17931791
parser_debug_msg("WHERE", line, line_number)
17941792

17951793
elif obj_type == "assoc":
17961794
block_counter += 1
1797-
name = "#ASSOC{0}".format(block_counter)
1795+
name = f"#ASSOC{block_counter}"
17981796
new_assoc = fortran_associate(file_ast, line_number, name)
17991797
file_ast.add_scope(new_assoc, END_ASSOCIATE_REGEX, req_container=True)
18001798
for bound_var in obj_info:
@@ -1811,20 +1809,20 @@ def parser_debug_msg(msg: str, line: str, ln: int):
18111809

18121810
elif obj_type == "if":
18131811
if_counter += 1
1814-
name = "#IF{0}".format(if_counter)
1812+
name = f"#IF{if_counter}"
18151813
new_if = fortran_if(file_ast, line_number, name)
18161814
file_ast.add_scope(new_if, END_IF_REGEX, req_container=True)
18171815
parser_debug_msg("IF", line, line_number)
18181816

18191817
elif obj_type == "select":
18201818
select_counter += 1
1821-
name = "#SELECT{0}".format(select_counter)
1819+
name = f"#SELECT{select_counter}"
18221820
new_select = fortran_select(file_ast, line_number, name, obj_info)
18231821
file_ast.add_scope(new_select, END_SELECT_REGEX, req_container=True)
18241822
new_var = new_select.create_binding_variable(
18251823
file_ast,
18261824
line_number,
1827-
"{0}({1})".format(obj_info.desc, obj_info.binding),
1825+
f"{obj_info.desc}({obj_info.binding})",
18281826
obj_info.type,
18291827
)
18301828
if new_var is not None:
@@ -1841,7 +1839,7 @@ def parser_debug_msg(msg: str, line: str, ln: int):
18411839

18421840
elif obj_type == "enum":
18431841
block_counter += 1
1844-
name = "#ENUM{0}".format(block_counter)
1842+
name = f"#ENUM{block_counter}"
18451843
new_enum = fortran_enum(file_ast, line_number, name)
18461844
file_ast.add_scope(new_enum, END_ENUMD_REGEX, req_container=True)
18471845
parser_debug_msg("ENUM", line, line_number)
@@ -1850,7 +1848,7 @@ def parser_debug_msg(msg: str, line: str, ln: int):
18501848
name = obj_info.name
18511849
if name is None:
18521850
int_counter += 1
1853-
name = "#GEN_INT{0}".format(int_counter)
1851+
name = f"#GEN_INT{int_counter}"
18541852
new_int = fortran_int(
18551853
file_ast, line_number, name, abstract=obj_info.abstract
18561854
)

0 commit comments

Comments
 (0)