visitchildren

AntaresSimulatorTeam · Oct 28, 2024 · 1ef4f27 · 1ef4f27
1 parent 47b2932
commit 1ef4f27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/solver/modelConverter/convertorVisitor.cpp b/src/solver/modelConverter/convertorVisitor.cpp
@@ -43,7 +43,7 @@ Nodes::Node* convertExpressionToNode(
     ExprParser::ExprContext* tree = parser.expr();
 
     ConvertorVisitor visitor(registry, model);
-    auto a = visitor.visitChildren(tree);
+    auto a = visitor.visit(tree);
     Nodes::Node* n;
     return n;
 }
@@ -58,11 +58,11 @@ ConvertorVisitor::ConvertorVisitor(
 
 std::any ConvertorVisitor::visitChildren(antlr4::tree::ParseTree* node)
 {
-    /* for (auto child: node->children) */
-    /* { */
-    /*     child->accept(this); */
-    /* } */
-    return node->accept(this);
+    for (auto child: node->children)
+    {
+        child->accept(this);
+    }
+    return std::any();
 }
 
 std::any ConvertorVisitor::visit(antlr4::tree::ParseTree* tree)

diff --git a/src/tests/src/solver/modelParser/testConvertorVisitor.cpp b/src/tests/src/solver/modelParser/testConvertorVisitor.cpp
@@ -29,22 +29,23 @@
 
 using namespace Antares::Solver;
 
-BOOST_AUTO_TEST_CASE(simple_expression)
+BOOST_AUTO_TEST_CASE(empty_expression)
 {
     ObjectModel::Model model;
     Antares::Solver::Registry<Antares::Solver::Nodes::Node> registry;
 
-    std::string expression = "a * b";
+    std::string expression = "";
 
     auto* node = ModelConverter::convertExpressionToNode(expression, registry, model);
 }
 
-BOOST_AUTO_TEST_CASE(empty_expression)
+BOOST_AUTO_TEST_CASE(simple_expression)
 {
     ObjectModel::Model model;
     Antares::Solver::Registry<Antares::Solver::Nodes::Node> registry;
 
-    std::string expression = "";
+    std::string expression = "a * b";
 
     auto* node = ModelConverter::convertExpressionToNode(expression, registry, model);
 }
+