Skip to content

Commit f2ef50d

Browse files
expr_substitute() does substitute double sided formula (#5915)
* expr_substitute() does substitute double sided formula
1 parent 55917b6 commit f2ef50d

File tree

6 files changed

+408
-315
lines changed

6 files changed

+408
-315
lines changed

R/utils.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ expr_substitute <- function(expr, old, new) {
145145
node_walk_replace <- function(node, old, new) {
146146
while (!is_null(node)) {
147147
switch(typeof(node_car(node)),
148-
language = if (!is_call(node_car(node), c("~", "function"))) node_walk_replace(node_cdar(node), old, new),
148+
language = if (!is_call(node_car(node), c("~", "function")) || is_call(node_car(node), "~", n = 2)) node_walk_replace(node_cdar(node), old, new),
149149
symbol = if (identical(node_car(node), old)) node_poke_car(node, new)
150150
)
151151
node <- node_cdr(node)

revdep/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
# Revdeps
22

3-
## Failed to check (18)
3+
## Failed to check (21)
44

55
|package |version |error |warning |note |
66
|:--------------|:-------|:-----|:-------|:----|
77
|bayesdfa |1.1.0 |1 | | |
88
|CausalImpact |? | | | |
99
|CB2 |? | | | |
1010
|cbar |? | | | |
11-
|CGPfunctions |? | | | |
12-
|crossmap |? | | | |
1311
|diceR |? | | | |
12+
|glmmfields |0.1.4 |1 | | |
13+
|loon.shiny |? | | | |
1414
|MarketMatching |? | | | |
15+
|metagam |? | | | |
16+
|mlbstatsR |0.1.0 |1 | | |
17+
|pencal |? | | | |
18+
|rabhit |? | | | |
1519
|raw |? | | | |
1620
|rmdcev |1.2.4 |1 | | |
1721
|rstap |1.0.3 |1 | | |
1822
|scoper |? | | | |
19-
|SimplyAgree |? | | | |
2023
|SynthETIC |? | | | |
2124
|tigger |? | | | |
2225
|trackr |? | | | |
2326
|vivid |? | | | |
2427
|wrswoR |? | | | |
2528

26-
## New problems (4)
29+
## New problems (1)
2730

28-
|package |version |error |warning |note |
29-
|:------------------------------------|:-------|:--------|:-------|:--------|
30-
|[finreportr](problems.md#finreportr) |1.0.2 |1 __+1__ | | |
31-
|[MoMPCA](problems.md#mompca) |1.0.1 |1 | |1 __+1__ |
32-
|[SwimmeR](problems.md#swimmer) |0.10.0 |__+1__ | | |
33-
|[xray](problems.md#xray) |0.2 |__+1__ | | |
31+
|package |version |error |warning |note |
32+
|:------------------------|:-------|:------|:-------|:----|
33+
|[imfr](problems.md#imfr) |0.1.9.1 |__+1__ | | |
3434

revdep/cran.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,36 @@
11
## revdepcheck results
22

3-
We checked 2131 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
3+
We checked 2518 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
44

5-
* We saw 4 new problems
6-
* We failed to check 18 packages
5+
* We saw 1 new problems
6+
* We failed to check 21 packages
77

88
Issues with CRAN packages are summarised below.
99

1010
### New problems
1111
(This reports the first line of each new failure)
1212

13-
* finreportr
14-
checking examples ... ERROR
15-
16-
* MoMPCA
17-
checking dependencies in R code ... NOTE
18-
19-
* SwimmeR
13+
* imfr
2014
checking tests ... ERROR
2115

22-
* xray
23-
checking examples ... ERROR
24-
2516
### Failed to check
2617

2718
* bayesdfa (NA)
2819
* CausalImpact (NA)
2920
* CB2 (NA)
3021
* cbar (NA)
31-
* CGPfunctions (NA)
32-
* crossmap (NA)
3322
* diceR (NA)
23+
* glmmfields (NA)
24+
* loon.shiny (NA)
3425
* MarketMatching (NA)
26+
* metagam (NA)
27+
* mlbstatsR (NA)
28+
* pencal (NA)
29+
* rabhit (NA)
3530
* raw (NA)
3631
* rmdcev (NA)
3732
* rstap (NA)
3833
* scoper (NA)
39-
* SimplyAgree (NA)
4034
* SynthETIC (NA)
4135
* tigger (NA)
4236
* trackr (NA)

0 commit comments

Comments
 (0)