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

...

Browse Source
This commit is contained in:
nub31
2025-06-02 16:20:25 +02:00
parent cc80194e48
commit c3714af5f3
34 changed files with 95 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
example/main.nub
View File

@@ -1,6 +1,12 @@
namespace main
struct Ape {
name: string
age: i64
}
struct Human {
parent: Ape
name: string
age: i64
}
@@ -16,14 +22,17 @@ export func main(args: []^string) {
// }
let human = alloc Human {
parent = alloc Ape {
name = "john"
age = 24
}
age = 23
name = "oliver"
}
c::printf("%s is %d years old\n", human.name, human.age)
c::printf("parent name is %s\n", human.parent.name)
// human.name = "hubert"
// human.age = 92
c::printf("%s is %d years old\n", human.name, human.age)
}

2
src/lang/Nub.Lang.CLI/Program.cs
View File

@@ -1,5 +1,5 @@
using Nub.Lang;
using Nub.Lang.Backend;
using Nub.Lang.Frontend.Generation;
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing;
using Nub.Lang.Frontend.Typing;

49
src/lang/Nub.Lang/Backend/Generator.cs → src/lang/Nub.Lang/Frontend/Generation/Generator.cs
View File

@@ -2,9 +2,12 @@
using System.Globalization;
using System.Text;
using Nub.Lang.Frontend.Parsing;
using Nub.Lang.Frontend.Parsing.Definitions;
using Nub.Lang.Frontend.Parsing.Expressions;
using Nub.Lang.Frontend.Parsing.Statements;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Backend;
namespace Nub.Lang.Frontend.Generation;
public class Generator
{
@@ -270,6 +273,11 @@ public class Generator
}
}
private bool IsLargeType(NubType type)
{
return QbeTypeSize(type) > 8;
}
private void GenerateFuncDefinition(LocalFuncDefinitionNode node)
{
_variables.Clear();
@@ -451,7 +459,7 @@ public class Generator
Debug.Assert(structType != null);
var structDefinition = LookupStructDefinition(structType.Namespace, structType.Name);
var offset = LookupStructOffset(structDefinition, memberAssignment.MemberAccess.Member);
var offset = LookupMemberOffset(structDefinition, memberAssignment.MemberAccess.Member);
var item = GenerateExpression(memberAssignment.MemberAccess.Expression);
var offsetName = GenVarName();
@@ -1359,27 +1367,35 @@ public class Generator
var size = structDefinition.Fields.Sum(x => QbeTypeSize(x.Type));
_builder.AppendLine($" %{structVar} =l alloc8 {size}");
for (var i = 0; i < structDefinition.Fields.Count; i++)
foreach (var field in structDefinition.Fields)
{
var field = structDefinition.Fields[i];
var offset = LookupMemberOffset(structDefinition, field.Name);
if (structInitializer.Initializers.TryGetValue(field.Name, out var fieldValue))
{
var var = GenerateExpression(fieldValue);
var offsetName = GenVarName();
_builder.AppendLine($" %{offsetName} =l add %{structVar}, {i * QbeTypeSize(field.Type)}");
_builder.AppendLine($" store{SQT(field.Type)} {var}, %{offsetName}");
_builder.AppendLine($" %{offsetName} =l add %{structVar}, {offset}");
if (IsLargeType(field.Type))
{
_builder.AppendLine($" blit %{offsetName}, {var}, {QbeTypeSize(field.Type)}");
}
else
{
_builder.AppendLine($" store{SQT(field.Type)} {var}, %{offsetName}");
}
}
else if (field.Value.HasValue)
{
var var = GenerateExpression(field.Value.Value);
var offsetName = GenVarName();
_builder.AppendLine($" %{offsetName} =l add %{structVar}, {i * QbeTypeSize(field.Type)}");
_builder.AppendLine($" %{offsetName} =l add %{structVar}, {offset}");
_builder.AppendLine($" store{SQT(field.Type)} {var}, %{offsetName}");
}
else
{
throw new Exception($"Field {field.Name} on struct {structInitializer.StructType.Name} is not initialized");
Debug.Assert(false);
}
}
@@ -1453,15 +1469,22 @@ public class Generator
case NubStructType structType:
{
var structDefinition = LookupStructDefinition(structType.Namespace, structType.Name);
var offset = LookupStructOffset(structDefinition, memberAccess.Member);
var offset = LookupMemberOffset(structDefinition, memberAccess.Member);
var offsetName = GenVarName();
_builder.AppendLine($" %{offsetName} =l add {item}, {offset}");
var outputName = GenVarName();
_builder.AppendLine($" %{outputName} ={SQT(memberAccess.Type)} load{SQT(memberAccess.Type)} %{offsetName}");
if (memberAccess.Type is NubStructType)
{
return $"%{offsetName}";
}
else
{
var outputName = GenVarName();
_builder.AppendLine($" %{outputName} ={SQT(memberAccess.Type)} load{SQT(memberAccess.Type)} %{offsetName}");
return $"%{outputName}";
return $"%{outputName}";
}
}
default:
{
@@ -1551,7 +1574,7 @@ public class Generator
.Single(s => s.Name == name);
}
private int LookupStructOffset(StructDefinitionNode structDefinition, string member)
private int LookupMemberOffset(StructDefinitionNode structDefinition, string member)
{
return structDefinition.Fields.TakeWhile(f => f.Name != member).Sum(f => QbeTypeSize(f.Type));
}

2
src/lang/Nub.Lang/Frontend/Parsing/Definitions/DefinitionNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Definitions;
public abstract class DefinitionNode(IReadOnlyList<Token> tokens, Optional<string> documentation) : Node(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Definitions/FuncDefinitionNode.cs
View File

@@ -1,7 +1,8 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Statements;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Definitions;
public class FuncParameter(string name, NubType type, bool variadic)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Definitions/StructDefinitionNode.cs
View File

@@ -1,7 +1,8 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Definitions;
public class StructField(string name, NubType type, Optional<ExpressionNode> value)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/AddressOfNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class AddressOfNode(IReadOnlyList<Token> tokens, ExpressionNode expression) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/ArrayIndexAccessNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class ArrayIndexAccessNode(IReadOnlyList<Token> tokens, ExpressionNode array, ExpressionNode index) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/ArrayInitializerNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class ArrayInitializerNode(IReadOnlyList<Token> tokens, ExpressionNode capacity, NubType itemType) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/BinaryExpressionNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class BinaryExpressionNode(IReadOnlyList<Token> tokens, ExpressionNode left, BinaryExpressionOperator @operator, ExpressionNode right) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/CastNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class CastNode(IReadOnlyList<Token> tokens, NubType targetType, ExpressionNode expression) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/DereferenceNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class DereferenceNode(IReadOnlyList<Token> tokens, ExpressionNode expression) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/ExpressionNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public abstract class ExpressionNode(IReadOnlyList<Token> tokens) : Node(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/FuncCallNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class FuncCallNode(IReadOnlyList<Token> tokens, string @namespace, string name, List<ExpressionNode> parameters) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/IdentifierNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class IdentifierNode(IReadOnlyList<Token> tokens, string identifier) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/LiteralNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class LiteralNode(IReadOnlyList<Token> tokens, string literal, NubType literalType) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/MemberAccessNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class MemberAccessNode(IReadOnlyList<Token> tokens, ExpressionNode expression, string member) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/StructInitializerNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class StructInitializerNode(IReadOnlyList<Token> tokens, NubStructType structType, Dictionary<string, ExpressionNode> initializers) : ExpressionNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Expressions/UnaryExpressionNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Expressions;
public class UnaryExpressionNode(IReadOnlyList<Token> tokens, UnaryExpressionOperator @operator, ExpressionNode operand) : ExpressionNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Parser.cs
View File

@@ -1,6 +1,9 @@
using System.Diagnostics.CodeAnalysis;
using Nub.Lang.Diagnostics;
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Definitions;
using Nub.Lang.Frontend.Parsing.Expressions;
using Nub.Lang.Frontend.Parsing.Statements;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;

4
src/lang/Nub.Lang/Frontend/Parsing/SourceFile.cs
View File

@@ -1,4 +1,6 @@
namespace Nub.Lang.Frontend.Parsing;
using Nub.Lang.Frontend.Parsing.Definitions;
namespace Nub.Lang.Frontend.Parsing;
public class SourceFile(string @namespace, List<DefinitionNode> definitions)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/ArrayIndexAssignmentNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class ArrayIndexAssignmentNode(IReadOnlyList<Token> tokens, ArrayIndexAccessNode arrayIndexAccess, ExpressionNode value) : StatementNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Statements/BlockNode.cs
View File

@@ -1,6 +1,6 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class BlockNode(IReadOnlyList<Token> tokens, List<StatementNode> statements) : Node(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Statements/BreakNode.cs
View File

@@ -1,5 +1,5 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class BreakNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

2
src/lang/Nub.Lang/Frontend/Parsing/Statements/ContinueNode.cs
View File

@@ -1,5 +1,5 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class ContinueNode(IReadOnlyList<Token> tokens) : StatementNode(tokens);

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/IfNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class IfNode(IReadOnlyList<Token> tokens, ExpressionNode condition, BlockNode body, Optional<Variant<IfNode, BlockNode>> @else) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/MemberAssignmentNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class MemberAssignmentNode(IReadOnlyList<Token> tokens, MemberAccessNode expression, ExpressionNode value) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/ReturnNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class ReturnNode(IReadOnlyList<Token> tokens, Optional<ExpressionNode> value) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/StatementExpressionNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class StatementExpressionNode(IReadOnlyList<Token> tokens, ExpressionNode expression) : StatementNode(tokens)
{

2
src/lang/Nub.Lang/Frontend/Parsing/Statements/StatementNode.cs
View File

@@ -1,5 +1,5 @@
using Nub.Lang.Frontend.Lexing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public abstract class StatementNode(IReadOnlyList<Token> tokens) : Node(tokens);

4
src/lang/Nub.Lang/Frontend/Parsing/Statements/VariableAssignmentNode.cs
View File

@@ -1,7 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Typing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class VariableAssignmentNode(IReadOnlyList<Token> tokens, IdentifierNode identifier, ExpressionNode value) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/VariableDeclarationNode.cs
View File

@@ -1,7 +1,8 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
using Nub.Lang.Frontend.Typing;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class VariableDeclarationNode(IReadOnlyList<Token> tokens, string name, Optional<NubType> explicitType, Optional<ExpressionNode> value) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Parsing/Statements/WhileNode.cs
View File

@@ -1,6 +1,7 @@
using Nub.Lang.Frontend.Lexing;
using Nub.Lang.Frontend.Parsing.Expressions;
namespace Nub.Lang.Frontend.Parsing;
namespace Nub.Lang.Frontend.Parsing.Statements;
public class WhileNode(IReadOnlyList<Token> tokens, ExpressionNode condition, BlockNode body) : StatementNode(tokens)
{

3
src/lang/Nub.Lang/Frontend/Typing/TypeChecker.cs
View File

@@ -1,5 +1,8 @@
using Nub.Lang.Diagnostics;
using Nub.Lang.Frontend.Parsing;
using Nub.Lang.Frontend.Parsing.Definitions;
using Nub.Lang.Frontend.Parsing.Expressions;
using Nub.Lang.Frontend.Parsing.Statements;
namespace Nub.Lang.Frontend.Typing;