jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove _wrap from .R files

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10105 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Joseph Wang 2007-11-11 03:08:10 +00:00
commit cd9c301b48
10 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/constant_pointers.i
View file

@ -116,6 +116,10 @@ int* const globalRet2() {return &GlobalInt;}
%{ %{
static int wxEVT_COMMAND_BUTTON_CLICKEDv; static int wxEVT_COMMAND_BUTTON_CLICKEDv;
static int **wxEVT_COMMAND_BUTTON_CLICKEDp; static int **wxEVT_COMMAND_BUTTON_CLICKEDp;
#if defined(SWIGR)
#undef lang1 /* conflicts with symbol in R internals */
#endif
char lang1[16] = "Hello"; char lang1[16] = "Hello";
char *langs[] ={ lang1 }; char *langs[] ={ lang1 };

5
Examples/test-suite/r/Makefile.in
View file

@ -4,7 +4,7 @@
LANGUAGE = r LANGUAGE = r
SCRIPTSUFFIX = _runme.R SCRIPTSUFFIX = _runme.R
WRAPSUFFIX = _wrap.R WRAPSUFFIX = .R
RUNR = R CMD BATCH --no-save --no-restore RUNR = R CMD BATCH --no-save --no-restore
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@ -59,4 +59,5 @@ clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile r_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile r_clean
%.clean: %.clean:
@rm -f $*_wrap.R $*_wrap.so $*_wrap.cpp $*_wrap.c $*_runme.Rout @rm -f $*.R $*_wrap.so $*_wrap.cpp $*_wrap.c $*_runme.Rout $*.Rout

2
Examples/test-suite/r/copy_struct_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("copy_struct_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("copy_struct_wrap", .Platform$dynlib.ext, sep=""))
source("copy_struct_wrap.R") source("copy_struct.R")
cacheMetaData(1) cacheMetaData(1)
a <- getA() a <- getA()

2
Examples/test-suite/r/double_delete_runme.R
View file

@ -2,7 +2,7 @@
# by SWIG. # by SWIG.
dyn.load(paste("double_delete_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("double_delete_wrap", .Platform$dynlib.ext, sep=""))
source("double_delete_wrap.R") source("double_delete.R")
cacheMetaData(1) cacheMetaData(1)
# ----- Object creation ----- # ----- Object creation -----

2
Examples/test-suite/r/funcptr_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("funcptr_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("funcptr_wrap", .Platform$dynlib.ext, sep=""))
source("funcptr_wrap.R") source("funcptr.R")
cacheMetaData(1) cacheMetaData(1)
unittest(do_op(1, 3, add), 4) unittest(do_op(1, 3, add), 4)
unittest(do_op(2, 3, mul), 6) unittest(do_op(2, 3, mul), 6)

2
Examples/test-suite/r/ignore_parameter_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("ignore_parameter_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("ignore_parameter_wrap", .Platform$dynlib.ext, sep=""))
source("ignore_parameter_wrap.R") source("ignore_parameter.R")
cacheMetaData(1) cacheMetaData(1)
unittest(jaguar(1, 1.0), "hello") unittest(jaguar(1, 1.0), "hello")

2
Examples/test-suite/r/legacy_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("legacy_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("legacy_wrap", .Platform$dynlib.ext, sep=""))
source("legacy_wrap.R") source("legacy.R")
cacheMetaData(1) cacheMetaData(1)
obj <- getObject(1,3) obj <- getObject(1,3)

2
Examples/test-suite/r/simple_array_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("simple_array_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("simple_array_wrap", .Platform$dynlib.ext, sep=""))
source("simple_array_wrap.R") source("simple_array.R")
cacheMetaData(1) cacheMetaData(1)
initArray() initArray()

2
Examples/test-suite/r/unions_runme.R
View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("unions_wrap", .Platform$dynlib.ext, sep="")) dyn.load(paste("unions_wrap", .Platform$dynlib.ext, sep=""))
source("unions_wrap.R") source("unions.R")
cacheMetaData(1) cacheMetaData(1)
ss <- SmallStruct() ss <- SmallStruct()

2
Source/Modules/r.cxx
View file

@ -854,7 +854,7 @@ int R::DumpCode(Node *n, String *module) {
/* The name of the file in which we will generate the S code. */ /* The name of the file in which we will generate the S code. */
Printf(output_filename, "%s%s_wrap.R", SWIG_output_directory(), module); Printf(output_filename, "%s%s.R", SWIG_output_directory(), module);
#ifdef R_SWIG_VERBOSE #ifdef R_SWIG_VERBOSE
Printf(stderr, "Writing S code to %s\n", output_filename); Printf(stderr, "Writing S code to %s\n", output_filename);