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-29 15:13:17 +02:00
parent 30081c49d4
commit 857e29d77b
8 changed files with 30 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/NubLang/Parsing/Parser.cs
View File

@@ -86,7 +86,6 @@ public sealed class Parser
{
Symbol.Func => ParseFunc(startIndex, exported, null),
Symbol.Struct => ParseStruct(startIndex, exported),
Symbol.Enum => ParseEnum(startIndex, exported),
_ => throw new ParseException(Diagnostic
.Error($"Expected 'func' or 'struct' but found '{keyword.Symbol}'")
.WithHelp("Valid definition keywords are 'func' and 'struct'")
@@ -225,36 +224,6 @@ public sealed class Parser
return new StructSyntax(GetTokens(startIndex), name.Value, exported, fields, funcs);
}
private EnumSyntax ParseEnum(int startIndex, bool exported)
{
var name = ExpectIdentifier();
TypeSyntax? type = null;
if (TryExpectSymbol(Symbol.Colon))
{
type = ParseType();
}
var values = new List<EnumValueSyntax>();
ExpectSymbol(Symbol.OpenBrace);
while (!TryExpectSymbol(Symbol.CloseBrace))
{
var valueStartIndex = _tokenIndex;
var valueName = ExpectIdentifier().Value;
ExpressionSyntax? valueValue = null;
if (TryExpectSymbol(Symbol.Assign))
{
valueValue = ParseExpression();
}
values.Add(new EnumValueSyntax(GetTokens(valueStartIndex), valueName, valueValue));
}
return new EnumSyntax(GetTokens(startIndex), name.Value, exported, type, values);
}
private StatementSyntax ParseStatement()
{
var startIndex = _tokenIndex;
@@ -593,11 +562,11 @@ public sealed class Parser
}
}
expr = new DotFuncCallSyntax(GetTokens(startIndex), member, expr, parameters);
expr = new MemberFuncCallSyntax(GetTokens(startIndex), member, expr, parameters);
continue;
}
expr = new StructFieldAccessSyntax(GetTokens(startIndex), expr, member);
expr = new MemberAccessSyntax(GetTokens(startIndex), expr, member);
continue;
}

4
compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs
View File

@@ -17,7 +17,3 @@ public record StructFuncSyntax(List<Token> Tokens, string Name, string? Hook, Fu
public record StructSyntax(List<Token> Tokens, string Name, bool Exported, List<StructFieldSyntax> Fields, List<StructFuncSyntax> Functions) : DefinitionSyntax(Tokens, Name, Exported);
public record StructTemplateSyntax(List<Token> Tokens, List<string> TemplateArguments, string Name, bool Exported, List<StructFieldSyntax> Fields, List<StructFuncSyntax> Functions) : DefinitionSyntax(Tokens, Name, Exported);
public record EnumValueSyntax(List<Token> Tokens, string Name, ExpressionSyntax? Value) : SyntaxNode(Tokens);
public record EnumSyntax(List<Token> Tokens, string Name, bool Exported, TypeSyntax? Type, List<EnumValueSyntax> Values) : DefinitionSyntax(Tokens, Name, Exported);

4
compiler/NubLang/Parsing/Syntax/ExpressionSyntax.cs
View File

@@ -38,7 +38,7 @@ public record UnaryExpressionSyntax(List<Token> Tokens, UnaryOperatorSyntax Oper
public record FuncCallSyntax(List<Token> Tokens, ExpressionSyntax Expression, List<ExpressionSyntax> Parameters) : ExpressionSyntax(Tokens);
public record DotFuncCallSyntax(List<Token> Tokens, string Name, ExpressionSyntax Target, List<ExpressionSyntax> Parameters) : ExpressionSyntax(Tokens);
public record MemberFuncCallSyntax(List<Token> Tokens, string Name, ExpressionSyntax Target, List<ExpressionSyntax> Parameters) : ExpressionSyntax(Tokens);
public record LocalIdentifierSyntax(List<Token> Tokens, string Name) : ExpressionSyntax(Tokens);
@@ -52,7 +52,7 @@ public record AddressOfSyntax(List<Token> Tokens, ExpressionSyntax Target) : Exp
public record LiteralSyntax(List<Token> Tokens, string Value, LiteralKind Kind) : ExpressionSyntax(Tokens);
public record StructFieldAccessSyntax(List<Token> Tokens, ExpressionSyntax Target, string Member) : ExpressionSyntax(Tokens);
public record MemberAccessSyntax(List<Token> Tokens, ExpressionSyntax Target, string Member) : ExpressionSyntax(Tokens);
public record StructInitializerSyntax(List<Token> Tokens, TypeSyntax? StructType, Dictionary<string, ExpressionSyntax> Initializers) : ExpressionSyntax(Tokens);