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

.uppdev

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8292 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-03-24 14:50:32 +00:00
parent cd6850090e
commit adef44db1c
6 changed files with 169 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

39
uppdev/cpp2/ppfile.cpp
View file

@ -32,33 +32,6 @@ void RemoveComments(String& l, bool& incomment)
}
}
String CppMacro::Define(const char *s)
{
CParser p(s);
String id;
try {
if(!p.IsId())
return Null;
id = p.ReadId();
param.Clear();
variadic = false;
if(p.Char('(')) {
while(p.IsId()) {
param.Add(p.ReadId());
p.Char(',');
}
if(p.Char3('.', '.', '.'))
variadic = true;
p.Char(')');
}
body = p.GetPtr();
}
catch(CParser::Error) {
return Null;
}
return id;
}
void PPFile::CheckEndNamespace(Vector<int>& namespace_block, int level)
{
if(namespace_block.GetCount() && namespace_block.Top() == level) {
@ -191,15 +164,8 @@ void PPFile::Dump() const
PP_USING, "using namespace", PP_NAMESPACE, "namespace",
PP_NAMESPACE_END, "}", "")
<< ' ' << m.id;
if(m.type == PP_DEFINE) {
if(m.macro.param.GetCount() || m.macro.variadic) {
ll << '(' << Join(m.macro.param.GetKeys(), ", ");
if(m.macro.variadic)
ll << "...";
ll << ')';
}
ll << ' ' << m.macro.body;
}
if(m.type == PP_DEFINE)
ll << m.macro;
if(m.type == PP_NAMESPACE)
ll << " {";
LOG(ll);
@ -255,6 +221,7 @@ FileTime GetFileTimeCached(const String& p)
String GetIncludePath(const String& s, const String& filedir, const String& include_path)
{
RTIMING("GetIncludePath");
String key;
key << s << "#" << filedir << "#" << include_path;
int q = sIncludePath.Find(key);