github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed assist++ handling of SKYLARK macro

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5341 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-09-09 14:35:11 +00:00
parent b3b6ccb8a9
commit 297ebcebce
4 changed files with 222 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/CppBase/Parser.cpp
View file

@ -669,7 +669,7 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
}
Qualifier();
if(l0)
if(lex == tk_SKYLARK && lex[1] == '(') {
if(lex == tk_SKYLARK && lex[1] == '(' && lex.IsId(2)) {
++lex;
++lex;
Decl& a = r.Add();
@ -684,8 +684,9 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
lex.GetText();
Key(')');
return r;
} else
if((lex == tk_RPC_METHOD || lex == tk_RPC_GMETHOD) && lex[1] == '(') {
}
else
if((lex == tk_RPC_METHOD || lex == tk_RPC_GMETHOD) && lex[1] == '(' && lex.IsId(2)) {
++lex;
++lex;
Decl& a = r.Add();