root/mrpc
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fixed functions with void return

Browse Source
This commit is contained in:
Mutzi
2023-12-22 15:27:37 +01:00
parent 12392808f7
commit e550ed32e2
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generators/ts_c.rs
View File

@@ -34,10 +34,10 @@ pub fn method_args(method: &crate::data::MethodTy) -> String {
} }
pub fn method_ret(method: &crate::data::MethodTy) -> String { pub fn method_ret(method: &crate::data::MethodTy) -> String {
if method.ret_stream || method.ret.is_none() { if method.ret_stream {
String::new() String::new()
} else { } else {
format!(": Promise<{}>", ty_to_str(method.ret.as_ref().unwrap())) format!(": Promise<{}>", method.ret.as_ref().map(ty_to_str).unwrap_or("void".into()))
} }
} }

5
templates/cpp_server.rs.cxx
View File

@@ -89,8 +89,9 @@ void mrpc::MRPCServer::msg_handler(const std::shared_ptr<restbed::Session> __c,
} }
@for (name, ty) in m.args.iter().map(|a| (&a.name, ty_to_str(&a.ty))) { @ty @name; @name << json_get(__data, "@name"); @for (name, ty) in m.args.iter().map(|a| (&a.name, ty_to_str(&a.ty))) { @ty @name; @name << json_get(__data, "@name");
} }
@if m.ret_stream || m.ret.is_none() {@(s.name)_@(m.name)(@call_args(m));} @if m.ret_stream {@(s.name)_@(m.name)(@call_args(m));}
else {send_msg(__c, @(s.name)_@(m.name)(@call_args(m)));} else if m.ret.is_some() {send_msg(__c, @(s.name)_@(m.name)(@call_args(m)));}
else {@(s.name)_@(m.name)(@call_args(m)); send_msg(__c, nullptr);}
@}} @}}
else @{ throw std::exception@{@}; @} else @{ throw std::exception@{@}; @}
@}} @}}

4
templates/cpp_server_json.rs.cxx
View File

@@ -24,6 +24,10 @@ mrpc::MRPCJWriter& operator>>(const mrpc::@e.name &v, mrpc::MRPCJWriter &w) @{
return w; return w;
@} @}
} }
inline mrpc::MRPCJWriter& operator>>(const std::nullptr_t &, mrpc::MRPCJWriter &w) @{
w.Null();
return w;
@}
template<typename T> template<typename T>
inline std::vector<T>& operator<<(std::vector<T> &v, const rapidjson::Value &j); inline std::vector<T>& operator<<(std::vector<T> &v, const rapidjson::Value &j);

6
templates/typescript_client.rs.ts
View File

@@ -36,8 +36,10 @@ export class MRPCConnector @{
else if m.ret_stream {fetchEventSource(this.url, @{ else if m.ret_stream {fetchEventSource(this.url, @{
method: 'POST', method: 'POST',
body: JSON.stringify(__msg), body: JSON.stringify(__msg),
onmessage: __e => __cbk(JSON.parse(__e.data)) onmessage: __e => __cbk(JSON.parse(__e.data)),
@});} else {fetch(this.url, @{method: 'POST', body: JSON.stringify(__msg)@});} onerror: __e => @{throw __e;@},
onclose: () => __cbk(null)
@});} else {return fetch(this.url, @{method: 'POST', body: JSON.stringify(__msg)@}).then(__r => @{@});}
@} @}
}} }}
@} @}