From 1ddd7f102bb50eb4ffe24f81b6b35f66ab96584a Mon Sep 17 00:00:00 2001 From: "Tristan B. Kildaire" Date: Sun, 6 Jun 2021 15:43:01 +0200 Subject: [PATCH] Support for `static` without preceding accessor, has been added --- source/tlang/compiler/parsing/core.d | 5 +++++ source/tlang/compiler/symbols/check.d | 5 +++++ source/tlang/compiler/symbols/data.d | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/source/tlang/compiler/parsing/core.d b/source/tlang/compiler/parsing/core.d index 9f1b93ac..02d8607f 100644 --- a/source/tlang/compiler/parsing/core.d +++ b/source/tlang/compiler/parsing/core.d @@ -449,6 +449,11 @@ public final class Parser { statements ~= parseAccessor(); } + /* If it is a modifier */ + else if(isModifier(tok)) + { + statements ~= parseInitScope(); + } /* If it is a branch */ else if (symbol == SymbolType.IF) { diff --git a/source/tlang/compiler/symbols/check.d b/source/tlang/compiler/symbols/check.d index c60c78d1..d15b986d 100644 --- a/source/tlang/compiler/symbols/check.d +++ b/source/tlang/compiler/symbols/check.d @@ -156,6 +156,11 @@ public bool isAccessor(Token token) getSymbolType(token) == SymbolType.PROTECTED; } +public bool isModifier(Token token) +{ + return getSymbolType(token) == SymbolType.STATIC; +} + public bool isIdentifier_NoDot(Token tokenIn) { /* Make sure it isn't any other type of symbol */ diff --git a/source/tlang/compiler/symbols/data.d b/source/tlang/compiler/symbols/data.d index 13f30094..a236005a 100644 --- a/source/tlang/compiler/symbols/data.d +++ b/source/tlang/compiler/symbols/data.d @@ -106,7 +106,7 @@ public enum AccessorType public enum InitScope { - STATIC, UNKNOWN + STATIC, VIRTUAL, UNKNOWN } public class Assignment : Statement