diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp index 1db158279..1024b5ed5 100644 --- a/uppsrc/CppBase/Parser.cpp +++ b/uppsrc/CppBase/Parser.cpp @@ -1118,6 +1118,7 @@ bool Parser::Scope(const String& tp, const String& tn) { im.param.Clear(); if(Key(';')) { context = cc; + im.natural = Gpurify(nn); SetScopeCurrent(); return true; } diff --git a/uppsrc/CppBase/Qualify.cpp b/uppsrc/CppBase/Qualify.cpp index 94950b1e1..7cdfe8dc8 100644 --- a/uppsrc/CppBase/Qualify.cpp +++ b/uppsrc/CppBase/Qualify.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) +#define LLOG(x) DLOG(x) #define LTIMING(x) // RTIMING(x) bool DoQualify(Scopefo& nf, const String& type, String& qt); @@ -216,7 +216,8 @@ void QualifyPass1(CppBase& base) } m.qitem = m.item; } - LLOG(base.GetKey(ni) << "." << m.item << " " << GetCppFile(m.file) + LLOG(base.GetKey(ni) << "." << m.item << " " << GetCppFile(m.file) << '(' << m.line << ") " + << AsCString(m.natural) << " impl:" << m.impl << " kind:" << (int)m.kind << " IsType:" << m.IsType() << " type: " << m.type << " qtype:" << m.qtype << " tparam:" << m.tparam); } @@ -264,7 +265,8 @@ void QualifyPass2(CppBase& base) : m.item; } } - LLOG(base.GetKey(ni) << "." << m.item << " " << GetCppFile(m.file) + LLOG(base.GetKey(ni) << "." << m.item << " " << GetCppFile(m.file) << '(' << m.line << ") " + << AsCString(m.natural) << " impl:" << m.impl << " kind:" << (int)m.kind << " IsType:" << m.IsType() << " qtype:" << m.qtype << " tparam:" << m.tparam); } diff --git a/uppsrc/CtrlLib/DropChoice.h b/uppsrc/CtrlLib/DropChoice.h index 78fa4b2c1..f469de773 100644 --- a/uppsrc/CtrlLib/DropChoice.h +++ b/uppsrc/CtrlLib/DropChoice.h @@ -161,9 +161,6 @@ public: void AddTo(Ctrl& _owner) { MultiButtonFrame::AddTo(_owner); owner = &_owner; } bool IsActive() const { return IsOpen(); } -// void Show(bool b = true) { drop.Show(b); } -// void Hide() { Show(false); } - Value Get() const; int GetIndex() const;