XX

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>
zuspec · Nov 22, 2023 · c73f6ff · c73f6ff
1 parent 75f57dc
commit c73f6ff
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ast/expr.yaml b/ast/expr.yaml
@@ -187,6 +187,7 @@ classes:
             - image: string
             - width: int32_t
             - value: int64_t
+    # TODO: Remove this once it is safe to do so
     - ExprStaticRefPath:
         super: Expr
         data: 

diff --git a/src/TaskBuildSymbolTree.cpp b/src/TaskBuildSymbolTree.cpp
@@ -346,6 +346,7 @@ void TaskBuildSymbolTree::visitFunctionDefinition(ast::IFunctionDefinition *i) {
                     func_sym->getChildren().at(sym_it->second),
                     it->get());
             } else {
+                DEBUG("Add parameter %s to function symtab", (*it)->getName()->getId().c_str());
                 func_sym->getSymtab().insert({(*it)->getName()->getId(), id});
                 func_sym->getChildren().push_back(it->get());
             }
@@ -372,6 +373,11 @@ void TaskBuildSymbolTree::visitFunctionDefinition(ast::IFunctionDefinition *i) {
     m_scope_s.pop_back();
 
     func_sym->setDefinition(i);
+    // Ensure that the definition takes the primary prototype location
+    func_sym->getPrototypes().insert(
+        func_sym->getPrototypes().begin(),
+        i->getProto()
+    );
 
     DEBUG_LEAVE("visitFunctionDefinition %s", i->getProto()->getName()->getId().c_str());
 }

diff --git a/src/TaskResolveRefs.cpp b/src/TaskResolveRefs.cpp
@@ -447,14 +447,17 @@ void TaskResolveRefs::visitSymbolFunctionScope(ast::ISymbolFunctionScope *i) {
     }
 
     if (i->getBody()) {
+        DEBUG("Push function scope %s", i->getName().c_str());
         m_symtab_it->pushScope(i);
-        m_symtab_it->pushScope(i->getBody());
+        DEBUG("  has i: %d", (m_symtab_it->getScope()->getSymtab().find("i") != m_symtab_it->getScope()->getSymtab().end()));
+//        DEBUG("Push function body scope");
+//        m_symtab_it->pushScope(i->getBody());
         for (std::vector<ast::IScopeChild *>::const_iterator
             it=i->getBody()->getChildren().begin();
             it!=i->getBody()->getChildren().end(); it++) {
             (*it)->accept(m_this);
         }
-        m_symtab_it->popScope();
+ //       m_symtab_it->popScope();
         m_symtab_it->popScope();
     }
 

diff --git a/src/TaskResolveRootRef.cpp b/src/TaskResolveRootRef.cpp
@@ -132,7 +132,7 @@ void TaskResolveRootRef::visitSymbolTypeScope(ast::ISymbolTypeScope *i) {
 
 void TaskResolveRootRef::visitSymbolFunctionScope(ast::ISymbolFunctionScope *i) {
     DEBUG_ENTER("visitSymbolFunctionScope");
-
+    visitSymbolScope(i);
     DEBUG_LEAVE("visitSymbolFunctionScope");
 }