Merge pull request #402 from SebKrantz/development

SebKrantz · web-flow · commit 24ccfd8724ed · 2023-04-03T18:38:52.000+02:00
Development
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: collapse
 Title: Advanced and Fast Data Transformation
 Version: 1.9.5
-Date: 2023-03-30
+Date: 2023-04-03
 Authors@R: c(
            person("Sebastian", "Krantz", role = c("aut", "cre"), 
                   email = "sebastian.krantz@graduateinstitute.ch"),
diff --git a/src/programming.c b/src/programming.c
@@ -404,8 +404,7 @@ SEXP setcopyv(SEXP x, SEXP val, SEXP rep, SEXP Rinvert, SEXP Rset, SEXP Rind1) {
   }
   case VECSXP:
   {
-    if(set && ALTREP(x)) error("cannot modify ALTREP list by reference");
-    SEXP *restrict px = set ? SEXPPTR(x) : SEXPPTR(ans);
+    SEXP *restrict px = (set == 0) ? SEXPPTR(ans) : ALTREP(x) ? (SEXP *)ALTVEC_DATAPTR(x) : SEXPPTR(x);
     if(lv == 1 && ind1 == 0) error("Cannot compare lists to a value");
     // if(tr != VECSXP) error("If X is a list and xlist = TRUE, R also needs to be a list");
     const int *restrict pv = INTEGER(val); // ALTREP(val) ? (const int *)ALTVEC_DATAPTR(val) :

Original file line number	Diff line number	Diff line change
`@@ -404,8 +404,7 @@ SEXP setcopyv(SEXP x, SEXP val, SEXP rep, SEXP Rinvert, SEXP Rset, SEXP Rind1) {`
`404`	`404`	`}`
`405`	`405`	`case VECSXP:`
`406`	`406`	`{`
`407`		`- if(set && ALTREP(x)) error("cannot modify ALTREP list by reference");`
`408`		`- SEXP *restrict px = set ? SEXPPTR(x) : SEXPPTR(ans);`
	`407`	`+ SEXP restrict px = (set == 0) ? SEXPPTR(ans) : ALTREP(x) ? (SEXP )ALTVEC_DATAPTR(x) : SEXPPTR(x);`
`409`	`408`	`if(lv == 1 && ind1 == 0) error("Cannot compare lists to a value");`
`410`	`409`	`// if(tr != VECSXP) error("If X is a list and xlist = TRUE, R also needs to be a list");`
`411`	`410`	`const int restrict pv = INTEGER(val); // ALTREP(val) ? (const int )ALTVEC_DATAPTR(val) :`