Commitafde119

authored

Merge pull request#145 from shikokuchuo/master

Fix non-API calls for closures

2 parents8d6f7c3 +903a78a commitafde119Copy full SHA for afde119

File tree

+21

-7

lines changed

+21

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ Package: yaml`
`2`	`2`	`Type: Package`
`3`	`3`	`Title: Methods to Convert R Data to YAML and Back`
`4`	`4`	`Date: 2023-11-28`
`5`		`-Version: 2.3.8`
	`5`	`+Version: 2.3.9`
`6`	`6`	`Suggests: RUnit`
`7`	`7`	`Author: Shawn P Garbett [aut], Jeremy Stephens [aut, cre], Kirill Simonov [aut], Yihui Xie [ctb],`
`8`	`8`	`Zhuoer Dong [ctb], Hadley Wickham [ctb], Jeffrey Horner [ctb], reikoch [ctb],`
`9`	`9`	`Will Beasley [ctb], Brendan O'Connor [ctb], Gregory R. Warnes [ctb],`
`10`		`- Michael Quinn [ctb], Zhian N. Kamvar [ctb]`
	`10`	`+ Michael Quinn [ctb], Zhian N. Kamvar [ctb], Charlie Gao [ctb]`
`11`	`11`	`Maintainer: Shawn Garbett <shawn.garbett@vumc.org>`
`12`	`12`	`License: BSD_3_clause + file LICENSE`
`13`	`13`	`Description: Implements the 'libyaml' 'YAML' 1.1 parser and emitter`

Lines changed: 1 addition & 1 deletion

Lines changed: 17 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,22 @@ typedef struct {`
`11`	`11`	`size_tcapa;`
`12`	`12`	`}s_emitter_output;`
`13`	`13`
	`14`	`+#ifR_VERSION<R_Version(4,5,0)`
	`15`	`+`
	`16`	`+# defineR_ClosureFormals(x) FORMALS(x)`
	`17`	`+# defineR_ClosureBody(x) BODY(x)`
	`18`	`+# defineR_ClosureEnv(x) CLOENV(x)`
	`19`	`+`
	`20`	`+staticinlineSEXPR_mkClosure(SEXPformals,SEXPbody,SEXPenv) {`
	`21`	`+SEXPfun=Rf_allocSExp(CLOSXP);`
	`22`	`+SET_FORMALS(fun,formals);`
	`23`	`+SET_BODY(fun,body);`
	`24`	`+SET_CLOENV(fun,env);`
	`25`	`+returnfun;`
	`26`	`+}`
	`27`	`+`
	`28`	`+#endif`
	`29`	`+`
`14`	`30`	`staticSEXPRyaml_deparse_function(SEXPs_obj)`
`15`	`31`	`{`
`16`	`32`	`SEXPs_new_obj=NULL,s_call=NULL,s_result=NULL,s_chr=NULL;`
`@@ -20,10 +36,7 @@ static SEXP Ryaml_deparse_function(SEXP s_obj)`
`20`	`36`	`/* Copy function without any attributes */`
`21`	`37`	`if (TYPEOF(s_obj)==CLOSXP) {`
`22`	`38`	`PROTECT(s_obj);`
`23`		`-PROTECT(s_new_obj=allocSExp(CLOSXP));`
`24`		`-SET_FORMALS(s_new_obj,FORMALS(s_obj));`
`25`		`-SET_BODY(s_new_obj,BODY(s_obj));`
`26`		`-SET_CLOENV(s_new_obj,CLOENV(s_obj));`
	`39`	`+PROTECT(s_new_obj=R_mkClosure(R_ClosureFormals(s_obj),R_ClosureBody(s_obj),R_ClosureEnv(s_obj)));`
`27`	`40`	`SET_OBJECT(s_new_obj,OBJECT(s_obj));`
`28`	`41`	`UNPROTECT(2);`
`29`	`42`	`s_obj=s_new_obj;`

Lines changed: 1 addition & 0 deletions

Comments

(0)