tlang
/
tlang
mirror of http://deavmi.assigned.network/git/tlang/tlang
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'parsetypedev_fix' into extern_symbols

This commit is contained in:
Tristan B. Velloza Kildaire 2023-01-19 08:47:31 +02:00
parent d288440e18 75e2fc2e68
commit cb42713377
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/tlang/compiler/parsing/core.d
View File

@ -450,6 +450,24 @@ public final class Parser
{
previousToken();
ret = parseTypedDeclaration();
/* If it is a function definition, then do nothing */
if(cast(Function)ret)
{
// The ending `}` would have already been consumed
}
/* If it is a variable declaration then */
else if(cast(Variable)ret)
{
/* Expect a semicolon and consume it */
expect(SymbolType.SEMICOLON, getCurrentToken());
nextToken();
}
/* This should never happen */
else
{
assert(false);
}
}
/* Assignment */
else if(type == SymbolType.ASSIGN)
@ -462,7 +480,6 @@ public final class Parser
{
gprintln(getCurrentToken);
expect("Error expected ( for var/func def");
}
@ -1374,7 +1391,6 @@ public final class Parser
if(allowVarDec)
{
gprintln("Semi: "~to!(string)(getCurrentToken()));
nextToken();
gprintln("Semi: "~to!(string)(getCurrentToken()));
gprintln("ParseTypedDec: VariableDeclaration: (Type: " ~ type ~ ", Identifier: " ~ identifier ~ ")",
DebugType.WARNING);
@ -1395,6 +1411,7 @@ public final class Parser
// Only continue if assignments are allowed
if(wantsBody)
{
/* Consume the `=` token */
nextToken();
/* Now parse an expression */
@ -1402,14 +1419,6 @@ public final class Parser
VariableAssignment varAssign = new VariableAssignment(expression);
/**
* The symbol that returned us from `parseExpression` must
* be a semi-colon
*/
expect(SymbolType.SEMICOLON, getCurrentToken());
nextToken();
gprintln("ParseTypedDec: VariableDeclarationWithAssingment: (Type: "
~ type ~ ", Identifier: " ~ identifier ~ ")", DebugType.WARNING);
@ -1435,8 +1444,6 @@ public final class Parser
expect("Expected one of the following: (, ; or =");
}
/* TODO: If we outta tokens we should not call this */
// gprintln(getCurrentToken());
gprintln("parseTypedDeclaration(): Leave", DebugType.WARNING);
return generated;