Added more strict testing to make sure that the found symbol is eithe…

…r function or procedure and related test
BlueBrain · Jan 11, 2024 · af2a387 · af2a387
1 parent fb609b8
commit af2a387
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/visitors/semantic_analysis_visitor.cpp b/src/visitors/semantic_analysis_visitor.cpp
@@ -23,6 +23,8 @@
 namespace nmodl {
 namespace visitor {
 
+using symtab::syminfo::NmodlType;
+
 bool SemanticAnalysisVisitor::check(const ast::Program& node) {
     check_fail = false;
 
@@ -93,8 +95,10 @@ void SemanticAnalysisVisitor::visit_function_call(const ast::FunctionCall& node)
         return;
     }
     auto func_symbol = psymtab->lookup(func_name);
-    // If symbol is not found or there are no AST nodes for it return
-    if (!func_symbol || func_symbol->get_nodes().empty()) {
+    // If symbol is not found or there are no AST nodes for it or it's not a function or procedure
+    // return
+    if (!func_symbol || func_symbol->get_nodes().empty() ||
+        !func_symbol->has_any_property(NmodlType::function_block | NmodlType::procedure_block)) {
         return;
     }
     const auto func_block = func_symbol->get_nodes()[0];

diff --git a/test/unit/visitor/semantic_analysis.cpp b/test/unit/visitor/semantic_analysis.cpp
@@ -198,9 +198,11 @@ SCENARIO("Recursive function calls", "[visitor][semantic_analysis]") {
         std::string nmodl_text = R"(
             FUNCTION a() {
                 b()
+                a = 42
             }
             PROCEDURE b() {
-                a()
+                LOCAL x
+                x = a()
             }
         )";
         THEN("Semantic analysis should fail") {