Rewrite to keep below 80 character line length.

Author: jonovik

R/extract.R

@@ -46,12 +46,13 @@ str_extract <- function(string, pattern, group = NULL) {
   }
 
   check_lengths(string, pattern)
+  opt <- opts(pattern)
   out <- switch(type(pattern),
-    empty = stri_extract_first_boundaries(string, opts_brkiter = opts(pattern)),
-    bound = stri_extract_first_boundaries(string, opts_brkiter = opts(pattern)),
-    fixed = stri_extract_first_fixed(string, pattern, opts_fixed = opts(pattern)),
-    coll  = stri_extract_first_coll(string, pattern, opts_collator = opts(pattern)),
-    regex = stri_extract_first_regex(string, pattern, opts_regex = opts(pattern))
+    empty = stri_extract_first_boundaries(string, opts_brkiter = opt),
+    bound = stri_extract_first_boundaries(string, opts_brkiter = opt),
+    fixed = stri_extract_first_fixed(string, pattern, opts_fixed = opt),
+    coll  = stri_extract_first_coll(string, pattern, opts_collator = opt),
+    regex = stri_extract_first_regex(string, pattern, opts_regex = opt)
   )
   if (length(out) == length(string)) names(out) <- names(string)
   out
@@ -63,17 +64,18 @@ str_extract_all <- function(string, pattern, simplify = FALSE) {
   check_lengths(string, pattern)
   check_bool(simplify)
 
+  opt <- opts(pattern)
   out <- switch(type(pattern),
     empty = stri_extract_all_boundaries(string,
-      simplify = simplify, omit_no_match = TRUE, opts_brkiter = opts(pattern)),
+      simplify = simplify, omit_no_match = TRUE, opts_brkiter = opt),
     bound = stri_extract_all_boundaries(string,
-      simplify = simplify, omit_no_match = TRUE, opts_brkiter = opts(pattern)),
+      simplify = simplify, omit_no_match = TRUE, opts_brkiter = opt),
     fixed = stri_extract_all_fixed(string, pattern,
-      simplify = simplify, omit_no_match = TRUE, opts_fixed = opts(pattern)),
+      simplify = simplify, omit_no_match = TRUE, opts_fixed = opt),
     coll  = stri_extract_all_coll(string, pattern,
-      simplify = simplify, omit_no_match = TRUE, opts_collator = opts(pattern)),
+      simplify = simplify, omit_no_match = TRUE, opts_collator = opt),
     regex = stri_extract_all_regex(string, pattern,
-      simplify = simplify, omit_no_match = TRUE, opts_regex = opts(pattern))
+      simplify = simplify, omit_no_match = TRUE, opts_regex = opt)
   )
   if (simplify) {
     rownames(out) <- names(string)