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)) if (!IsSemicolon(nextNode))
{ {
bool doWarn = false;
// Why did we have this BfIdentifierNode check? It failed to throw an error on just things like "{ a }" // 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; return stmt;
if (origStmtNode->IsA<BfVariableDeclaration>()) 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)) if (((createStmtFlags & CreateStmtFlags_AllowUnterminatedExpression) != 0) && (origStmtNode->IsA<BfExpression>()) && (nextNode == NULL))
return stmt; 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)) if ((error != NULL) && (mSource != NULL))
error->mProject = mSource->mProject; error->mProject = mSource->mProject;
mPrevStmtHadError = true; mPrevStmtHadError = true;

42
IDEHelper/Compiler/BfSystem.cpp
View file

@ -1701,6 +1701,48 @@ BfError* BfPassInstance::WarnAfter(int warningNumber, const StringImpl& warning,
return WarnAt(warningNumber, warning, refNode->GetSourceData(), refNode->GetSrcEnd()); return WarnAt(warningNumber, warning, refNode->GetSourceData(), refNode->GetSrcEnd());
} }
BfError* BfPassInstance::WarnAfterAt(int warningNumber, const StringImpl& error, BfSourceData* bfSource, int srcIdx)
{
BP_ZONE("BfPassInstance::FailAfterAt");
mFailedIdx++;
if ((int)mErrors.size() >= sMaxErrors)
return NULL;
auto bfParser = bfSource->ToParserData();
if ((bfParser != NULL) && (warningNumber > 0) && (!bfParser->IsWarningEnabledAtSrcIndex(warningNumber, srcIdx)))
return NULL;
if (!WantsRangeRecorded(bfParser, srcIdx, 1, false))
return NULL;
// Go to start of UTF8 chunk
// int startIdx = srcIdx;
// int spanLenth = 0;
// UTF8GetGraphemeClusterSpan(bfParser->mSrc, bfParser->mOrigSrcLength, srcIdx, startIdx, spanLenth);
BfError* errorVal = new BfError();
errorVal->mIsWarning = true;
errorVal->SetSource(this, bfSource);
errorVal->mIsAfter = true;
errorVal->mError = error;
errorVal->mSrcStart = srcIdx;
errorVal->mSrcEnd = srcIdx + 1;
FixSrcStartAndEnd(bfSource, errorVal->mSrcStart, errorVal->mSrcEnd);
mErrorSet.Add(BfErrorEntry(errorVal));
mErrors.push_back(errorVal);
mLastWasDisplayed = WantsRangeDisplayed(bfParser, srcIdx - 1, 2, false);
if (mLastWasDisplayed)
{
String errorStart = "WARNING";
/*if ((int)mErrors.size() > 1)
errorStart += StrFormat(" #%d", mErrors.size());*/
MessageAt(":warn", errorStart + ": " + error, bfParser, srcIdx + 1, 1);
}
return errorVal;
}
BfMoreInfo* BfPassInstance::MoreInfoAt(const StringImpl& info, BfSourceData* bfSource, int srcIdx, int srcLen, BfFailFlags flags) BfMoreInfo* BfPassInstance::MoreInfoAt(const StringImpl& info, BfSourceData* bfSource, int srcIdx, int srcLen, BfFailFlags flags)
{ {
if (!mLastWasDisplayed) if (!mLastWasDisplayed)

1
IDEHelper/Compiler/BfSystem.h
View file

@ -1375,6 +1375,7 @@ public:
BfError* Warn(int warningNumber, const StringImpl& warning); BfError* Warn(int warningNumber, const StringImpl& warning);
BfError* Warn(int warningNumber, const StringImpl& warning, BfAstNode* refNode); BfError* Warn(int warningNumber, const StringImpl& warning, BfAstNode* refNode);
BfError* WarnAfter(int warningNumber, const StringImpl& warning, BfAstNode* refNode); BfError* WarnAfter(int warningNumber, const StringImpl& warning, BfAstNode* refNode);
BfError* WarnAfterAt(int warningNumber, const StringImpl& error, BfSourceData* bfSource, int srcIdx);
BfMoreInfo* MoreInfoAt(const StringImpl& info, BfSourceData* bfSource, int srcIdx, int srcLen, BfFailFlags flags = BfFailFlag_None); BfMoreInfo* MoreInfoAt(const StringImpl& info, BfSourceData* bfSource, int srcIdx, int srcLen, BfFailFlags flags = BfFailFlag_None);
BfMoreInfo* MoreInfo(const StringImpl& info, bool forceQueue = false); BfMoreInfo* MoreInfo(const StringImpl& info, bool forceQueue = false);