[apps] Remove arg parameter in Shared::Function::nameWithArgument and Shared::CartesianFunction::derivativeNameWithArgument

This commit is contained in:
Ruben Dashyan
2019-07-16 15:33:03 +02:00
committed by Léa Saviot
parent b1b309c0c4
commit b665e841ad
13 changed files with 22 additions and 23 deletions

View File

@@ -64,14 +64,15 @@ void Function::setActive(bool active) {
recordData()->setActive(active);
}
int Function::nameWithArgument(char * buffer, size_t bufferSize, CodePoint arg) {
assert(UTF8Decoder::CharSizeOfCodePoint(arg) == 1);
int Function::nameWithArgument(char * buffer, size_t bufferSize) {
const char * functionName = fullName();
size_t baseNameLength = SymbolAbstract::TruncateExtension(buffer, functionName, bufferSize - k_parenthesedArgumentLength);
assert(baseNameLength <= bufferSize);
size_t result = baseNameLength + strlcpy(&buffer[baseNameLength], k_parenthesedArgument, bufferSize-baseNameLength);
if (baseNameLength + 1 < bufferSize) {
UTF8Decoder::CodePointToChars(arg, buffer+baseNameLength+1, bufferSize - (baseNameLength+1));
int bufferRemainingSize = bufferSize - (baseNameLength+1);
if (bufferRemainingSize > 0) {
assert(UTF8Decoder::CharSizeOfCodePoint(symbol()) == 1);
UTF8Decoder::CodePointToChars(symbol(), buffer+baseNameLength+1, bufferRemainingSize);
}
return result;
}