github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -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
commit 741447d279
9 changed files with 296 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

63
uppsrc/ide/Browser/Base.cpp
View file

@ -146,6 +146,32 @@ void BaseInfoSync(Progress& pi)
ClearSources();
const Workspace& wspc = GetIdeWorkspace();
LTIMING("Gathering files");
Vector<String> defs;
defs.Add(ConfigFile("global.defs"));
for(int i = 0; i < wspc.GetCount(); i++) {
pi.Step();
const Package& pk = wspc.GetPackage(i);
String n = wspc[i];
for(int i = 0; i < pk.file.GetCount(); i++) {
String path = SourcePath(n, pk.file[i]);
if(GetFileExt(path) == ".defs")
defs.Add(path);
}
}
String fp;
for(int i = 0; i < defs.GetCount(); i++)
fp << defs[i] << "\n" << GetFileTimeCached(defs[i]) << "\n";
static String defs_fp;
if(fp != defs_fp) {
defs_fp = fp;
String h;
for(int i = 0; i < defs.GetCount(); i++)
h << LoadFile(defs[i]) << "\n";
SetPPDefs(h);
}
pi.SetText("Gathering files");
pi.SetTotal(wspc.GetCount());
for(int pass = 0; pass < 2; pass++)
@ -193,7 +219,7 @@ Time GetDependsTime(const Vector<int>& file)
bool CheckFile(SourceFileInfo& f, const String& path)
{
LTIMING("CheckFile");
if(f.time != FileGetTime(path))
if(f.time != GetFileTimeCached(path))
return false;
if(!f.check_info)
return true;
@ -380,38 +406,10 @@ void CodeBaseScanFile(Stream& in, const String& fn, bool check_macros)
namespace_info_changed, includes_changed);
LDUMP(f.defined_macros);
LDUMP(check_macros);
if(check_macros && (includes_changed || namespace_info_changed || cm.GetCount())) {
if(check_macros && (includes_changed || namespace_info_changed || cm.GetCount()))
SyncCodeBase();
return;
}
/*
if( && check_macros) {
}
if((namespace_info_changed || cm.GetCount()) && check_macros) {
SyncCodeBase(); return; _DBG_
DLOG("Checking files");
Progress pi;
BaseInfoSync(pi);
pi.SetText("Checking source files");
pi.SetTotal(sSrcFile.GetCount());
pi.SetPos(0);
Index<int> parse_file;
for(int i = 0; i < sSrcFile.GetCount(); i++) {
pi.Step();
String path = sSrcFile.GetKey(i);
DDUMP(path);
int q = GetSourceFileIndex(path);
const SourceFileInfo& f = source_file[q];
if((namespace_info_changed || HasIntersection(f.ids, cm)) && !CheckFile(f, path))
parse_file.Add(q);
}
CodeBase().RemoveFiles(parse_file);
ParseFiles(pi, parse_file);
}
*/
FinishCodeBase();
else
FinishCodeBase();
}
void CodeBaseScanFile(const String& fn, bool check_macros)
@ -422,6 +420,7 @@ void CodeBaseScanFile(const String& fn, bool check_macros)
void ClearCodeBase()
{
// TODO: Create combined defs
CleanPP();
CodeBase().Clear();
source_file.Clear();