bugfix in manipulateConfig

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '4240422'
+ValidationKey: '4259969'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "lucode2: Code Manipulation and Analysis Tools",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "description": "<p>A collection of tools which allow to manipulate and analyze code.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: lucode2
 Type: Package
 Title: Code Manipulation and Analysis Tools
-Version: 0.22.2
-Date: 2022-04-19
+Version: 0.22.3
+Date: 2022-04-21
 Authors@R: c(person("Jan Philipp", "Dietrich", email = "[email protected]", role = c("aut","cre")),
              person("David", "Klein", role = "aut"),
              person("Anastasis", "Giannousakis", role = "aut"),

R/manipulateConfig.R

@@ -45,7 +45,8 @@ manipulateConfig <- function(configFile, ...) {
       m[[paste(i, "_pattern1", sep = "")]][2] <- paste(
         "\\1 ", rpl, "\\2", sep = "")
       m[[paste(i, "_pattern2", sep = "")]][1] <- paste(
-        "((\\n|^)[\\t ]*(scalar|parameter|set|)s?[\\t ]*", i, "(|\\([^\\)]*\\))[\\t ][^/;]*/)[^/]*", sep = "")
+        "((\\n|^)[\\t ]*(scalar|parameter|set|)s?[\\t ]*", i, "(|\\([^\\)]*\\))[\\t ]*(\"[^\"]*\"|)[^\"/;]*/)[^/]*",
+        sep = "")
       m[[paste(i, "_pattern2", sep = "")]][2] <- paste(
         "\\1 ", rpl, " ", sep = "")
       m[[paste(i, "_pattern3", sep = "")]][1] <- paste(

README.md

@@ -1,6 +1,6 @@
 # Code Manipulation and Analysis Tools
 
-R package **lucode2**, version **0.22.2**
+R package **lucode2**, version **0.22.3**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/lucode2)](https://cran.r-project.org/package=lucode2) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4389418.svg)](https://doi.org/10.5281/zenodo.4389418) [![R build status](https://github.com/pik-piam/lucode2/workflows/check/badge.svg)](https://github.com/pik-piam/lucode2/actions) [![codecov](https://codecov.io/gh/pik-piam/lucode2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/lucode2) [![r-universe](https://pik-piam.r-universe.dev/badges/lucode2)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -38,7 +38,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **lucode2** in publications use:
 
-Dietrich J, Klein D, Giannousakis A, Bonsch M, Bodirsky B, Baumstark L, Führlich P (2022). _lucode2: Code Manipulation and Analysis Tools_. doi: 10.5281/zenodo.4389418 (URL: https://doi.org/10.5281/zenodo.4389418), R package version 0.22.2, <URL: https://github.com/pik-piam/lucode2>.
+Dietrich J, Klein D, Giannousakis A, Bonsch M, Bodirsky B, Baumstark L, Führlich P (2022). _lucode2: Code Manipulation and Analysis Tools_. doi: 10.5281/zenodo.4389418 (URL: https://doi.org/10.5281/zenodo.4389418), R package version 0.22.3, <URL: https://github.com/pik-piam/lucode2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
   title = {lucode2: Code Manipulation and Analysis Tools},
   author = {Jan Philipp Dietrich and David Klein and Anastasis Giannousakis and Markus Bonsch and Benjamin Leon Bodirsky and Lavinia Baumstark and Pascal Führlich},
   year = {2022},
-  note = {R package version 0.22.2},
+  note = {R package version 0.22.3},
   doi = {10.5281/zenodo.4389418},
   url = {https://github.com/pik-piam/lucode2},
 }

tests/testthat/test-manipulateConfig.R

@@ -0,0 +1,29 @@
+
+test_that("manipulateConfig works", {
+  withr::with_tempdir({
+    configFile <- "test.gms"
+
+    cfg <- list(foo  = 0,
+                bar  = 0,
+                buzz = 0,
+                bazz = 0)
+
+    code <- function(cfg) {
+      x <- c("scalars",
+             paste0("  foo  blah / ", cfg$foo, " /"),
+             '  bar  "either x/y or X/Y"',
+             '  bazz "just x/y"',
+             paste0('  buzz "not x/y" / ', cfg$buzz, " /"),
+             ";",
+             paste0("bar  = ", cfg$bar, ";"),
+             paste0("bazz = ", cfg$bazz, ";"),
+             paste0("buzz = ", cfg$buzz, ";"))
+      return(x)
+    }
+
+    writeLines(code(cfg), configFile)
+    cfg[seq_along(cfg)] <- seq_along(cfg)
+    manipulateConfig(configFile, cfg)
+    expect_identical(readLines(configFile), code(cfg))
+  })
+})