mewin/cppdap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address #7 nits and fix compiler warning (#9)

Browse Source 
Compiler warning was signed / unsigned compare.
This commit is contained in:
Ben Clayton 2019-12-31 21:04:57 +00:00 committed by GitHub
parent 73d697eac4
commit d19d8f83c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/session.cpp
View File

@ -314,39 +314,40 @@ class Impl : public dap::Session {
} }
return [=] { return [=] {
handler(data, handler(
[&](const dap::TypeInfo* typeinfo, const void* data) { data,
// onSuccess [&](const dap::TypeInfo* typeinfo, const void* data) {
dap::json::Serializer s; // onSuccess
s.field("seq", dap::integer(nextSeq++)); dap::json::Serializer s;
s.field("type", "response"); s.field("seq", dap::integer(nextSeq++));
s.field("request_seq", sequence); s.field("type", "response");
s.field("success", dap::boolean(true)); s.field("request_seq", sequence);
s.field("command", command); s.field("success", dap::boolean(true));
s.field("body", [&](dap::Serializer* s) { s.field("command", command);
return typeinfo->serialize(s, data); s.field("body", [&](dap::Serializer* s) {
}); return typeinfo->serialize(s, data);
send(s.dump()); });
send(s.dump());
if (auto handler = handlers.responseSent(typeinfo)) { if (auto handler = handlers.responseSent(typeinfo)) {
handler(data, nullptr); handler(data, nullptr);
} }
}, },
[&](const dap::TypeInfo* typeinfo, const dap::Error& error) { [&](const dap::TypeInfo* typeinfo, const dap::Error& error) {
// onError // onError
dap::json::Serializer s; dap::json::Serializer s;
s.field("seq", dap::integer(nextSeq++)); s.field("seq", dap::integer(nextSeq++));
s.field("type", "response"); s.field("type", "response");
s.field("request_seq", sequence); s.field("request_seq", sequence);
s.field("success", dap::boolean(false)); s.field("success", dap::boolean(false));
s.field("command", command); s.field("command", command);
s.field("message", error.message); s.field("message", error.message);
send(s.dump()); send(s.dump());
if (auto handler = handlers.responseSent(typeinfo)) { if (auto handler = handlers.responseSent(typeinfo)) {
handler(nullptr, &error); handler(nullptr, &error);
} }
}); });
typeinfo->destruct(data); typeinfo->destruct(data);
delete[] data; delete[] data;
}; };
@ -416,7 +417,6 @@ class Impl : public dap::Session {
d->field("body", [&](const dap::Deserializer* d) { d->field("body", [&](const dap::Deserializer* d) {
return typeinfo->deserialize(d, data.get()); return typeinfo->deserialize(d, data.get());
}); });
handler(data.get(), nullptr); handler(data.get(), nullptr);
typeinfo->destruct(data.get()); typeinfo->destruct(data.get());

78
src/session_test.cpp
View File

@ -42,19 +42,19 @@ struct TestResponse : public Response {
DAP_STRUCT_TYPEINFO(TestResponse, DAP_STRUCT_TYPEINFO(TestResponse,
"test-response", "test-response",
DAP_FIELD(b, "b"), DAP_FIELD(b, "res_b"),
DAP_FIELD(i, "i"), DAP_FIELD(i, "res_i"),
DAP_FIELD(n, "n"), DAP_FIELD(n, "res_n"),
DAP_FIELD(a, "a"), DAP_FIELD(a, "res_a"),
DAP_FIELD(o, "o"), DAP_FIELD(o, "res_o"),
DAP_FIELD(s, "s"), DAP_FIELD(s, "res_s"),
DAP_FIELD(o1, "o1"), DAP_FIELD(o1, "res_o1"),
DAP_FIELD(o2, "o2")); DAP_FIELD(o2, "res_o2"));
struct TestRequest : public Request { struct TestRequest : public Request {
using Response = TestResponse; using Response = TestResponse;
boolean req_b; boolean b;
integer i; integer i;
number n; number n;
array<integer> a; array<integer> a;
@ -66,14 +66,14 @@ struct TestRequest : public Request {
DAP_STRUCT_TYPEINFO(TestRequest, DAP_STRUCT_TYPEINFO(TestRequest,
"test-request", "test-request",
DAP_FIELD(req_b, "req_b"), DAP_FIELD(b, "req_b"),
DAP_FIELD(i, "i"), DAP_FIELD(i, "req_i"),
DAP_FIELD(n, "n"), DAP_FIELD(n, "req_n"),
DAP_FIELD(a, "a"), DAP_FIELD(a, "req_a"),
DAP_FIELD(o, "o"), DAP_FIELD(o, "req_o"),
DAP_FIELD(s, "s"), DAP_FIELD(s, "req_s"),
DAP_FIELD(o1, "o1"), DAP_FIELD(o1, "req_o1"),
DAP_FIELD(o2, "o2")); DAP_FIELD(o2, "req_o2"));
struct TestEvent : public Event { struct TestEvent : public Event {
boolean b; boolean b;
@ -88,14 +88,14 @@ struct TestEvent : public Event {
DAP_STRUCT_TYPEINFO(TestEvent, DAP_STRUCT_TYPEINFO(TestEvent,
"test-event", "test-event",
DAP_FIELD(b, "b"), DAP_FIELD(b, "evt_b"),
DAP_FIELD(i, "i"), DAP_FIELD(i, "evt_i"),
DAP_FIELD(n, "n"), DAP_FIELD(n, "evt_n"),
DAP_FIELD(a, "a"), DAP_FIELD(a, "evt_a"),
DAP_FIELD(o, "o"), DAP_FIELD(o, "evt_o"),
DAP_FIELD(s, "s"), DAP_FIELD(s, "evt_s"),
DAP_FIELD(o1, "o1"), DAP_FIELD(o1, "evt_o1"),
DAP_FIELD(o2, "o2")); DAP_FIELD(o2, "evt_o2"));
}; // namespace dap }; // namespace dap
@ -103,7 +103,7 @@ namespace {
dap::TestRequest createRequest() { dap::TestRequest createRequest() {
dap::TestRequest request; dap::TestRequest request;
request.req_b = false; request.b = false;
request.i = 72; request.i = 72;
request.n = 9.87; request.n = 9.87;
request.a = {2, 5, 7, 8}; request.a = {2, 5, 7, 8};
@ -177,7 +177,7 @@ TEST_F(SessionTest, Request) {
client->send(request).get(); client->send(request).get();
// Check request was received correctly. // Check request was received correctly.
ASSERT_EQ(received.req_b, request.req_b); ASSERT_EQ(received.b, request.b);
ASSERT_EQ(received.i, request.i); ASSERT_EQ(received.i, request.i);
ASSERT_EQ(received.n, request.n); ASSERT_EQ(received.n, request.n);
ASSERT_EQ(received.a, request.a); ASSERT_EQ(received.a, request.a);
@ -220,29 +220,23 @@ TEST_F(SessionTest, RequestResponseSuccess) {
} }
TEST_F(SessionTest, BreakPointRequestResponseSuccess) { TEST_F(SessionTest, BreakPointRequestResponseSuccess) {
server->registerHandler( server->registerHandler([&](const dap::SetBreakpointsRequest&) {
[&](const dap::SetBreakpointsRequest&) { dap::SetBreakpointsResponse response;
dap::SetBreakpointsResponse rsp; dap::Breakpoint bp;
dap::array<dap::Breakpoint> breakpoints; bp.line = 2;
dap::Breakpoint bpItem; response.breakpoints.emplace_back(std::move(bp));
bpItem.line = 2; return response;
breakpoints.emplace_back(std::move(bpItem));
rsp.breakpoints.swap(breakpoints);
return rsp;
}); });
bind(); bind();
dap::SetBreakpointsRequest request; auto got = client->send(dap::SetBreakpointsRequest{}).get();
auto response = client->send(request);
auto got = response.get();
// Check response was received correctly. // Check response was received correctly.
ASSERT_EQ(got.error, false); ASSERT_EQ(got.error, false);
ASSERT_EQ(got.response.breakpoints.size(), 1); ASSERT_EQ(got.response.breakpoints.size(), 1U);
} }
TEST_F(SessionTest, RequestResponseOrError) { TEST_F(SessionTest, RequestResponseOrError) {
server->registerHandler( server->registerHandler(
[&](const dap::TestRequest&) -> dap::ResponseOrError<dap::TestResponse> { [&](const dap::TestRequest&) -> dap::ResponseOrError<dap::TestResponse> {