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

.cpp

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8445 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-13 14:01:22 +00:00
parent 66ae191e91
commit 3d9e13e4e4
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CppBase/cpp.cpp
View file

@ -2,7 +2,7 @@
NAMESPACE_UPP
#define LTIMING(x) RTIMING(x)
#define LTIMING(x) // RTIMING(x)
#define LLOG(x) // DLOG(x)
void Cpp::ParamAdd(Vector<String>& param, const char *s, const char *e)
@ -156,7 +156,7 @@ bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& current
bool get_macros)
{
LLOG("===== Preprocess " << sourcefile << " <- " << currentfile);
LTIMING("Cpp::Preprocess");
RTIMING("Cpp::Preprocess");
macro.Clear();
macro.Reserve(1000);
segment_id.Clear();
@ -192,6 +192,7 @@ bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& current
void Cpp::DoFlatInclude(const String& header_path)
{
RTIMING("DoFlatInclude");
LLOG("Flat include " << header_path);
if(header_path.GetCount()) {
const PPFile& pp = GetFlatPPFile(header_path);
@ -223,6 +224,7 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile,
String current_folder = GetFileFolder(currentfile);
bool notthefile = sourcefile != currentfile;
if(notthefile || get_macros) {
RTIMING("DO2");
const PPFile& pp = GetPPFile(currentfile);
for(int i = 0; i < pp.item.GetCount() && !done; i++) {
const PPItem& m = pp.item[i];
@ -268,7 +270,7 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile,
namespaces = Join(namespace_stack, ";");
if(!get_macros) {
LTIMING("Expand");
RTIMING("Expand");
incomment = false;
prefix_macro.Clear();
StringBuffer result;