gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat operator overload as normal function. Do not wrap it.

Browse Source 
Fixes https://github.com/root-project/root/issues/9449

so it is possible to define operator overload in cling cmd prompt.

btw, Make SkipPointerRefs() to not assume next token being a

tok::raw_identifier since it can be a global-scoped identifier,

e.g. int* ::class_a::func_b(short c) { return nullptr; }
This commit is contained in:
Jiang Yi 2022-08-28 11:58:51 +02:00 committed by jenkins
parent 7c7f5e0d19
commit 884b73b2a7
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/Utils/SourceNormalization.cpp
View File

@ -21,12 +21,19 @@ namespace {
///\brief A Lexer that exposes preprocessor directives. ///\brief A Lexer that exposes preprocessor directives.
class MinimalPPLexer: public Lexer { class MinimalPPLexer: public Lexer {
///\brief Jump to last Identifier in a scope chain A::B::C::D ///\brief Jump to the next token after a scope chain A::B::C::D
/// ///
bool SkipScopes(Token& Tok) { bool SkipScopes(Token& Tok) {
Token LastTok;
return SkipScopes(Tok, LastTok);
}
bool SkipScopes(Token& Tok, Token& LastTok) {
LastTok = Tok;
if (getLangOpts().CPlusPlus) { if (getLangOpts().CPlusPlus) {
while (Tok.is(tok::coloncolon)) { while (Tok.is(tok::coloncolon)) {
if (!LexClean(Tok) || Identifier(Tok).empty()) if (!LexClean(LastTok) || Identifier(LastTok).empty())
return false; return false;
if (!LexClean(Tok)) if (!LexClean(Tok))
return false; return false;
@ -38,9 +45,7 @@ class MinimalPPLexer: public Lexer {
///\brief Skips all contiguous '*' '&' tokens ///\brief Skips all contiguous '*' '&' tokens
/// ///
bool SkipPointerRefs(Token& Tok) { bool SkipPointerRefs(Token& Tok) {
while (Tok.isNot(tok::raw_identifier)) { while (Tok.isOneOf(tok::star, tok::amp)) {
if (!Tok.isOneOf(tok::star, tok::amp))
return false;
if (!LexClean(Tok)) if (!LexClean(Tok))
return false; return false;
} }
@ -71,14 +76,34 @@ class MinimalPPLexer: public Lexer {
return false; return false;
} }
// Function or class name should be in Tok now auto LastTok{Tok};
if (Identifier(Tok).empty()) // skip scopes in function name
// e.g. int ::the_namespace::class_a::mem_func() { return 3; }
if ((Tok.is(tok::coloncolon) && !SkipScopes(Tok, LastTok)) ||
(!LexClean(Tok) ||
(Tok.is(tok::coloncolon) && !SkipScopes(Tok, LastTok))))
return false; return false;
// Advance to argument list or method name const auto Ident{Identifier(LastTok)}; // function, operator or class name
if (!LexClean(Tok))
if (Ident.empty())
return false; return false;
if (Ident.equals("operator")) {
// Tok is the operator, e.g. <=, ==, +...
// however, for operator() and [], Tok only contains the
// left side so we need to parse the closing right side
// TODO: tok::spaceship operator<=>
if ((Tok.isOneOf(tok::l_paren, tok::l_square) && !CheckBalance(Tok)) ||
// user-defined literal, e.g. double operator "" _dd(long double t)
// TODO: parse without the space right after "",
// e.g. double operator ""_dd(long double t)
(Tok.is(tok::string_literal) && !LexClean(Tok)) ||
// Advance to argument list or method name
!LexClean(Tok))
return false;
}
if (!SkipScopes(Tok)) if (!SkipScopes(Tok))
return false; return false;
@ -228,7 +253,7 @@ public:
return kNONE; return kNONE;
// Advance to argument list, or next scope // Advance to argument list, or next scope
if (!LexClean(Tok)) if (!SkipIdentifier(Tok))
return kNONE; return kNONE;
// Function name should be last on scope chain // Function name should be last on scope chain