Avoid duplicate constraint generation

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>
zuspec · Oct 23, 2024 · b6ef02e · b6ef02e
1 parent 6db2f9d
commit b6ef02e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/TaskBuildTypeConstraints.cpp b/src/TaskBuildTypeConstraints.cpp
@@ -40,9 +40,18 @@ TaskBuildTypeConstraints::~TaskBuildTypeConstraints() {
 }
 
 void TaskBuildTypeConstraints::build(ast::ISymbolTypeScope *ast_type) {
+    DEBUG_ENTER("build (%d children)", ast_type->getChildren().size());
     m_subtype_c.clear();
-    m_depth = 0;
-    ast_type->accept(m_this);
+    m_depth = 1;
+    for (std::vector<ast::IScopeChildUP>::const_iterator
+        it=ast_type->getChildren().begin();
+        it!=ast_type->getChildren().end(); it++) {
+        DEBUG_ENTER("accept %d", (it-ast_type->getChildren().begin()));
+        (*it)->accept(m_this);
+        DEBUG_LEAVE("accept %d", (it-ast_type->getChildren().begin()));
+    }
+//    ast_type->accept(m_this);
+    DEBUG_LEAVE("build");
 }
 
 void TaskBuildTypeConstraints::visitAction(ast::IAction *i) {

diff --git a/src/TaskBuildTypeFunctions.cpp b/src/TaskBuildTypeFunctions.cpp
@@ -77,6 +77,7 @@ void TaskBuildTypeFunctions::visitSymbolFunctionScope(ast::ISymbolFunctionScope
 }
 
 void TaskBuildTypeFunctions::visitConstraintBlock(ast::IConstraintBlock *i) {
+#ifdef UNDEFINED
     DEBUG_ENTER("visitConstraintBlock %s (%d)", 
         i->getName().c_str(), i->getConstraints().size());
 
@@ -102,6 +103,7 @@ void TaskBuildTypeFunctions::visitConstraintBlock(ast::IConstraintBlock *i) {
     m_arl_type->addConstraint(cb, true);
 
     DEBUG_LEAVE("visitConstraintBlock %s", i->getName().c_str());
+#endif // UNDEFINED
 }
 
 void TaskBuildTypeFunctions::visitConstraintScope(ast::IConstraintScope *i) {