[Distr-commits] r1379 - in pkg/distr: R inst

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2022-11-12 19:41:08 +0100 (Sat, 12 Nov 2022)
New Revision: 1379

Modified:
   pkg/distr/R/bAcDcLcDistribution.R
   pkg/distr/inst/NEWS
Log:
[distr] trunk:
During our first attempt to submit the package to CRAN a reverse dependency check against pkg distrEllipse revealed that our new code 
checking for an appearance of "/" and "^" in the parsing tree could give paste()-results of length > 1... is fixed now...


Modified: pkg/distr/R/bAcDcLcDistribution.R
===================================================================
--- pkg/distr/R/bAcDcLcDistribution.R	2022-11-12 17:19:07 UTC (rev 1378)
+++ pkg/distr/R/bAcDcLcDistribution.R	2022-11-12 18:41:08 UTC (rev 1379)
@@ -110,7 +110,7 @@
     i <- i + 1
 	trcall <- sys.call(sys.parent(i))
     myc <- paste(as.list(trcall)[[1]])
-	if(myc=="/"){
+	if(any(myc == "/")){
 	   e2s <- as.character(deparse(match.call(call=trcall)$e2))
 	   stopit <- TRUE
 	}
@@ -181,7 +181,7 @@
     i <- i + 1
 	trcall <- sys.call(sys.parent(i))
     myc <- paste(as.list(trcall)[[1]])
-	if(myc=="/"){
+	if(any(myc == "/")){
 	   e2s <- as.character(deparse(match.call(call=trcall)$e2))
 	   stopit <- TRUE
 	}
@@ -300,7 +300,7 @@
     i <- i + 1
 	trcall <- sys.call(sys.parent(i))
     myc <- paste(as.list(trcall)[[1]])
-	if(myc=="^"){
+	if(any(myc == "^")){
 	   mc <- match.call(call=trcall)
 	   e1s <- as.character(deparse(mc$e1))
 	   e2s <- as.character(deparse(mc$e2))
@@ -398,7 +398,7 @@
     i <- i + 1
 	trcall <- sys.call(sys.parent(i))
     myc <- paste(as.list(trcall)[[1]])
-	if(myc=="/"){
+	if(any(myc == "/")){
 	   mc <- match.call(call=trcall)
 	   e1s <- as.character(deparse(mc$e1))
 	   e2s <- as.character(deparse(mc$e2))
@@ -491,7 +491,7 @@
     i <- i + 1
 	trcall <- sys.call(sys.parent(i))
     myc <- paste(as.list(trcall)[[1]])
-	if(myc=="^"){
+	if(any(myc == "^")){
 	   mc <- match.call(call=trcall)
 	   e1s <- as.character(deparse(mc$e1))
 	   e2s <- as.character(deparse(mc$e2))

Modified: pkg/distr/inst/NEWS
===================================================================
--- pkg/distr/inst/NEWS	2022-11-12 17:19:07 UTC (rev 1378)
+++ pkg/distr/inst/NEWS	2022-11-12 18:41:08 UTC (rev 1379)
@@ -23,6 +23,9 @@
 	in this deparsing within a try()-catch did not work any longer when called from within a function; 
 	as way out, we now have code which no longer needs the try()-catch and instead climbs up the 
 	parsing tree and searches for the first occurrence of "/" resp. "^" and deparses this
+	... in the end this was more complicated than expected, as the parsing tree could give
+	paste()-results of length > 1... (only popped up in a reverse dependency check through 
+	package distrEllipse)
 
 under the hood:
 + triggered by an email by Santhosh V <Santhosh.V at se.com>, we added a patch to be more careful when producing