[rtems-central commit] specview.py: Simplify _validate()
Sebastian Huber
sebh at rtems.org
Wed Aug 31 09:44:10 UTC 2022
Module: rtems-central
Branch: master
Commit: 97425807f4c052456386bbac9c315986108762fb
Changeset: http://git.rtems.org/rtems-central/commit/?id=97425807f4c052456386bbac9c315986108762fb
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Aug 31 10:31:39 2022 +0200
specview.py: Simplify _validate()
---
specview.py | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/specview.py b/specview.py
index 235b09b3..c20096a0 100755
--- a/specview.py
+++ b/specview.py
@@ -172,17 +172,13 @@ _VALIDATION_LEAF = [
"validation",
]
-
-def _validation_count(item: Item, enabled: List[str]) -> int:
- return len(
- list(child for child in item.children("validation")
- if child.is_enabled(enabled)))
+_VALIDATION_ROLES = _CHILD_ROLES + ["validation"]
def _validate(item: Item, enabled: List[str]) -> bool:
- count = _validation_count(item, enabled)
validated = True
- for child in item.children(_CHILD_ROLES):
+ count = 0
+ for child in item.children(_VALIDATION_ROLES):
if child.is_enabled(enabled):
validated = _validate(child, enabled) and validated
count += 1
@@ -193,14 +189,17 @@ def _validate(item: Item, enabled: List[str]) -> bool:
pre_qualified = is_pre_qualified(item)
item["_pre_qualified"] = pre_qualified
if count == 0:
- if not pre_qualified:
- validated = True
- else:
- validated = item.type in _VALIDATION_LEAF
+ validated = (not pre_qualified) or (item.type in _VALIDATION_LEAF)
item["_validated"] = validated
return validated
+def _validation_count(item: Item, enabled: List[str]) -> int:
+ return len(
+ list(child for child in item.children("validation")
+ if child.is_enabled(enabled)))
+
+
def _no_validation(item: Item, path: List[str],
enabled: List[str]) -> List[str]:
path_2 = path + [item.uid]
More information about the vc
mailing list