consistent use if ifndef

Author: pachadotdev

cpp4rtest/src/errors_fmt.h

@@ -1,4 +1,4 @@
-#define cpp4r_USE_FMT
+#define CPP4R_USE_FMT
 #define FMT_HEADER_ONLY
 #include "fmt/core.h"
 #include "fmt/format.h"

cpp4rtest/src/test-complex.h

@@ -355,11 +355,6 @@ context("complexes-C++") {
   test_that("comparison operator works") {
     using namespace cpp4r;
 
-    // SEXP base = PROTECT(Rf_allocVector(CPLXSXP, 2));
-    // SEXP same_values = PROTECT(Rf_allocVector(CPLXSXP, 2));
-    // SEXP diff_length = PROTECT(Rf_allocVector(CPLXSXP, 1));
-    // SEXP diff_values = PROTECT(Rf_allocVector(CPLXSXP, 2));
-
     cpp4r::complexes base(Rf_allocVector(CPLXSXP, 2));
     cpp4r::complexes same_values(Rf_allocVector(CPLXSXP, 2));
     cpp4r::complexes diff_length(Rf_allocVector(CPLXSXP, 1));
@@ -385,8 +380,6 @@ context("complexes-C++") {
     expect_true(!(base != same_values));
     expect_true(base != diff_length);
     expect_true(base != diff_values);
-
-    UNPROTECT(4);
   }
 
   test_that("proxy comparison works symmetrically") {
@@ -482,16 +475,20 @@ context("complexes-C++") {
     auto x0 = x[0];
     expect_true(x0 == one);
 
-    // Arithmetic is not defined on Rcomplex or r_complex,
-    // so using it on a proxy also fails and is not defined
-    // expect_error(x0 += two);
-    // expect_error(x0 -= two);
-    // expect_error(x0 *= two);
-    // expect_error(x0 /= two);
-    // expect_error(x0--);
-    // expect_error(x0++);
-    // expect_error(++x0);
-    // expect_error(--x0);
+    // Test compound assignment operators (now implemented in proxy class)
+    x0 += two;  // (1,1) + (2,2) = (3,3)
+    expect_true(x0 == cpp4r::r_complex(3, 3));
+
+    x0 -= two;  // (3,3) - (2,2) = (1,1)
+    expect_true(x0 == one);
+
+    x0 *= two;  // (1,1) * (2,2) = (1*2-1*2, 1*2+1*2) = (0,4)
+    expect_true(x0 == cpp4r::r_complex(0, 4));
+
+    x[0] = one;  // Reset to (1,1)
+    x0 = x[0];
+    x0 /= two;  // (1,1) / (2,2) = ((1*2+1*2) + (1*2-1*2)i)/(2²+2²) = (4,0)/8 = (0.5,0)
+    expect_true(x0 == cpp4r::r_complex(0.5, 0));
   }
 
   test_that("writable::complexes convert to complexes with correct size") {

cpp4rtest/src/test-protect.h

@@ -1,4 +1,4 @@
-#define cpp4r_USE_FMT
+#define CPP4R_USE_FMT
 
 #include <testthat.h>