We can now use concept sets in BNF definitions

tests/test_sheerka_non_reg.py

@@ -152,7 +152,8 @@ as:
     for prop in PROPERTIES_TO_SERIALIZE:
         assert getattr(concept_saved.metadata, prop) == getattr(expected.metadata, prop)
 
-    assert concept_saved.key in sheerka.concepts_cache
+    assert concept_saved.key in sheerka.cache_by_key
+    assert concept_saved.id in sheerka.cache_by_id
     assert sheerka.sdp.io.exists(
         sheerka.sdp.io.get_obj_path(SheerkaDataProvider.ObjectsFolder, concept_saved.get_digest()))
 
@@ -182,7 +183,8 @@ def test_i_can_eval_def_concept_part_when_one_part_is_a_ref_of_another_concept()
     for prop in PROPERTIES_TO_SERIALIZE:
         assert getattr(concept_saved.metadata, prop) == getattr(expected.metadata, prop)
 
-    assert concept_saved.key in sheerka.concepts_cache
+    assert concept_saved.key in sheerka.cache_by_key
+    assert concept_saved.id in sheerka.cache_by_id
     assert sheerka.sdp.io.exists(
         sheerka.sdp.io.get_obj_path(SheerkaDataProvider.ObjectsFolder, concept_saved.get_digest()))
 
@@ -331,8 +333,7 @@ def test_i_can_create_concept_with_bnf_definition():
 
     saved_definitions = sheerka.sdp.get_safe(sheerka.CONCEPTS_DEFINITIONS_ENTRY)
     expected_bnf = Sequence(
-        ConceptExpression("a", rule_name="a"),
-        Optional(Sequence(StrMatch("plus"), ConceptExpression("plus", rule_name="plus"))))
+        a, Optional(Sequence(StrMatch("plus"), ConceptExpression("plus", rule_name="plus"))))
     assert saved_definitions[saved_concept] == expected_bnf
 
     new_concept = res[0].value.body
@@ -421,6 +422,23 @@ def test_i_can_eval_bnf_definitions_from_separate_instances():
         "def concept digit from bnf one|two",
         "def concept twenties from bnf twenty digit as twenty + digit"
     ]),
+    ("When using isa and concept twenty", [
+        "def concept one as 1",
+        "def concept two as 2",
+        "def concept number",
+        "one isa number",
+        "two isa number",
+        "def concept twenties from bnf 'twenty' number as 20 + number"
+    ]),
+    ("When using isa and concept twenty", [
+        "def concept one as 1",
+        "def concept two as 2",
+        "def concept twenty as 20",
+        "def concept number",
+        "one isa number",
+        "two isa number",
+        "def concept twenties from bnf twenty number as 20 + number"
+    ]),
 ])
 def test_i_can_mix_concept_with_python_to_define_numbers(desc, definitions):
     sheerka = get_sheerka()
@@ -460,6 +478,50 @@ def test_i_can_mix_concept_with_python_to_define_numbers(desc, definitions):
     assert res[0].body == 23
 
 
+def test_i_can_mix_bnf_and_isa():
+    """
+    if 'one' isa 'number, twenty number should be recognized
+    :return:
+    """
+    sheerka = get_sheerka()
+    sheerka.evaluate_user_input("def concept one as 1")
+    sheerka.evaluate_user_input("def concept two as 2")
+    sheerka.evaluate_user_input("def concept number")
+    sheerka.evaluate_user_input("one isa number")
+    sheerka.evaluate_user_input("two isa number")
+    sheerka.evaluate_user_input("def concept twenties from bnf 'twenty' number as 20 + number")
+
+    res = sheerka.evaluate_user_input("twenty one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == simplec("twenties", 21)
+
+    res = sheerka.evaluate_user_input("twenty one + 1")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
+    res = sheerka.evaluate_user_input("twenty one + one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
+    res = sheerka.evaluate_user_input("twenty one + twenty two")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 43
+
+    res = sheerka.evaluate_user_input("1 + twenty one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 22
+
+    res = sheerka.evaluate_user_input("1 + 1 + twenty one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 23
+
+
 def test_i_can_mix_concept_of_concept():
     sheerka = get_sheerka()