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

ide/cpp: global.defs and workspackes defs #1086

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8462 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-18 13:01:14 +00:00
parent 6e644d5c9c
commit d1f9ecbe82
9 changed files with 296 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

17
uppsrc/CppBase/cpp.cpp
View file

@ -327,20 +327,9 @@ bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& current
macro.Clear();
macro.Reserve(1000);
segment_id.Clear();
segment_id.Add(0);
segment_id.Reserve(100);
const Vector<String>& ignorelist = GetIgnoreList();
for(int i = 0; i < ignorelist.GetCount(); i++) {
PPMacro h;
PPMacro& pp = macro.GetAdd(h.macro.Define(ignorelist[i]));
pp = h;
pp.segment_id = -999999999;
}
segment_id.Add(-999999999);
std_macros = macro.GetCount();
ONCELOCK {
const char **h = CppKeyword();
while(*h) {
@ -364,11 +353,9 @@ VectorMap<String, String> Cpp::GetDefinedMacros()
{
LTIMING("GetDefinedMacros");
VectorMap<String, String> r;
for(int i = std_macros; i < macro.GetCount(); i++)
r.GetAdd(macro.GetKey(i)) << macro[i].macro << "\n";
LLOG("GetDefinedMacros " << r);
for(int i = 0; i < r.GetCount(); i++)
r[i] = MD5String(r[i]);
LLOG("GetDefinedMacros " << r);
return r;
}