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

ide: C++ parser fix (for boost), parser directives now can exclude includes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13589 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-09-06 09:01:59 +00:00
parent 53e7c84102
commit 24005d0bf9
3 changed files with 66 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/CppBase/cpp.cpp
View file

@ -247,6 +247,7 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, bo
result.Reserve(16384);
int lineno = 0;
bool incomment = false;
bool do_pp = true;
int segment_serial = 0;
segment_id.Add(--segment_serial);
#ifdef IGNORE_ELSE
@ -254,8 +255,10 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, bo
#endif
while(!in.IsEof()) {
String l = prefix_macro + in.GetLine();
if(l.StartsWith("//$")) { // Do not remove assist++ parser directives
String ll = TrimLeft(l);
if(ll.StartsWith("//$")) { // Do not remove assist++ parser directives
result.Cat(l + "\n");
do_pp = decode(ll[3], '+', true, '-', false, do_pp);
continue;
}
prefix_macro.Clear();
@ -268,7 +271,7 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, bo
}
RemoveComments(l, incomment);
CParser p(l);
if(p.Char('#')) {
if(p.Char('#') && do_pp) {
if(p.Id("define")) {
result.Cat(l + "\n");
CppMacro m;