Merge pull request #24 from explodecomputer/default-varpath-fix

stxmjh · web-flow · commit a01ae43c97a6 · 2025-05-29T11:54:34.000+01:00
Update findvars.r
Fix logic
diff --git a/R/findvars.r b/R/findvars.r
@@ -40,7 +40,7 @@ findVars <- function(..., logic="any", ignore.case=TRUE, perl=FALSE, fixed=FALSE
 	l <- unlist(list(...))
 	stopifnot(length(l) > 0)
 	stopifnot(logic %in% c("any", "all", "none"))
-	invert <- ifelse("none", TRUE, FALSE)
+	invert <- logic == "none"
 	if (whole.word) {
 		l <- lapply(l, whole.word.regex)
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ findVars <- function(..., logic="any", ignore.case=TRUE, perl=FALSE, fixed=FALSE`
`40`	`40`	`l <- unlist(list(...))`
`41`	`41`	`stopifnot(length(l) > 0)`
`42`	`42`	`stopifnot(logic %in% c("any", "all", "none"))`
`43`		`- invert <- ifelse("none", TRUE, FALSE)`
	`43`	`+ invert <- logic == "none"`
`44`	`44`	`if (whole.word) {`
`45`	`45`	`l <- lapply(l, whole.word.regex)`
`46`	`46`	`}`