version 2.3.9

Author: spgarbet

DESCRIPTION

@@ -1,20 +1,20 @@
 Package: yaml
 Type: Package
 Title: Methods to Convert R Data to YAML and Back
-Date: 2023-11-28
-Version: 2.3.8
+Date: 2024-07-05
+Version: 2.3.9
 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],
   Will Beasley [ctb], Brendan O'Connor [ctb], Gregory R. Warnes [ctb],
-  Michael Quinn [ctb], Zhian N. Kamvar [ctb]
+  Michael Quinn [ctb], Zhian N. Kamvar [ctb], Charlie Gao [ctb]
 Maintainer: Shawn Garbett <shawn.garbett@vumc.org>
 License: BSD_3_clause + file LICENSE
 Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter
   (<https://pyyaml.org/wiki/LibYAML>) for R.
 URL: https://github.com/vubiostat/r-yaml/
 BugReports: https://github.com/vubiostat/r-yaml/issues
 NeedsCompilation: yes
-Packaged: 2023-12-11 16:46:09 UTC; garbetsp
+Packaged: 2024-07-05 14:37:49 UTC; garbetsp
 Repository: CRAN
-Date/Publication: 2023-12-11 18:50:02 UTC
+Date/Publication: 2024-07-05 16:30:02 UTC

MD5

@@ -1,5 +1,5 @@
 bbba10d958545e3425cc20f316d9da75 *COPYING
-eceb0a0787e1e53016d4650fb3a4599e *DESCRIPTION
+6604e5be6f72cfd7262278d024da7ea0 *DESCRIPTION
 59797fdd34baf532ba0e4c97bc5e3cf8 *LICENSE
 84e3c05130718b3c373f57fbb809cb86 *NAMESPACE
 b901a42735294b31cf1d91b526714858 *R/as.yaml.R
@@ -23,17 +23,17 @@ f6e8413262b60d2b926f4cbad12b1bed *inst/tests/test_yaml_load_file.R
 11563d3fabb3788f025131444aa35e8b *man/read_yaml.Rd
 0b2030532868feea28c54a3600fddaa9 *man/verbatim_logical.Rd
 466b1a01bd0eead68a25633559e01ad3 *man/write_yaml.Rd
-baab030c01a0f2f7eeb99c8d7355c014 *man/yaml.load.Rd
+0bc574ee3d2e29384ea279c4f196f0ab *man/yaml.load.Rd
 6b0576349be43cf3d872205b41aff77d *src/Makevars
 67daa508265c6140db6d048c9a587978 *src/api.c
 a2657fec1bbeca766a5e1cb0a9458a05 *src/dumper.c
 a085415195f7814d2bbca52ec4e517d1 *src/emitter.c
 9cfda206be239794d470b8148bbc9a69 *src/implicit.c
 adea9625fc3b724041e4a5e3947392f8 *src/loader.c
 9c4f0181665c37d4bcdd05535e6a2130 *src/parser.c
-d6194640ed6d599c41f297906c68533f *src/r_emit.c
+d7543ba902b6e98b49fecc0f3276e0a1 *src/r_emit.c
 54485eec23a3e3416821863f93d97753 *src/r_ext.c
-acc43ebc0942c7ec36f4f13ef2fc4747 *src/r_ext.h
+f5356570d02218afeeb754a9827ec9e5 *src/r_ext.h
 d12dfca0fc247f8cc9e48e60bef17429 *src/r_parse.c
 efcea8b4a8bcfbc96ae32abd0f18e472 *src/reader.c
 830f57f176e768c7fa97d086de18050d *src/scanner.c

man/yaml.load.Rd

@@ -57,9 +57,9 @@
 
   There is a built-in handler that will evaluate expressions that are tagged
   with the \sQuote{!expr} tag.  Currently this handler is disabled by default
-  for security reasons.  If a \sQuote{!expr} tag exists and this is set to 
+  for security reasons.  If a \sQuote{!expr} tag exists and this is set to
   FALSE a warning will occur. Alternately, you can set the option named
-  \sQuote{yaml.eval.expr} via the \code{options} function to turn on 
+  \sQuote{yaml.eval.expr} via the \code{options} function to turn on
   evaluation.
 
   The \code{merge.precedence} parameter controls how merge keys are handled.
@@ -115,7 +115,7 @@
   # handling custom types
   yaml.load("!sqrt 555", handlers=list(sqrt=function(x) { sqrt(as.integer(x)) }))
   yaml.load("!foo\n- 1\n- 2", handlers=list(foo=function(x) { as.integer(x) + 1 }))
-  yaml.load("!bar\none: 1\ntwo: 2", handlers=list(foo=function(x) { x$one <- "one"; x }))
+  yaml.load("!bar\none: 1\ntwo: 2", handlers=list(bar=function(x) { x$one <- "one"; x }))
 
   # loading R expressions
   # NOTE: this will not be done by default in the near future

src/r_emit.c

@@ -11,6 +11,22 @@ typedef struct {
   size_t capa;
 } s_emitter_output;
 
+#if R_VERSION < R_Version(4, 5, 0)
+
+# define R_ClosureFormals(x) FORMALS(x)
+# define R_ClosureBody(x) BODY(x)
+# define R_ClosureEnv(x) CLOENV(x)
+
+static inline SEXP R_mkClosure(SEXP formals, SEXP body, SEXP env) {
+  SEXP fun = Rf_allocSExp(CLOSXP);
+  SET_FORMALS(fun, formals);
+  SET_BODY(fun, body);
+  SET_CLOENV(fun, env);
+  return fun;
+}
+
+#endif
+
 static SEXP Ryaml_deparse_function(SEXP s_obj)
 {
   SEXP s_new_obj = NULL, s_call = NULL, s_result = NULL, s_chr = NULL;
@@ -20,10 +36,7 @@ static SEXP Ryaml_deparse_function(SEXP s_obj)
   /* Copy function without any attributes */
   if (TYPEOF(s_obj) == CLOSXP) {
     PROTECT(s_obj);
-    PROTECT(s_new_obj = allocSExp(CLOSXP));
-    SET_FORMALS(s_new_obj, FORMALS(s_obj));
-    SET_BODY(s_new_obj, BODY(s_obj));
-    SET_CLOENV(s_new_obj, CLOENV(s_obj));
+    PROTECT(s_new_obj = R_mkClosure(R_ClosureFormals(s_obj), R_ClosureBody(s_obj), R_ClosureEnv(s_obj)));
     SET_OBJECT(s_new_obj, OBJECT(s_obj));
     UNPROTECT(2);
     s_obj = s_new_obj;

src/r_ext.h

@@ -12,6 +12,7 @@
 #include <limits.h>
 #include "R.h"
 #include "Rdefines.h"
+#include "Rversion.h"
 #include "R_ext/Rdynload.h"
 #include "R_ext/Parse.h"
 #include "R_ext/Print.h"