simplify get_warnings

m7pr · m7pr · commit 7bd1c2d376e7 · 2024-11-07T12:43:52.000+01:00
diff --git a/R/qenv-get_warnings.R b/R/qenv-get_warnings.R
@@ -34,7 +34,9 @@ setGeneric("get_warnings", function(object) {
 
 setMethod("get_warnings", signature = c("qenv"), function(object) {
   warnings <- lapply(object@code, "attr", "warning")
-  code <- object@code[unlist(lapply(warnings, Negate(is.null)))]
+  idx_warn <- which(sapply(warnings, Negate(is.null)))
+  warnings <- warnings[idx_warn]
+  code <- object@code[idx_warn]
   if (length(unlist(warnings)) == 0) {
     return(NULL)
   }
@@ -46,8 +48,8 @@ setMethod("get_warnings", signature = c("qenv"), function(object) {
       }
       sprintf("%swhen running code:\n%s", warn, paste(lang2calls(expr), collapse = "\n"))
     },
-    warn = as.list(unlist(warnings)),
-    expr = as.list(unlist(code))
+    warn = warnings,
+    expr = code
   )
   lines <- Filter(Negate(is.null), lines)
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ setGeneric("get_warnings", function(object) {`
`34`	`34`
`35`	`35`	`setMethod("get_warnings", signature = c("qenv"), function(object) {`
`36`	`36`	`warnings <- lapply(object@code, "attr", "warning")`
`37`		`- code <- object@code[unlist(lapply(warnings, Negate(is.null)))]`
	`37`	`+ idx_warn <- which(sapply(warnings, Negate(is.null)))`
	`38`	`+ warnings <- warnings[idx_warn]`
	`39`	`+ code <- object@code[idx_warn]`
`38`	`40`	`if (length(unlist(warnings)) == 0) {`
`39`	`41`	`return(NULL)`
`40`	`42`	`}`
`@@ -46,8 +48,8 @@ setMethod("get_warnings", signature = c("qenv"), function(object) {`
`46`	`48`	`}`
`47`	`49`	`sprintf("%swhen running code:\n%s", warn, paste(lang2calls(expr), collapse = "\n"))`
`48`	`50`	`},`
`49`		`- warn = as.list(unlist(warnings)),`
`50`		`- expr = as.list(unlist(code))`
	`51`	`+ warn = warnings,`
	`52`	`+ expr = code`
`51`	`53`	`)`
`52`	`54`	`lines <- Filter(Negate(is.null), lines)`
`53`	`55`