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

Expose -Wno via ignore-warnings kompile option #4471

Merged
merged 13 commits into from
Jun 25, 2024
Merged

Expose -Wno via ignore-warnings kompile option #4471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a680cf8
Add `ignore-warnings` kompile option
JuanCoRo Jun 21, 2024
a8c8b8f
Merge remote-tracking branch 'origin/develop' into expose-Wno
JuanCoRo Jun 21, 2024
8c2dd17
kompile.py: set right flags to ignore warnings
JuanCoRo Jun 21, 2024
7f3c1d8
kompile.py: more concise silence warnings command
JuanCoRo Jun 21, 2024
81b86ef
remove duplicated `ignore_warnings` option
JuanCoRo Jun 21, 2024
ce2a378
actually include all changes meant for last commit lol
JuanCoRo Jun 21, 2024
82fa4cd
kompile.py: move `ignore-warnings` to `Kompile.__call__`
JuanCoRo Jun 23, 2024
993b715
kompile.py: include `ignore_warnings` argument in kompile calls
JuanCoRo Jun 24, 2024
4a58967
args.py: remove ` | None` from `ignore_warnings` type
JuanCoRo Jun 24, 2024
8e6be9d
__main__.py: correctly place `ignore_warnings` in `exec_compile`
JuanCoRo Jun 24, 2024
47594df
_kompiler.py: add `ignore_warnings` argument to `kompile` call
JuanCoRo Jun 24, 2024
65adaee
Revert "_kompiler.py: add `ignore_warnings` argument to `kompile` call"
JuanCoRo Jun 24, 2024
e3cca08
Merge branch 'develop' into expose-Wno
JuanCoRo Jun 25, 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: 2 additions & 0 deletions pyk/src/pyk/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ def exec_kompile(options: KompileCommandOptions) -> None:
'gen_glr_bison_parser': options.gen_glr_bison_parser,
'bison_lists': options.bison_lists,
'outer_parsed_json': options.outer_parsed_json,
'ignore_warnings': options.ignore_warnings,
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved
}
if options.backend == KompileBackend.LLVM:
kompile_dict['ccopts'] = options.ccopts
Expand Down Expand Up @@ -346,6 +347,7 @@ def exec_kompile(options: KompileCommandOptions) -> None:
warnings=options.warnings,
warnings_to_errors=options.warnings_to_errors,
no_exc_wrap=options.no_exc_wrap,
ignore_warnings=options.ignore_warnings,
)
except RuntimeError as err:
_, _, _, _, cpe = err.args
Expand Down
5 changes: 5 additions & 0 deletions pyk/src/pyk/cli/args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ class KompileOptions(Options):
bison_lists: bool
no_exc_wrap: bool
outer_parsed_json: bool
ignore_warnings: list[str] | None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a 100% sure in this, but consider

Suggested change
ignore_warnings: list[str] | None
ignore_warnings: list[str]

This makes it consitent with ccopts.

@nwatson22, is this the right convention to follow?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'd go without the None type option unless there is a situation where it could actually be set to None, which there shouldn't be as far as I know since you have [] as the default.


@staticmethod
def default() -> dict[str, Any]:
Expand All @@ -230,6 +231,7 @@ def default() -> dict[str, Any]:
'bison_lists': False,
'no_exc_wrap': False,
'outer_parsed_json': False,
'ignore_warnings': None,
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved
}

@staticmethod
Expand Down Expand Up @@ -475,6 +477,9 @@ def kompile_args(self) -> ArgumentParser:
action='store_true',
help='Do not wrap the output on the CLI.',
)
args.add_argument(
'--ignore-warnings', dest='ignore_warnings', default=None, action='append', help='Ignore provided warnings'
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved
)
return args

@cached_property
Expand Down
16 changes: 16 additions & 0 deletions pyk/src/pyk/ktool/kompile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def kompile(
verbose: bool = False,
cwd: Path | None = None,
check: bool = True,
ignore_warnings: Iterable[str] | None = None,
# ---
**kwargs: Any,
) -> Path:
Expand All @@ -83,6 +84,7 @@ def kompile(
cwd=cwd,
check=check,
kwargs=kwargs,
ignore_warnings=ignore_warnings,
)

kwargs['backend'] = KompileBackend(pyk_backend.value) if pyk_backend else None
Expand All @@ -100,6 +102,7 @@ def kompile(
verbose=verbose,
cwd=cwd,
check=check,
ignore_warnings=ignore_warnings,
)


Expand All @@ -116,6 +119,7 @@ def _booster_kompile(
verbose: bool,
cwd: Path | None,
check: bool,
ignore_warnings: Iterable[str] | None,
# ---
kwargs: Mapping[str, Any],
) -> Path:
Expand Down Expand Up @@ -150,6 +154,7 @@ def kompile_llvm() -> None:
verbose=verbose,
cwd=cwd,
check=check,
ignore_warnings=ignore_warnings,
)

def kompile_haskell() -> None:
Expand All @@ -165,6 +170,7 @@ def kompile_haskell() -> None:
verbose=verbose,
cwd=cwd,
check=check,
ignore_warnings=ignore_warnings,
)

with concurrent.futures.ThreadPoolExecutor(max_workers=2) as executor:
Expand Down Expand Up @@ -279,6 +285,7 @@ def __call__(
check: bool = True,
bug_report: BugReport | None = None,
outer_parsed_json: bool = False,
ignore_warnings: Iterable[str] | None = None,
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved
) -> Path:
check_file_path(abs_or_rel_to(self.base_args.main_file, cwd or Path()))
for include_dir in self.base_args.include_dirs:
Expand Down Expand Up @@ -320,6 +327,9 @@ def __call__(
if outer_parsed_json:
args += ['--outer-parsed-json']

if ignore_warnings:
args += ['-Wno', ', '.join(ignore_warnings)]
nwatson22 marked this conversation as resolved.
Show resolved Hide resolved

try:
proc_res = run_process(args, logger=_LOGGER, cwd=cwd, check=check)
except CalledProcessError as err:
Expand Down Expand Up @@ -512,6 +522,7 @@ class KompileArgs:
coverage: bool
bison_lists: bool
outer_parsed_json: bool
ignore_warnings: Iterable[str] | None
tothtamas28 marked this conversation as resolved.
Show resolved Hide resolved

def __init__(
self,
Expand All @@ -531,6 +542,7 @@ def __init__(
coverage: bool = False,
bison_lists: bool = False,
outer_parsed_json: bool = False,
ignore_warnings: Iterable[str] | None = None,
):
main_file = Path(main_file)
include_dirs = tuple(sorted(Path(include_dir) for include_dir in include_dirs))
Expand All @@ -551,6 +563,7 @@ def __init__(
object.__setattr__(self, 'coverage', coverage)
object.__setattr__(self, 'bison_lists', bison_lists)
object.__setattr__(self, 'outer_parsed_json', outer_parsed_json)
object.__setattr__(self, 'ignore_warnings', ignore_warnings)

def args(self) -> list[str]:
args = [str(self.main_file)]
Expand Down Expand Up @@ -597,6 +610,9 @@ def args(self) -> list[str]:
if self.outer_parsed_json:
args += ['--outer-parsed-json']

if self.ignore_warnings:
args += ['-Wno', ', '.join(self.ignore_warnings)]

return args


Expand Down
Loading