[poincare] Remove unused parameter in SerializationHelper::Prefix

This commit is contained in:
Léa Saviot
2019-06-24 16:26:08 +02:00
committed by LeaNumworks
parent b6638bb929
commit b985599079
3 changed files with 9 additions and 17 deletions

View File

@@ -31,7 +31,6 @@ namespace SerializationHelper {
Preferences::PrintFloatMode floatDisplayMode,
int numberOfDigits,
const char * operatorName,
int firstChildIndex = 0,
int lastChildIndex = -1);
int SerializeChild(

View File

@@ -152,7 +152,7 @@ int NthRootLayoutNode::serialize(char * buffer, int bufferSize, Preferences::Pri
assert((const_cast<NthRootLayoutNode *>(this))->indexLayout());
if ((const_cast<NthRootLayoutNode *>(this))->indexLayout()->isEmpty()) {
// Case: root(x,empty): Write "'SquareRootSymbol'('radicandLayout')"
return SerializationHelper::Prefix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, SquareRoot::s_functionHelper.name(), true, false);
return SerializationHelper::Prefix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, SquareRoot::s_functionHelper.name(), 0);
}
// Case: root(x,n)
return SerializationHelper::Prefix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, NthRoot::s_functionHelper.name());

View File

@@ -117,7 +117,6 @@ int SerializationHelper::Prefix(
Preferences::PrintFloatMode floatDisplayMode,
int numberOfDigits,
const char * operatorName,
int firstChildIndex,
int lastChildIndex)
{
{
@@ -142,22 +141,16 @@ int SerializationHelper::Prefix(
int childrenCount = node->numberOfChildren();
if (childrenCount > 0) {
assert(childrenCount > firstChildIndex);
int lastIndex = lastChildIndex < 0 ? childrenCount - 1 : lastChildIndex;
assert(firstChildIndex <= lastIndex);
// Write the first child
numberOfChar += node->childAtIndex(firstChildIndex)->serialize(buffer+numberOfChar, bufferSize-numberOfChar, floatDisplayMode, numberOfDigits);
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize-1;
}
// Write the remaining children, separated with commas
for (int i = firstChildIndex + 1; i <= lastIndex; i++) {
numberOfChar += UTF8Decoder::CodePointToChars(',', buffer+numberOfChar, bufferSize - numberOfChar);
if (numberOfChar >= bufferSize-1) {
return bufferSize-1;
// Write the children, separated with commas
for (int i = 0; i <= lastIndex; i++) {
if (i != 0) {
// Write the comma
numberOfChar += UTF8Decoder::CodePointToChars(',', buffer+numberOfChar, bufferSize - numberOfChar);
if (numberOfChar >= bufferSize-1) {
return bufferSize-1;
}
}
numberOfChar += node->childAtIndex(i)->serialize(buffer+numberOfChar, bufferSize-numberOfChar, floatDisplayMode, numberOfDigits);
if (numberOfChar >= bufferSize-1) {