[rkward-cvs] SF.net SVN: rkward:[4489] trunk/rkward/rkward/rbackend/rpackages/rkward/R
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Jan 14 19:00:11 UTC 2013
Revision: 4489
http://rkward.svn.sourceforge.net/rkward/?rev=4489&view=rev
Author: tfry
Date: 2013-01-14 19:00:10 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
Fix for upcoming R 3.0.0.
At least the development version will not search for symbols in the embedding dll info, unless told so, explicitly.
Modified Paths:
--------------
trunk/rkward/rkward/rbackend/rpackages/rkward/R/base_overrides.R
trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R
trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R
trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R
Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/base_overrides.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/base_overrides.R 2013-01-09 18:39:57 UTC (rev 4488)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/base_overrides.R 2013-01-14 19:00:10 UTC (rev 4489)
@@ -55,7 +55,7 @@
ret <- base::Sys.setlocale (category, locale, ...)
- .Call ("rk.update.locale")
+ .Call ("rk.update.locale", PACKAGE="(embedding)")
ret
} else {
base::Sys.setlocale (category, locale, ...)
Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R 2013-01-09 18:39:57 UTC (rev 4488)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R 2013-01-14 19:00:10 UTC (rev 4489)
@@ -117,7 +117,7 @@
".rk.do.error" <- function () {
# comment in R sources says, it may not be good to query options during error handling. But what can we do, if R_ShowErrorMessages is not longer exported?
if (getOption ("show.error.messages")) {
- .Call ("rk.do.error", c (geterrmessage ()));
+ .Call ("rk.do.error", c (geterrmessage ()), PACKAGE="(embedding)");
}
}
@@ -127,13 +127,13 @@
#' @export
".rk.do.call" <- function (x, args=NULL) {
.rk.set.reply (NULL)
- .Call ("rk.do.command", c (x, args));
+ .Call ("rk.do.command", c (x, args), PACKAGE="(embedding)");
return (.rk.variables$.rk.rkreply)
}
#' @export
".rk.do.plain.call" <- function (x, args=NULL, synchronous=TRUE) {
- .Call ("rk.do.generic.request", c (x, args), isTRUE (synchronous))
+ .Call ("rk.do.generic.request", c (x, args), isTRUE (synchronous), PACKAGE="(embedding)")
}
#' @export
@@ -241,7 +241,7 @@
function (value) {
if (!missing (value)) {
assign (k, value, envir=.rk.watched.symbols)
- .Call ("rk.do.command", c ("ws", k));
+ .Call ("rk.do.command", c ("ws", k), PACKAGE="(embedding)");
# NOTE: the above is essentially the same a
# .rk.do.call ("ws", k);
# only minimally faster.
@@ -255,7 +255,7 @@
#' @export
".rk.watch.symbol" <- function (k) {
f <- .rk.make.watch.f (k)
- .Call ("rk.copy.no.eval", k, globalenv(), .rk.watched.symbols);
+ .Call ("rk.copy.no.eval", k, globalenv(), .rk.watched.symbols, PACKAGE="(embedding)");
#assign (k, get (k, envir=globalenv ()), envir=.rk.watched.symbols)
rm (list=k, envir=globalenv ())
@@ -323,7 +323,7 @@
#' @export
".rk.get.structure" <- function (x, name, envlevel=0, namespacename=NULL) {
- .Call ("rk.get.structure", x, as.character (name), as.integer (envlevel), namespacename)
+ .Call ("rk.get.structure", x, as.character (name), as.integer (envlevel), namespacename, PACKAGE="(embedding)")
}
#' @export
@@ -333,7 +333,7 @@
#' @export
".rk.get.structure.global" <- function (name, envlevel=0, namespacename=NULL) {
- .Call ("rk.get.structure.global", as.character (name), as.integer (envlevel), namespacename)
+ .Call ("rk.get.structure.global", as.character (name), as.integer (envlevel), namespacename, PACKAGE="(embedding)")
}
#' @export
Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R 2013-01-09 18:39:57 UTC (rev 4488)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R 2013-01-14 19:00:10 UTC (rev 4489)
@@ -61,7 +61,7 @@
#' @export
"rk.show.message" <- function (message, caption = "Information", wait=TRUE) {
- .Call ("rk.dialog", caption, message, "ok", "", "", isTRUE (wait))
+ .Call ("rk.dialog", caption, message, "ok", "", "", isTRUE (wait), PACKAGE="(embedding)")
invisible (TRUE)
}
@@ -69,7 +69,7 @@
#' @export
#' @rdname rk.show.messages
"rk.show.question" <- function (message, caption = "Question", button.yes = "yes", button.no = "no", button.cancel = "cancel") {
- res <- .Call ("rk.dialog", caption, message, button.yes, button.no, button.cancel, TRUE)
+ res <- .Call ("rk.dialog", caption, message, button.yes, button.no, button.cancel, TRUE, PACKAGE="(embedding)")
if (res > 0) return (TRUE)
else if (res < 0) return (FALSE)
else return (NULL) # cancelled
Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R 2013-01-09 18:39:57 UTC (rev 4488)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R 2013-01-14 19:00:10 UTC (rev 4489)
@@ -51,19 +51,19 @@
nfile = tempfile()
env = environment (file)
dput (file, file=nfile, control=c ("useSource", "keepNA", "keepInteger", "showAttributes"))
- .Call("rk.edit.files", nfile, title, name, prompt)
+ .Call("rk.edit.files", nfile, title, name, prompt, PACKAGE="(embedding)")
x <- dget (nfile)
environment (x) <- env
return (x)
}
- invisible (.Call ("rk.edit.files", as.character (file), as.character (title), as.character (name), isTRUE (prompt)))
+ invisible (.Call ("rk.edit.files", as.character (file), as.character (title), as.character (name), isTRUE (prompt), PACKAGE="(embedding)"))
}
#' @export
#' @rdname rk.edit
"rk.show.files" <- function (file = file, title = file, wtitle = NULL, delete=FALSE, prompt = TRUE)
{
- invisible (.Call ("rk.show.files", as.character (file), as.character (title), as.character (wtitle), delete, isTRUE (prompt)))
+ invisible (.Call ("rk.show.files", as.character (file), as.character (title), as.character (wtitle), delete, isTRUE (prompt), PACKAGE="(embedding)"))
}
#' @export
Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R 2013-01-09 18:39:57 UTC (rev 4488)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R 2013-01-14 19:00:10 UTC (rev 4489)
@@ -82,7 +82,7 @@
assign (".rk.output.html.file", x, .rk.variables)
if (!file.exists (x)) {
- .rk.cat.output (paste ("<?xml version=\"1.0\" encoding=\"", .Call ("rk.locale.name"), "\"?>\n", sep=""))
+ .rk.cat.output (paste ("<?xml version=\"1.0\" encoding=\"", .Call ("rk.locale.name", PACKAGE="(embedding)"), "\"?>\n", sep=""))
.rk.cat.output (paste ("<html><head>\n<title>RKWard Output</title>\n", .rk.do.plain.call ("getCSSlink"), sep=""))
# the next part defines a JavaScript function to add individual results to a global table of contents menu in the document
.rk.cat.output (paste ("\t<script type=\"text/javascript\">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list