github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

cpp: .icpp is now 'FILE_CPP'

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8555 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-17 13:56:50 +00:00
parent bd654cb71b
commit f6d17d22c7
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,7 +336,7 @@ void ParseSrc(Stream& in, int file, Callback2<int, const String&> error)
else {
cpp.Preprocess(path, in, GetMasterFile(GetSourceFilePath(file)));
filetype = decode(ext, ".h", FILE_H, ".hpp", FILE_HPP,
".cpp",FILE_CPP, ".c", FILE_C, FILE_OTHER);
".cpp", FILE_CPP, ".icpp", FILE_CPP, ".c", FILE_C, FILE_OTHER);
StringStream pin(cpp.output);
Parser p;
p.Do(pin, CodeBase(), file, filetype, GetFileName(path), error, Vector<String>(),

2
uppsrc/ide/Cpp.cpp
View file

@ -187,6 +187,8 @@ void AssistEditor::ExpressionType(const String& ttype, const String& usings,
String type = ParseTemplatedType(ttype, tparam);
int c0 = typeset.GetCount();
const Array<CppItem>& n = GetTypeItems(type);
LDUMP(type);
LDUMP(tparam);
for(int i = 0; i < n.GetCount(); i++)
if(n[i].kind == TYPEDEF) {
ExpressionType(n[i].qtype, usings, xp, ii, typeset, variable, can_shortcut_operator, visited_bases, lvl + 1);