Commiteb5f6f1

committed

R 3.0: correctly restore native symbols for plots; provide distinct scratch directory

1 parent194e20d commiteb5f6f1Copy full SHA for eb5f6f1

File tree

+48

-4

lines changed

+48

-4

lines changed

Lines changed: 26 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,33 @@ assign( envir = .rs.Env, ".rs.setVar", function(name, var)`
`180`	`180`	`{`
`181`	`181`	`load(filename)`
`182`	`182`
	`183`	`+# restore native symbols for R >= 3.0`
	`184`	`+rVersion<- getRversion()`
	`185`	`+if (rVersion>="3.0")`
	`186`	`+ {`
	`187`	`+for(iin1:length(plot[[1]]))`
	`188`	`+ {`
	`189`	`+# get the symbol then test if it's a native symbol`
	`190`	`+symbol<-plot[[1]][[i]][[2]][[1]]`
	`191`	`+if("NativeSymbolInfo"%in% class(symbol))`
	`192`	`+ {`
	`193`	`+# determine the dll that the symbol lives in`
	`194`	`+if (!is.null(symbol$package))`
	`195`	`+name=symbol$package[["name"]]`
	`196`	`+else`
	`197`	`+name=symbol$dll[["name"]]`
	`198`	`+pkgDLL<- getLoadedDLLs()[[name]]`
	`199`	`+`
	`200`	`+# reconstruct the native symbol and assign it into the plot`
	`201`	`+nativeSymbol<-getNativeSymbolInfo(name=symbol$name,`
	`202`	`+PACKAGE=pkgDLL,`
	`203`	`+withRegistrationInfo=TRUE);`
	`204`	`+plot[[1]][[i]][[2]][[1]]<-nativeSymbol;`
	`205`	`+ }`
	`206`	`+ }`
	`207`	`+ }`
`183`	`208`	`# restore native symbols for R >= 2.14`
`184`		`-if (getRversion()>="2.14")`
	`209`	`+elseif (rVersion>="2.14")`
`185`	`210`	`{`
`186`	`211`	`try({`
`187`	`212`	`for(iin1:length(plot[[1]]))`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,10 @@ namespace core {`
`26`	`26`	`namespacer {`
`27`	`27`	`namespacesession {`
`28`	`28`	`namespaceutils {`
`29`		`-`
	`29`	`+`
	`30`	`+// check for R 3.0`
	`31`	`+boolisR3();`
	`32`	`+`
`30`	`33`	`// user home path`
`31`	`34`	`const core::FilePath&userHomePath();`
`32`	`35`

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,10 @@ namespace r {`
`76`	`76`	`namespacesession {`
`77`	`77`
`78`	`78`	`namespace {`
`79`		`-`
	`79`	`+`
	`80`	`+// is this R 3.0 or greator`
	`81`	`+bool s_isR3 =false;`
	`82`	`+`
`80`	`83`	`// options`
`81`	`84`	`ROptions s_options;`
`82`	`85`
`@@ -372,6 +375,11 @@ Error initialize()`
`372`	`375`	`if (libError)`
`373`	`376`	`LOG_ERROR(libError);`
`374`	`377`
	`378`	`+// check whether this is R 3.0 or greater`
	`379`	`+ Error r3Error =r::exec::evaluateString("getRversion() >= '3.0.0'", &s_isR3);`
	`380`	`+if (r3Error)`
	`381`	`+LOG_ERROR(r3Error);`
	`382`	`+`
`375`	`383`	`// initialize console history capacity`
`376`	`384`	`r::session::consoleHistory().setCapacityFromRHistsize();`
`377`	`385`
`@@ -387,7 +395,10 @@ Error initialize()`
`387`	`395`	`FilePath graphicsPath;`
`388`	`396`	`if (s_options.serverMode)`
`389`	`397`	`{`
`390`		`- graphicsPath = s_options.scopedScratchPath.complete(kGraphicsPath);`
	`398`	`+ std::string path =kGraphicsPath;`
	`399`	`+if (utils::isR3())`
	`400`	`+ path +="-r3";`
	`401`	`+ graphicsPath = s_options.scopedScratchPath.complete(path);`
`391`	`402`	`}`
`392`	`403`	`else`
`393`	`404`	`{`
`@@ -1578,6 +1589,11 @@ void quit(bool saveWorkspace)`
`1578`	`1589`
`1579`	`1590`	`namespaceutils {`
`1580`	`1591`
	`1592`	`+boolisR3()`
	`1593`	`+{`
	`1594`	`+return s_isR3;`
	`1595`	`+}`
	`1596`	`+`
`1581`	`1597`	`const FilePath&userHomePath()`
`1582`	`1598`	`{`
`1583`	`1599`	`return s_options.userHomePath;`

Comments

(0)