resolve conflicts

Signed-off-by: shruti2522 <[email protected]>

kclvm/sema/src/advanced_resolver/node.rs

@@ -1309,4 +1309,4 @@ impl<'ctx> AdvancedResolver<'ctx> {
             }
         }
     }
-}
+}

kclvm/sema/src/core/symbol.rs

@@ -230,6 +230,9 @@ impl SymbolData {
             SymbolKind::Decorator => {
                 self.decorators.remove(id.get_id());
             }
+            SymbolKind::Function => {
+                self.functions.remove(id.get_id());
+            }
         }
     }
 
@@ -802,7 +805,12 @@ impl SymbolData {
         Some(symbol_ref)
     }
 
-    pub fn alloc_function_symbol(&mut self, func: FunctionSymbol, node_key: NodeKey) -> SymbolRef {
+    pub fn alloc_function_symbol(
+        &mut self,
+        func: FunctionSymbol,
+        node_key: NodeKey,
+        pkg_name: String,
+    ) -> SymbolRef {
         self.symbols_info.symbol_pos_set.insert(func.end.clone());
         let symbol_id = self.functions.insert(func);
         let symbol_ref = SymbolRef {
@@ -816,6 +824,7 @@ impl SymbolData {
             .symbol_node_map
             .insert(symbol_ref, node_key);
         self.functions.get_mut(symbol_id).unwrap().id = Some(symbol_ref);
+        self.insert_package_symbol(symbol_ref, pkg_name);
         symbol_ref
     }
 

kclvm/sema/src/namer/mod.rs

@@ -46,7 +46,7 @@ use crate::builtin::{
 use crate::core::global_state::GlobalState;
 use crate::core::package::{ModuleInfo, PackageInfo};
 use crate::core::symbol::{
-    PackageSymbol, SymbolRef, FunctionSymbol, BUILTIN_FUNCTION_PACKAGE, BUILTIN_STR_PACKAGE,
+    FunctionSymbol, PackageSymbol, SymbolRef, BUILTIN_FUNCTION_PACKAGE, BUILTIN_STR_PACKAGE,
 };
 use crate::resolver::scope::NodeKey;
 use indexmap::IndexSet;
@@ -59,7 +59,6 @@ mod node;
 pub const BUILTIN_SYMBOL_PKG_PATH: &str = "@builtin";
 
 pub struct Namer<'ctx> {
-    gs: &'ctx mut GlobalState,
     gs: &'ctx mut GlobalState,
     ctx: NamerContext<'ctx>,
 }
@@ -86,7 +85,6 @@ impl<'ctx> NamerContext<'ctx> {
 }
 
 impl<'ctx> Namer<'ctx> {
-    fn new(program: &'ctx Program, gs: &'ctx mut GlobalState) -> Self {
     fn new(program: &'ctx Program, gs: &'ctx mut GlobalState) -> Self {
         Self {
             ctx: NamerContext {
@@ -101,7 +99,6 @@ impl<'ctx> Namer<'ctx> {
     }
 
     // serial namer pass
-    pub fn find_symbols(program: &'ctx Program, gs: &'ctx mut GlobalState) {
     pub fn find_symbols(program: &'ctx Program, gs: &'ctx mut GlobalState) {
         let mut namer = Self::new(program, gs);
         namer.ctx.current_package_info = Some(PackageInfo::new(
@@ -400,4 +397,4 @@ mod tests {
             );
         }
     }
-}
+}