Assert edges, source and target nodes, tests

src/rsprocess/grammar.lalrpop

@@ -49,8 +49,8 @@ match {
 	"UncommonEntitiesDeleted", "UncommonMaskEntitiesDeleted",
     "EntitiesAdded", "MaskEntitiesAdded",
 	"UncommonEntitiesAdded", "UncommonMaskEntitiesAdded",
-    "label", "if", "then", "else", "let", "=", "return", "for", "in",
+    "label", "edge", "if", "then", "else", "let", "=", "return", "for", "in",
-    "not", "rand", ".empty", ".length", ".tostr",
+    "not", "rand", ".empty", ".length", ".tostr", ".source", ".target",
     "&&", "||", "^^", "<=", ">=", "==", "!=", "+", "*", "/", "%",
     "::", "substr", "min", "max", "commonsubstr",
     "AvailableEntities", "AllReactants", "AllInhibitors",
@@ -217,6 +217,7 @@ AssertAssignmentVar: assert::AssignmentVariable = {
 
 AssertVariable: assert::Variable = {
     "label" => assert::Variable::Label,
+    "edge" => assert::Variable::Edge,
     <v: Literal> => assert::Variable::Id(v),
 }
 
@@ -262,6 +263,9 @@ AssertUnarySuffix: assert::Unary = {
     ".length" => assert::Unary::Length,
     ".tostr" => assert::Unary::ToStr,
     ".toel" => assert::Unary::ToEl,
+    ".source" => assert::Unary::Source,
+    ".target" => assert::Unary::Target,
+    ".neighbours" => assert::Unary::Neighbours,
     "." <q: AssertQualifier> => assert::Unary::Qualifier(q),
 }
 

src/rsprocess/perpetual.rs

@@ -81,17 +81,13 @@ fn filter_delta<'a>(x: (&IdType, &'a RSprocess)) -> Option<&'a RSset> {
     use super::structure::RSprocess::*;
     let (id, rest) = x;
 
-    if let EntitySet {
+    if let EntitySet { entities, next_process } = rest
-        entities,
+	&& let RecursiveIdentifier { identifier } = &**next_process
-        next_process,
+        && identifier == id
-    } = rest
     {
-        if let RecursiveIdentifier { identifier } = &**next_process {
+        return Some(entities);
-            if identifier == id {
-                return Some(entities);
-            }
-        }
     }
+
     None
 }
 
@@ -196,16 +192,11 @@ fn filter_delta_named<'a>(
         return None;
     }
 
-    if let EntitySet {
+    if let EntitySet { entities, next_process } = rest
-        entities,
+	&& let RecursiveIdentifier { identifier } = &**next_process
-        next_process,
+	&& identifier == id
-    } = rest
     {
-        if let RecursiveIdentifier { identifier } = &**next_process {
+        return Some(entities);
-            if identifier == id {
-                return Some(entities);
-            }
-        }
     }
     None
 }

testing/first.system

@@ -6,7 +6,13 @@ Reactions: ([{a,b}, {c}, {b}])
 
 Bisimilarity ("testing/adversarial.system") > Print,
 Digraph > Dot
-        | Entities
+        | Entities " - " Context " - entities masked: " MaskEntities {a}
 	| Entities
-	| ! "white"
+	| EntitiesDeleted {a} ? "blue" ! "white"
-	| ! "black" > Print
+	| ! "black"
+	> Print,
+
+Digraph > GraphML
+	| Entities
+	| Entities
+	> Print