Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.342
0.1.343
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pyk"
version = "0.1.342"
version = "0.1.343"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
14 changes: 8 additions & 6 deletions src/pyk/kcfg/tui.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
from ..cterm import CTerm
from ..kast.inner import KApply, KRewrite
from ..kast.manip import flatten_label, minimize_term, push_down_rewrites
from ..kcfg import KCFG, KCFGShow
from ..prelude.kbool import TRUE
from ..utils import shorten_hashes, single
from .kcfg import KCFG
from .show import KCFGShow

if TYPE_CHECKING:
from collections.abc import Callable, Iterable
Expand All @@ -23,6 +24,7 @@

from ..kast import KInner
from ..ktool.kprint import KPrint
from .show import NodePrinter


KCFGElem = Union[KCFG.Node, KCFG.Successor]
Expand Down Expand Up @@ -57,15 +59,15 @@ class BehaviorView(Widget):
_kcfg: KCFG
_kprint: KPrint
_minimize: bool
_node_printer: Callable[[CTerm], Iterable[str]] | None
_node_printer: NodePrinter | None
_kcfg_nodes: Iterable[GraphChunk]

def __init__(
self,
kcfg: KCFG,
kprint: KPrint,
minimize: bool = True,
node_printer: Callable[[CTerm], Iterable[str]] | None = None,
node_printer: NodePrinter | None = None,
id: str = '',
):
super().__init__(id=id)
Expand All @@ -74,7 +76,7 @@ def __init__(
self._minimize = minimize
self._node_printer = node_printer
self._kcfg_nodes = []
kcfg_show = KCFGShow(kprint)
kcfg_show = KCFGShow(kprint, node_printer=node_printer)
for lseg_id, node_lines in kcfg_show.pretty_segments(self._kcfg, minimize=self._minimize):
self._kcfg_nodes.append(GraphChunk(lseg_id, node_lines))

Expand Down Expand Up @@ -236,7 +238,7 @@ class KCFGViewer(App):
_kcfg: KCFG
_kprint: KPrint

_node_printer: Callable[[CTerm], Iterable[str]] | None
_node_printer: NodePrinter | None
_custom_view: Callable[[KCFGElem], Iterable[str]] | None

_minimize: bool
Expand All @@ -248,7 +250,7 @@ def __init__(
self,
kcfg: KCFG,
kprint: KPrint,
node_printer: Callable[[CTerm], Iterable[str]] | None = None,
node_printer: NodePrinter | None = None,
custom_view: Callable[[KCFGElem], Iterable[str]] | None = None,
minimize: bool = True,
) -> None:
Expand Down
61 changes: 61 additions & 0 deletions src/pyk/proof/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#navigation {
dock: left;
width: 35%;
height: 100%;
layout: vertical;
}
#behavior {
height: 1fr;
border: solid;
overflow-x: auto;
overflow-y: auto;
}

.cfg-node {
height: auto;
width: auto;
}

.hidden {
display: none;
}

#display {
layout: vertical;
}
#info-view {
height: 2fr;
border: solid;
overflow: auto scroll;
}
#term-view {
height: 15fr;
border: solid;
overflow: auto scroll;
}
#constraint-view {
height: 5fr;
border: solid;
overflow: auto scroll;
}
#custom-view {
height: 15fr;
border: solid;
overflow: auto scroll;
}
#info {
width: auto;
height: auto;
}
#term {
width: auto;
height: auto;
}
#constraint {
width: auto;
height: auto;
}
#custom {
width: auto;
height: auto;
}
Comment on lines +1 to +61
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this just a clone of src/pyk/kcfg/style.css? I wonder if it would be better to have APRProofViewer inherit the styling from its superclass.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmmmmm, that would be a good idea, sorry I didn't see this before it was merged.

76 changes: 76 additions & 0 deletions src/pyk/proof/tui.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from textual.containers import Horizontal, Vertical
from textual.widget import Widget
from textual.widgets import Footer

from ..kcfg.tui import GraphChunk, KCFGViewer, NodeView
from .show import APRProofShow

if TYPE_CHECKING:
from collections.abc import Callable, Iterable

from textual.app import ComposeResult

from ..kcfg.show import NodePrinter
from ..kcfg.tui import KCFGElem
from ..ktool.kprint import KPrint
from .reachability import APRProof


class APRProofBehaviorView(Widget):
_proof: APRProof
_kprint: KPrint
_minimize: bool
_node_printer: NodePrinter | None
_proof_nodes: Iterable[GraphChunk]

def __init__(
self,
proof: APRProof,
kprint: KPrint,
minimize: bool = True,
node_printer: NodePrinter | None = None,
id: str = '',
):
super().__init__(id=id)
self._proof = proof
self._kprint = kprint
self._minimize = minimize
self._node_printer = node_printer
self._proof_nodes = []
proof_show = APRProofShow(kprint, node_printer=node_printer)
for lseg_id, node_lines in proof_show.pretty_segments(self._proof, minimize=self._minimize):
self._proof_nodes.append(GraphChunk(lseg_id, node_lines))

def compose(self) -> ComposeResult:
return self._proof_nodes


class APRProofViewer(KCFGViewer):
CSS_PATH = 'style.css'

_proof: APRProof

def __init__(
self,
proof: APRProof,
kprint: KPrint,
node_printer: NodePrinter | None = None,
custom_view: Callable[[KCFGElem], Iterable[str]] | None = None,
minimize: bool = True,
) -> None:
super().__init__(proof.kcfg, kprint, node_printer=node_printer, custom_view=custom_view, minimize=minimize)
self._proof = proof

def compose(self) -> ComposeResult:
yield Horizontal(
Vertical(
APRProofBehaviorView(self._proof, self._kprint, node_printer=self._node_printer, id='behavior'),
id='navigation',
),
Vertical(NodeView(self._kprint, custom_view=self._custom_view, id='node-view'), id='display'),
)
yield Footer()