wrap all unit and converter pointers to free memory automatically

Author: Enchufa2

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: units
-Version: 1.0-0.2
+Version: 1.0-0.3
 Title: Measurement Units for R Vectors
 Authors@R: c(person("Edzer", "Pebesma", role = c("aut", "cre"), email = "edzer.pebesma@uni-muenster.de", comment = c(ORCID = "0000-0001-8049-7069")),
     person("Thomas", "Mailund", role = "aut", email = "mailund@birc.au.dk"),

NEWS.md

@@ -8,6 +8,8 @@
 * Fix `print` methods for `units` and `mixed_units`, which now correctly return
   invisibly the object being printed; #422
 
+* Wrap all pointers to avoid memory leaks derived from errors.
+
 # version 1.0-0
 
 * Breaking change: a new tokenizer fixes longstanding issues with parsing

R/RcppExports.R

@@ -29,16 +29,16 @@ ud_convert_doubles <- function(x, from, to) {
     .Call('_units_ud_convert_doubles', PACKAGE = 'units', x, from, to)
 }
 
-ud_map_names <- function(names, inunit) {
-    invisible(.Call('_units_ud_map_names', PACKAGE = 'units', names, inunit))
+ud_map_names <- function(names, unit) {
+    invisible(.Call('_units_ud_map_names', PACKAGE = 'units', names, unit))
 }
 
 ud_unmap_names <- function(names) {
     invisible(.Call('_units_ud_unmap_names', PACKAGE = 'units', names))
 }
 
-ud_map_symbols <- function(symbols, inunit) {
-    invisible(.Call('_units_ud_map_symbols', PACKAGE = 'units', symbols, inunit))
+ud_map_symbols <- function(symbols, unit) {
+    invisible(.Call('_units_ud_map_symbols', PACKAGE = 'units', symbols, unit))
 }
 
 ud_unmap_symbols <- function(symbols) {

src/RcppExports.cpp

@@ -1,6 +1,7 @@
 // Generated by using Rcpp::compileAttributes() -> do not edit by hand
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
+#include "units_types.h"
 #include <Rcpp.h>
 
 using namespace Rcpp;
@@ -85,12 +86,12 @@ BEGIN_RCPP
 END_RCPP
 }
 // ud_map_names
-void ud_map_names(CharacterVector names, SEXP inunit);
-RcppExport SEXP _units_ud_map_names(SEXP namesSEXP, SEXP inunitSEXP) {
+void ud_map_names(CharacterVector names, xut_unit unit);
+RcppExport SEXP _units_ud_map_names(SEXP namesSEXP, SEXP unitSEXP) {
 BEGIN_RCPP
     Rcpp::traits::input_parameter< CharacterVector >::type names(namesSEXP);
-    Rcpp::traits::input_parameter< SEXP >::type inunit(inunitSEXP);
-    ud_map_names(names, inunit);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
+    ud_map_names(names, unit);
     return R_NilValue;
 END_RCPP
 }
@@ -104,12 +105,12 @@ BEGIN_RCPP
 END_RCPP
 }
 // ud_map_symbols
-void ud_map_symbols(CharacterVector symbols, SEXP inunit);
-RcppExport SEXP _units_ud_map_symbols(SEXP symbolsSEXP, SEXP inunitSEXP) {
+void ud_map_symbols(CharacterVector symbols, xut_unit unit);
+RcppExport SEXP _units_ud_map_symbols(SEXP symbolsSEXP, SEXP unitSEXP) {
 BEGIN_RCPP
     Rcpp::traits::input_parameter< CharacterVector >::type symbols(symbolsSEXP);
-    Rcpp::traits::input_parameter< SEXP >::type inunit(inunitSEXP);
-    ud_map_symbols(symbols, inunit);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
+    ud_map_symbols(symbols, unit);
     return R_NilValue;
 END_RCPP
 }
@@ -123,7 +124,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // R_ut_get_dimensionless_unit_one
-SEXP R_ut_get_dimensionless_unit_one();
+xut_unit R_ut_get_dimensionless_unit_one();
 RcppExport SEXP _units_R_ut_get_dimensionless_unit_one() {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
@@ -132,7 +133,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // R_ut_new_base_unit
-SEXP R_ut_new_base_unit();
+xut_unit R_ut_new_base_unit();
 RcppExport SEXP _units_R_ut_new_base_unit() {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
@@ -141,7 +142,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // R_ut_new_dimensionless_unit
-SEXP R_ut_new_dimensionless_unit();
+xut_unit R_ut_new_dimensionless_unit();
 RcppExport SEXP _units_R_ut_new_dimensionless_unit() {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
@@ -150,114 +151,114 @@ BEGIN_RCPP
 END_RCPP
 }
 // R_ut_get_name
-CharacterVector R_ut_get_name(SEXP unit);
+CharacterVector R_ut_get_name(xut_unit unit);
 RcppExport SEXP _units_R_ut_get_name(SEXP unitSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type unit(unitSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_get_name(unit));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_get_symbol
-CharacterVector R_ut_get_symbol(SEXP unit);
+CharacterVector R_ut_get_symbol(xut_unit unit);
 RcppExport SEXP _units_R_ut_get_symbol(SEXP unitSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type unit(unitSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_get_symbol(unit));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_scale
-SEXP R_ut_scale(SEXP unit, double factor);
+xut_unit R_ut_scale(xut_unit unit, double factor);
 RcppExport SEXP _units_R_ut_scale(SEXP unitSEXP, SEXP factorSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type unit(unitSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
     Rcpp::traits::input_parameter< double >::type factor(factorSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_scale(unit, factor));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_offset
-SEXP R_ut_offset(SEXP unit, double origin);
+xut_unit R_ut_offset(xut_unit unit, double origin);
 RcppExport SEXP _units_R_ut_offset(SEXP unitSEXP, SEXP originSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type unit(unitSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type unit(unitSEXP);
     Rcpp::traits::input_parameter< double >::type origin(originSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_offset(unit, origin));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_multiply
-SEXP R_ut_multiply(SEXP a, SEXP b);
+xut_unit R_ut_multiply(xut_unit a, xut_unit b);
 RcppExport SEXP _units_R_ut_multiply(SEXP aSEXP, SEXP bSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
-    Rcpp::traits::input_parameter< SEXP >::type b(bSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type a(aSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type b(bSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_multiply(a, b));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_invert
-SEXP R_ut_invert(SEXP a);
+xut_unit R_ut_invert(xut_unit a);
 RcppExport SEXP _units_R_ut_invert(SEXP aSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type a(aSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_invert(a));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_divide
-SEXP R_ut_divide(SEXP numer, SEXP denom);
+xut_unit R_ut_divide(xut_unit numer, xut_unit denom);
 RcppExport SEXP _units_R_ut_divide(SEXP numerSEXP, SEXP denomSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type numer(numerSEXP);
-    Rcpp::traits::input_parameter< SEXP >::type denom(denomSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type numer(numerSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type denom(denomSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_divide(numer, denom));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_raise
-SEXP R_ut_raise(SEXP a, int i);
+xut_unit R_ut_raise(xut_unit a, int i);
 RcppExport SEXP _units_R_ut_raise(SEXP aSEXP, SEXP iSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type a(aSEXP);
     Rcpp::traits::input_parameter< int >::type i(iSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_raise(a, i));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_root
-SEXP R_ut_root(SEXP a, int i);
+xut_unit R_ut_root(xut_unit a, int i);
 RcppExport SEXP _units_R_ut_root(SEXP aSEXP, SEXP iSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type a(aSEXP);
     Rcpp::traits::input_parameter< int >::type i(iSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_root(a, i));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_log
-SEXP R_ut_log(SEXP a, double base);
+xut_unit R_ut_log(xut_unit a, double base);
 RcppExport SEXP _units_R_ut_log(SEXP aSEXP, SEXP baseSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type a(aSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type a(aSEXP);
     Rcpp::traits::input_parameter< double >::type base(baseSEXP);
     rcpp_result_gen = Rcpp::wrap(R_ut_log(a, base));
     return rcpp_result_gen;
 END_RCPP
 }
 // R_ut_parse
-SEXP R_ut_parse(std::string name);
+xut_unit R_ut_parse(std::string name);
 RcppExport SEXP _units_R_ut_parse(SEXP nameSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
@@ -267,11 +268,11 @@ BEGIN_RCPP
 END_RCPP
 }
 // R_ut_format
-CharacterVector R_ut_format(SEXP p, bool names, bool definition, bool ascii);
+CharacterVector R_ut_format(xut_unit p, bool names, bool definition, bool ascii);
 RcppExport SEXP _units_R_ut_format(SEXP pSEXP, SEXP namesSEXP, SEXP definitionSEXP, SEXP asciiSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
-    Rcpp::traits::input_parameter< SEXP >::type p(pSEXP);
+    Rcpp::traits::input_parameter< xut_unit >::type p(pSEXP);
     Rcpp::traits::input_parameter< bool >::type names(namesSEXP);
     Rcpp::traits::input_parameter< bool >::type definition(definitionSEXP);
     Rcpp::traits::input_parameter< bool >::type ascii(asciiSEXP);