From bcbfe2dc65a8ccd2b3de629f76d92e9da258273d Mon Sep 17 00:00:00 2001
From: Lorenz Walthert <lorenz.walthert@icloud.com>
Date: Tue, 4 Feb 2020 23:38:47 +0100
Subject: [PATCH] make things work for parser version < 2 (relocate eq_assign
 moves block = NA up)

---
 R/nest.R | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/R/nest.R b/R/nest.R
index ad3ed8394..dfa7c511c 100644
--- a/R/nest.R
+++ b/R/nest.R
@@ -21,9 +21,9 @@ compute_parse_data_nested <- function(text,
   parse_data$child <- rep(list(NULL), length(parse_data$text))
   pd_nested <- parse_data %>%
     nest_parse_data() %>%
-    add_cache_block() %>%
     flatten_operators() %>%
-    when(any(parse_data$token == "EQ_ASSIGN") ~ relocate_eq_assign(.), ~.)
+    when(any(parse_data$token == "EQ_ASSIGN") ~ relocate_eq_assign(.), ~.) %>%
+    add_cache_block()
 
   pd_nested
 }
@@ -233,7 +233,7 @@ add_terminal_token_before <- function(pd_flat) {
 #' @describeIn add_token_terminal Initializes `newlines` and `lag_newlines`.
 #' @keywords internal
 add_attributes_caching <- function(pd_flat, transformers) {
-  pd_flat$block <- pd_flat$is_cached <- rep(NA, nrow(pd_flat))
+  pd_flat$is_cached <- rep(NA, nrow(pd_flat))
   if (cache_is_activated()) {
     pd_flat$is_cached[pd_flat$parent == 0] <- map_lgl(
       pd_flat$text[pd_flat$parent == 0],