Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Fixed typealias dependencies

Browse source
This commit is contained in:
Brian Fiete 2019-11-27 08:02:15 -08:00
parent 19c34255df
commit 38dd2cc183
7 changed files with 100 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

25
IDEHelper/Compiler/BfReducer.cpp
View file

@ -367,6 +367,7 @@ bool BfReducer::IsTypeReference(BfAstNode* checkNode, BfToken successToken, int*
bool hadTupleComma = false;
bool hadIdentifier = false;
bool foundSuccessToken = false;
bool hadUnexpectedIdentifier = false;
BfTokenNode* lastToken = NULL;
//while (checkNode != NULL)
@ -425,6 +426,12 @@ bool BfReducer::IsTypeReference(BfAstNode* checkNode, BfToken successToken, int*
success = (chevronDepth == 0) && (bracketDepth == 0) && (parenDepth == 0);
}
if ((success) || (doEnding))
{
if ((!hadTupleComma) && (hadUnexpectedIdentifier)) // Looked like a tuple but wasn't
return false;
}
if (success)
{
if (outEndNode != NULL)
@ -811,13 +818,17 @@ bool BfReducer::IsTypeReference(BfAstNode* checkNode, BfToken successToken, int*
// Identifier is always allowed in tuple (parenDepth == 0), because it's potentially the field name
// (successToken == BfToken_RParen) infers we are already checking inside parentheses, such as
// when we see a potential cast expression
if ((!identifierExpected) && (parenDepth == 0) && (successToken != BfToken_RParen))
if (!identifierExpected)
{
if (outEndNode != NULL)
*outEndNode = checkIdx;
if (successToken == BfToken_None)
return chevronDepth == 0;
return false;
if ((parenDepth == 0) && (successToken != BfToken_RParen))
{
if (outEndNode != NULL)
*outEndNode = checkIdx;
if (successToken == BfToken_None)
return chevronDepth == 0;
return false;
}
hadUnexpectedIdentifier = true;
}
hadIdentifier = true;
@ -847,6 +858,8 @@ bool BfReducer::IsTypeReference(BfAstNode* checkNode, BfToken successToken, int*
}
if (outEndNode != NULL)
*outEndNode = checkIdx;
if ((!hadTupleComma) && (hadUnexpectedIdentifier)) // Looked like a tuple but wasn't
return false;
return (hadIdentifier) && (chevronDepth == 0) && (bracketDepth == 0) && (parenDepth == 0) && ((successToken == BfToken_None) || (foundSuccessToken));
}