Refactoring :), in the middle of so please be patient

This commit is contained in:
elvis
2025-08-23 23:40:19 +02:00
parent f8740b8bd7
commit 8a492c7b8a
29 changed files with 2630 additions and 2489 deletions

View File

@ -741,7 +741,7 @@ impl AssertReturnValue {
self,
u: &Unary,
translator: &mut translator::Translator,
graph: &graph::RSgraph,
graph: &graph::SystemGraph,
) -> Result<AssertReturnValue, String> {
match (self, u) {
(AssertReturnValue::Boolean(b), Unary::Not) => {
@ -1029,7 +1029,7 @@ pub(super) fn execute<S, G>(
tree: &Tree<S>,
c: &mut Context<S>,
translator: &mut translator::Translator,
graph: &graph::RSgraph,
graph: &graph::SystemGraph,
) -> Result<Option<AssertReturnValue>, String>
where S: SpecialVariables<G> {
match tree {
@ -1083,7 +1083,7 @@ fn range_into_iter<S, G>(
range: &Range<S>,
c: &mut Context<S>,
translator: &mut translator::Translator,
graph: &graph::RSgraph,
graph: &graph::SystemGraph,
) -> Result<RangeIterator, String>
where S: SpecialVariables<G> {
use petgraph::visit::EdgeRef;
@ -1129,7 +1129,7 @@ fn execute_exp<S, G>(
exp: &Expression<S>,
c: &Context<S>,
translator: &mut translator::Translator,
graph: &graph::RSgraph,
graph: &graph::SystemGraph,
) -> Result<AssertReturnValue, String>
where S: SpecialVariables<G> {
match exp {

View File

@ -123,8 +123,8 @@ impl RSassert<EdgeRelablerInput> {
pub fn execute(
&self,
graph: &graph::RSgraph,
edge: &<graph::RSgraph as petgraph::visit::GraphBase>::EdgeId,
graph: &graph::SystemGraph,
edge: &<graph::SystemGraph as petgraph::visit::GraphBase>::EdgeId,
translator: &mut translator::Translator,
) -> Result<AssertReturnValue, String> {
let label = graph.edge_weight(*edge)
@ -239,8 +239,8 @@ impl RSassert<NodeRelablerInput> {
pub fn execute(
&self,
graph: &graph::RSgraph,
node: &<graph::RSgraph as petgraph::visit::GraphBase>::NodeId,
graph: &graph::SystemGraph,
node: &<graph::SystemGraph as petgraph::visit::GraphBase>::NodeId,
translator: &mut translator::Translator,
) -> Result<AssertReturnValue, String> {
let structure::RSsystem {available_entities: entities, ..} =