Bug fix #5: parameters not passed by reference.

jfjlaros · Jul 20, 2019 · d1885f4 · d1885f4
1 parent 71ea0ab
commit d1885f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/rpcCall.tcc b/src/rpcCall.tcc
@@ -61,7 +61,7 @@ void _call(void (*)(void), Tuple<C*, void (P::*)(Tail...)> t, Args&... args) {
  * @param args Parameter pack for @a f.
  */
 template <class T, class... Tail, class F, class... Args>
-void _call(void (*f_)(T, Tail...), F f, Args... args) {
+void _call(void (*f_)(T, Tail...), F f, Args&... args) {
   T data;
 
   _read(&data);
@@ -70,7 +70,7 @@ void _call(void (*f_)(T, Tail...), F f, Args... args) {
 
 // Parameter of type @a T&.
 template <class T, class... Tail, class F, class... Args>
-void _call(void (*f_)(T&, Tail...), F f, Args... args) {
+void _call(void (*f_)(T&, Tail...), F f, Args&... args) {
   T data;
 
   _read(&data);

diff --git a/tests/test_rpcCall.cc b/tests/test_rpcCall.cc
@@ -203,6 +203,9 @@ TEST_CASE("RPC call function with Vector types", "[call][vector]") {
       return v;
     }
     static void f2(Object<Vector<int>, char>&) {}
+    static int f3(Vector<signed char>&, int i) {
+      return 1;
+    }
   };
 
   // Void function, parameter is of type Vector.
@@ -227,6 +230,12 @@ TEST_CASE("RPC call function with Vector types", "[call][vector]") {
   rpcCall(S::f2);
   REQUIRE(Serial.rx == sizeof(size_t) + 2 * sizeof(int) + sizeof(char));
   REQUIRE(Serial.tx == 0);
+
+  Serial.reset();
+  Serial.prepare((size_t)2, (signed char)123, (signed char)234, 10);
+  rpcCall(S::f3);
+  REQUIRE(Serial.rx == sizeof(size_t) + 2 * sizeof(signed char) + sizeof(int));
+  REQUIRE(Serial.tx == sizeof(int));
 }
 
 TEST_CASE("RPC call class member functions", "[call][class]") {

diff --git a/tests/test_signature.cc b/tests/test_signature.cc
@@ -43,7 +43,9 @@ TEST_CASE("Objects", "[signature][object]") {
 TEST_CASE("Vectors", "[signature][vector]") {
   void (*f0)(Vector<int>, float);
   Vector<int> (*f1)(float);
+  int (*f2)(Vector<signed char>&, int);
 
   REQUIRE(signature(f0) == ": [i] f");
   REQUIRE(signature(f1) == "[i]: f");
+  REQUIRE(signature(f2) == "i: [b] i");
 }