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

New heurestics singificantly improves C++ parser in theide

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@427 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-09-11 20:46:49 +00:00
parent dcd4cfa666
commit a041d64a11
5 changed files with 61 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
uppsrc/CppBase/cpplex.cpp
View file

@ -86,7 +86,7 @@ Lex::Lex()
for(int i = 0; cppk[i]; i++)
id.Add(cppk[i]);
endkey = id.GetCount();
braceslevel = ignore_low = ignore_high = 0;
braceslevel = ignore_low = ignore_high = body = 0;
}
void Lex::Init(const char *s, const Vector<String>& ig)
@ -104,13 +104,12 @@ void Lex::StartStatCollection()
statsCollected = true;
}
const LexSymbolStat & Lex::FinishStatCollection()
const LexSymbolStat& Lex::FinishStatCollection()
{
statsCollected = false;
return symbolStat;
}
int Lex::GetCharacter()
{
if(*ptr == '\0') return t_eof;
@ -151,7 +150,10 @@ int Lex::GetCharacter()
void Lex::Next()
{
grounding = false;
while((byte)*ptr <= ' ') {
if(*ptr == '\1')
grounding = true;
if(*ptr == '\0') return;
ptr++;
}
@ -369,6 +371,8 @@ void Lex::Get(int n)
{
while(n--) {
if(term.GetCount()) {
if(body && term.Head().grounding)
throw Grounding();
int chr = term.Head().code;
if(statsCollected)
symbolStat.IncStat(chr);
@ -381,6 +385,29 @@ void Lex::Get(int n)
}
if(term.GetCount() == 0)
Next();
if(term.GetCount() == 0)
break;
}
}
void Lex::SkipToGrounding()
{
for(;;) {
if(term.GetCount() == 0)
Next();
if(term.GetCount() == 0)
break;
int chr = term.Head().code;
if(chr == t_eof)
return;
if(term.Head().grounding)
return;
if(chr == '{')
braceslevel++;
else
if(chr == '}')
braceslevel--;
term.DropHead();
}
}