support push (back or front) on empty data.frame

eddelbuettel · eddelbuettel · commit 54a14cc661f5 · 2022-10-06T16:33:07.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-04  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/DataFrame.h (set_type_after_push): Allow zero-row
+	data.frame objects to be grown by push_{back,front}()
+
 2022-09-25  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): Roll minor version
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.0.9.3
-Date: 2022-09-25
+Version: 1.0.9.3.1
+Date: 2022-10-04
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
diff --git a/inst/include/Rcpp/DataFrame.h b/inst/include/Rcpp/DataFrame.h
@@ -140,10 +140,12 @@ namespace Rcpp{
                     max_rows = Rf_xlength(*it);
                 }
             }
-            for (it = Parent::begin(); it != Parent::end(); ++it) {
-                if (Rf_xlength(*it) == 0 || ( Rf_xlength(*it) > 1 && max_rows % Rf_xlength(*it) != 0 )) {
-                    // We have a column that is not an integer fraction of the largest
-                    invalid_column_size = true;
+            if (max_rows > 0) {
+                for (it = Parent::begin(); it != Parent::end(); ++it) {
+                    if (Rf_xlength(*it) == 0 || ( Rf_xlength(*it) > 1 && max_rows % Rf_xlength(*it) != 0 )) {
+                        // We have a column that is not an integer fraction of the largest
+                        invalid_column_size = true;
+                    }
                 }
             }
             if (invalid_column_size) {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2022-10-04  Dirk Eddelbuettel  <[email protected]>
++
 +	* inst/include/Rcpp/DataFrame.h (set_type_after_push): Allow zero-row
 +	data.frame objects to be grown by push_{back,front}()
++
 -09-25  Dirk Eddelbuettel  <[email protected]>
 	* DESCRIPTION (Version, Date): Roll minor version
Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,12 @@ namespace Rcpp{`
`140`	`140`	`max_rows = Rf_xlength(*it);`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`- for (it = Parent::begin(); it != Parent::end(); ++it) {`
`144`		`- if (Rf_xlength(it) == 0 \|\| ( Rf_xlength(it) > 1 && max_rows % Rf_xlength(*it) != 0 )) {`
`145`		`- // We have a column that is not an integer fraction of the largest`
`146`		`- invalid_column_size = true;`
	`143`	`+ if (max_rows > 0) {`
	`144`	`+ for (it = Parent::begin(); it != Parent::end(); ++it) {`
	`145`	`+ if (Rf_xlength(it) == 0 \|\| ( Rf_xlength(it) > 1 && max_rows % Rf_xlength(*it) != 0 )) {`
	`146`	`+ // We have a column that is not an integer fraction of the largest`
	`147`	`+ invalid_column_size = true;`
	`148`	`+ }`
`147`	`149`	`}`
`148`	`150`	`}`
`149`	`151`	`if (invalid_column_size) {`