Added basic implentation for where

src/core/sheerka/Services/SheerkaEvaluateConcept.py

@@ -147,9 +147,6 @@ class SheerkaEvaluateConcept:
         if concept.metadata.is_evaluated:
             return concept
 
-        # WHERE condition should already be validated by the parser.
-        # It's a mandatory condition for the concept before it can be recognized
-
         #
         # TODO : Validate the PRE condition
         #
@@ -157,8 +154,8 @@ class SheerkaEvaluateConcept:
         self.initialize_concept_asts(context, concept, logger)
 
         # to make sure of the order, it don't use ConceptParts.get_parts()
-        # props must be evaluated first
-        all_metadata_to_eval = ["props", "where", "pre", "post", "body"]
+        # props must be evaluated first, body must be evaluated before where
+        all_metadata_to_eval = ["pre", "post", "props", "body", "where"]
 
         for metadata_to_eval in all_metadata_to_eval:
             if metadata_to_eval == "props":
@@ -186,6 +183,12 @@ class SheerkaEvaluateConcept:
                     else:
                         concept.values[part_key] = resolved
 
+        # validate where clause
+        if concept.metadata.where is not None:
+            where_value = concept.values[ConceptParts.WHERE]
+            if not (where_value is None or self.sheerka.value(where_value) is True):
+                return self.sheerka.new(BuiltinConcepts.WHERE_CLAUSE_FAILED, body=concept)
+
         #
         # TODO : Validate the POST condition
         #