walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed several bugs when deleting and swapping tokens

This commit is contained in:
PKEuS 2016-02-02 17:30:14 +01:00
parent 841f17776b
commit d8b75e3492
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/token.cpp
View File

@ -196,11 +196,13 @@ void Token::swapWithNext()
std::swap(_flags, _next->_flags); std::swap(_flags, _next->_flags);
std::swap(_varId, _next->_varId); std::swap(_varId, _next->_varId);
std::swap(_fileIndex, _next->_fileIndex); std::swap(_fileIndex, _next->_fileIndex);
std::swap(_linenr, _next->_linenr);
std::swap(_link, _next->_link); std::swap(_link, _next->_link);
std::swap(_scope, _next->_scope); std::swap(_scope, _next->_scope);
std::swap(_function, _next->_function); std::swap(_function, _next->_function);
std::swap(_originalName, _next->_originalName); std::swap(_originalName, _next->_originalName);
std::swap(values, _next->values); std::swap(values, _next->values);
std::swap(valuetype, _next->valuetype);
std::swap(_progressValue, _next->_progressValue); std::swap(_progressValue, _next->_progressValue);
} }
} }
@ -225,6 +227,11 @@ void Token::deleteThis()
_next->_originalName = nullptr; _next->_originalName = nullptr;
} }
values = _next->values; values = _next->values;
if (_next->valuetype) {
delete valuetype;
valuetype = _next->valuetype;
_next->valuetype = nullptr;
}
if (_link) if (_link)
_link->link(this); _link->link(this);
@ -247,6 +254,11 @@ void Token::deleteThis()
_previous->_originalName = nullptr; _previous->_originalName = nullptr;
} }
values = _previous->values; values = _previous->values;
if (_previous->valuetype) {
delete valuetype;
valuetype = _previous->valuetype;
_previous->valuetype = nullptr;
}
if (_link) if (_link)
_link->link(this); _link->link(this);