diff options
| author | 2023-01-16 04:25:52 +0100 | |
|---|---|---|
| committer | 2023-01-16 04:25:52 +0100 | |
| commit | d886885b0ec2506fa2caf0986a3d0e496fea91c2 (patch) | |
| tree | 58bc4bcd1963ea885abd60a65bf87a2685526714 /src/Integer.cpp | |
| parent | 47a7fbe438ee7350a2b151e007f07043ef596775 (diff) | |
| download | libplist-d886885b0ec2506fa2caf0986a3d0e496fea91c2.tar.gz libplist-d886885b0ec2506fa2caf0986a3d0e496fea91c2.tar.bz2 | |
Rename PLIST_UINT to PLIST_INT and add plist_new_int() and plist_get_int_val()
This properly supports getting and setting signed or unsigned integer values.
Also, a new helper function plist_int_val_is_negative() was added to determine if
a given #PLIST_INT node has a negative value or not.
The old type PLIST_UINT is defined as a macro with the value of PLIST_INT for
backwards compatibility.
This commit also adds int vs. uint support to the C++ interface, and the python
bindings in a hopefully useful way.
Diffstat (limited to 'src/Integer.cpp')
| -rw-r--r-- | src/Integer.cpp | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/src/Integer.cpp b/src/Integer.cpp index a40d026..7fa0f93 100644 --- a/src/Integer.cpp +++ b/src/Integer.cpp | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | namespace PList | 24 | namespace PList |
| 25 | { | 25 | { |
| 26 | 26 | ||
| 27 | Integer::Integer(Node* parent) : Node(PLIST_UINT, parent) | 27 | Integer::Integer(Node* parent) : Node(PLIST_INT, parent) |
| 28 | { | 28 | { |
| 29 | } | 29 | } |
| 30 | 30 | ||
| @@ -32,7 +32,7 @@ Integer::Integer(plist_t node, Node* parent) : Node(node, parent) | |||
| 32 | { | 32 | { |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | Integer::Integer(const PList::Integer& i) : Node(PLIST_UINT) | 35 | Integer::Integer(const PList::Integer& i) : Node(PLIST_INT) |
| 36 | { | 36 | { |
| 37 | plist_set_uint_val(_node, i.GetValue()); | 37 | plist_set_uint_val(_node, i.GetValue()); |
| 38 | } | 38 | } |
| @@ -44,11 +44,16 @@ Integer& Integer::operator=(const PList::Integer& i) | |||
| 44 | return *this; | 44 | return *this; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | Integer::Integer(uint64_t i) : Node(PLIST_UINT) | 47 | Integer::Integer(uint64_t i) : Node(PLIST_INT) |
| 48 | { | 48 | { |
| 49 | plist_set_uint_val(_node, i); | 49 | plist_set_uint_val(_node, i); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | Integer::Integer(int64_t i) : Node(PLIST_INT) | ||
| 53 | { | ||
| 54 | plist_set_int_val(_node, i); | ||
| 55 | } | ||
| 56 | |||
| 52 | Integer::~Integer() | 57 | Integer::~Integer() |
| 53 | { | 58 | { |
| 54 | } | 59 | } |
| @@ -58,16 +63,38 @@ Node* Integer::Clone() const | |||
| 58 | return new Integer(*this); | 63 | return new Integer(*this); |
| 59 | } | 64 | } |
| 60 | 65 | ||
| 66 | void Integer::SetValue(int64_t i) | ||
| 67 | { | ||
| 68 | plist_set_int_val(_node, i); | ||
| 69 | } | ||
| 70 | |||
| 61 | void Integer::SetValue(uint64_t i) | 71 | void Integer::SetValue(uint64_t i) |
| 62 | { | 72 | { |
| 63 | plist_set_uint_val(_node, i); | 73 | plist_set_uint_val(_node, i); |
| 64 | } | 74 | } |
| 65 | 75 | ||
| 66 | uint64_t Integer::GetValue() const | 76 | void Integer::SetUnsignedValue(uint64_t i) |
| 77 | { | ||
| 78 | plist_set_uint_val(_node, i); | ||
| 79 | } | ||
| 80 | |||
| 81 | int64_t Integer::GetValue() const | ||
| 82 | { | ||
| 83 | int64_t i = 0; | ||
| 84 | plist_get_int_val(_node, &i); | ||
| 85 | return i; | ||
| 86 | } | ||
| 87 | |||
| 88 | uint64_t Integer::GetUnsignedValue() const | ||
| 67 | { | 89 | { |
| 68 | uint64_t i = 0; | 90 | uint64_t i = 0; |
| 69 | plist_get_uint_val(_node, &i); | 91 | plist_get_uint_val(_node, &i); |
| 70 | return i; | 92 | return i; |
| 71 | } | 93 | } |
| 72 | 94 | ||
| 95 | bool Integer::isNegative() const | ||
| 96 | { | ||
| 97 | return plist_int_val_is_negative(_node); | ||
| 98 | } | ||
| 99 | |||
| 73 | } // namespace PList | 100 | } // namespace PList |
