tlang
/
t
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that only assignment-less variable declarations and funciton definitions are present in the struct's body

develop.sync-conflict-20210606-150924-O3W7KWN
Tristan B. Kildaire 2021-05-31 18:01:06 +02:00
parent 6a18315f78
commit b07c2fb2b5
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,11 @@ public final class Parser
while(true)
{
/* Get current token */
//SymbolType symbolType = getSymbolType(getCurrentToken());
SymbolType symbolType = getSymbolType(getCurrentToken());
/* The possibly valid returned struct member (Entity) */
Statement structMember;
/** TODO:
* We only want to allow function definitions and variable
@ -331,7 +335,48 @@ public final class Parser
* filter out those (raise an error) on checking the type of
* Entity returned by `parseAccessor()`
*/
Entity structMember = parseAccessor();
/* If it is a type */
if (symbolType == SymbolType.IDENT_TYPE)
{
/* Might be a function, might be a variable, or assignment */
structMember = parseName();
}
/* If it is an accessor */
else if (isAccessor(getCurrentToken()))
{
structMember = parseAccessor();
}
/* Ensure only function declaration or variable declaration */
if(cast(Function)structMember)
{
}
else if(cast(Variable)structMember)
{
/* Ensure that there is (WIP: for now) no assignment in the variable declaration */
Variable variableDeclaration = cast(Variable)structMember;
/* Raise error if an assignment is present */
if(variableDeclaration.getAssignment())
{
expect("Assignments not allowed in struct body");
}
}
/**
* Anything else that isn't a assignment-less variable declaration
* or a function definition is an error
*/
else
{
expect("Only function definitions and variable declarations allowed in struct body");
}
/* If closing brace then exit */
if(symbolType == SymbolType.CCURLY)