Skip to content
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

Allow whitespaces in START STENCIL directive for name argument #414

Merged
merged 12 commits into from
Apr 10, 2024
Merged

Allow whitespaces in START STENCIL directive for name argument #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3615809
Allow whitespaces in START STENCIL directive for name argument
Mar 15, 2024
0f09d79
Merge remote-tracking branch 'origin/main' into improve_liskov_stenci…
Mar 21, 2024
a7dd889
Fixed names of stencils used in repeated_stencils test
Mar 22, 2024
609591e
Added test for whitespaces in name argument
Mar 22, 2024
d709ea1
Merge remote-tracking branch 'origin/main' into improve_liskov_stenci…
Mar 22, 2024
a29de0f
Merge remote-tracking branch 'origin/main' into improve_liskov_stenci…
Apr 2, 2024
be58dbc
Fixed tests for whitespaces not containing DECLARE and IMPORTS direct…
Apr 8, 2024
c90df88
Small fix
Apr 8, 2024
061f19b
Revert "Fixed names of stencils used in repeated_stencils test"
stelliom Apr 8, 2024
20b7c36
Merge remote-tracking branch 'origin/main' into improve_liskov_stenci…
stelliom Apr 9, 2024
c7ccd81
Merge remote-tracking branch 'origin/main' into improve_liskov_stenci…
stelliom Apr 10, 2024
5519351
Changed test name
Apr 10, 2024
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
2 changes: 1 addition & 1 deletion tools/src/icon4pytools/liskov/parsing/validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def validate(self, directives: Sequence[ts.ParsedDirective]) -> None:


def _extract_arg_from_directive(directive: str, arg: str) -> str:
match = re.search(f"{arg}=([^;)]+)", directive)
match = re.search(f"{arg}\s*=\s*([^\s;)]+)", directive)
if match:
return match.group(1)
else:
Expand Down
23 changes: 23 additions & 0 deletions tools/tests/liskov/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,29 @@ def test_directive_semantics_validation_unbalanced_stencil_directives(
parser(directives)


@mark.parametrize(
"stencil, directive",
[
(
SINGLE_STENCIL_WITH_COMMENTS,
"!$DSL START STENCIL( name = foo ; x = bar )\n!$DSL END STENCIL(name = foo)",
),
(
SINGLE_STENCIL_WITH_COMMENTS,
"!$DSL START FUSED STENCIL( name = foo ; x = bar )\n!$DSL END FUSED STENCIL(name = foo)",
),
],
)
def test_directive_semantics_validation_allow_whitespaces_in_name_arg(
make_f90_tmpfile, stencil, directive
):
fpath = make_f90_tmpfile(stencil + directive)
opath = fpath.with_suffix(".gen")
directives = scan_for_directives(fpath)
parser = DirectivesParser(fpath, opath)
parser(directives)


@mark.parametrize(
"directive",
(
Expand Down
Loading