Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Require semicolon after repeat/while (warning for backward compat)

Browse source
This commit is contained in:
Brian Fiete 2021-06-22 13:14:56 -07:00
parent 0aa751dec7
commit a888fd745a
3 changed files with 57 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDEHelper/Compiler/BfReducer.cpp
View file

@ -4451,8 +4451,15 @@ BfAstNode* BfReducer::CreateStatement(BfAstNode* node, CreateStmtFlags createStm
{
if (!IsSemicolon(nextNode))
{
bool doWarn = false;
// Why did we have this BfIdentifierNode check? It failed to throw an error on just things like "{ a }"
if (/*(origStmtNode->IsA<BfIdentifierNode>()) || */(origStmtNode->IsA<BfCompoundStatement>()) || (origStmtNode->IsA<BfBlock>()))
if (origStmtNode->IsA<BfRepeatStatement>())
{
// These do require a semicolon
doWarn = true;
}
else if (/*(origStmtNode->IsA<BfIdentifierNode>()) || */(origStmtNode->IsA<BfCompoundStatement>()) || (origStmtNode->IsA<BfBlock>()))
return stmt;
if (origStmtNode->IsA<BfVariableDeclaration>())
{
@ -4465,7 +4472,12 @@ BfAstNode* BfReducer::CreateStatement(BfAstNode* node, CreateStmtFlags createStm
if (((createStmtFlags & CreateStmtFlags_AllowUnterminatedExpression) != 0) && (origStmtNode->IsA<BfExpression>()) && (nextNode == NULL))
return stmt;
auto error = mPassInstance->FailAfterAt("Semicolon expected", node->GetSourceData(), stmt->GetSrcEnd() - 1);
BfError* error;
if (doWarn)
error = mPassInstance->WarnAfterAt(0, "Semicolon expected", node->GetSourceData(), stmt->GetSrcEnd() - 1);
else
error = mPassInstance->FailAfterAt("Semicolon expected", node->GetSourceData(), stmt->GetSrcEnd() - 1);
if ((error != NULL) && (mSource != NULL))
error->mProject = mSource->mProject;
mPrevStmtHadError = true;