Enhanced complex concepts handling

tests/test_PythonEvaluator.py

@@ -126,3 +126,26 @@ def test_i_can_eval_concept_token():
 
     assert not evaluated.status
     assert evaluated.body.body.args[0] == "'int' object has no attribute 'name'"
+
+
+@pytest.mark.parametrize("text, concept_key, concept_id, use_concept", [
+    ("__C__key__C__", "key", None, False),
+    ("__C__key__id__C__", "key", "id", False),
+    ("__C__USE_CONCEPT__key__id__C__", "key", "id", True),
+    ("__C__USE_CONCEPT__key__id__C__", "key", "id", True),
+])
+def test_i_can_resolve_name(text, concept_key, concept_id, use_concept):
+    context = get_context()
+    assert PythonEvaluator().resolve_name(context, text) == (concept_key, concept_id, use_concept)
+
+
+@pytest.mark.parametrize("text", [
+    "__C__",
+    "__C__key",
+    "__C__key____",
+    "__C____",
+    "__C__USE_CONCEPT__",
+])
+def test_i_cannot_resolve_name(text):
+    context = get_context()
+    assert PythonEvaluator().resolve_name(context, text) is None