UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/serializ_hlpr] Use SerHlpr::CodePoint, not UTF8Decoder

Browse Source 
SerializationHelper::CodePoint puts a null-terminating char
This commit is contained in:
Léa Saviot
2019-08-07 15:13:59 +02:00
committed by Émilie Feral
parent c2b4d2b760
commit 601827e790
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/include/ion/unicode/utf8_decoder.h
View File

@@ -42,7 +42,7 @@ public:
const char * previousGlyphPosition();
const char * stringPosition() const { return m_stringPosition; }
static size_t CharSizeOfCodePoint(CodePoint c);
static size_t CodePointToChars(CodePoint c, char * buffer, size_t bufferSize);
static size_t CodePointToChars(CodePoint c, char * buffer, size_t bufferSize); // No null-terminating char
private:
const char * const m_string;
const char * m_stringPosition;

14
poincare/src/serialization_helper.cpp
View File

@@ -59,7 +59,7 @@ int SerializationHelper::SerializeChild(
// Write the child with parentheses if needed
bool addParentheses = parentNode->childNeedsSystemParenthesesAtSerialization(childNode);
if (addParentheses) {
numberOfChar += UTF8Decoder::CodePointToChars(UCodePointLeftSystemParenthesis, buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, UCodePointLeftSystemParenthesis);
if (numberOfChar >= bufferSize-1) {
return bufferSize-1;
}
@@ -70,7 +70,7 @@ int SerializationHelper::SerializeChild(
return bufferSize-1;
}
if (addParentheses) {
numberOfChar += UTF8Decoder::CodePointToChars(UCodePointRightSystemParenthesis, buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, UCodePointRightSystemParenthesis);
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize-1;
@@ -112,7 +112,7 @@ int InfixPrefix(
return bufferSize-1;
}
// Add the opening (system or user) parenthesis
numberOfChar += UTF8Decoder::CodePointToChars(needsSystemParentheses ? UCodePointLeftSystemParenthesis : CodePoint('('), buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, needsSystemParentheses ? UCodePointLeftSystemParenthesis : CodePoint('('));
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize - 1;
@@ -131,7 +131,7 @@ int InfixPrefix(
if (i != firstChildIndex) {
// Write the operator or the comma
numberOfChar += prefix ?
UTF8Decoder::CodePointToChars(',', buffer+numberOfChar, bufferSize - numberOfChar) :
SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, ',') :
strlcpy(buffer+numberOfChar, operatorName, bufferSize-numberOfChar);
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
@@ -141,7 +141,7 @@ int InfixPrefix(
// Write the child, with or without parentheses if needed
if (prefix) {
if (needsSystemParentheses && (childrenCount > 1)) {
numberOfChar += UTF8Decoder::CodePointToChars(UCodePointLeftSystemParenthesis, buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, UCodePointLeftSystemParenthesis);
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize - 1;
@@ -153,7 +153,7 @@ int InfixPrefix(
return bufferSize - 1;
}
if (needsSystemParentheses && (childrenCount > 1)) {
numberOfChar += UTF8Decoder::CodePointToChars(UCodePointRightSystemParenthesis, buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, UCodePointRightSystemParenthesis);
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize - 1;
@@ -171,7 +171,7 @@ int InfixPrefix(
if (prefix) {
// Add the closing system parenthesis
numberOfChar += UTF8Decoder::CodePointToChars(needsSystemParentheses ? UCodePointRightSystemParenthesis : CodePoint(')'), buffer+numberOfChar, bufferSize - numberOfChar);
numberOfChar += SerializationHelper::CodePoint(buffer+numberOfChar, bufferSize - numberOfChar, needsSystemParentheses ? UCodePointRightSystemParenthesis : CodePoint(')'));
if (numberOfChar >= bufferSize-1) {
assert(buffer[bufferSize - 1] == 0);
return bufferSize - 1;