version 2.3.8

spgarbet · cran-robot · commit d41800767540 · 2023-12-12T02:44:17.000Z
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: yaml
 Type: Package
 Title: Methods to Convert R Data to YAML and Back
-Date: 2023-01-18
-Version: 2.3.7
+Date: 2023-11-28
+Version: 2.3.8
 Suggests: RUnit
 Author: Shawn P Garbett [aut], Jeremy Stephens [aut, cre], Kirill Simonov [aut], Yihui Xie [ctb],
   Zhuoer Dong [ctb], Hadley Wickham [ctb], Jeffrey Horner [ctb], reikoch [ctb],
@@ -15,6 +15,6 @@ Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter
 URL: https://github.com/vubiostat/r-yaml/
 BugReports: https://github.com/vubiostat/r-yaml/issues
 NeedsCompilation: yes
-Packaged: 2023-01-18 17:20:16 UTC; garbetsp
+Packaged: 2023-12-11 16:46:09 UTC; garbetsp
 Repository: CRAN
-Date/Publication: 2023-01-23 18:40:02 UTC
+Date/Publication: 2023-12-11 18:50:02 UTC
diff --git a/MD5 b/MD5
@@ -1,14 +1,15 @@
 bbba10d958545e3425cc20f316d9da75 *COPYING
-f1de57ea2406878a414eeff439a66ecb *DESCRIPTION
+eceb0a0787e1e53016d4650fb3a4599e *DESCRIPTION
 59797fdd34baf532ba0e4c97bc5e3cf8 *LICENSE
-17a16244d43d0cfe5439535f4695dd7f *NAMESPACE
+84e3c05130718b3c373f57fbb809cb86 *NAMESPACE
 b901a42735294b31cf1d91b526714858 *R/as.yaml.R
 0bb1cc5151f96c8da86eb7080d697e52 *R/read_yaml.R
+70f4ab72b534ebb247efbce07d407c83 *R/verbatim_logical.R
 41bba07a114c49bbdfe2b025403c89c0 *R/write_yaml.R
 29e454510ffb615b4391eb999ba99670 *R/yaml.load.R
 58bb803b31e71d93b9279a3c74fc1552 *R/yaml.load_file.R
 59d3ef441a03e63a67784ef7d111f8fe *R/zzz.R
-d80709e9248820ed1455ad21562b95ad *inst/CHANGELOG
+76a8e161e6b42aba2ffd2d3f1777a8f1 *inst/CHANGELOG
 616265f0a9f5aacfdec8802f2e82d5ff *inst/THANKS
 39a3d6c0eded3941e7ca0d3c1b26f8a5 *inst/implicit.re
 0625a433dcef8def801ea9ed2a7396c9 *inst/tests/files/merge.yml
@@ -18,8 +19,9 @@ b70b0ade3126a031e5bf77d8aa9af4f2 *inst/tests/files/test.yml
 f0258adf12eff3e4ef781d06ed5ca659 *inst/tests/test_write_yaml.R
 244044b994ffb7c56925020516202720 *inst/tests/test_yaml_load.R
 f6e8413262b60d2b926f4cbad12b1bed *inst/tests/test_yaml_load_file.R
-b28b3dca8fb45d671bf003f30de49879 *man/as.yaml.Rd
+303be7867757feba4aad55b866e01946 *man/as.yaml.Rd
 11563d3fabb3788f025131444aa35e8b *man/read_yaml.Rd
+0b2030532868feea28c54a3600fddaa9 *man/verbatim_logical.Rd
 466b1a01bd0eead68a25633559e01ad3 *man/write_yaml.Rd
 baab030c01a0f2f7eeb99c8d7355c014 *man/yaml.load.Rd
 6b0576349be43cf3d872205b41aff77d *src/Makevars
@@ -29,10 +31,10 @@ a085415195f7814d2bbca52ec4e517d1 *src/emitter.c
 9cfda206be239794d470b8148bbc9a69 *src/implicit.c
 adea9625fc3b724041e4a5e3947392f8 *src/loader.c
 9c4f0181665c37d4bcdd05535e6a2130 *src/parser.c
-4ff87409bae3d51bab6f037372f23f56 *src/r_emit.c
+d6194640ed6d599c41f297906c68533f *src/r_emit.c
 54485eec23a3e3416821863f93d97753 *src/r_ext.c
 acc43ebc0942c7ec36f4f13ef2fc4747 *src/r_ext.h
-a983155ff509eead126ee27042771709 *src/r_parse.c
+d12dfca0fc247f8cc9e48e60bef17429 *src/r_parse.c
 efcea8b4a8bcfbc96ae32abd0f18e472 *src/reader.c
 830f57f176e768c7fa97d086de18050d *src/scanner.c
 7b2e815cfd48dbfd462f3bd317059e3f *src/writer.c
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,2 +1,2 @@
 useDynLib(yaml, .registration = TRUE, .fixes = "C_")
-export(as.yaml, yaml.load_file, yaml.load, read_yaml, write_yaml)
+export(as.yaml, yaml.load_file, yaml.load, read_yaml, write_yaml, verbatim_logical)
diff --git a/R/verbatim_logical.R b/R/verbatim_logical.R
@@ -0,0 +1,5 @@
+verbatim_logical <- function(x) {
+  result <- tolower(as.logical(x))
+  class(result) <- "verbatim"
+  return(result)
+}
diff --git a/inst/CHANGELOG b/inst/CHANGELOG
@@ -1,4 +1,5 @@
 ### Release Notes
+v2.3.8 added verbatim_logical helper function
 
 v2.3.7 clang deprecated sprintf. Changed in included clib to snprintf
 
diff --git a/man/as.yaml.Rd b/man/as.yaml.Rd
@@ -88,12 +88,7 @@
   # custom handler with verbatim output to change how logical vectors are
   # emitted
   as.yaml(c(TRUE, FALSE), handlers = list(
-    logical = function(x) {
-      result <- ifelse(x, "true", "false")
-      class(result) <- "verbatim"
-      return(result)
-    }
-  ))
+    logical = verbatim_logical))
 
   # force quotes around a string
   port_def <- "80:80"
diff --git a/man/verbatim_logical.Rd b/man/verbatim_logical.Rd
@@ -0,0 +1,43 @@
+\name{verbatim_logical}
+\alias{verbatim_logical}
+%- Also NEED an '\alias' for EACH other topic documented here.
+\title{
+Alternalte logical handler
+}
+\description{
+A yaml handler function that will cause logical vectors to emit true/false value
+instead of yes/no value
+}
+\usage{
+verbatim_logical(x)
+}
+%- maybe also 'usage' for other objects documented here.
+\arguments{
+  \item{x}{
+	logical values to convert to \code{true} or \code{false}.
+}
+}
+\details{
+To use pass into as.yaml as part of a handler arguement list like 
+\code{list(logical=verbatim_logical)}.
+}
+\value{
+Returns a vector of strings of either \code{true} or \code{false} of class
+\code{verbatim}.
+}
+\author{
+Charles Dupont and James Goldie (jimjam-slam)
+}
+
+%% ~Make other sections like Warning with \section{Warning }{....} ~
+
+\seealso{
+\code{\link{as.yaml}}
+}
+\examples{
+vector <- c(TRUE, FALSE, TRUE)
+
+as.yaml(vector, handlers=list(logical=verbatim_logical))
+}
+\keyword{ data }
+\keyword{ manip }
diff --git a/src/r_emit.c b/src/r_emit.c
@@ -954,7 +954,7 @@ SEXP Ryaml_serialize_to_yaml(
     free(output.buffer);
   }
   else {
-    error(Ryaml_error_msg);
+    error("%s", Ryaml_error_msg);
   }
 
   return s_retval;
diff --git a/src/r_parse.c b/src/r_parse.c
@@ -1340,7 +1340,7 @@ SEXP Ryaml_unserialize_from_yaml(
         free(error_msg_copy);
       }
     }
-    error(Ryaml_error_msg);
+    error("%s", Ryaml_error_msg);
   }
 
   UNPROTECT(3); /* s_stack_head, s_aliases_head, s_handlers */

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`useDynLib(yaml, .registration = TRUE, .fixes = "C_")`
`2`		`-export(as.yaml, yaml.load_file, yaml.load, read_yaml, write_yaml)`
	`2`	`+export(as.yaml, yaml.load_file, yaml.load, read_yaml, write_yaml, verbatim_logical)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`### Release Notes`
	`2`	`+v2.3.8 added verbatim_logical helper function`
`2`	`3`
`3`	`4`	`v2.3.7 clang deprecated sprintf. Changed in included clib to snprintf`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,7 @@ SEXP Ryaml_serialize_to_yaml(`
`954`	`954`	`free(output.buffer);`
`955`	`955`	`}`
`956`	`956`	`else {`
`957`		`- error(Ryaml_error_msg);`
	`957`	`+ error("%s", Ryaml_error_msg);`
`958`	`958`	`}`
`959`	`959`
`960`	`960`	`return s_retval;`
Original file line number	Diff line number	Diff line change
`@@ -1340,7 +1340,7 @@ SEXP Ryaml_unserialize_from_yaml(`
`1340`	`1340`	`free(error_msg_copy);`
`1341`	`1341`	`}`
`1342`	`1342`	`}`
`1343`		`- error(Ryaml_error_msg);`
	`1343`	`+ error("%s", Ryaml_error_msg);`
`1344`	`1344`	`}`
`1345`	`1345`
`1346`	`1346`	`UNPROTECT(3); /* s_stack_head, s_aliases_head, s_handlers */`