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: Fixed issue with wrong comment detection

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8692 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-07-16 18:41:19 +00:00
parent f5d0361067
commit 4147dfb66a
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CppBase/ppfile.cpp
View file

@ -47,6 +47,12 @@ void RemoveComments(String& l, bool& incomment)
if(*s == '\"')
s = SkipString(s);
else
if(s[0] == '/' && s[1] == '/') {
q = int(s - ~l);
SetSpaces(l, q, l.GetCount() - q);
return;
}
else
if(s[0] == '/' && s[1] == '*') {
q = int(s - ~l);
break;

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

@ -10,7 +10,7 @@
#define CLOG(x) RLOG(x)
#define CPP_CODEBASE_VERSION 31415
#define CPP_CODEBASE_VERSION 314159
ArrayMap<String, SourceFileInfo> source_file;

11
uppsrc/ide/Cpp.cpp
View file

@ -222,16 +222,7 @@ void AssistEditor::ExpressionType(const String& ttype,
for(int i = 0; i < tparam.GetCount(); i++) // need to qualify template parameters
tparam[i] = Qualify(context_type, tparam[i], usings);
/*
bool tryop = id == "->";
if(tryop)
id = "operator->";
else
if(id == "[]") {
tryop = true;
id = "operator[]";
}
*/
bool shortcut_oper = false;
if(!iscid(*id) && *id != '.') {
shortcut_oper = can_shortcut_operator;