nub31/nub-lang-archive
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
nub31
2025-09-09 15:33:33 +02:00
parent 9c9578f526
commit 14619fd678
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/src/main.nub
View File

@@ -3,11 +3,11 @@ extern func puts(text: cstring)
func main(args: []cstring): i64
{
let x: i32 = 23
let x: u32 = 23
test(x)
return 0
}
func test(test: u8)
func test(test: u32)
{
}

4
src/compiler/NubLang/Generation/QBE/QBEGenerator.cs
View File

@@ -1124,7 +1124,7 @@ public class QBEGenerator
{
var value = EmitExpression(convertInt.Value);
if (convertInt.ValueType == convertInt.TargetType || convertInt.ValueType.Width > convertInt.TargetType.Width)
if (convertInt.ValueType.Width >= convertInt.TargetType.Width)
{
return value;
}
@@ -1156,7 +1156,7 @@ public class QBEGenerator
{
var value = EmitExpression(convertFloat.Value);
if (convertFloat.ValueType == convertFloat.TargetType)
if (convertFloat.ValueType.Width == convertFloat.TargetType.Width)
{
return value;
}

4
src/compiler/NubLang/TypeChecking/Node/ExpressionNode.cs
View File

@@ -61,6 +61,6 @@ public record DereferenceNode(TypeNode Type, ExpressionNode Expression) : RValue
public record InterfaceInitializerNode(TypeNode Type, InterfaceTypeNode InterfaceType, StructTypeNode StructType, ExpressionNode Implementation) : LValueExpressionNode(Type);
public record ConvertIntNode(TypeNode Type, ExpressionNode Value, IntTypeNode TargetType, IntTypeNode ValueType) : RValueExpressionNode(Type);
public record ConvertIntNode(TypeNode Type, ExpressionNode Value, IntTypeNode ValueType, IntTypeNode TargetType) : RValueExpressionNode(Type);
public record ConvertFloatNode(TypeNode Type, ExpressionNode Value, FloatTypeNode TargetType, FloatTypeNode ValueType) : RValueExpressionNode(Type);
public record ConvertFloatNode(TypeNode Type, ExpressionNode Value, FloatTypeNode ValueType, FloatTypeNode TargetType) : RValueExpressionNode(Type);

35
src/compiler/NubLang/TypeChecking/TypeChecker.cs
View File

@@ -286,38 +286,33 @@ public sealed class TypeChecker
_ => throw new ArgumentOutOfRangeException(nameof(node))
};
if (expectedType != null && result.Type != expectedType)
if (expectedType == null || result.Type == expectedType)
{
return CheckConversion(expectedType, result);
return result;
}
return result;
}
private ExpressionNode CheckConversion(TypeNode targetType, ExpressionNode expression)
{
if (expression.Type is StructTypeNode structType && targetType is InterfaceTypeNode interfaceType)
if (result.Type is StructTypeNode structType && expectedType is InterfaceTypeNode interfaceType)
{
return new InterfaceInitializerNode(interfaceType, interfaceType, structType, expression);
return new InterfaceInitializerNode(interfaceType, interfaceType, structType, result);
}
if (expression.Type is IntTypeNode sourceIntType && targetType is IntTypeNode targetIntType)
if (result.Type is IntTypeNode sourceIntType && expectedType is IntTypeNode targetIntType)
{
// if ((sourceIntType.Width < targetIntType.Width) || (sourceIntType.Width == targetIntType.Width && sourceIntType.Signed != targetIntType.Signed))
// {
return new ConvertIntNode(targetIntType, expression, targetIntType, sourceIntType);
// }
if (sourceIntType.Signed == targetIntType.Signed && sourceIntType.Width < targetIntType.Width)
{
return new ConvertIntNode(targetIntType, result, sourceIntType, targetIntType);
}
}
if (expression.Type is FloatTypeNode sourceFloatType && targetType is FloatTypeNode targetFloatType)
if (result.Type is FloatTypeNode sourceFloatType && expectedType is FloatTypeNode targetFloatType)
{
// if (sourceFloatType.Width < targetFloatType.Width)
// {
return new ConvertFloatNode(targetFloatType, expression, targetFloatType, sourceFloatType);
// }
if (sourceFloatType.Width < targetFloatType.Width)
{
return new ConvertFloatNode(targetFloatType, result, sourceFloatType, targetFloatType);
}
}
throw new TypeCheckerException(Diagnostic.Error($"Cannot convert {expression.Type} to {targetType}").Build());
throw new TypeCheckerException(Diagnostic.Error($"Cannot convert {result.Type} to {expectedType}").Build());
}
private AddressOfNode CheckAddressOf(AddressOfSyntax expression)