From 4adb0a39db102dc53830c8445c84e13859887e98 Mon Sep 17 00:00:00 2001 From: Sebastian Krantz Date: Wed, 17 Jul 2024 21:59:01 +0200 Subject: [PATCH 1/3] Make these definitions conditional on the header not being loaded (on some weird R configurations this is the case). --- src/base_radixsort.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/base_radixsort.h b/src/base_radixsort.h index b23e8d79..3e844cbd 100644 --- a/src/base_radixsort.h +++ b/src/base_radixsort.h @@ -32,6 +32,7 @@ #define NAMED_BITS 16 +#ifndef DEFN_H struct sxpinfo_struct { SEXPTYPE type : TYPE_BITS; /* ==> (FUNSXP == 99) %% 2^5 == 3 == CLOSXP @@ -66,6 +67,7 @@ typedef struct VECTOR_SEXPREC { SEXPREC_HEADER; struct vecsxp_struct vecsxp; } VECTOR_SEXPREC, *VECSEXP; +#endif typedef struct { SEXPREC_HEADER; From 78f0e4b69465f1f28e7516e58ed39a4893cca529 Mon Sep 17 00:00:00 2001 From: Sebastian Krantz Date: Thu, 18 Jul 2024 01:03:23 +0200 Subject: [PATCH 2/3] No checks for semi and anti join. --- R/join.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/join.R b/R/join.R index 6d6b2c95..e0920724 100644 --- a/R/join.R +++ b/R/join.R @@ -155,7 +155,7 @@ join <- function(x, y, } # Check for duplicate columns and suffix as needed - if(any(nm <- match(ynam[-iyon], xnam, nomatch = 0L))) { + if(any(nm <- match(ynam[-iyon], xnam, nomatch = 0L)) && switch(how, semi = FALSE, anti = FALSE, TRUE)) { nnm <- nm != 0L nam <- xnam[nm[nnm]] if(is.character(drop.dup.cols) || drop.dup.cols) { From 7f20410a7e24df21fe7142f434f82fee2899254e Mon Sep 17 00:00:00 2001 From: Sebastian Krantz Date: Fri, 19 Jul 2024 08:45:49 +0200 Subject: [PATCH 3/3] Fix badges. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a339eb68..5523bc30 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ [![R-CMD-check](https://github.com/SebKrantz/collapse/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/SebKrantz/collapse/actions/workflows/R-CMD-check.yaml) -[![collapse status badge](https://fastverse.r-universe.dev/badges/collapse)](https://fastverse.r-universe.dev) +[![collapse status badge](https://fastverse.r-universe.dev/badges/collapse)](https://fastverse.r-universe.dev/collapse) [![CRAN status](https://www.r-pkg.org/badges/version/collapse)](https://cran.r-project.org/package=collapse) [![cran checks](https://badges.cranchecks.info/worst/collapse.svg)](https://cran.r-project.org/web/checks/check_results_collapse.html) -![downloads per month](http://cranlogs.r-pkg.org/badges/collapse?color=blue) -![downloads](http://cranlogs.r-pkg.org/badges/grand-total/collapse?color=blue) +![downloads per month](http://cranlogs.r-pkg.org/badges/collapse) +![downloads](http://cranlogs.r-pkg.org/badges/grand-total/collapse) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-collapse.svg)](https://anaconda.org/conda-forge/r-collapse) [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-collapse.svg)](https://anaconda.org/conda-forge/r-collapse) [![Codecov test coverage](https://codecov.io/gh/SebKrantz/collapse/branch/master/graph/badge.svg)](https://app.codecov.io/gh/SebKrantz/collapse?branch=master)