From ebe3dcc882dc63f3c91d11b3f25203853d0a07ef Mon Sep 17 00:00:00 2001 From: Eric Mercer Date: Fri, 27 Jul 2018 11:27:18 -0500 Subject: [PATCH] Rewrote the "system_prop_check" to not give a type error in the AADL editor. --- CASE_simple_example/AADL/claim.aadl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CASE_simple_example/AADL/claim.aadl b/CASE_simple_example/AADL/claim.aadl index c03c0c567..500dd0524 100644 --- a/CASE_simple_example/AADL/claim.aadl +++ b/CASE_simple_example/AADL/claim.aadl @@ -48,7 +48,8 @@ package claim -- property for each component that contains AGREE contracts when those checks pass system_prop_checked(c : component, prop : string) <= ** "AGREE property passed: [ " prop " ]" ** - has_property(c, CASE::AGREE_PROPERTIES_PASSED) and length(intersect(property(c, CASE::AGREE_PROPERTIES_PASSED), {prop})) = 1 + has_property(c, CASE::AGREE_PROPERTIES_PASSED) and + member(prop, property(c, CASE::AGREE_PROPERTIES_PASSED)) -- Checks if the specified component is a filter is_filter(c : component) : bool =