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

[poincare/TreeNode] Fix hasNode

Browse Source
This commit is contained in:
Léa Saviot
2019-12-02 14:21:01 +01:00
parent ed211f185a
commit a2a0abdcef
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
poincare/include/poincare/integer.h
View File

@@ -58,7 +58,7 @@ public:
Integer(double_native_int_t i);
Integer(const char * digits, size_t length, bool negative);
Integer(const char * digits) : Integer(digits, strlen(digits), false) {}
static Integer Overflow(bool negative) { return Integer(OverflowIdentifier, negative); }
static Integer Overflow(bool negative) { return Integer(TreeNode::OverflowIdentifier, negative); }
#if POINCARE_TREE_LOG
void logInteger(std::ostream & stream) const {
@@ -108,7 +108,7 @@ public:
/* An integer can have (k_maxNumberOfDigits + 1) digits: either when it is an
* overflow, or when we want to have one more digit than usual to compute a
* big division. */
bool isOverflow() const { return m_identifier == OverflowIdentifier; }
bool isOverflow() const { return m_identifier == TreeNode::OverflowIdentifier; }
static int NumberOfBase10DigitsWithoutSign(const Integer & i);
bool isOne() const { return (numberOfDigits() == 1 && digit(0) == 1 && !m_negative); };
bool isTwo() const { return (numberOfDigits() == 1 && digit(0) == 2 && !m_negative); };
@@ -140,7 +140,6 @@ public:
constexpr static int k_maxNumberOfDigits = 32;
private:
constexpr static int k_maxNumberOfDigitsBase10 = 308; // (2^32)^k_maxNumberOfDigits ~ 1E308
static constexpr int OverflowIdentifier = TreeNode::NoNodeIdentifier - 1;
// Constructors
Integer(native_uint_t * digits, uint16_t numberOfDigits, bool negative);

2
poincare/include/poincare/tree_handle.h
View File

@@ -127,7 +127,7 @@ protected:
void setIdentifierAndRetain(uint16_t newId);
void setTo(const TreeHandle & tr);
static bool hasNode(uint16_t identifier) { return identifier > TreeNode::NoNodeIdentifier; }
static bool hasNode(uint16_t identifier) { return identifier < TreeNode::NoNodeIdentifier; }
/* Hierarchy operations */
// Add

3
poincare/include/poincare/tree_node.h
View File

@@ -39,7 +39,8 @@ constexpr static int ByteAlignment = sizeof(AlignedNodeBuffer);
class TreeNode {
friend class TreePool;
public:
static constexpr uint16_t NoNodeIdentifier = -1;
static constexpr uint16_t NoNodeIdentifier = -2;
static constexpr uint16_t OverflowIdentifier = TreeNode::NoNodeIdentifier + 1; // Used for Integer
// Constructor and destructor
virtual ~TreeNode() {}