summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/codec-json/c++/json.tmpl.hpp6
-rw-r--r--modules/codec-json/tests/codec-json.cpp32
-rw-r--r--modules/codec/c++/data.hpp75
-rw-r--r--modules/codec/tests/codec.cpp58
-rw-r--r--modules/codec/tests/csv.cpp2
-rw-r--r--modules/tools/.nix/derivation.nix4
-rw-r--r--modules/tools/SConstruct1
-rw-r--r--modules/tools/c++/cli_analyzer.hpp12
8 files changed, 95 insertions, 95 deletions
diff --git a/modules/codec-json/c++/json.tmpl.hpp b/modules/codec-json/c++/json.tmpl.hpp
index 0a9f53d..002d477 100644
--- a/modules/codec-json/c++/json.tmpl.hpp
+++ b/modules/codec-json/c++/json.tmpl.hpp
@@ -773,7 +773,7 @@ struct json_decode<schema::Array<T,D>, ToDecode> {
using Schema = schema::Array<T,D>;
template<size_t Level>
- static error_or<void> decode_flat_level(buffer_view& buff, std::vector<data<T, encode::Native<rmt::Host>>>& to, std::array<std::size_t, D>& index, std::array<std::size_t, D>& dims, bool log_dim){
+ static error_or<void> decode_flat_level(buffer_view& buff, std::vector<data<T, encode::Native<storage::Default>>>& to, std::array<std::size_t, D>& index, std::array<std::size_t, D>& dims, bool log_dim){
if constexpr (Level == D) {
json_helper::skip_whitespace(buff);
try {
@@ -830,7 +830,7 @@ struct json_decode<schema::Array<T,D>, ToDecode> {
}
template<std::size_t Level>
- static error_or<void> decode_unflat_level(std::vector<data<T,encode::Native<rmt::Host>>>& flat, data<schema::Array<T,D>, ToDecode>& to, std::array<std::size_t, D>& index, std::size_t& flat_index) {
+ static error_or<void> decode_unflat_level(std::vector<data<T,encode::Native<storage::Default>>>& flat, data<schema::Array<T,D>, ToDecode>& to, std::array<std::size_t, D>& index, std::size_t& flat_index) {
if constexpr ( Level == D ){
auto& flat_data = flat.at(flat_index);
to.at(index) = std::move(flat_data);
@@ -852,7 +852,7 @@ struct json_decode<schema::Array<T,D>, ToDecode> {
std::array<std::size_t, D> index;
std::array<std::size_t, D> dims;
std::fill(dims.begin(), dims.end(), 0);
- std::vector<data<T,encode::Native<rmt::Host>>> flat_array;
+ std::vector<data<T,encode::Native<storage::Default>>> flat_array;
auto eov = decode_flat_level<0>(buff, flat_array, index, dims, true);
if(eov.is_error()){
return eov;
diff --git a/modules/codec-json/tests/codec-json.cpp b/modules/codec-json/tests/codec-json.cpp
index aca4e21..d6492d2 100644
--- a/modules/codec-json/tests/codec-json.cpp
+++ b/modules/codec-json/tests/codec-json.cpp
@@ -28,7 +28,7 @@ using TestStruct = Struct<
SAW_TEST("UInt8 write"){
using namespace saw;
- data<schema::UInt8, encode::Native<rmt::Host>> native_int;
+ data<schema::UInt8, encode::Native<storage::Default>> native_int;
data<schema::UInt8, encode::Json> json_int;
native_int.set(121);
@@ -48,7 +48,7 @@ SAW_TEST("UInt8 write"){
SAW_TEST("UInt16 write"){
using namespace saw;
- data<schema::UInt16, encode::Native<rmt::Host>> native_int;
+ data<schema::UInt16, encode::Native<storage::Default>> native_int;
data<schema::UInt16, encode::Json> json_int;
native_int.set(24413);
@@ -68,7 +68,7 @@ SAW_TEST("UInt16 write"){
SAW_TEST("UInt32 write"){
using namespace saw;
- data<schema::UInt32, encode::Native<rmt::Host>> native_int;
+ data<schema::UInt32, encode::Native<storage::Default>> native_int;
data<schema::UInt32, encode::Json> json_int;
native_int.set(44123);
@@ -88,7 +88,7 @@ SAW_TEST("UInt32 write"){
SAW_TEST("UInt64 write"){
using namespace saw;
- data<schema::UInt64, encode::Native<rmt::Host>> native_int;
+ data<schema::UInt64, encode::Native<storage::Default>> native_int;
data<schema::UInt64, encode::Json> json_int;
native_int.set(243345543);
@@ -108,7 +108,7 @@ SAW_TEST("UInt64 write"){
SAW_TEST("Int8 write"){
using namespace saw;
- data<schema::Int8, encode::Native<rmt::Host>> native_int;
+ data<schema::Int8, encode::Native<storage::Default>> native_int;
data<schema::Int8, encode::Json> json_int;
native_int.set(-121);
@@ -128,7 +128,7 @@ SAW_TEST("Int8 write"){
SAW_TEST("Int16 write"){
using namespace saw;
- data<schema::Int16, encode::Native<rmt::Host>> native_int;
+ data<schema::Int16, encode::Native<storage::Default>> native_int;
data<schema::Int16, encode::Json> json_int;
native_int.set(-24413);
@@ -148,7 +148,7 @@ SAW_TEST("Int16 write"){
SAW_TEST("Int32 write"){
using namespace saw;
- data<schema::Int32, encode::Native<rmt::Host>> native_int;
+ data<schema::Int32, encode::Native<storage::Default>> native_int;
data<schema::Int32, encode::Json> json_int;
native_int.set(44123);
@@ -168,7 +168,7 @@ SAW_TEST("Int32 write"){
SAW_TEST("Int64 write"){
using namespace saw;
- data<schema::Int64, encode::Native<rmt::Host>> native_int;
+ data<schema::Int64, encode::Native<storage::Default>> native_int;
data<schema::Int64, encode::Json> json_int;
native_int.set(243345543);
@@ -188,7 +188,7 @@ SAW_TEST("Int64 write"){
SAW_TEST("String write and read"){
using namespace saw;
- data<schema::String, encode::Native<rmt::Host>> nat_str;
+ data<schema::String, encode::Native<storage::Default>> nat_str;
data<schema::String, encode::Json> json_str;
nat_str.set("foo");
@@ -215,7 +215,7 @@ SAW_TEST("String write and read"){
SAW_TEST("Tuple read and write"){
using namespace saw;
- data<schema::TestTuple, encode::Native<rmt::Host>> native_tup;
+ data<schema::TestTuple, encode::Native<storage::Default>> native_tup;
data<schema::TestTuple, encode::Json> json_tup;
auto& nat_zero = native_tup.template get<0>();
@@ -244,7 +244,7 @@ SAW_TEST("Tuple read and write"){
SAW_TEST("Array write"){
using namespace saw;
- data<schema::TestArray, encode::Native<rmt::Host>> native{3u};
+ data<schema::TestArray, encode::Native<storage::Default>> native{3u};
data<schema::TestArray, encode::Json> json;
native.at(0).set("foo");
@@ -264,7 +264,7 @@ SAW_TEST("Array write"){
SAW_TEST("Three Dim Array write and read"){
using namespace saw;
- data<schema::TestMultiArray, encode::Native<rmt::Host>> native{2,1,2};
+ data<schema::TestMultiArray, encode::Native<storage::Default>> native{2,1,2};
data<schema::TestMultiArray, encode::Json> json;
native.at(0,0,0).set("multi");
@@ -294,7 +294,7 @@ SAW_TEST("Three Dim Array write and read"){
SAW_TEST("Struct read and write"){
using namespace saw;
- data<schema::TestStruct, encode::Native<rmt::Host>> native;
+ data<schema::TestStruct, encode::Native<storage::Default>> native;
data<schema::TestStruct, encode::Json> json;
native.get<"foo">().set(5);
@@ -319,7 +319,7 @@ SAW_TEST("Struct read and write"){
SAW_TEST("Int8 read"){
using namespace saw;
- data<schema::Int8, encode::Native<rmt::Host>> native_int;
+ data<schema::Int8, encode::Native<storage::Default>> native_int;
data<schema::Int8, encode::Json> json_int{"43"};
codec<schema::Int8, encode::Json> json_codec;
@@ -337,7 +337,7 @@ SAW_TEST("Int8 read"){
SAW_TEST("Int64 read"){
using namespace saw;
- data<schema::Int64, encode::Native<rmt::Host>> native_int;
+ data<schema::Int64, encode::Native<storage::Default>> native_int;
data<schema::Int64, encode::Json> json_int{"-453"};
codec<schema::Int64, encode::Json> json_codec;
@@ -355,7 +355,7 @@ SAW_TEST("Int64 read"){
SAW_TEST("Tuple Pretty Encode and Decode"){
using namespace saw;
- data<schema::TestTuple, encode::Native<rmt::Host>> native_tup;
+ data<schema::TestTuple, encode::Native<storage::Default>> native_tup;
data<schema::TestTuple, encode::Json> json_tup;
auto& nat_zero = native_tup.template get<0>();
diff --git a/modules/codec/c++/data.hpp b/modules/codec/c++/data.hpp
index 3d14a18..c7af0d4 100644
--- a/modules/codec/c++/data.hpp
+++ b/modules/codec/c++/data.hpp
@@ -15,11 +15,12 @@
#include "schema.hpp"
namespace saw {
-namespace rmt {
-struct Host {};
+namespace storage {
+struct Default {};
}
+
namespace encode {
-template<typename Platform = rmt::Host>
+template<typename Storage = storage::Default>
struct Native {};
}
template<typename Schema, typename Encode>
@@ -80,7 +81,7 @@ struct native_data_type<schema::Primitive<schema::FloatingPoint, 8>> {
using type = double;
};
-template<typename T, typename Encoding = encode::Native<rmt::Host>>
+template<typename T, typename Encoding = encode::Native<storage::Default>>
class data {
private:
static_assert(always_false<T>, "Type not supported");
@@ -168,9 +169,9 @@ public:
* Union type for native data classes
*/
template<typename... T, string_literal... literals>
-class data<schema::Union<schema::Member<T, literals>...>, encode::Native<rmt::Host>> {
+class data<schema::Union<schema::Member<T, literals>...>, encode::Native<storage::Default>> {
private:
- std::variant<data<T,encode::Native<rmt::Host>>...> value_;
+ std::variant<data<T,encode::Native<storage::Default>>...> value_;
public:
data() = default;
@@ -178,12 +179,12 @@ public:
SAW_DEFAULT_MOVE(data);
template<string_literal lit>
- void set(data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<rmt::Host>> val){
+ void set(data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<storage::Default>> val){
value_ = std::move(val);
}
template<string_literal lit>
- data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<rmt::Host>>& init(){
+ data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<storage::Default>>& init(){
value_.template emplace<parameter_key_pack_index<lit, literals...>::value>();
return get<lit>();
}
@@ -194,20 +195,20 @@ public:
}
template<string_literal lit>
- data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<rmt::Host>>& get(){
+ data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<storage::Default>>& get(){
return std::get<parameter_key_pack_index<lit, literals...>::value>(value_);
}
template<string_literal lit>
- const data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<rmt::Host>>& get() const{
+ const data<typename parameter_pack_type<parameter_key_pack_index<lit, literals...>::value, T...>::type, encode::Native<storage::Default>>& get() const{
return std::get<parameter_key_pack_index<lit, literals...>::value>(value_);
}
};
template<typename... T, string_literal... literals>
-class data<schema::Struct<schema::Member<T, literals>...>, encode::Native<rmt::Host>> {
+class data<schema::Struct<schema::Member<T, literals>...>, encode::Native<storage::Default>> {
private:
- std::tuple<data<T,encode::Native<rmt::Host>>...> value_;
+ std::tuple<data<T,encode::Native<storage::Default>>...> value_;
public:
data() = default;
SAW_DEFAULT_COPY(data);
@@ -220,7 +221,7 @@ public:
literal, literals...
>::value
, T...>::type
- , encode::Native<rmt::Host>>& get(){
+ , encode::Native<storage::Default>>& get(){
return std::get<parameter_key_pack_index<literal, literals...>::value>(value_);
}
@@ -231,7 +232,7 @@ public:
literal, literals...
>::value
, T...>::type
- , encode::Native<rmt::Host>>& get() const {
+ , encode::Native<storage::Default>>& get() const {
return std::get<parameter_key_pack_index<literal, literals...>::value>(value_);
}
@@ -241,21 +242,21 @@ public:
};
template<typename... T>
-class data<schema::Tuple<T...>, encode::Native<rmt::Host>> {
+class data<schema::Tuple<T...>, encode::Native<storage::Default>> {
private:
- std::tuple<data<T,encode::Native<rmt::Host>>...> value_;
+ std::tuple<data<T,encode::Native<storage::Default>>...> value_;
public:
data() = default;
SAW_DEFAULT_COPY(data);
SAW_DEFAULT_MOVE(data);
template<size_t i>
- data<typename parameter_pack_type<i,T...>::type, encode::Native<rmt::Host>>& get(){
+ data<typename parameter_pack_type<i,T...>::type, encode::Native<storage::Default>>& get(){
return std::get<i>(value_);
}
template<size_t i>
- const data<typename parameter_pack_type<i,T...>::type, encode::Native<rmt::Host>>& get() const{
+ const data<typename parameter_pack_type<i,T...>::type, encode::Native<storage::Default>>& get() const{
return std::get<i>(value_);
}
@@ -265,11 +266,11 @@ public:
};
template<typename T, size_t Dim>
-class data<schema::Array<T,Dim>, encode::Native<rmt::Host>> {
+class data<schema::Array<T,Dim>, encode::Native<storage::Default>> {
private:
// data<schema::FixedArray<schema::UInt64, Dim>> dims_;
std::array<uint64_t, Dim> dims_;
- std::vector<data<T, encode::Native<rmt::Host>>> value_;
+ std::vector<data<T, encode::Native<storage::Default>>> value_;
uint64_t get_full_size() const {
uint64_t s = 1;
@@ -301,7 +302,7 @@ class data<schema::Array<T,Dim>, encode::Native<rmt::Host>> {
}
template<size_t i = 0>
- error_or<void> add(saw::data<T,encode::Native<rmt::Host>> data){
+ error_or<void> add(saw::data<T,encode::Native<storage::Default>> data){
/** @todo
* Generally the last dimension can always accept a element so to say.
* Changing the others would require moving data due to the stride changing.
@@ -336,29 +337,29 @@ class data<schema::Array<T,Dim>, encode::Native<rmt::Host>> {
static_assert(sizeof...(Dims)==Dim, "Argument size must be equal to the Dimension");
}
- data<T, encode::Native<rmt::Host>>& at(const std::array<uint64_t, Dim>& ind){
+ data<T, encode::Native<storage::Default>>& at(const std::array<uint64_t, Dim>& ind){
return value_.at(this->get_flat_index(ind));
}
- const data<T, encode::Native<rmt::Host>>& at(const std::array<uint64_t, Dim>& ind) const {
+ const data<T, encode::Native<storage::Default>>& at(const std::array<uint64_t, Dim>& ind) const {
return value_.at(this->get_flat_index(ind));
}
template<std::integral... Dims>
- data<T, encode::Native<rmt::Host>>& at(Dims... i){
+ data<T, encode::Native<storage::Default>>& at(Dims... i){
return value_.at(this->get_flat_index(std::array<uint64_t, Dim>{static_cast<uint64_t>(i)...}));
}
template<std::integral... Dims>
- const data<T, encode::Native<rmt::Host>>& at(Dims... i) const {
+ const data<T, encode::Native<storage::Default>>& at(Dims... i) const {
return value_.at(this->get_flat_index(std::array<uint64_t, Dim>{static_cast<uint64_t>(i)...}));
}
- data<T,encode::Native<rmt::Host>>& at(const data<schema::FixedArray<schema::UInt64,Dim>>& i){
+ data<T,encode::Native<storage::Default>>& at(const data<schema::FixedArray<schema::UInt64,Dim>>& i){
return value_.at(this->get_flat_index(i));
}
- const data<T,encode::Native<rmt::Host>>& at(const data<schema::FixedArray<schema::UInt64,Dim>>& i)const{
+ const data<T,encode::Native<storage::Default>>& at(const data<schema::FixedArray<schema::UInt64,Dim>>& i)const{
return value_.at(this->get_flat_index(i));
}
@@ -406,39 +407,39 @@ private:
};
template<typename T, uint64_t... D>
-class data<schema::FixedArray<T,D...>, encode::Native<rmt::Host>> {
+class data<schema::FixedArray<T,D...>, encode::Native<storage::Default>> {
private:
- //using inner_type = std::array<data<T, encode::Native<rmt::Host>>, multiply_helper<Dims...>::value>;
+ //using inner_type = std::array<data<T, encode::Native<storage::Default>>, multiply_helper<Dims...>::value>;
//std::unique_ptr<inner_type> value_;
- using ArrayT = std::array<data<T, encode::Native<rmt::Host>>, ct_multiply<uint64_t, D...>::value>;
+ using ArrayT = std::array<data<T, encode::Native<storage::Default>>, ct_multiply<uint64_t, D...>::value>;
ArrayT value_;
public:
data() = default;
- data<T, encode::Native<rmt::Host>>& at(const std::array<uint64_t, sizeof...(D)>& ind){
+ data<T, encode::Native<storage::Default>>& at(const std::array<uint64_t, sizeof...(D)>& ind){
return value_.at(this->get_flat_index(ind));
}
- const data<T, encode::Native<rmt::Host>>& at(const std::array<uint64_t, sizeof...(D)>& ind) const {
+ const data<T, encode::Native<storage::Default>>& at(const std::array<uint64_t, sizeof...(D)>& ind) const {
return value_.at(this->get_flat_index(ind));
}
template<std::integral... Dims>
- data<T, encode::Native<rmt::Host>>& at(Dims... i) {
+ data<T, encode::Native<storage::Default>>& at(Dims... i) {
return value_.at(this->get_flat_index({i...}));
}
template<std::integral... Dims>
- const data<T, encode::Native<rmt::Host>>& at(Dims... i) const {
+ const data<T, encode::Native<storage::Default>>& at(Dims... i) const {
return value_.at(this->get_flat_index({i...}));
}
- data<T, encode::Native<rmt::Host>>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>>& i){
+ data<T, encode::Native<storage::Default>>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>>& i){
return value_.at(this->get_flat_index(i));
}
- const data<T, encode::Native<rmt::Host>>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>>& i)const{
+ const data<T, encode::Native<storage::Default>>& at(const data<schema::FixedArray<schema::UInt64, sizeof...(D)>>& i)const{
return value_.at(this->get_flat_index(i));
}
@@ -469,7 +470,7 @@ private:
};
template<>
-class data<schema::String, encode::Native<rmt::Host>> {
+class data<schema::String, encode::Native<storage::Default>> {
private:
std::string value_;
public:
diff --git a/modules/codec/tests/codec.cpp b/modules/codec/tests/codec.cpp
index 8ffe9f0..b67d70d 100644
--- a/modules/codec/tests/codec.cpp
+++ b/modules/codec/tests/codec.cpp
@@ -50,7 +50,7 @@ using TestInterface = Interface<
SAW_TEST("One Dimensional Array") {
using namespace saw;
- data<schema::OneDimArray, encode::Native<rmt::Host>> arr{500u};
+ data<schema::OneDimArray, encode::Native<storage::Default>> arr{500u};
int bar = 0;
@@ -69,7 +69,7 @@ SAW_TEST("One Dimensional Array") {
SAW_TEST("One dim Array Default init"){
using namespace saw;
- data<schema::OneDimArray, encode::Native<rmt::Host>> arr;
+ data<schema::OneDimArray, encode::Native<storage::Default>> arr;
SAW_EXPECT(arr.get_dim_size(0) == 0, "Dim should be size 0");
SAW_EXPECT(arr.size() == 0, "Total size should also be zero");
@@ -78,7 +78,7 @@ SAW_TEST("One dim Array Default init"){
SAW_TEST("One dimensional Array Add"){
using namespace saw;
- data<schema::OneDimArray, encode::Native<rmt::Host>> arr{5u};
+ data<schema::OneDimArray, encode::Native<storage::Default>> arr{5u};
int bar = 0;
@@ -95,7 +95,7 @@ SAW_TEST("One dimensional Array Add"){
SAW_TEST("Two Dimensional Array") {
using namespace saw;
- data<schema::TwoDimArray, encode::Native<rmt::Host>> arr{10,30u};
+ data<schema::TwoDimArray, encode::Native<storage::Default>> arr{10,30u};
int expected_sum = (300 * 301) / 2;
@@ -119,7 +119,7 @@ SAW_TEST("Two Dimensional Array") {
SAW_TEST("Three Dimensional Array") {
using namespace saw;
- data<schema::ThreeDimArray, encode::Native<rmt::Host>> arr{10,10u,3};
+ data<schema::ThreeDimArray, encode::Native<storage::Default>> arr{10,10u,3};
int expected_sum = (300 * 301) / 2;
int bar = 0;
@@ -145,7 +145,7 @@ SAW_TEST("Three Dimensional Array") {
SAW_TEST("KelSimple UInt16 write"){
using namespace saw;
- data<schema::UInt16, encode::Native<rmt::Host>> native;
+ data<schema::UInt16, encode::Native<storage::Default>> native;
data<schema::UInt16, encode::KelSimple> simple;
codec<schema::UInt16, encode::KelSimple> codec;
@@ -168,7 +168,7 @@ SAW_TEST("KelSimple UInt16 write"){
SAW_TEST("KelSimple UInt32 write"){
using namespace saw;
- data<schema::UInt32, encode::Native<rmt::Host>> native;
+ data<schema::UInt32, encode::Native<storage::Default>> native;
data<schema::UInt32, encode::KelSimple> simple;
codec<schema::UInt32, encode::KelSimple> codec;
@@ -191,7 +191,7 @@ SAW_TEST("KelSimple UInt32 write"){
SAW_TEST("KelSimple Array write and read back"){
using namespace saw;
- data<schema::TwoDimArray, encode::Native<rmt::Host>> native{2,3};
+ data<schema::TwoDimArray, encode::Native<storage::Default>> native{2,3};
data<schema::TwoDimArray, encode::KelSimple> simple;
codec<schema::TwoDimArray, encode::KelSimple> codec;
@@ -224,7 +224,7 @@ SAW_TEST("KelSimple Array write and read back"){
SAW_TEST("KelSimple Struct write and read back"){
using namespace saw;
- data<schema::TestStruct,encode::Native<rmt::Host>> native;
+ data<schema::TestStruct,encode::Native<storage::Default>> native;
data<schema::TestStruct,encode::KelSimple> simple;
auto& tda = native.template get<"two_dim_array">();
@@ -255,7 +255,7 @@ SAW_TEST("KelSimple Struct write and read back"){
SAW_TEST("Native Union same type compilation"){
using namespace saw;
- data<schema::TestSameTypeUnion, encode::Native<rmt::Host>> native;
+ data<schema::TestSameTypeUnion, encode::Native<storage::Default>> native;
native.template init<"two">().set(50u);
@@ -268,10 +268,10 @@ SAW_TEST("Native Union same type compilation"){
SAW_TEST("KelSimple Union write and read back"){
using namespace saw;
- data<schema::TestUnion,encode::Native<rmt::Host>> native;
+ data<schema::TestUnion,encode::Native<storage::Default>> native;
data<schema::TestUnion,encode::KelSimple> simple;
- native.template set<"number">(data<schema::UInt64, encode::Native<rmt::Host>>{});
+ native.template set<"number">(data<schema::UInt64, encode::Native<storage::Default>>{});
native.template get<"number">().set(410);
codec<schema::TestUnion, encode::KelSimple> codec;
@@ -292,7 +292,7 @@ SAW_TEST("KelSimple Union write and read back"){
SAW_TEST("KelSimple Tuple write and read back"){
using namespace saw;
- data<schema::TestTuple,encode::Native<rmt::Host>> native;
+ data<schema::TestTuple,encode::Native<storage::Default>> native;
data<schema::TestTuple,encode::KelSimple> simple;
auto& tda = native.template get<0>();
@@ -323,7 +323,7 @@ SAW_TEST("KelSimple Tuple write and read back"){
SAW_TEST("KelSimple String write and read back"){
using namespace saw;
- data<schema::String,encode::Native<rmt::Host>> native;
+ data<schema::String,encode::Native<storage::Default>> native;
data<schema::String,encode::KelSimple> simple;
std::string str = "FooBananaJoe";
@@ -348,14 +348,14 @@ SAW_TEST("Function basics"){
using namespace saw;
{
- data<schema::TestInt32Pair, encode::Native<rmt::Host>> native;
+ data<schema::TestInt32Pair, encode::Native<storage::Default>> native;
native.get<0>().set(5);
native.get<1>().set(40);
- auto func_add = function_factory<schema::TestCalcFunction, encode::Native<rmt::Host>>::create(
- [](data<schema::TestInt32Pair, encode::Native<rmt::Host>> req){
- data<schema::Int32, encode::Native<rmt::Host>> resp;
+ auto func_add = function_factory<schema::TestCalcFunction, encode::Native<storage::Default>>::create(
+ [](data<schema::TestInt32Pair, encode::Native<storage::Default>> req){
+ data<schema::Int32, encode::Native<storage::Default>> resp;
resp.set(req.get<0>().get() + req.get<1>().get());
@@ -374,36 +374,36 @@ SAW_TEST("Function basics"){
SAW_TEST("Interface basics"){
using namespace saw;
- data<schema::TestInt32Pair, encode::Native<rmt::Host>> native;
+ data<schema::TestInt32Pair, encode::Native<storage::Default>> native;
auto func_add =
- [](data<schema::TestInt32Pair, encode::Native<rmt::Host>> req){
- data<schema::Int32, encode::Native<rmt::Host>> resp;
+ [](data<schema::TestInt32Pair, encode::Native<storage::Default>> req){
+ data<schema::Int32, encode::Native<storage::Default>> resp;
resp.set(req.get<0>().get() + req.get<1>().get());
return resp;
};
auto func_sub =
- [](data<schema::TestInt32Pair, encode::Native<rmt::Host>> req){
- data<schema::Int32, encode::Native<rmt::Host>> resp;
+ [](data<schema::TestInt32Pair, encode::Native<storage::Default>> req){
+ data<schema::Int32, encode::Native<storage::Default>> resp;
resp.set(req.get<0>().get() - req.get<1>().get());
return resp;
};
- auto func_multiply = [](data<schema::TestInt32Pair, encode::Native<rmt::Host>> req){
- data<schema::Int32, encode::Native<rmt::Host>> resp;
+ auto func_multiply = [](data<schema::TestInt32Pair, encode::Native<storage::Default>> req){
+ data<schema::Int32, encode::Native<storage::Default>> resp;
resp.set(req.get<0>().get() * req.get<1>().get());
return resp;
};
- auto iface = interface_factory<schema::TestInterface, encode::Native<rmt::Host>>::create(std::move(func_add), std::move(func_sub), std::move(func_multiply));
+ auto iface = interface_factory<schema::TestInterface, encode::Native<storage::Default>>::create(std::move(func_add), std::move(func_sub), std::move(func_multiply));
{
- data<schema::TestInt32Pair, encode::Native<rmt::Host>> native;
+ data<schema::TestInt32Pair, encode::Native<storage::Default>> native;
native.get<0>().set(5);
native.get<1>().set(40);
@@ -414,7 +414,7 @@ SAW_TEST("Interface basics"){
SAW_EXPECT(val.get() == 45, "Sum is incorrect");
}
{
- data<schema::TestInt32Pair, encode::Native<rmt::Host>> native;
+ data<schema::TestInt32Pair, encode::Native<storage::Default>> native;
native.get<0>().set(5);
native.get<1>().set(40);
@@ -425,7 +425,7 @@ SAW_TEST("Interface basics"){
SAW_EXPECT(val.get() == -35, "Sum is incorrect");
}
{
- data<schema::TestInt32Pair, encode::Native<rmt::Host>> native;
+ data<schema::TestInt32Pair, encode::Native<storage::Default>> native;
native.get<0>().set(5);
native.get<1>().set(40);
diff --git a/modules/codec/tests/csv.cpp b/modules/codec/tests/csv.cpp
index 6e9b124..04813c5 100644
--- a/modules/codec/tests/csv.cpp
+++ b/modules/codec/tests/csv.cpp
@@ -22,7 +22,7 @@ SAW_TEST("Codec Csv Encode Basic"){
using namespace saw;
size_t n_size = 3;
- data <TestArray, encode::Native<rmt::Host>> native_data{n_size};
+ data <TestArray, encode::Native<storage::Default>> native_data{n_size};
{
auto& row = native_data.at(0);
row.template get<"string">().set("foo");
diff --git a/modules/tools/.nix/derivation.nix b/modules/tools/.nix/derivation.nix
index 1c1431a..54ebb5e 100644
--- a/modules/tools/.nix/derivation.nix
+++ b/modules/tools/.nix/derivation.nix
@@ -7,9 +7,7 @@
, forstio
}:
-let
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
pname = "forstio-tools";
inherit version;
src = ./..;
diff --git a/modules/tools/SConstruct b/modules/tools/SConstruct
index ddfd768..fa67084 100644
--- a/modules/tools/SConstruct
+++ b/modules/tools/SConstruct
@@ -51,6 +51,7 @@ env_vars.Add(
);
env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
+ CXX=['c++'],
CPPDEFINES=['SAW_UNIX'],
CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
LIBS=[
diff --git a/modules/tools/c++/cli_analyzer.hpp b/modules/tools/c++/cli_analyzer.hpp
index 9a0998b..6b44987 100644
--- a/modules/tools/c++/cli_analyzer.hpp
+++ b/modules/tools/c++/cli_analyzer.hpp
@@ -27,7 +27,7 @@ struct cli_traverser {
template<typename Schema, typename Encoding>
struct cli_modifier {
codec<Schema, encode::Json> json;
- static_assert( std::is_same_v<Encoding, encode::Native>, "Not supported" );
+ static_assert( std::is_same_v<Encoding, encode::Native<storage::Default>>, "Not supported" );
error_or<void> read(
std::deque<std::string>& sch_path,
@@ -186,9 +186,9 @@ error_or<void> modify_data_on_cli(bool read_mode, const std::string_view& file_p
data<Schema, Encoding> enc_data{std::string_view{file_data}};
codec<Schema, Encoding> enc_codec;
- data<Schema, encode::Native> native_data;
+ data<Schema> native_data;
{
- auto eov = enc_codec.template decode<encode::Native>(enc_data, native_data);
+ auto eov = enc_codec.decode(enc_data, native_data);
if(eov.is_error()){
return eov;
}
@@ -196,20 +196,20 @@ error_or<void> modify_data_on_cli(bool read_mode, const std::string_view& file_p
if (read_mode) {
{
- auto eov = impl::cli_traverser<Schema, encode::Native>::template traverse<impl::cli_mode::read>(sch_path, native_data, json_data);
+ auto eov = impl::cli_traverser<Schema, encode::Native<storage::Default>>::template traverse<impl::cli_mode::read>(sch_path, native_data, json_data);
if(eov.is_error()){
return eov;
}
}
} else {
{
- auto eov = impl::cli_traverser<Schema, encode::Native>::template traverse<impl::cli_mode::write>(sch_path, native_data, json_data);
+ auto eov = impl::cli_traverser<Schema, encode::Native<storage::Default>>::template traverse<impl::cli_mode::write>(sch_path, native_data, json_data);
if(eov.is_error()){
return eov;
}
}
{
- auto eov = enc_codec.template encode<encode::Native>(native_data, enc_data);
+ auto eov = enc_codec.template encode<encode::Native<storage::Default>>(native_data, enc_data);
if(eov.is_error()){
return eov;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-17 12:11:04 +0000