xo-object: streamline DFloat construction, like w/ DList/DInteger
This commit is contained in:
parent
fc1108a9b1
commit
53affe2fd1
3 changed files with 14 additions and 6 deletions
|
|
@ -6,6 +6,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <xo/alloc2/Allocator.hpp>
|
#include <xo/alloc2/Allocator.hpp>
|
||||||
|
#include <xo/facet/obj.hpp>
|
||||||
#include <xo/indentlog/print/ppindentinfo.hpp>
|
#include <xo/indentlog/print/ppindentinfo.hpp>
|
||||||
|
|
||||||
namespace xo {
|
namespace xo {
|
||||||
|
|
@ -16,9 +17,12 @@ namespace xo {
|
||||||
|
|
||||||
explicit DFloat(double x) : value_{x} {}
|
explicit DFloat(double x) : value_{x} {}
|
||||||
|
|
||||||
|
/** probably want default = ANumeric, once we introduce it **/
|
||||||
|
template <typename AFacet>
|
||||||
|
static obj<AFacet,DFloat> box(obj<AAllocator> mm, double x);
|
||||||
|
|
||||||
/** allocate boxed value @p x using memory from @p mm **/
|
/** allocate boxed value @p x using memory from @p mm **/
|
||||||
static DFloat * make(obj<AAllocator> mm,
|
static DFloat * _box(obj<AAllocator> mm, double x);
|
||||||
double x);
|
|
||||||
|
|
||||||
double value() const noexcept { return value_; }
|
double value() const noexcept { return value_; }
|
||||||
|
|
||||||
|
|
@ -31,6 +35,12 @@ namespace xo {
|
||||||
/** boxed floating-oint value **/
|
/** boxed floating-oint value **/
|
||||||
double value_;
|
double value_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template <typename AFacet>
|
||||||
|
obj<AFacet,DFloat>
|
||||||
|
DFloat::box(obj<AAllocator> mm, double x) {
|
||||||
|
return obj<AFacet,DFloat>(DFloat::_box(mm, x));
|
||||||
|
}
|
||||||
} /*nmaespace scm*/
|
} /*nmaespace scm*/
|
||||||
} /*namespace xo*/
|
} /*namespace xo*/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,7 @@ namespace xo {
|
||||||
|
|
||||||
namespace scm {
|
namespace scm {
|
||||||
DFloat *
|
DFloat *
|
||||||
DFloat::make(obj<AAllocator> mm,
|
DFloat::_box(obj<AAllocator> mm, double x)
|
||||||
double x)
|
|
||||||
{
|
{
|
||||||
void * mem = mm.alloc(typeseq::id<DFloat>(),
|
void * mem = mm.alloc(typeseq::id<DFloat>(),
|
||||||
sizeof(DFloat));
|
sizeof(DFloat));
|
||||||
|
|
|
||||||
|
|
@ -167,8 +167,7 @@ namespace ut {
|
||||||
ok = c_o.is_type_installed(typeseq::id<DList>());
|
ok = c_o.is_type_installed(typeseq::id<DList>());
|
||||||
REQUIRE(ok);
|
REQUIRE(ok);
|
||||||
|
|
||||||
DFloat * x0 = DFloat::make(gc_o, 3.1415927);
|
auto x0_o = DFloat::box<AGCObject>(gc_o, 3.1415927);
|
||||||
auto x0_o = with_facet<AGCObject>::mkobj(x0);
|
|
||||||
c_o.add_gc_root(&x0_o);
|
c_o.add_gc_root(&x0_o);
|
||||||
REQUIRE(to_0->allocated() == sizeof(AllocHeader) + sizeof(DFloat));
|
REQUIRE(to_0->allocated() == sizeof(AllocHeader) + sizeof(DFloat));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue