Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
devops committed Aug 9, 2024
2 parents ce5eeb1 + 015327f commit d5e9a61
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions pyk/src/pyk/cterm/symbolic.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,21 @@ def __init__(self, message: str):
class CTermSymbolic:
_kore_client: KoreClient
_definition: KDefinition
_trace_rewrites: bool
_log_succ_rewrites: bool
_log_fail_rewrites: bool

def __init__(
self,
kore_client: KoreClient,
definition: KDefinition,
*,
trace_rewrites: bool = False,
log_succ_rewrites: bool = True,
log_fail_rewrites: bool = False,
):
self._kore_client = kore_client
self._definition = definition
self._trace_rewrites = trace_rewrites
self._log_succ_rewrites = log_succ_rewrites
self._log_fail_rewrites = log_fail_rewrites

def kast_to_kore(self, kinner: KInner) -> Pattern:
return kast_to_kore(self._definition, kinner, sort=GENERATED_TOP_CELL)
Expand All @@ -110,8 +113,8 @@ def execute(
cut_point_rules=cut_point_rules,
terminal_rules=terminal_rules,
module_name=module_name,
log_successful_rewrites=True,
log_failed_rewrites=self._trace_rewrites,
log_successful_rewrites=self._log_succ_rewrites,
log_failed_rewrites=self._log_succ_rewrites and self._log_fail_rewrites,
)
except SmtSolverError as err:
raise self._smt_solver_error(err) from err
Expand Down Expand Up @@ -309,7 +312,8 @@ def cterm_symbolic(
haskell_log_format: KoreExecLogFormat = KoreExecLogFormat.ONELINE,
haskell_log_entries: Iterable[str] = (),
log_axioms_file: Path | None = None,
trace_rewrites: bool = False,
log_succ_rewrites: bool = True,
log_fail_rewrites: bool = False,
start_server: bool = True,
maude_port: int | None = None,
fallback_on: Iterable[FallbackReason] | None = None,
Expand All @@ -336,7 +340,9 @@ def cterm_symbolic(
no_post_exec_simplify=no_post_exec_simplify,
) as server:
with KoreClient('localhost', server.port, bug_report=bug_report, bug_report_id=id) as client:
yield CTermSymbolic(client, definition, trace_rewrites=trace_rewrites)
yield CTermSymbolic(
client, definition, log_succ_rewrites=log_succ_rewrites, log_fail_rewrites=log_fail_rewrites
)
else:
if port is None:
raise ValueError('Missing port with start_server=False')
Expand All @@ -352,4 +358,6 @@ def cterm_symbolic(
],
}
with KoreClient('localhost', port, bug_report=bug_report, bug_report_id=id, dispatch=dispatch) as client:
yield CTermSymbolic(client, definition, trace_rewrites=trace_rewrites)
yield CTermSymbolic(
client, definition, log_succ_rewrites=log_succ_rewrites, log_fail_rewrites=log_fail_rewrites
)

0 comments on commit d5e9a61

Please sign in to comment.