Skip to content

Commit 48ffa7c

Browse files
authored
Merge pull request #2 from Gekctek/xtendedNumbers2
Xtended numbers2
2 parents 3ca3a99 + 0068f93 commit 48ffa7c

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

mops.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/NatLabs/ByteUtils"
88

99
[dependencies]
1010
base = "0.14.11"
11-
xtended-numbers = "0.4.0"
11+
xtended-numbers = "2.0.0"
1212

1313
[dev-dependencies]
1414
test = "2.1.1"
@@ -18,5 +18,5 @@ augmented-btrees = "0.6.0"
1818
itertools = "0.2.2"
1919

2020
[toolchain]
21-
moc = "0.14.9"
21+
moc = "0.14.13"
2222
wasmtime = "28.0.1"

src/lib.mo

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import Int64 "mo:base/Int64";
1414
import Int "mo:base/Int";
1515
import Nat "mo:base/Nat";
1616
import Debug "mo:base/Debug";
17+
import BInterface "mo:buffer";
1718

1819
import FloatX "mo:xtended-numbers/FloatX";
1920

@@ -113,7 +114,7 @@ module ByteUtils {
113114
};
114115

115116
public func toFloat(bytes : Bytes) : Float {
116-
let ?fx = FloatX.decode(bytes, #f64, #lsb) else Debug.trap("ByteUtils: failed to decode Float");
117+
let ?fx = FloatX.fromBytes(bytes, #f64, #lsb) else Debug.trap("ByteUtils: failed to decode Float");
117118
FloatX.toFloat(fx);
118119
};
119120

@@ -159,7 +160,7 @@ module ByteUtils {
159160
let fx = FloatX.fromFloat(f, #f64);
160161
let buffer = B.Buffer<Nat8>(8);
161162

162-
FloatX.encode(buffer, fx, #lsb);
163+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(buffer), fx, #lsb);
163164
B.toArray(buffer);
164165
};
165166

@@ -218,7 +219,7 @@ module ByteUtils {
218219
};
219220

220221
public func toFloat(bytes : Bytes) : Float {
221-
let ?fx = FloatX.decode(bytes, #f64, #msb) else Debug.trap("ByteUtils: failed to decode Float");
222+
let ?fx = FloatX.fromBytes(bytes, #f64, #msb) else Debug.trap("ByteUtils: failed to decode Float");
222223
FloatX.toFloat(fx);
223224
};
224225

@@ -264,7 +265,7 @@ module ByteUtils {
264265
let fx = FloatX.fromFloat(f, #f64);
265266
let buffer = B.Buffer<Nat8>(8);
266267

267-
FloatX.encode(buffer, fx, #msb);
268+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(buffer), fx, #msb);
268269
B.toArray(buffer);
269270
};
270271

@@ -327,7 +328,7 @@ module ByteUtils {
327328
// IEEE-754 sortable encoding
328329
let fx = FloatX.fromFloat(f, #f64);
329330
let buffer = B.Buffer<Nat8>(8);
330-
FloatX.encode(buffer, fx, #msb); // Use big-endian
331+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(buffer), fx, #msb); // Use big-endian
331332

332333
let bytes = B.toArray(buffer);
333334

@@ -446,7 +447,7 @@ module ByteUtils {
446447
);
447448
};
448449

449-
let ?fx = FloatX.decode(decodedBytes.vals(), #f64, #msb) else Debug.trap("ByteUtils: failed to decode Float");
450+
let ?fx = FloatX.fromBytes(decodedBytes.vals(), #f64, #msb) else Debug.trap("ByteUtils: failed to decode Float");
450451
FloatX.toFloat(fx);
451452
};
452453
};
@@ -573,7 +574,7 @@ module ByteUtils {
573574

574575
public func addFloat(buffer : B.Buffer<Nat8>, f : Float) {
575576
let fx = FloatX.fromFloat(f, #f64);
576-
FloatX.encode(buffer, fx, #lsb);
577+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(buffer), fx, #lsb);
577578
};
578579

579580
// Add new write methods (write at specific offset)
@@ -629,7 +630,7 @@ module ByteUtils {
629630
public func writeFloat(buffer : BufferLike<Nat8>, offset : Nat, f : Float) {
630631
let fx = FloatX.fromFloat(f, #f64);
631632
let tempBuffer = B.Buffer<Nat8>(8);
632-
FloatX.encode(tempBuffer, fx, #lsb);
633+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(tempBuffer), fx, #lsb);
633634

634635
// Copy from temp buffer to target buffer at offset
635636
for (i in Iter.range(0, 7)) {
@@ -743,7 +744,7 @@ module ByteUtils {
743744

744745
public func addFloat(buffer : B.Buffer<Nat8>, f : Float) {
745746
let fx = FloatX.fromFloat(f, #f64);
746-
FloatX.encode(buffer, fx, #msb);
747+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(buffer), fx, #msb);
747748
};
748749

749750
// Add new write methods (write at specific offset)
@@ -799,7 +800,7 @@ module ByteUtils {
799800
public func writeFloat(buffer : B.Buffer<Nat8>, offset : Nat, f : Float) {
800801
let fx = FloatX.fromFloat(f, #f64);
801802
let tempBuffer = B.Buffer<Nat8>(8);
802-
FloatX.encode(tempBuffer, fx, #msb);
803+
FloatX.toBytesBuffer(BInterface.fromDeprecatedBuffer(tempBuffer), fx, #msb);
803804

804805
// Copy from temp buffer to target buffer at offset
805806
for (i in Iter.range(0, 7)) {
@@ -1346,5 +1347,4 @@ module ByteUtils {
13461347
};
13471348

13481349
};
1349-
13501350
};

0 commit comments

Comments
 (0)