frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add static_assert

This commit is contained in:
drmortalwombat 2025-05-25 12:31:15 +02:00
parent f720feebbf
commit 4d9d628b67
8 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autotest/makefile
View File

@ -50,5 +50,11 @@ autorefreturn: autorefreturn.cpp
$(OSCAR64_CC) -e -Os -n $<
$(OSCAR64_CC) -e -O3 -n $<
copyconstructor: copyconstructor.cpp
$(OSCAR64_CC) -e -O2 -n $<
$(OSCAR64_CC) -e -O0 -n $<
$(OSCAR64_CC) -e -Os -n $<
$(OSCAR64_CC) -e -O3 -n $<
clean:
@$(RM) *.asm *.bcs *.int *.lbl *.map *.prg

2
oscar64/Errors.h
View File

@ -127,6 +127,8 @@ enum ErrorID
EERR_INVALID_CLASS_INITIALIZER,
EERR_CALL_OF_DELETED_FUNCTION,
EERR_STATIC_ASSERT,
EFATAL_GENERIC = 4000,
EFATAL_OUT_OF_MEMORY,
EFATAL_MACRO_EXPANSION_DEPTH,

3
oscar64/InterCodeGenerator.cpp
View File

@ -6231,7 +6231,10 @@ InterCodeProcedure* InterCodeGenerator::TranslateProcedure(InterCodeModule * mod
proc->mNativeProcedure = true;
if (dec->mFlags & DTF_INTERRUPT)
{
proc->mInterrupt = true;
proc->mCompilerOptions &= ~COPT_OPTIMIZE_OUTLINE;
}
if (dec->mFlags & DTF_HWINTERRUPT)
proc->mHardwareInterrupt = true;

2
oscar64/NativeCodeGenerator.cpp
View File

@ -58519,7 +58519,7 @@ void NativeCodeGenerator::OutlineFunctions(void)
for (int i = 0; i < mProcedures.Size(); i++)
{
if (mProcedures[i]->mCompilerOptions & COPT_OPTIMIZE_OUTLINE)
if ((mProcedures[i]->mCompilerOptions & COPT_OPTIMIZE_OUTLINE))
mProcedures[i]->AddToSuffixTree(mapper, tree);
}
tree->AddParents(nullptr);

44
oscar64/Parser.cpp
View File

@ -303,6 +303,10 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio
{
Declaration * tdec = ParseTemplateDeclaration(pthis);
}
else if (ConsumeTokenIf(TK_STATIC_ASSERT))
{
ParseStaticAssert();
}
else
{
Declaration* mdec = ParseDeclaration(nullptr, false, false, true, pthis);
@ -9541,6 +9545,32 @@ Expression* Parser::ParseParenthesisExpression(void)
return exp;
}
void Parser::ParseStaticAssert(void)
{
if (ConsumeToken(TK_OPEN_PARENTHESIS))
{
Expression* exp = ParseExpression(false);
exp = exp->ConstantFold(mErrors, mDataSection);
if (exp->mType == EX_CONSTANT && exp->mDecType->IsIntegerType() && exp->mDecValue->mInteger)
{
if (ConsumeTokenIf(TK_COMMA))
mScanner->NextToken();
}
else
{
if (ConsumeTokenIf(TK_COMMA) && mScanner->mToken == TK_STRING)
{
mErrors->Error(mScanner->mLocation, EERR_STATIC_ASSERT, "static assertion failed: ", (const char*)mScanner->mTokenString);
mScanner->NextToken();
}
else
mErrors->Error(mScanner->mLocation, EERR_STATIC_ASSERT, "static assertion failed");
}
ConsumeToken(TK_CLOSE_PARENTHESIS);
}
}
Expression* Parser::CheckOperatorOverload(Expression* exp)
{
if (mCompilerOptions & COPT_CPLUSPLUS)
@ -11094,6 +11124,10 @@ Expression* Parser::ParseStatement(void)
exp->mLeft = ParseParenthesisExpression();
ConsumeToken(TK_SEMICOLON);
break;
case TK_STATIC_ASSERT:
mScanner->NextToken();
ParseStaticAssert();
break;
case TK_GOTO:
#if 1
exp = new Expression(mScanner->mLocation, EX_GOTO);
@ -14304,6 +14338,11 @@ void Parser::ParseNamespace(void)
mScanner->NextToken();
ParseNamespace();
}
else if (mScanner->mToken == TK_STATIC_ASSERT)
{
mScanner->NextToken();
ParseStaticAssert();
}
else
ParseDeclaration(nullptr, true, false, false);
}
@ -14419,6 +14458,11 @@ void Parser::Parse(void)
mScanner->NextToken();
ParseNamespace();
}
else if (mScanner->mToken == TK_STATIC_ASSERT)
{
mScanner->NextToken();
ParseStaticAssert();
}
else
ParseDeclaration(nullptr, true, false, false);
}

1
oscar64/Parser.h
View File

@ -159,6 +159,7 @@ protected:
Expression* ParseListExpression(bool lhs, Declaration * params = nullptr);
Expression* ParseParenthesisExpression(void);
void ParseStaticAssert(void);
Errors* mErrors;
Scanner* mScanner;

3
oscar64/Scanner.cpp
View File

@ -51,6 +51,7 @@ const char* TokenNames[] =
"'extern'",
"'inline'",
"'__assume'",
"'static_assert'",
"__asm",
"__interrupt",
@ -1832,6 +1833,8 @@ void Scanner::NextRawToken(void)
mToken = TK_ASM;
else if (!strcmp(tkident, "__assume"))
mToken = TK_ASSUME;
else if (!strcmp(tkident, "static_assert"))
mToken = TK_STATIC_ASSERT;
else if (!strcmp(tkident, "__interrupt"))
mToken = TK_INTERRUPT;
else if (!strcmp(tkident, "__hwinterrupt"))

1
oscar64/Scanner.h
View File

@ -49,6 +49,7 @@ enum Token
TK_EXTERN,
TK_INLINE,
TK_ASSUME,
TK_STATIC_ASSERT,
TK_ASM,
TK_INTERRUPT,