Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/fortran_tools/parse_fortran.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ class FtypeCharacter(Ftype):
'Character(len=512)'
>>> FtypeCharacter('character(*)', None).__str__()
'character(len=*)'
>>> FtypeCharacter('character(nf_file_length)', None).__str__()
'character(len=nf_file_length)'
>>> FtypeCharacter('character(len=nf_file_length)', None).__str__()
'character(len=nf_file_length)'
>>> FtypeCharacter('character*7', None).__str__() #doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
ParseSyntaxError: Invalid character declaration, 'character*7', at <standard input>:1
Expand All @@ -335,9 +339,9 @@ class FtypeCharacter(Ftype):
"character(len=15, kind=kind('b'))"
"""

char_re = re.compile(r"(?i)(character)\s*(\([A-Za-z0-9,=*:\s\'\"()]+\))?")
char_re = re.compile(r"(?i)(character)\s*(\([A-Za-z0-9_,=*:\s\'\"()]+\))?")
chartrail_re = re.compile(r"\s*[,:]|\s+[A-Z]")
oldchar_re = re.compile(r"(?i)(character)\s*(\*)\s*([0-9]+\s*)")
oldchar_re = re.compile(r"(?i)(character)\s*(\*)\s*([A-Za-z0-9_]+\s*)")
Comment thread
climbfuji marked this conversation as resolved.
oldchartrail_re = re.compile(r"\s*[,]|\s+[A-Z]")
len_token_re = re.compile(r"(?i)([:]|[*]|[0-9]+|[A-Z][A-Z0-9_]*)$")

Expand Down
Loading