Refactored Caching, Refactored BnfNodeParser, Introduced Sphinx

src/core/sheerka/ExecutionContext.py

@@ -144,9 +144,9 @@ class ExecutionContext:
 
     def add_preprocess(self, name, **kwargs):
         preprocess = self.sheerka.new(BuiltinConcepts.EVALUATOR_PRE_PROCESS)
-        preprocess.set_prop("name", name)
+        preprocess.set_value("name", name)
         for k, v in kwargs.items():
-            preprocess.set_prop(k, v)
+            preprocess.set_value(k, v)
 
         if not self.preprocess:
             self.preprocess = []
@@ -168,9 +168,9 @@ class ExecutionContext:
         if isinstance(self.obj, Concept):
             if self.obj.key == key:
                 return self.obj
-            for prop in self.obj.props:
-                if prop == key:
-                    value = self.obj.props[prop].value
+            for var_name in self.obj.values:
+                if var_name == key:
+                    value = self.obj.get_value(var_name)
                     if isinstance(value, Concept):
                         return value
 
@@ -180,16 +180,16 @@ class ExecutionContext:
                 if k == key:
                     return c
 
-        return self.sheerka.get(key)
+        return self.sheerka.get_by_key(key)
 
     def new_concept(self, key, **kwargs):
         # search in obj
         if self.obj:
             if self.obj.key == key:
                 return self.sheerka.new_from_template(self.obj, key, **kwargs)
-            for prop in self.obj.props:
-                if prop == key:
-                    value = self.obj.props[prop].value
+            for var_name in self.obj.values:
+                if var_name == key:
+                    value = self.obj.get_value(var_name)
                     if isinstance(value, Concept):
                         return self.sheerka.new_from_template(value, key, **kwargs)
                     else:
@@ -327,6 +327,7 @@ class ExecutionContext:
             bag[prop] = getattr(self, prop)
         bag["status"] = self.get_status()
         bag["elapsed"] = self.elapsed
+        bag["elapsed_str"] = self.elapsed_str
         bag["digest"] = self.event.get_digest() if self.event else None
         return bag