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

More A++ fixes...

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@522 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-10-12 22:57:02 +00:00
parent 6ccdd7cd0a
commit 7563c85231
5 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/CppBase/Qualify.cpp
View file

@ -134,7 +134,7 @@ String QualifyIds(Scopefo& nf, const String& k, bool all, byte& qual)
r.Cat(b, s);
}
else
if(iscib(c)) {
if(iscid(c)) {
if(iscid(*r.Last()))
r << ' ';
if(s[0] == 'c' && s[1] == 'o' && s[2] == 'n' && s[3] == 's' && s[4] == 't' && !iscid(s[5])) {
@ -212,6 +212,9 @@ void QualifyPass1(CppBase& base)
}
m.qitem = m.item;
}
LLOG(base.GetKey(ni) << "." << m.item << " " << GetCppFile(m.file)
<< " impl:" << m.impl << " kind:" << (int)m.kind << " IsType:" << m.IsType()
<< " type: " << m.type << " qtype:" << m.qtype << " tparam:" << m.tparam);
}
}
}

3
uppsrc/ide/Assist.cpp
View file

@ -183,9 +183,8 @@ Vector<String> AssistEditor::ReadBack(int q)
SkipSpcBack(q);
int c = Ch(q - 1);
if(c == '>' && !wasid) {
String id = ">";
q--;
r.Add() = id + CompleteIdBack(q);
r.Add() = CompleteIdBack(q) + ">";
wasid = true;
continue;
}

19
uppsrc/ide/Browser/Move.cpp
View file

@ -1,16 +1,31 @@
#include "Browser.h"
class MoveTopicDlg : public WithMoveTopicLayout<TopWindow> {
struct MoveTopicDlg : public WithMoveTopicLayout<TopWindow> {
typedef MoveTopicDlg CLASSNAME;
public:
void Package();
MoveTopicDlg();
};
void MoveTopicDlg::Package()
{
}
MoveTopicDlg::MoveTopicDlg()
{
CtrlLayoutOKCancel(*this, "");
topic.NotNull();
topic.MaxLen(30);
topic.SetFilter(CharFilterID);
package <<= THISBACK(Package);
const Workspace& w = GetIdeWorkspace();
for(int i = 0; i < w.GetCount(); i++)
package.Add(w[i]);
}
void TopicEditor::MoveTopic()

1
uppsrc/ide/Browser/TopicWin.cpp
View file

@ -206,6 +206,7 @@ void CreateTopic(const char *fn, int lang, const String& ss)
void TopicEditor::NewTopic()
{
TopicDlg<WithNewTopicLayout<TopWindow> > d("New topic");
d.lang <<= lastlang;
Vector<String> path, name;

33
uppsrc/ide/Cpp.cpp
View file

@ -83,7 +83,7 @@ String ResolveTParam(const String& type, const Vector<String>& tparam)
LLOG("Resolved " << type << " -> " << r);
const Array<CppItem>& x = GetTypeItems(r);
if(x.GetCount() && x[0].kind == TYPEDEF) {
LLOG("Is typedef " << x[0].qtype);
LLOG("Is typedef " << x[0].qtype << ';' << x[0].type << ';' << x[0].natural);
String h = x[0].qtype;
if(h != type && h != r)
return ResolveTParam(h, tparam);
@ -125,29 +125,29 @@ String Qualify(const String& scope, const String& type)
return Qualify(CodeBase(), scope, type);
}
void AssistEditor::ExpressionType(const String& type, const Vector<String>& xp, int ii,
Index<String>& typeset, const Vector<String>& tparam,
void AssistEditor::ExpressionType(const String& ttype, const Vector<String>& xp, int ii,
Index<String>& typeset, const Vector<String>& tparam_,
bool can_shortcut_operator, Index<String>& visited_bases)
{
if(ii >= xp.GetCount()) {
LLOG("Final type: " << type);
typeset.FindAdd(type);
LLOG("Final type: " << ttype);
typeset.FindAdd(ttype);
return;
}
Vector<String> tparam;
String type = ParseTemplatedType(ttype, tparam);
int c0 = typeset.GetCount();
const Array<CppItem>& n = GetTypeItems(type);
String id = xp[ii];
int q = id.ReverseFind(':');
if(q > 0 && id[q - 1] == ':') {
Vector<String> tparam;
String qtype = ParseTemplatedType(Qualify("", id.Mid(0, q - 1)), tparam);
id = id.Mid(q + 1);
ExpressionType(ResolveTParam(qtype, tparam), xp, ii + 1, typeset);
ExpressionType(ResolveTParam(Qualify("", id.Mid(0, q - 1)), tparam), xp, ii + 1, typeset);
return;
}
LLOG("ExpressionType " << type << " ii: " << ii << " id:" << id);
if(*id == '.') {
ExpressionType(type, xp, ii + 1, typeset, tparam);
ExpressionType(ttype, xp, ii + 1, typeset, tparam);
return;
}
bool shortcut_oper = false;
@ -167,14 +167,12 @@ void AssistEditor::ExpressionType(const String& type, const Vector<String>& xp,
for(int i = 0; i < base.GetCount(); i++)
if(visited_bases.Find(base[i]) < 0) {
visited_bases.Add(base[i]);
Vector<String> tparam;
ExpressionType(ParseTemplatedType(base[i], tparam), xp, ii, typeset,
tparam, false, visited_bases);
ExpressionType(base[i], xp, ii, typeset, tparam, false, visited_bases);
if(typeset.GetCount() != c0)
return;
}
if(shortcut_oper)
ExpressionType(type, xp, ii + 1, typeset, tparam);
ExpressionType(ttype, xp, ii + 1, typeset, tparam);
}
void AssistEditor::ExpressionType(const String& type, const Vector<String>& xp, int ii,
@ -187,8 +185,7 @@ void AssistEditor::ExpressionType(const String& type, const Vector<String>& xp,
void AssistEditor::ExpressionType(const String& type, const Vector<String>& xp, int ii,
Index<String>& typeset)
{
Vector<String> tparam;
ExpressionType(ParseTemplatedType(type, tparam), xp, ii, typeset, tparam);
ExpressionType(type, xp, ii, typeset, Vector<String>());
}
Index<String> AssistEditor::ExpressionType(const Parser& parser, const Vector<String>& xp)
@ -213,11 +210,11 @@ Index<String> AssistEditor::ExpressionType(const Parser& parser, const Vector<St
if(typeset.GetCount())
return typeset;
if(xp.GetCount() >= 2 && xp[1] == "()") {
String qtype = Qualify(parser.current_scope, xp[0]);
Vector<String> tparam;
String qtype = ParseTemplatedType(Qualify(parser.current_scope, xp[0]), tparam);
if(CodeBase().Find(qtype) >= 0) {
if(CodeBase().Find(ParseTemplatedType(qtype, tparam)) >= 0) {
LLOG("Is constructor " << qtype);
ExpressionType(ResolveTParam(qtype, tparam), xp, 2, typeset);
ExpressionType(qtype, xp, 2, typeset);
return typeset;
}
}