[education/rkward] rkward/rbackend: Merge branch 'master' into work/backend_dlopen

[Thomas Friedrichsmeier]

Git commit 577876a30084cb74ad4a60067aadb3b45613b51b by Thomas Friedrichsmeier.
Committed on 10/05/2024 at 15:12.
Pushed by tfry into branch 'master'.

Merge branch 'master' into work/backend_dlopen

M  +4    -4    rkward/rbackend/rkrbackend.cpp

https://invent.kde.org/education/rkward/-/commit/577876a30084cb74ad4a60067aadb3b45613b51b

diff --cc rkward/rbackend/rkrbackend.cpp
index f34ec9502,9e98b3ee3..cf6486e6a
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@@ -891,8 -937,8 +891,8 @@@ SEXP doSubstackCall (SEXP _call, SEXP _
  
  	// For now, for simplicity, assume args are always strings, although possibly nested in lists
  	auto ret = RKRBackend::this_pointer->handleRequestWithSubcommands(call, RKRSupport::SEXPToNestedStrings(_args));
- 	if (!ret.warning.isEmpty()) RFn::Rf_warning(RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
- 	if (!ret.error.isEmpty()) RFn::Rf_error(RKTextCodec::toNative(ret.error).constData());
 -	if (!ret.warning.isEmpty()) Rf_warning("%s", RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
 -	if (!ret.error.isEmpty()) Rf_error("%s", RKTextCodec::toNative(ret.error).constData());
++	if (!ret.warning.isEmpty()) RFn::Rf_warning("%s", RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
++	if (!ret.error.isEmpty()) RFn::Rf_error("%s", RKTextCodec::toNative(ret.error).constData());
  
  	return RKRSupport::QVariantToSEXP(ret.ret);
  }
@@@ -900,11 -946,11 +900,11 @@@
  SEXP doPlainGenericRequest (SEXP call, SEXP synchronous) {
  	RK_TRACE (RBACKEND);
  
 -	R_CheckUserInterrupt ();
 +	RFn::R_CheckUserInterrupt ();
  
  	auto ret = RKRBackend::this_pointer->handlePlainGenericRequest(RKRSupport::SEXPToStringList(call), RKRSupport::SEXPToInt(synchronous));
- 	if (!ret.warning.isEmpty()) RFn::Rf_warning(RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
- 	if (!ret.error.isEmpty()) RFn::Rf_error(RKTextCodec::toNative(ret.error).constData());
 -	if (!ret.warning.isEmpty()) Rf_warning("%s", RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
 -	if (!ret.error.isEmpty()) Rf_error("%s", RKTextCodec::toNative(ret.error).constData());
++	if (!ret.warning.isEmpty()) RFn::Rf_warning("%s", RKTextCodec::toNative(ret.warning).constData());  // print warnings, first, as errors will cause a stop
++	if (!ret.error.isEmpty()) RFn::Rf_error("%s", RKTextCodec::toNative(ret.error).constData());
  
  	return RKRSupport::QVariantToSEXP(ret.ret);
  }