fix(Parser): rollback when signature not found

berdal84 · Apr 5, 2022 · c8c6197 · c8c6197
1 parent fe6563b
commit c8c6197
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/src/core/src/Language.cpp b/src/core/src/Language.cpp
@@ -35,6 +35,10 @@ const IInvokable* Language::find_function(const Signature* _signature) const
 
 const IInvokable* Language::find_operator_fct_exact(const Signature* _signature) const
 {
+    if(!_signature)
+    {
+        return nullptr;
+    }
 
     auto is_exactly = [&](const IInvokable* _invokable)
     {
@@ -53,6 +57,10 @@ const IInvokable* Language::find_operator_fct_exact(const Signature* _signature)
 
 const IInvokable* Language::find_operator_fct(const Signature* _signature) const
 {
+    if(!_signature)
+    {
+        return nullptr;
+    }
     auto exact = find_operator_fct_exact(_signature);
     if( !exact) return find_operator_fct_fallback(_signature);
     return exact;

diff --git a/src/core/src/Parser.cpp b/src/core/src/Parser.cpp
@@ -291,12 +291,18 @@ Member* Parser::parse_binary_operator_expression(unsigned short _precedence, Mem
         component = binary_op->get<InvokableComponent>();
         delete signature;
     }
-	else
+	else if(signature)
     {
 	    // abstract operator
         binary_op = m_graph->create_abstract_function(signature);
         component = binary_op->get<InvokableComponent>();
     }
+    else
+    {
+        LOG_VERBOSE("Parser", "parse binary operation expr... " KO " no signature\n")
+        rollback_transaction();
+        return nullptr;
+    }
 
     component->set_source_token(operatorToken);
     m_graph->connect(_left, component->get_l_handed_val());
@@ -339,29 +345,35 @@ Member* Parser::parse_unary_operator_expression(unsigned short _precedence)
 
   if ( value == nullptr )
   {
-		LOG_VERBOSE("Parser", "parseUnaryOperationExpression... " KO " (right expression is nullptr)\n")
-      rollback_transaction();
-		return nullptr;
-	}
+    LOG_VERBOSE("Parser", "parseUnaryOperationExpression... " KO " (right expression is nullptr)\n")
+    rollback_transaction();
+    return nullptr;
+    }
 
 	// Create a function signature
 
 	const Operator*   ope       = m_language->find_operator(operatorToken->m_word, Operator_t::Unary );
 	const Signature*  sig       = Signature::new_operator(R::MetaType::s_any, ope, value->get_meta_type());
 	const IInvokable* invokable = m_language->find_operator_fct(sig);
 
-	InvokableComponent* component;
+    InvokableComponent* component;
 	Node* node;
 
 	if (invokable)
 	{
         node = m_graph->create_function(invokable);
         delete sig;
 	}
-	else
+	else if(sig)
 	{
         node = m_graph->create_abstract_function(sig);
 	}
+    else
+    {
+        LOG_VERBOSE("Parser", "parseUnaryOperationExpression... " KO " (no signature found)\n")
+        rollback_transaction();
+        return nullptr;
+    }
 
     component = node->get<InvokableComponent>();
     component->set_source_token(operatorToken);

diff --git a/src/core/src/Signature.cpp b/src/core/src/Signature.cpp
@@ -122,6 +122,11 @@ const Signature* Signature::new_operator(
         Meta_t _rtype
 )
 {
+    if(!_op)
+    {
+        return nullptr;
+    }
+
     auto signature = new Signature(_op);
     signature->set_return_type(_type);
     signature->push_args(_ltype, _rtype);
@@ -137,6 +142,11 @@ const Signature* Signature::new_operator(
         const Operator* _op,
         Meta_t _ltype)
 {
+    if(!_op)
+    {
+        return nullptr;
+    }
+
     auto signature = new Signature(_op);
     signature->set_return_type(_type);
     signature->push_arg(_ltype);