fixed edge cases from new types in StandardLibrary

LostbBlizzard · Aug 31, 2024 · 0bd914e · 0bd914e
1 parent 9754d16
commit 0bd914e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/UCodeLang/UCodeLang/Compilation/Front/SystematicAnalysis/Statements/AssignExpressionNode.cpp b/UCodeLang/UCodeLang/Compilation/Front/SystematicAnalysis/Statements/AssignExpressionNode.cpp
@@ -33,7 +33,10 @@ void SystematicAnalysis::OnAssignExpressionNode(const AssignExpressionNode& node
 
 		if (node._ReassignAddress == false)
 		{
-			ExpressionType._IsAddress = false;
+			if (!AssignType.IsDynamicTrait()) 
+			{
+				ExpressionType._IsAddress = false;
+			}
 		}
 
 
@@ -156,9 +159,13 @@ void SystematicAnalysis::OnAssignExpressionNode(const AssignExpressionNode& node
 			}
 
 
-			if (!AssignExType._IsAddress )
+			if (!AssignExType._IsAddress)
 			{
-				//obj = _IR_LookingAtIRBlock->NewLoadPtr(obj.Pointer);
+				if (AssignExType.IsLocationValue() && !domove_ctor) 
+				{
+					obj = _IR_LookingAtIRBlock->NewLoadPtr(obj.Pointer);
+					ExIR = _IR_LookingAtIRBlock->NewLoad_Dereferenc(ExIR,IR_ConvertToIRType(AssignExType));//This current line may be in the wrong place. I will update it when i find the edge case
+				}
 				AssignExType._IsAddress = true;
 			}
 

diff --git a/UCodeLang/UCodeLang/Compilation/Front/SystematicAnalysis/Statements/DeclareVariablenode.cpp b/UCodeLang/UCodeLang/Compilation/Front/SystematicAnalysis/Statements/DeclareVariablenode.cpp
@@ -359,7 +359,7 @@ void SystematicAnalysis::OnDeclareVariablenode(const DeclareVariableNode& node,
 			auto& VarType = syb->VarType;
 
 
-			auto& Ex = _LastExpressionType;
+			auto Ex = _LastExpressionType;
 			auto Token = NeverNullptr(node._Type._name._ScopedName.back()._token);
 			Type_DeclareVariableTypeCheck(VarType, Ex, Token);