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

variadics

Browse Source
This commit is contained in:
nub31
2025-05-12 20:47:46 +02:00
parent 66fd6e3beb
commit 403adefa6a
12 changed files with 84 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/Nub.Lang/Frontend/Lexing/Lexer.cs
View File

@@ -8,7 +8,6 @@ public class Lexer
["global"] = Symbol.Global,
["extern"] = Symbol.Extern,
["import"] = Symbol.Import,
["let"] = Symbol.Let,
["if"] = Symbol.If,
["else"] = Symbol.Else,
["while"] = Symbol.While,

1
src/compiler/Nub.Lang/Frontend/Lexing/SymbolToken.cs
View File

@@ -13,7 +13,6 @@ public enum Symbol
Global,
Func,
Return,
Let,
If,
Else,
While,

57
src/compiler/Nub.Lang/Frontend/Parsing/Parser.cs
View File

@@ -68,14 +68,14 @@ public class Parser
var returnType = Optional<NubType>.Empty();
if (TryExpectSymbol(Symbol.Colon))
{
returnType = ParseTypeInstance();
returnType = ParseType();
}
var body = ParseBlock();
return new LocalFuncDefinitionNode(name.Value, parameters, body, returnType, false);
}
private LocalFuncDefinitionNode ParseGlobalFuncDefinition()
{
ExpectSymbol(Symbol.Func);
@@ -94,7 +94,7 @@ public class Parser
var returnType = Optional<NubType>.Empty();
if (TryExpectSymbol(Symbol.Colon))
{
returnType = ParseTypeInstance();
returnType = ParseType();
}
var body = ParseBlock();
@@ -120,7 +120,7 @@ public class Parser
var returnType = Optional<NubType>.Empty();
if (TryExpectSymbol(Symbol.Colon))
{
returnType = ParseTypeInstance();
returnType = ParseType();
}
ExpectSymbol(Symbol.Semicolon);
@@ -140,7 +140,7 @@ public class Parser
{
var variableName = ExpectIdentifier().Value;
ExpectSymbol(Symbol.Colon);
var variableType = ParseTypeInstance();
var variableType = ParseType();
var variableValue = Optional<ExpressionNode>.Empty();
@@ -159,11 +159,19 @@ public class Parser
private FuncParameter ParseFuncParameter()
{
var variadic = false;
if (TryExpectSymbol(Symbol.Period))
{
ExpectSymbol(Symbol.Period);
ExpectSymbol(Symbol.Period);
variadic = true;
}
var name = ExpectIdentifier();
ExpectSymbol(Symbol.Colon);
var type = ParseTypeInstance();
var type = ParseType();
return new FuncParameter(name.Value, type);
return new FuncParameter(name.Value, type, variadic);
}
private StatementNode ParseStatement()
@@ -193,7 +201,7 @@ public class Parser
{
var value = ParseExpression();
ExpectSymbol(Symbol.Semicolon);
return new VariableReassignmentNode(identifier.Value, value);
return new VariableAssignmentNode(identifier.Value, value);
}
default:
{
@@ -206,7 +214,6 @@ public class Parser
return symbol.Symbol switch
{
Symbol.Return => ParseReturn(),
Symbol.Let => ParseVariableAssignment(),
Symbol.If => ParseIf(),
Symbol.While => ParseWhile(),
Symbol.Break => ParseBreak(),
@@ -233,16 +240,6 @@ public class Parser
return new ReturnNode(value);
}
private VariableAssignmentNode ParseVariableAssignment()
{
var name = ExpectIdentifier().Value;
ExpectSymbol(Symbol.Assign);
var value = ParseExpression();
ExpectSymbol(Symbol.Semicolon);
return new VariableAssignmentNode(name, value);
}
private IfNode ParseIf()
{
var condition = ParseExpression();
@@ -381,7 +378,7 @@ public class Parser
}
case Symbol.New:
{
var type = ParseTypeInstance();
var type = ParseType();
Dictionary<string, ExpressionNode> initializers = [];
ExpectSymbol(Symbol.OpenBrace);
while (!TryExpectSymbol(Symbol.CloseBrace))
@@ -424,11 +421,11 @@ public class Parser
{
Next();
ExpressionNode result = new IdentifierNode(identifier.Value);
do
{
var field = ExpectIdentifier();
result = new StructFieldAccessorNode(result, field.Value);
result = new StructFieldAccessorNode(result, field.Value);
} while (TryExpectSymbol(Symbol.Period));
return result;
@@ -466,22 +463,10 @@ public class Parser
return new BlockNode(statements);
}
private NubType ParseTypeInstance()
private NubType ParseType()
{
var parameters = new List<NubType>();
var name = ExpectIdentifier().Value;
if (TryExpectSymbol(Symbol.LessThan))
{
do
{
parameters.Add(ParseTypeInstance());
} while (TryExpectSymbol(Symbol.Comma));
ExpectSymbol(Symbol.GreaterThan);
}
return new NubType(name, parameters.ToArray());
return new NubType(name);
}
private Token ExpectToken()

7
src/compiler/Nub.Lang/Frontend/Parsing/VariableReassignmentNode.cs
View File

@@ -1,7 +0,0 @@
namespace Nub.Lang.Frontend.Parsing;
public class VariableReassignmentNode(string name, ExpressionNode value) : StatementNode
{
public string Name { get; } = name;
public ExpressionNode Value { get; } = value;
}

9
src/compiler/Nub.Lang/Frontend/Typing/ExpressionTyper.cs
View File

@@ -102,9 +102,6 @@ public class ExpressionTyper
case VariableAssignmentNode variableAssignment:
PopulateVariableAssignment(variableAssignment);
break;
case VariableReassignmentNode variableReassignment:
PopulateVariableReassignment(variableReassignment);
break;
case WhileNode whileStatement:
PopulateWhileStatement(whileStatement);
break;
@@ -149,9 +146,9 @@ public class ExpressionTyper
_variables.Push(new Variable(variableAssignment.Name, variableAssignment.Value.Type));
}
private void PopulateVariableReassignment(VariableReassignmentNode variableReassignment)
private void PopulateVariableReassignment(VariableAssignmentNode variableAssignment)
{
PopulateExpression(variableReassignment.Value);
PopulateExpression(variableAssignment.Value);
}
private void PopulateWhileStatement(WhileNode whileStatement)
@@ -200,7 +197,7 @@ public class ExpressionTyper
case BinaryExpressionOperator.LessThan:
case BinaryExpressionOperator.LessThanOrEqual:
{
binaryExpression.Type = new NubType("bool", []);
binaryExpression.Type = new NubType("bool");
break;
}
case BinaryExpressionOperator.Plus: