tlang/tlang
tlang
/
tlang
mirror of https://github.com/tbklang/tlang.git
2
0
Fork 0
Code Issues 48 Projects 5 Releases Wiki Activity

Parser 

- Both variable declarations AND variable-declarations-with-assignments now have access modifier and init scope support

Test cases

- Fixed the `a.t`
This commit is contained in:
Tristan B. Velloza Kildaire 2024-05-05 15:14:58 +02:00
parent 8561fc2610
commit db8c1475f6
2 changed files with 143 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1993,6 +1993,61 @@ public final class Parser
/* Check for semi-colon (var dec) */
else if (symbolType == SymbolType.SEMICOLON)
{
Entity varEnt;
AccessorType potAccMod = AccessorType.PRIVATE;
InitScope potInitScp = InitScope.UNKNOWN;
if(hasModifierItems())
{
ModifierItem moditem = peekModifier();
if(moditem.isAccessModifier())
{
if(allowModifiers)
{
potAccMod = popModifierFront().getAccessModifier();
}
else
{
expect("Access modifiers are not allowed on variables in this context");
}
}
else if(moditem.isInitScope())
{
if(allowsInitScopeOnDec)
{
potInitScp = popModifierFront().getInitScope();
}
else
{
expect("Init scopes are not allowed on variables in this context");
}
}
// Only allow something to follow if we have [ACC_MOD, ...]
// where we are the `...`
if(hasModifierItems() && potAccMod != AccessorType.UNKNOWN)
{
moditem = peekModifier();
if(moditem.isInitScope())
{
if(allowsInitScopeOnDec)
{
potInitScp = popModifierFront().getInitScope();
}
else
{
expect("Init scopes are not allowed on variables in this context");
}
}
else
{
expect("An initscope is expected after an access modifier");
}
}
}
// Only continue if variable declarations are allowed
if(allowVarDec)
{
@ -2000,16 +2055,86 @@ public final class Parser
DEBUG("Semi: "~to!(string)(lexer.getCurrentToken()));
WARN("ParseTypedDec: VariableDeclaration: (Type: " ~ type ~ ", Identifier: " ~ identifier ~ ")");
generated = new Variable(type, identifier);
varEnt = new Variable(type, identifier);
generated = varEnt;
}
else
{
expect("Variables declarations are not allowed.");
}
/**
* Set any ACC_MOD and INIT_SCOPE
*/
if(potAccMod != AccessorType.UNKNOWN)
{
DEBUG(format("Setting explict access modifier of %s to %s", potAccMod, varEnt));
varEnt.setAccessorType(potAccMod);
}
if(potInitScp != InitScope.UNKNOWN)
{
DEBUG(format("Setting explicit init scope modifier of %s to %s", potInitScp, varEnt));
varEnt.setModifierType(potInitScp);
}
}
/* Check for `=` (var dec) */
else if (symbolType == SymbolType.ASSIGN && (arrayIndexing == false))
{
Entity varEnt;
AccessorType potAccMod = AccessorType.PRIVATE;
InitScope potInitScp = InitScope.UNKNOWN;
if(hasModifierItems())
{
ModifierItem moditem = peekModifier();
if(moditem.isAccessModifier())
{
if(allowModifiers)
{
potAccMod = popModifierFront().getAccessModifier();
}
else
{
expect("Access modifiers are not allowed on variables in this context");
}
}
else if(moditem.isInitScope())
{
if(allowsInitScopeOnDec)
{
potInitScp = popModifierFront().getInitScope();
}
else
{
expect("Init scopes are not allowed on variables in this context");
}
}
// Only allow something to follow if we have [ACC_MOD, ...]
// where we are the `...`
if(hasModifierItems() && potAccMod != AccessorType.UNKNOWN)
{
moditem = peekModifier();
if(moditem.isInitScope())
{
if(allowsInitScopeOnDec)
{
potInitScp = popModifierFront().getInitScope();
}
else
{
expect("Init scopes are not allowed on variables in this context");
}
}
else
{
expect("An initscope is expected after an access modifier");
}
}
}
// Only continue if variable declarations are allowed
if(allowVarDec)
{
@ -2032,7 +2157,8 @@ public final class Parser
varAssign.setVariable(variable);
generated = variable;
varEnt = variable;
generated = varEnt;
}
else
{
@ -2043,6 +2169,20 @@ public final class Parser
{
expect("Variables declarations are not allowed.");
}
/**
* Set any ACC_MOD and INIT_SCOPE
*/
if(potAccMod != AccessorType.UNKNOWN)
{
DEBUG(format("Setting explict access modifier of %s to %s", potAccMod, varEnt));
varEnt.setAccessorType(potAccMod);
}
if(potInitScp != InitScope.UNKNOWN)
{
DEBUG(format("Setting explicit init scope modifier of %s to %s", potInitScp, varEnt));
varEnt.setModifierType(potInitScp);
}
}
/* Check for `=` (array indexed assignment) */
else if (symbolType == SymbolType.ASSIGN && (arrayIndexing == true))

2
source/tlang/testing/modules/a.t
View File

@ -4,7 +4,7 @@ import niks.c, b;
public ubyte j = 0;
int ident(int i)
public int ident(int i)
{
c.k();
return i;