From 19d43011d05ee2b3784c3ceaa4bdc6240b2b73af Mon Sep 17 00:00:00 2001
From: Trevor Davis <trevor.l.davis@gmail.com>
Date: Wed, 7 Aug 2019 11:35:47 -0700
Subject: [PATCH] chore: CRAN v1.0.1 re-submission

---
 .Rbuildignore                |   2 +
 .gitignore                   |   2 +
 DESCRIPTION                  |   6 +-
 NEWS.md                      |   5 ++
 R/expand.R                   | 109 ++++++++++++++++++++++++++--------
 README.Rmd                   |  28 +++++----
 README.md                    |  45 +++++++++-----
 cran-comments.rst            |  14 +++++
 man/expand_braces.Rd         |   8 +--
 tests/testthat/test_expand.R | 110 ++++++++++++++++++++---------------
 10 files changed, 223 insertions(+), 106 deletions(-)
 create mode 100644 cran-comments.rst

diff --git a/.Rbuildignore b/.Rbuildignore
index dd999b5..1770496 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,4 +1,6 @@
+^cran-comments.rst$
 ^README.Rmd$
+^README.html$
 ^Rakefile$
 ^notes.txt$
 ^LICENSE.md$
diff --git a/.gitignore b/.gitignore
index 1377554..32117fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+README.html
 *.swp
+notes.txt
diff --git a/DESCRIPTION b/DESCRIPTION
index 01564d6..6608427 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,12 +1,12 @@
 Package: bracer
-Title: Bash-style Brace Expansion
-Version: 0.1.0-0
+Title: Brace Expansions
+Version: 1.0.1
 Authors@R: 
     person(given = "Trevor",
            family = "Davis",
            role = c("aut", "cre"),
            email = "trevor.l.davis@gmail.com")
-Description: Provides partial support for Bash-style brace expansions.
+Description: Performs brace expansions on strings.  Made popular by Unix shells, brace expansion allows users to quickly generate certain character vectors by taking a single string and (recursively) expanding the comma-separated lists and double-period-separated integer and character sequences enclosed within braces in that string.  The double-period-separated numeric integer expansion also supports padding the resulting numbers with zeros.
 Imports: stringr
 License: MIT + file LICENSE
 Encoding: UTF-8
diff --git a/NEWS.md b/NEWS.md
index 18cb09f..c2db5ad 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,8 @@
+bracer 1.0.1
+============
+
+* ``expand_braces`` can now parse nested braces.
+
 bracer 0.1
 ==========
 
diff --git a/R/expand.R b/R/expand.R
index ceab3bc..aa948ae 100644
--- a/R/expand.R
+++ b/R/expand.R
@@ -1,20 +1,27 @@
 #' Bash-style brace expansion
 #'
-#' \code{expand_braces} provides partial support for
-#' Bash-style brace expansion.
+#' \code{expand_braces} performs brace expansions on strings.  Made popular by Unix shells, brace expansion allows users to quickly generate certain character vectors by taking a single string and (recursively) expanding the comma-separated lists and double-period-separated integer and character sequences enclosed within braces in that string.  The double-period-separated numeric integer expansion also supports padding the resulting numbers with zeros.
+
 #' @param string input character vector
 #' @return A character vector
 #' @examples
 #'   expand_braces("Foo{A..F}")
 #'   expand_braces("Foo{01..10}")
-#'   expand_braces("Foo{A..F}{1..5..2}")
-#'   expand_braces("Foo{a..f..2}{-01..5}")
+#'   expand_braces("Foo{A..E..2}{1..5..2}")
+#'   expand_braces("Foo{-01..1}")
+#'   expand_braces("Foo{{d..d},{bar,biz}}.{py,bash}")
 #' @import stringr
 #' @export
 expand_braces <- function(string) {
-    # Find brace starts and ends
-    brace_token <- "(?<!\\\\)\\{([^}]|\\\\\\})*(?<!\\\\)\\}"
-    locations <- str_locate_all(string, brace_token)[[1]]
+    expand_braces_helper(string)
+}
+brace_token <- "(?<!\\\\)\\{([^}]|\\\\\\})*(?<!\\\\)\\}"
+has_brace <- function(string) {
+    str_detect(string, brace_token)
+}
+
+expand_braces_helper <- function(string, process=TRUE) {
+    locations <- get_locations(string) # Find brace starts and ends
     n <- nrow(locations)
     if (n == 0) return(process_string(string))
     braced <- vector("list", n)
@@ -30,9 +37,43 @@ expand_braces <- function(string) {
 
     df <- expand.grid(rev(braced), stringsAsFactors=FALSE)
     value <- preamble
-    for (ii in seq(n))
+    for (ii in seq(n)) {
         value <- paste0(value, df[,n+1-ii], non_braced[ii])
-    process_string(value)
+    }
+    if (process) {
+        process_string(value)
+    } else {
+        value
+    }
+}
+
+data_frame <- function(...) { data.frame(..., stringsAsFactors=FALSE) }
+
+# get locations of top level braces
+get_locations <- function(string) {
+    left_brace <- "(?<!\\\\)\\{"
+    left_locations <- str_locate_all(string, left_brace)[[1]]
+    if(nrow(left_locations)==0) { return(matrix(numeric(0), ncol=2)) }
+    df_left <- data_frame(index=left_locations[,1], char="{")
+    right_brace <- "(?<!\\\\)\\}"
+    right_locations <- str_locate_all(string, right_brace)[[1]]
+    if(nrow(right_locations)==0) { return(matrix(numeric(0), ncol=2)) }
+    df_right <- data_frame(index=right_locations[,1], char="}")
+    df <- rbind(df_left, df_right)
+    df <- df[order(df$index),]
+    df$level <- 0
+    level <- 1
+    for (ii in seq(length=nrow(df))) {
+        if (df[ii,2]=="{") {
+            df[ii,3] <- level
+            level <- level + 1
+        } else {
+            level <- level - 1
+            df[ii,3] <- level
+        }
+    }
+    df <- df[which(df$level==1),]
+    matrix(df$index, ncol=2, byrow=TRUE)
 }
 
 zero_pad <- function(numbers, width=2) {
@@ -54,18 +95,29 @@ expand_brace <- function(string, locations, i) {
     il <- locations[i,1]
     ir <- locations[i,2]
     brace <- str_sub(string, il, ir)
-    if (str_detect(brace, "(?<!\\\\),")) { # comma split
-        expand_comma(brace)
-    } else if (str_detect(brace, "\\.{2}")) {
-        expand_periods(brace)
+    inner <- str_sub(brace, 2, -2)
+    if (has_comma(inner)) { 
+        expand_comma(inner)
+    } else if (has_periods(inner)) {
+        expand_periods(inner)
+    } else if (has_brace(inner)) {
+        paste0("{", expand_braces_helper(inner, FALSE), "}")
     } else {
         brace
     }
 }
 
+comma_token <- "(?<!\\\\),(?![^\\{]*\\})"
+# comma_token <- "(?<!\\\\),(?![^\\{]*[^\\\\]\\})"
+has_comma <- function(string) {
+    str_detect(string, comma_token)
+}
+
 expand_comma <- function(string) {
-    string <- str_sub(string, 2, -2)
-    str_split(string, "(?<!\\\\),")[[1]]
+    elements <- str_split(string, comma_token)[[1]]
+    elements <- lapply(elements, expand_braces_helper, FALSE)
+    elements <- c(elements, recursive=TRUE)
+    elements
 }
 
 ASCII <- c(" ", "!", '"', "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", 
@@ -76,20 +128,28 @@ has_pad <- function(digits) {
     any(str_detect(digits[1:2], "^-?0[0-9]+"))
 }
 
+alpha2_token <- "^[[:alpha:]]\\.{2}[[:alpha:]]$"
+alpha3_token <- "^[[:alpha:]]\\.{2}[[:alpha:]]\\.{2}-?[[:digit:]]+$"
+digit2_token <- "^-?[[:digit:]]+\\.{2}-?[[:digit:]]+$"
+digit3_token <- "^-?[[:digit:]]+\\.{2}-?[[:digit:]]+\\.{2}-?[[:digit:]]+$"
+period_token <- paste(alpha2_token, alpha3_token, digit2_token, digit3_token, sep="|")
+
+has_periods <- function(string) {
+    str_detect(string, period_token)
+}
+
 expand_periods <- function(string) {
-    if (str_detect(string, "\\{[[:alpha:]]\\.{2}[[:alpha:]]\\}")) {
-        i_left <- match(str_sub(string, 2, 2), ASCII)
-        i_right <- match(str_sub(string, 5, 5), ASCII)
+    if (str_detect(string, alpha2_token)) {
+        i_left <- match(str_sub(string, 1, 1), ASCII)
+        i_right <- match(str_sub(string, 4, 4), ASCII)
         ASCII[i_left:i_right]
-    } else if (str_detect(string, "\\{[[:alpha:]]\\.{2}[[:alpha:]]\\.{2}-?[[:digit:]]+\\}")) {
-        string <- str_sub(string, 2, -2)
+    } else if (str_detect(string, alpha3_token)) {
         items <- str_split(string, "\\.{2}")[[1]]
         i_left <- match(items[1], ASCII)
         i_right <- match(items[2], ASCII)
         by <- sign(i_right-i_left)*abs(as.numeric(items[3]))
         ASCII[seq(i_left,i_right,by)]
-    } else if (str_detect(string, "\\{-?[[:digit:]]+\\.{2}-?[[:digit:]]+\\}")) {
-        string <- str_sub(string, 2, -2)
+    } else if (str_detect(string, digit2_token)) {
         digits <- str_split(string, "\\.{2}")[[1]]
         numbers <- as.numeric(digits)
         values <- seq(numbers[1], numbers[2])
@@ -98,8 +158,7 @@ expand_periods <- function(string) {
         } else {
             values
         }
-    } else if (str_detect(string, "\\{-?[[:digit:]]+\\.{2}-?[[:digit:]]+\\.{2}-?[[:digit:]]+\\}")) {
-        string <- str_sub(string, 2, -2)
+    } else if (str_detect(string, digit3_token)) {
         digits <- str_split(string, "\\.{2}")[[1]]
         numbers <- as.numeric(digits)
         by <- sign(numbers[2]-numbers[1])*abs(numbers[3])
@@ -110,7 +169,7 @@ expand_periods <- function(string) {
             values
         }
     } else {
-        string
+        paste0("{", string, "}")
     }
 }
 
diff --git a/README.Rmd b/README.Rmd
index ca61ff9..24a34e8 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -4,27 +4,35 @@ bracer
 [![Travis-CI Build Status](https://travis-ci.org/trevorld/bracer.png?branch=master)](https://travis-ci.org/trevorld/bracer)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/trevorld/bracer?branch=master&svg=true)](https://ci.appveyor.com/project/trevorld/bracer)
 [![Coverage Status](https://img.shields.io/codecov/c/github/trevorld/bracer/master.svg)](https://codecov.io/github/trevorld/bracer?branch=master)
-[![Project Status: WIP – Initial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
+[![Project Status: Inactive – The project has reached a stable, usable state but is no longer being actively developed; support/maintenance will be provided as time allows.](https://www.repostatus.org/badges/latest/inactive.svg)](https://www.repostatus.org/#inactive)
 
-``bracer`` provides partial support for [Bash-style brace expansion](https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Brace-Expansion) in R.
+``bracer`` provides support for performing [brace expansions](https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Brace-Expansion) on strings in R.
 
 ```{r examples}
 library("bracer")
 expand_braces("Foo{A..F}")
 expand_braces("Foo{01..10}")
-expand_braces("Foo{A..F}{1..5..2}")
-expand_braces("Foo{a..f..2}{-01..5}")
+expand_braces("Foo{A..E..2}{1..5..2}")
+expand_braces("Foo{-01..1}")
+expand_braces("Foo{{d..d},{bar,biz}}.{py,bash}")
 ```
 
-To install the developmental version use the following commands in R:
+To install the release version on CRAN use the following command in R:
+
+```{r install_stable, eval=FALSE}
+install.packages("bracer")
+```
+
+To install the developmental version use the following command in R:
 
 ```{r install, eval=FALSE}
 remotes::install_github("trevorld/bracer")
 ```
 
-``bracer`` currently does not properly support the proper Bash-style brace expansion under several conditions such as:
+``bracer`` currently does not properly support the "correct" (Bash-style) brace expansion under several edge conditions such as:
 
-1. Nested braces e.g. ``{{a..d},{1..2}}``
-2. Unbalanced braces e.g. ``{a,d}}``
-3. Using quotes to escape terms e.g. ``{'a,b','c'}``
-4. Including a non-escaping backslash ahead of a brace or comma e.g. ``{a,b\\\\\\\\}}``
+1. Unbalanced braces e.g. ``{a,d}}``
+2. Using surrounding quotes to escape terms e.g. ``{'a,b','c'}``
+3. Escaped *inner* braces e.g. ``{a,b\\}c,d}``
+4. (Non-escaping) backslashes before braces e.g. ``{a,\\\\{a,b}c}'``
+5. Sequences from letters to non-letter ASCII characters e.g. ``X{a..#}X``
diff --git a/README.md b/README.md
index 906381f..b01dc29 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ bracer
 [![Travis-CI Build Status](https://travis-ci.org/trevorld/bracer.png?branch=master)](https://travis-ci.org/trevorld/bracer)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/trevorld/bracer?branch=master&svg=true)](https://ci.appveyor.com/project/trevorld/bracer)
 [![Coverage Status](https://img.shields.io/codecov/c/github/trevorld/bracer/master.svg)](https://codecov.io/github/trevorld/bracer?branch=master)
-[![Project Status: WIP – Initial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
+[![Project Status: Inactive – The project has reached a stable, usable state but is no longer being actively developed; support/maintenance will be provided as time allows.](https://www.repostatus.org/badges/latest/inactive.svg)](https://www.repostatus.org/#inactive)
 
-``bracer`` provides partial support for [Bash-style brace expansion](https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Brace-Expansion) in R.
+``bracer`` provides support for performing [brace expansions](https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Brace-Expansion) on strings in R.
 
 
 ```r
@@ -28,35 +28,48 @@ expand_braces("Foo{01..10}")
 ```
 
 ```r
-expand_braces("Foo{A..F}{1..5..2}")
+expand_braces("Foo{A..E..2}{1..5..2}")
 ```
 
 ```
-##  [1] "FooA1" "FooA3" "FooA5" "FooB1" "FooB3" "FooB5" "FooC1" "FooC3"
-##  [9] "FooC5" "FooD1" "FooD3" "FooD5" "FooE1" "FooE3" "FooE5" "FooF1"
-## [17] "FooF3" "FooF5"
+## [1] "FooA1" "FooA3" "FooA5" "FooC1" "FooC3" "FooC5" "FooE1" "FooE3" "FooE5"
 ```
 
 ```r
-expand_braces("Foo{a..f..2}{-01..5}")
+expand_braces("Foo{-01..1}")
 ```
 
 ```
-##  [1] "Fooa-01" "Fooa000" "Fooa001" "Fooa002" "Fooa003" "Fooa004" "Fooa005"
-##  [8] "Fooc-01" "Fooc000" "Fooc001" "Fooc002" "Fooc003" "Fooc004" "Fooc005"
-## [15] "Fooe-01" "Fooe000" "Fooe001" "Fooe002" "Fooe003" "Fooe004" "Fooe005"
+## [1] "Foo-01" "Foo000" "Foo001"
 ```
 
-To install the developmental version use the following commands in R:
+```r
+expand_braces("Foo{{d..d},{bar,biz}}.{py,bash}")
+```
+
+```
+## [1] "Food.py"     "Food.bash"   "Foobar.py"   "Foobar.bash" "Foobiz.py"  
+## [6] "Foobiz.bash"
+```
+
+To install the release version on CRAN use the following command in R:
+
+
+```r
+install.packages("bracer")
+```
+
+To install the developmental version use the following command in R:
 
 
 ```r
 remotes::install_github("trevorld/bracer")
 ```
 
-``bracer`` currently does not properly support the proper Bash-style brace expansion under several conditions such as:
+``bracer`` currently does not properly support the "correct" (Bash-style) brace expansion under several edge conditions such as:
 
-1. Nested braces e.g. ``{{a..d},{1..2}}``
-2. Unbalanced braces e.g. ``{a,d}}``
-3. Using quotes to escape terms e.g. ``{'a,b','c'}``
-4. Including a non-escaping backslash ahead of a brace or comma e.g. ``{a,b\\\\\\\\}}``
+1. Unbalanced braces e.g. ``{a,d}}``
+2. Using surrounding quotes to escape terms e.g. ``{'a,b','c'}``
+3. Escaped *inner* braces e.g. ``{a,b\\}c,d}``
+4. (Non-escaping) backslashes before braces e.g. ``{a,\\\\{a,b}c}'``
+5. Sequences from letters to non-letter ASCII characters e.g. ``X{a..#}X``
diff --git a/cran-comments.rst b/cran-comments.rst
new file mode 100644
index 0000000..1f9e96f
--- /dev/null
+++ b/cran-comments.rst
@@ -0,0 +1,14 @@
+Resubmission.  Elaborated the 'Description' field as requested.
+
+**Test environments**
+
+* local (linux, R 3.4.4) 
+* win-builder (windows, R devel) 
+* appveyor (windows, R devel) 
+* appveyor (windows, R release) 
+* travis-ci (linux, R devel) 
+* travis-ci (linux, R release) 
+
+**R CMD check --as-cran results**
+
+Status: 1 NOTE (that this is a new submission)
diff --git a/man/expand_braces.Rd b/man/expand_braces.Rd
index 4600a80..d11173c 100644
--- a/man/expand_braces.Rd
+++ b/man/expand_braces.Rd
@@ -13,12 +13,12 @@ expand_braces(string)
 A character vector
 }
 \description{
-\code{expand_braces} provides partial support for
-Bash-style brace expansion.
+\code{expand_braces} performs brace expansions on strings.  Made popular by Unix shells, brace expansion allows users to quickly generate certain character vectors by taking a single string and (recursively) expanding the comma-separated lists and double-period-separated integer and character sequences enclosed within braces in that string.  The double-period-separated numeric integer expansion also supports padding the resulting numbers with zeros.
 }
 \examples{
   expand_braces("Foo{A..F}")
   expand_braces("Foo{01..10}")
-  expand_braces("Foo{A..F}{1..5..2}")
-  expand_braces("Foo{a..f..2}{-01..5}")
+  expand_braces("Foo{A..E..2}{1..5..2}")
+  expand_braces("Foo{-01..1}")
+  expand_braces("Foo{{d..d},{bar,biz}}.{py,bash}")
 }
diff --git a/tests/testthat/test_expand.R b/tests/testthat/test_expand.R
index 6a7e369..ae0ebce 100644
--- a/tests/testthat/test_expand.R
+++ b/tests/testthat/test_expand.R
@@ -7,17 +7,8 @@ test_that("Some simple test cases", {
 
 test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('{1\\.2}'), c('{1.2}'))
-#   expect_equal(expand_braces('{"x,x"}'), c('{x,x}'))
-#   expect_equal(expand_braces('{x","x}'), c('{x,x}'))
-#   expect_equal(expand_braces('\'{x,x}\''), c('{x,x}'))
-#   expect_equal(expand_braces('{x`,`x}'), c('{x,x}'))
-#   expect_equal(expand_braces('\'{a,b}{{a,b},a,b}\''), c('{a,b}{{a,b},a,b}'))
-#   expect_equal(expand_braces('A{b,{d,e},{f,g}}Z'), c('AbZ', 'AdZ', 'AeZ', 'AfZ', 'AgZ'))
-#   expect_equal(expand_braces('PRE-{a,b}{{a,b},a,b}-POST'), c('PRE-aa-POST', 'PRE-ab-POST', 'PRE-aa-POST', 'PRE-ab-POST', 'PRE-ba-POST', 'PRE-bb-POST', 'PRE-ba-POST', 'PRE-bb-POST'))
-#   expect_equal(expand_braces('\\{a,b}{{a,b},a,b}'), c('{a,b}a', '{a,b}b', '{a,b}a', '{a,b}b'))
-#   expect_equal(expand_braces('{{a,b}'), c('{a', '{b'))
-    expect_equal(expand_braces('{a,b}}'), c('a}', 'b}'))
-#   expect_equal(expand_braces('{,}'), c(', '))
+    expect_equal(expand_braces('A{b,{d,e},{f,g}}Z'), c('AbZ', 'AdZ', 'AeZ', 'AfZ', 'AgZ'))
+    expect_equal(expand_braces('PRE-{a,b}{{a,b},a,b}-POST'), c('PRE-aa-POST', 'PRE-ab-POST', 'PRE-aa-POST', 'PRE-ab-POST', 'PRE-ba-POST', 'PRE-bb-POST', 'PRE-ba-POST', 'PRE-bb-POST'))
     expect_equal(expand_braces('a{,}'), c('a', 'a'))
     expect_equal(expand_braces('{,}b'), c('b', 'b'))
     expect_equal(expand_braces('a{,}b'), c('ab', 'ab'))
@@ -27,21 +18,15 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('a{-01..5}b'), c('a-01b', 'a000b', 'a001b', 'a002b', 'a003b', 'a004b', 'a005b'))
     expect_equal(expand_braces('a{-01..5..3}b'), c('a-01b', 'a002b', 'a005b'))
     expect_equal(expand_braces('a{001..9}b'), c('a001b', 'a002b', 'a003b', 'a004b', 'a005b', 'a006b', 'a007b', 'a008b', 'a009b'))
-#   expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z'), c('abx{y,z', 'acdx{y,z', 'acex{y,z', 'afhx{y,z', 'aghx{y,z'))
-#   expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z\\}'), c('abx{y,z}', 'acdx{y,z}', 'acex{y,z}', 'afhx{y,z}', 'aghx{y,z}'))
-#   expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z}'), c('abxy', 'abxz', 'acdxy', 'acdxz', 'acexy', 'acexz', 'afhxy', 'afhxz', 'aghxy', 'aghxz'))
-#   expect_equal(expand_braces('a{b{c{d,e}f{x,y{{g}h'), c('a{b{cdf{x,y{{g}h', 'a{b{cef{x,y{{g}h'))
-#   expect_equal(expand_braces('a{b{c{d,e}f{x,y{}g}h'), c('a{b{cdfxh', 'a{b{cdfy{}gh', 'a{b{cefxh', 'a{b{cefy{}gh'))
-#   expect_equal(expand_braces('a{b{c{d,e}f{x,y}}g}h'), c('a{b{cdfx}g}h', 'a{b{cdfy}g}h', 'a{b{cefx}g}h', 'a{b{cefy}g}h'))
-#   expect_equal(expand_braces('a{b{c{d,e}f}g}h'), c('a{b{cdf}g}h', 'a{b{cef}g}h'))
-#   expect_equal(expand_braces('a{{x,y},z}b'), c('axb', 'ayb', 'azb'))
-#   expect_equal(expand_braces('f{x,y{g,z}}h'), c('fxh', 'fygh', 'fyzh'))
-#   expect_equal(expand_braces('f{x,y{{g,z}}h'), c('f{x,y{g}h', 'f{x,y{z}h'))
-#   expect_equal(expand_braces('f{x,y{{g,z}}h}'), c('fx', 'fy{g}h', 'fy{z}h'))
-#   expect_equal(expand_braces('f{x,y{{g}h'), c('f{x,y{{g}h'))
-#   expect_equal(expand_braces('f{x,y{{g}}h'), c('f{x,y{{g}}h'))
-#   expect_equal(expand_braces('f{x,y{}g}h'), c('fxh', 'fy{}gh'))
-#   expect_equal(expand_braces('z{a,b{,c}d'), c('z{a,bd', 'z{a,bcd'))
+    expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z}'), c('abxy', 'abxz', 'acdxy', 'acdxz', 'acexy', 'acexz', 'afhxy', 'afhxz', 'aghxy', 'aghxz'))
+    expect_equal(expand_braces('a{b{c{d,e}f{x,y}}g}h'), c('a{b{cdfx}g}h', 'a{b{cdfy}g}h', 'a{b{cefx}g}h', 'a{b{cefy}g}h'))
+    expect_equal(expand_braces('a{b{c{d,e}f}g}h'), c('a{b{cdf}g}h', 'a{b{cef}g}h'))
+    expect_equal(expand_braces('a{{x,y},z}b'), c('axb', 'ayb', 'azb'))
+    expect_equal(expand_braces('f{x,y{g,z}}h'), c('fxh', 'fygh', 'fyzh'))
+    expect_equal(expand_braces('f{x,y{{g,z}}h}'), c('fx', 'fy{g}h', 'fy{z}h'))
+    expect_equal(expand_braces('f{x,y{{g}h'), c('f{x,y{{g}h'))
+    expect_equal(expand_braces('f{x,y{{g}}h'), c('f{x,y{{g}}h'))
+    expect_equal(expand_braces('f{x,y{}g}h'), c('fxh', 'fy{}gh'))
     expect_equal(expand_braces('z{a,b},c}d'), c('za,c}d', 'zb,c}d'))
     expect_equal(expand_braces('{-01..5}'), c('-01', '000', '001', '002', '003', '004', '005'))
     expect_equal(expand_braces('{-05..100..5}'), c('-05', '000', '005', '010', '015', '020', '025', '030', '035', '040', '045', '050', '055', '060', '065', '070', '075', '080', '085', '090', '095', '100'))
@@ -56,8 +41,6 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('{1..05..3}'), c('01', '04'))
     expect_equal(expand_braces('{05..100}'), c('005', '006', '007', '008', '009', '010', '011', '012', '013', '014', '015', '016', '017', '018', '019', '020', '021', '022', '023', '024', '025', '026', '027', '028', '029', '030', '031', '032', '033', '034', '035', '036', '037', '038', '039', '040', '041', '042', '043', '044', '045', '046', '047', '048', '049', '050', '051', '052', '053', '054', '055', '056', '057', '058', '059', '060', '061', '062', '063', '064', '065', '066', '067', '068', '069', '070', '071', '072', '073', '074', '075', '076', '077', '078', '079', '080', '081', '082', '083', '084', '085', '086', '087', '088', '089', '090', '091', '092', '093', '094', '095', '096', '097', '098', '099', '100'))
     expect_equal(expand_braces('{0a..0z}'), c('{0a..0z}'))
-    expect_equal(expand_braces('{a,b\\}c,d}'), c('a', 'b}c', 'd'))
-#   expect_equal(expand_braces('{a,b{c,d}'), c('{a,bc', '{a,bd'))
     expect_equal(expand_braces('{a,b}c,d}'), c('ac,d}', 'bc,d}'))
     expect_equal(expand_braces('{a..F}'), c('a', '`', '_', '^', ']', '\\', '[', 'Z', 'Y', 'X', 'W', 'V', 'U', 'T', 'S', 'R', 'Q', 'P', 'O', 'N', 'M', 'L', 'K', 'J', 'I', 'H', 'G', 'F'))
     expect_equal(expand_braces('{A..f}'), c('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f'))
@@ -72,21 +55,17 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('{A..z..10}'), c('A', 'K', 'U', '_', 'i', 's'))
     expect_equal(expand_braces('{z..A..-2}'), c('z', 'x', 'v', 't', 'r', 'p', 'n', 'l', 'j', 'h', 'f', 'd', 'b', '`', '^', '\\', 'Z', 'X', 'V', 'T', 'R', 'P', 'N', 'L', 'J', 'H', 'F', 'D', 'B'))
     expect_equal(expand_braces('{Z..a..20}'), c('Z'))
-#   expect_equal(expand_braces('{a{,b}'), c('{a', '{ab'))
     expect_equal(expand_braces('{a\\},b}'), c('a}', 'b'))
-#   expect_equal(expand_braces('{x,y{,}g}'), c('x', 'yg', 'yg'))
-#   expect_equal(expand_braces('{x,y{}g}'), c('x', 'y{}g'))
-#   expect_equal(expand_braces('{{a,b}'), c('{a', '{b'))
-#   expect_equal(expand_braces('{{a,b},c}'), c('a', 'b', 'c'))
-#   expect_equal(expand_braces('{{a,b}c}'), c('{ac}', '{bc}'))
-#   expect_equal(expand_braces('{{a,b},}'), c('a', 'b', ''))
-#   expect_equal(expand_braces('X{{a,b},}X'), c('XaX', 'XbX', 'XX'))
-#   expect_equal(expand_braces('{{a,b},}c'), c('ac', 'bc', 'c'))
-#   expect_equal(expand_braces('{{a,b}.}'), c('{a.}', '{b.}'))
-#   expect_equal(expand_braces('{{a,b}}'), c('{a}', '{b}'))
-#   expect_equal(expand_braces('X{a..#}X'), c('XaX', 'X`X', 'X_X', 'X^X', 'X]X', 'X\\X', 'X[X', 'XZX', 'XYX', 'XXX', 'XWX', 'XVX', 'XUX', 'XTX', 'XSX', 'XRX', 'XQX', 'XPX', 'XOX', 'XNX', 'XMX', 'XLX', 'XKX', 'XJX', 'XIX', 'XHX', 'XGX', 'XFX', 'XEX', 'XDX', 'XCX', 'XBX', 'XAX', 'X@X', 'X?X', 'X>X', 'X=X', 'X<X', 'X;X', 'X:X', 'X9X', 'X8X', 'X7X', 'X6X', 'X5X', 'X4X', 'X3X', 'X2X', 'X1X', 'X0X', 'X/X', 'X.X', 'X-X', 'X,X', 'X+X', 'X*X', 'X)X', 'X(X', 'X\'X', 'X&X', 'X%X', 'X$X', 'X#X'))
+    expect_equal(expand_braces('{x,y{,}g}'), c('x', 'yg', 'yg'))
+    expect_equal(expand_braces('{x,y{}g}'), c('x', 'y{}g'))
+    expect_equal(expand_braces('{{a,b},c}'), c('a', 'b', 'c'))
+    expect_equal(expand_braces('{{a,b}c}'), c('{ac}', '{bc}'))
+    expect_equal(expand_braces('{{a,b},}'), c('a', 'b', ''))
+    expect_equal(expand_braces('X{{a,b},}X'), c('XaX', 'XbX', 'XX'))
+    expect_equal(expand_braces('{{a,b},}c'), c('ac', 'bc', 'c'))
+    expect_equal(expand_braces('{{a,b}.}'), c('{a.}', '{b.}'))
+    expect_equal(expand_braces('{{a,b}}'), c('{a}', '{b}'))
     expect_equal(expand_braces('{-10..00}'), c('-10', '-09', '-08', '-07', '-06', '-05', '-04', '-03', '-02', '-01', '000'))
-#   expect_equal(expand_braces('{a,\\\\{a,b}c}'), c('a', '\\ac', '\\bc'))
     expect_equal(expand_braces('{a,\\{a,b}c}'), c('ac}', '{ac}', 'bc}'))
     expect_equal(expand_braces('a,\\{b,c}'), c('a,{b,c}'))
     expect_equal(expand_braces('{-10.\\.00}'), c('{-10..00}'))
@@ -102,11 +81,10 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('{'), c('{'))
     expect_equal(expand_braces('abcd{efgh'), c('abcd{efgh'))
     expect_equal(expand_braces('foo {1,2} bar'), c('foo 1 bar', 'foo 2 bar'))
-#   expect_equal(expand_braces('"${var}"{x,y}'), c('${var}x', '${var}y'))
     expect_equal(expand_braces('{1..10}'), c('1', '2', '3', '4', '5', '6', '7', '8', '9', '10'))
     expect_equal(expand_braces('{0..10,braces}'), c('0..10', 'braces'))
-#   expect_equal(expand_braces('{{0..10},braces}'), c('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', 'braces'))
-#   expect_equal(expand_braces('x{{0..10},braces}y'), c('x0y', 'x1y', 'x2y', 'x3y', 'x4y', 'x5y', 'x6y', 'x7y', 'x8y', 'x9y', 'x10y', 'xbracesy'))
+    expect_equal(expand_braces('{{0..10},braces}'), c('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', 'braces'))
+    expect_equal(expand_braces('x{{0..10},braces}y'), c('x0y', 'x1y', 'x2y', 'x3y', 'x4y', 'x5y', 'x6y', 'x7y', 'x8y', 'x9y', 'x10y', 'xbracesy'))
     expect_equal(expand_braces('{3..3}'), c('3'))
     expect_equal(expand_braces('x{3..3}y'), c('x3y'))
     expect_equal(expand_braces('{10..1}'), c('10', '9', '8', '7', '6', '5', '4', '3', '2', '1'))
@@ -120,10 +98,7 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('0{1..9} {10..20}'), c('01 10', '01 11', '01 12', '01 13', '01 14', '01 15', '01 16', '01 17', '01 18', '01 19', '01 20', '02 10', '02 11', '02 12', '02 13', '02 14', '02 15', '02 16', '02 17', '02 18', '02 19', '02 20', '03 10', '03 11', '03 12', '03 13', '03 14', '03 15', '03 16', '03 17', '03 18', '03 19', '03 20', '04 10', '04 11', '04 12', '04 13', '04 14', '04 15', '04 16', '04 17', '04 18', '04 19', '04 20', '05 10', '05 11', '05 12', '05 13', '05 14', '05 15', '05 16', '05 17', '05 18', '05 19', '05 20', '06 10', '06 11', '06 12', '06 13', '06 14', '06 15', '06 16', '06 17', '06 18', '06 19', '06 20', '07 10', '07 11', '07 12', '07 13', '07 14', '07 15', '07 16', '07 17', '07 18', '07 19', '07 20', '08 10', '08 11', '08 12', '08 13', '08 14', '08 15', '08 16', '08 17', '08 18', '08 19', '08 20', '09 10', '09 11', '09 12', '09 13', '09 14', '09 15', '09 16', '09 17', '09 18', '09 19', '09 20'))
     expect_equal(expand_braces('{-1..-10}'), c('-1', '-2', '-3', '-4', '-5', '-6', '-7', '-8', '-9', '-10'))
     expect_equal(expand_braces('{-20..0}'), c('-20', '-19', '-18', '-17', '-16', '-15', '-14', '-13', '-12', '-11', '-10', '-9', '-8', '-7', '-6', '-5', '-4', '-3', '-2', '-1', '0'))
-#   expect_equal(expand_braces('a-{b{d,e}}-c'), c('a-{bd}-c', 'a-{be}-c'))
-#   expect_equal(expand_braces('a-{bdef-{g,i}-c'), c('a-{bdef-g-c', 'a-{bdef-i-c'))
-#   expect_equal(expand_braces('{"klklkl"}{1,2,3}'), c('{klklkl}1', '{klklkl}2', '{klklkl}3'))
-#   expect_equal(expand_braces('{"x,x"}'), c('{x,x}'))
+    expect_equal(expand_braces('a-{b{d,e}}-c'), c('a-{bd}-c', 'a-{be}-c'))
     expect_equal(expand_braces('{klklkl}{1,2,3}'), c('{klklkl}1', '{klklkl}2', '{klklkl}3'))
     expect_equal(expand_braces('{1..10..2}'), c('1', '3', '5', '7', '9'))
     expect_equal(expand_braces('{-1..-10..2}'), c('-1', '-3', '-5', '-7', '-9'))
@@ -157,3 +132,42 @@ test_that("Bash 4.3 unit tests", {
     expect_equal(expand_braces('y{\\},a}x'), c('y}x', 'yax'))
     expect_equal(expand_braces('{}a,b}c'), c('{}a,b}c'))
 })
+
+test_that("Misc", {
+    skip("Not supported yet")
+    expect_equal(expand_braces('"${var}"{x,y}'), c('${var}x', '${var}y'))
+    expect_equal(expand_braces('{,}'), c(', '))
+    expect_equal(expand_braces('X{a..#}X'), c('XaX', 'X`X', 'X_X', 'X^X', 'X]X', 'X\\X', 'X[X', 'XZX', 'XYX', 'XXX', 'XWX', 'XVX', 'XUX', 'XTX', 'XSX', 'XRX', 'XQX', 'XPX', 'XOX', 'XNX', 'XMX', 'XLX', 'XKX', 'XJX', 'XIX', 'XHX', 'XGX', 'XFX', 'XEX', 'XDX', 'XCX', 'XBX', 'XAX', 'X@X', 'X?X', 'X>X', 'X=X', 'X<X', 'X;X', 'X:X', 'X9X', 'X8X', 'X7X', 'X6X', 'X5X', 'X4X', 'X3X', 'X2X', 'X1X', 'X0X', 'X/X', 'X.X', 'X-X', 'X,X', 'X+X', 'X*X', 'X)X', 'X(X', 'X\'X', 'X&X', 'X%X', 'X$X', 'X#X'))
+})
+
+test_that("Inner escaped terms", {
+    skip("Not supported yet")
+    expect_equal(expand_braces('{a,b\\}c,d}'), c('a', 'b}c', 'd'))
+    expect_equal(expand_braces('{a,\\\\{a,b}c}'), c('a', '\\ac', '\\bc'))
+})
+
+test_that("Quoted terms", {
+    skip("Not supported yet")
+    expect_equal(expand_braces('{"x,x"}'), c('{x,x}'))
+    expect_equal(expand_braces('{x","x}'), c('{x,x}'))
+    expect_equal(expand_braces('\'{x,x}\''), c('{x,x}'))
+    expect_equal(expand_braces('{x`,`x}'), c('{x,x}'))
+    expect_equal(expand_braces('\'{a,b}{{a,b},a,b}\''), c('{a,b}{{a,b},a,b}'))
+    expect_equal(expand_braces('{"klklkl"}{1,2,3}'), c('{klklkl}1', '{klklkl}2', '{klklkl}3'))
+    expect_equal(expand_braces('{"x,x"}'), c('{x,x}'))
+
+    skip("Unbalanced braces")
+    expect_equal(expand_braces('a-{bdef-{g,i}-c'), c('a-{bdef-g-c', 'a-{bdef-i-c'))
+    expect_equal(expand_braces('{{a,b}'), c('{a', '{b'))
+    expect_equal(expand_braces('{a{,b}'), c('{a', '{ab'))
+    expect_equal(expand_braces('{a,b{c,d}'), c('{a,bc', '{a,bd'))
+    expect_equal(expand_braces('\\{a,b}{{a,b},a,b}'), c('{a,b}a', '{a,b}b', '{a,b}a', '{a,b}b'))
+    expect_equal(expand_braces('{{a,b}'), c('{a', '{b'))
+    expect_equal(expand_braces('{a,b}}'), c('a}', 'b}'))
+    expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z'), c('abx{y,z', 'acdx{y,z', 'acex{y,z', 'afhx{y,z', 'aghx{y,z'))
+    expect_equal(expand_braces('a{b,c{d,e},{f,g}h}x{y,z\\}'), c('abx{y,z}', 'acdx{y,z}', 'acex{y,z}', 'afhx{y,z}', 'aghx{y,z}'))
+    expect_equal(expand_braces('a{b{c{d,e}f{x,y{{g}h'), c('a{b{cdf{x,y{{g}h', 'a{b{cef{x,y{{g}h'))
+    expect_equal(expand_braces('a{b{c{d,e}f{x,y{}g}h'), c('a{b{cdfxh', 'a{b{cdfy{}gh', 'a{b{cefxh', 'a{b{cefy{}gh'))
+    expect_equal(expand_braces('f{x,y{{g,z}}h'), c('f{x,y{g}h', 'f{x,y{z}h'))
+    expect_equal(expand_braces('z{a,b{,c}d'), c('z{a,bd', 'z{a,bcd'))
+})