Skip to content

Disable whitespace disrupting CUDA chevrons #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable whitespace disrupting CUDA chevrons #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion fprettify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ def build_scope_parser(fypp=True, mod=True):
# find namelists and data statements
NML_STMT_RE = re.compile(SOL_STR + r"NAMELIST.*/.*/", RE_FLAGS)
DATA_STMT_RE = re.compile(SOL_STR + r"DATA\s+\w", RE_FLAGS)
# find CUDA chevrons
CUDA_CHEVRONS_RE = re.compile(r"<<<.*>>>", RE_FLAGS)

## Regexp for f90 keywords'
F90_KEYWORDS_RE = re.compile(r"\b(" + "|".join((
Expand Down Expand Up @@ -1302,7 +1304,7 @@ def add_whitespace_context(line, spacey):
# exclude comments, strings:
if not STR_OPEN_RE.match(part):
# also exclude / if we see a namelist and data statement
if not ( NML_STMT_RE.match(line) or DATA_STMT_RE.match(line) ):
if not ( NML_STMT_RE.match(line) or DATA_STMT_RE.match(line) or CUDA_CHEVRONS_RE.search(line) ):
partsplit = lr_re.split(part)
line_parts[pos] = (' ' * spacey[n_op + 2]).join(partsplit)

Expand Down