drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: drew:27c39d05e82a5007bb895a83cb8fa3f601160476
Branches Tags
drew:main
drew:0.1.0
..
compare: drew:a98e66ac475aca632e61ab88238bfe74d8b91307
Branches Tags
drew:main
drew:0.1.0

No commits in common. "27c39d05e82a5007bb895a83cb8fa3f601160476" and "a98e66ac475aca632e61ab88238bfe74d8b91307" have entirely different histories.
27c39d05e8 ... a98e66ac47

7 changed files with 3 additions and 118 deletions
Show Stats Expand all files Collapse all files

4
lib/yunq/test/example/example.yunq
View File

@ -13,7 +13,3 @@ message Types {
message Cap {
capability cap;
}
message Repeated {
repeated u64 unsigned_ints;
}

37
lib/yunq/test/example/example.yunq.cpp
View File

@ -136,43 +136,6 @@ uint64_t Cap::SerializeInternal(yunq::Serializer& serializer) const {
return serializer.size();
}
glcr::Status Repeated::ParseFromBytes(const yunq::MessageView& message) {
RETURN_ERROR(ParseFromBytesInternal(message));
return glcr::Status::Ok();
}
glcr::Status Repeated::ParseFromBytes(const yunq::MessageView& message, const glcr::CapBuffer& caps) {
RETURN_ERROR(ParseFromBytesInternal(message));
return glcr::Status::Ok();
}
glcr::Status Repeated::ParseFromBytesInternal(const yunq::MessageView& message) {
RETURN_ERROR(message.CheckHeader());
// Parse unsigned_ints.
ASSIGN_OR_RETURN(unsigned_ints_, message.ReadRepeated<uint64_t>(0));
return glcr::Status::Ok();
}
uint64_t Repeated::SerializeToBytes(glcr::ByteBuffer& bytes, uint64_t offset) const {
yunq::Serializer serializer(bytes, offset, 1);
return SerializeInternal(serializer);
}
uint64_t Repeated::SerializeToBytes(glcr::ByteBuffer& bytes, uint64_t offset, glcr::CapBuffer& caps) const {
yunq::Serializer serializer(bytes, offset, 1, caps);
return SerializeInternal(serializer);
}
uint64_t Repeated::SerializeInternal(yunq::Serializer& serializer) const {
// Write unsigned_ints.
serializer.WriteRepeated<uint64_t>(0, unsigned_ints_);
serializer.WriteHeader();
return serializer.size();
}
} // namepace ex

26
lib/yunq/test/example/example.yunq.h
View File

@ -98,32 +98,6 @@ class Cap {
uint64_t SerializeInternal(yunq::Serializer& serializer) const;
};
class Repeated {
public:
Repeated() {}
// Delete copy and move until implemented.
Repeated(const Repeated&) = delete;
Repeated(Repeated&&) = default;
Repeated& operator=(Repeated&&) = default;
[[nodiscard]] glcr::Status ParseFromBytes(const yunq::MessageView& message);
[[nodiscard]] glcr::Status ParseFromBytes(const yunq::MessageView& message, const glcr::CapBuffer&);
uint64_t SerializeToBytes(glcr::ByteBuffer&, uint64_t offset) const;
uint64_t SerializeToBytes(glcr::ByteBuffer&, uint64_t offset, glcr::CapBuffer&) const;
const glcr::Vector<uint64_t>& unsigned_ints() const { return unsigned_ints_; }
glcr::Vector<uint64_t>& mutable_unsigned_ints() { return unsigned_ints_; }
void add_unsigned_ints(const uint64_t& value) { unsigned_ints_.PushBack(value); }
void add_unsigned_ints(uint64_t&& value) { unsigned_ints_.PushBack(glcr::Move(value)); }
private:
glcr::Vector<uint64_t> unsigned_ints_;
// Parses everything except for caps.
glcr::Status ParseFromBytesInternal(const yunq::MessageView& message);
uint64_t SerializeInternal(yunq::Serializer& serializer) const;
};
} // namepace ex

48
lib/yunq/test/yunq_test.cpp
View File

@ -50,51 +50,3 @@ TEST_CASE("Types Serialization", "[yunq]") {
REQUIRE(b.signed_int() == -1);
REQUIRE(b.str() == "test");
}
TEST_CASE("Cap Setter/Getter", "[yunq]") {
ex::Cap c;
c.set_cap(1234);
REQUIRE(c.cap() == 1234);
}
TEST_CASE("Cap Serialization Inline", "[yunq]") {
ex::Cap a;
a.set_cap(1234);
glcr::ByteBuffer buf(1024);
a.SerializeToBytes(buf, 0);
ex::Cap b;
yunq::MessageView v(buf, 0);
REQUIRE(b.ParseFromBytes(v).ok() == true);
REQUIRE(b.cap() == 1234);
}
TEST_CASE("Cap Serialization Sidebuffer", "[yunq]") {
ex::Cap a;
a.set_cap(1234);
glcr::ByteBuffer buf(1024);
glcr::CapBuffer caps(1);
a.SerializeToBytes(buf, 0, caps);
ex::Cap b;
yunq::MessageView v(buf, 0);
REQUIRE(b.ParseFromBytes(v, caps).ok() == true);
REQUIRE(b.cap() == 1234);
}
TEST_CASE("Repeated Setter/Getter", "[yunq]") {
ex::Repeated r;
r.mutable_unsigned_ints().PushBack(1);
r.add_unsigned_ints(2);
uint64_t c = 3;
r.add_unsigned_ints(glcr::Move(c));
REQUIRE(r.unsigned_ints()[0] == 1);
REQUIRE(r.unsigned_ints()[1] == 2);
REQUIRE(r.unsigned_ints()[2] == 3);
}

2
scripts/test-mem.sh
View File

@ -6,7 +6,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
pushd "$DIR/.."
if [[ ! -e test-bin ]]; then
cmake -B test-bin/ -G Ninja -D enable_testing=on -D CMAKE_ASM-ATT_COMPILER=gcc
cmake -B test-bin/ -G Ninja -D enable_testing=on
fi
pushd test-bin/
ninja build_test

2
scripts/test.sh
View File

@ -6,7 +6,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
pushd "$DIR/.."
if [[ ! -e test-bin ]]; then
cmake -B test-bin/ -G Ninja -D enable_testing=on -D CMAKE_ASM-ATT_COMPILER=gcc
cmake -B test-bin/ -G Ninja -D enable_testing=on
fi
pushd test-bin/
ninja build_test

2
yunq/message.cpp.jinja
View File

@ -107,7 +107,7 @@ uint64_t {{message.name}}::SerializeInternal(yunq::Serializer& serializer) const
{%- if field.type == Type.MESSAGE %}
serializer.WriteRepeatedMessage<{{field.cpp_type()}}>({{field.number}}, {{field.name}}_);
{%- elif field.type == Type.CAPABILITY %}
{%- elif field.type != Type.CAPABILITY %}
serializer.WriteRepeatedCapability({{field.number}}, {{field.name}}_);
{%- else %}
serializer.WriteRepeated<{{field.cpp_type()}}>({{field.number}}, {{field.name}}_);