rice 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Doxyfile +1758 -731
- data/Makefile.am +1 -1
- data/Makefile.in +57 -24
- data/README +7 -6
- data/aclocal.m4 +153 -69
- data/configure +48 -2
- data/configure.ac +1 -1
- data/extconf.rb +1 -0
- data/rice/Arg_impl.hpp +2 -0
- data/rice/Constructor.hpp +23 -0
- data/rice/Director.hpp +1 -1
- data/rice/Exception.hpp +4 -0
- data/rice/Hash.ipp +0 -1
- data/rice/Makefile.in +79 -90
- data/rice/String.hpp +2 -0
- data/rice/to_from_ruby_defn.hpp +1 -2
- data/ruby/Makefile.in +50 -23
- data/ruby/lib/Makefile.in +44 -16
- data/ruby/lib/version.rb +1 -1
- data/sample/Makefile.in +44 -16
- data/test/Makefile.in +59 -28
- data/test/ext/Makefile.in +44 -16
- data/test/test_Array.cpp +13 -0
- data/test/test_Builtin_Object.cpp +0 -1
- data/test/test_Director.cpp +4 -0
- data/test/test_Hash.cpp +14 -0
- data/test/test_String.cpp +13 -0
- data/test/test_Struct.cpp +13 -0
- metadata +2 -2
data/test/Makefile.in
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
# Makefile.in generated by automake 1.
|
1
|
+
# Makefile.in generated by automake 1.14 from Makefile.am.
|
2
2
|
# @configure_input@
|
3
3
|
|
4
|
-
# Copyright (C) 1994-
|
4
|
+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
5
5
|
|
6
6
|
# This Makefile.in is free software; the Free Software Foundation
|
7
7
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -15,23 +15,51 @@
|
|
15
15
|
@SET_MAKE@
|
16
16
|
|
17
17
|
VPATH = @srcdir@
|
18
|
-
|
19
|
-
|
20
|
-
|
18
|
+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
19
|
+
am__make_running_with_option = \
|
20
|
+
case $${target_option-} in \
|
21
|
+
?) ;; \
|
22
|
+
*) echo "am__make_running_with_option: internal error: invalid" \
|
23
|
+
"target option '$${target_option-}' specified" >&2; \
|
24
|
+
exit 1;; \
|
25
|
+
esac; \
|
26
|
+
has_opt=no; \
|
27
|
+
sane_makeflags=$$MAKEFLAGS; \
|
28
|
+
if $(am__is_gnu_make); then \
|
29
|
+
sane_makeflags=$$MFLAGS; \
|
30
|
+
else \
|
21
31
|
case $$MAKEFLAGS in \
|
22
32
|
*\\[\ \ ]*) \
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
for am__flg in $$MAKEFLAGS; do \
|
27
|
-
case $$am__flg in \
|
28
|
-
*=*|--*) ;; \
|
29
|
-
*n*) am__dry=yes; break;; \
|
30
|
-
esac; \
|
31
|
-
done;; \
|
33
|
+
bs=\\; \
|
34
|
+
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
35
|
+
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
32
36
|
esac; \
|
33
|
-
|
34
|
-
|
37
|
+
fi; \
|
38
|
+
skip_next=no; \
|
39
|
+
strip_trailopt () \
|
40
|
+
{ \
|
41
|
+
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
42
|
+
}; \
|
43
|
+
for flg in $$sane_makeflags; do \
|
44
|
+
test $$skip_next = yes && { skip_next=no; continue; }; \
|
45
|
+
case $$flg in \
|
46
|
+
*=*|--*) continue;; \
|
47
|
+
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
48
|
+
-*I?*) strip_trailopt 'I';; \
|
49
|
+
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
50
|
+
-*O?*) strip_trailopt 'O';; \
|
51
|
+
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
52
|
+
-*l?*) strip_trailopt 'l';; \
|
53
|
+
-[dEDm]) skip_next=yes;; \
|
54
|
+
-[JT]) skip_next=yes;; \
|
55
|
+
esac; \
|
56
|
+
case $$flg in \
|
57
|
+
*$$target_option*) has_opt=yes; break;; \
|
58
|
+
esac; \
|
59
|
+
done; \
|
60
|
+
test $$has_opt = yes
|
61
|
+
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
62
|
+
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
35
63
|
pkgdatadir = $(datadir)/@PACKAGE@
|
36
64
|
pkgincludedir = $(includedir)/@PACKAGE@
|
37
65
|
pkglibdir = $(libdir)/@PACKAGE@
|
@@ -597,9 +625,11 @@ $(am__aclocal_m4_deps):
|
|
597
625
|
|
598
626
|
clean-noinstPROGRAMS:
|
599
627
|
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
|
628
|
+
|
600
629
|
unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest_DEPENDENCIES)
|
601
630
|
@rm -f unittest$(EXEEXT)
|
602
631
|
$(AM_V_CXXLD)$(CXXLINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
|
632
|
+
|
603
633
|
vm_unittest$(EXEEXT): $(vm_unittest_OBJECTS) $(vm_unittest_DEPENDENCIES) $(EXTRA_vm_unittest_DEPENDENCIES)
|
604
634
|
@rm -f vm_unittest$(EXEEXT)
|
605
635
|
$(AM_V_CXXLD)$(CXXLINK) $(vm_unittest_OBJECTS) $(vm_unittest_LDADD) $(LIBS)
|
@@ -636,15 +666,17 @@ distclean-compile:
|
|
636
666
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittest.Po@am__quote@
|
637
667
|
|
638
668
|
.cpp.o:
|
639
|
-
@am__fastdepCXX_TRUE@ $(AM_V_CXX)
|
640
|
-
@am__fastdepCXX_TRUE@ $(
|
669
|
+
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
670
|
+
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
671
|
+
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
641
672
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
642
673
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
643
674
|
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
|
644
675
|
|
645
676
|
.cpp.obj:
|
646
|
-
@am__fastdepCXX_TRUE@ $(AM_V_CXX)
|
647
|
-
@am__fastdepCXX_TRUE@ $(
|
677
|
+
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
|
678
|
+
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
|
679
|
+
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
648
680
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
649
681
|
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
650
682
|
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
@@ -656,13 +688,12 @@ distclean-compile:
|
|
656
688
|
# (which will cause the Makefiles to be regenerated when you run 'make');
|
657
689
|
# (2) otherwise, pass the desired values on the 'make' command line.
|
658
690
|
$(am__recursive_targets):
|
659
|
-
@fail
|
660
|
-
|
661
|
-
|
662
|
-
|
663
|
-
|
664
|
-
|
665
|
-
done; \
|
691
|
+
@fail=; \
|
692
|
+
if $(am__make_keepgoing); then \
|
693
|
+
failcom='fail=yes'; \
|
694
|
+
else \
|
695
|
+
failcom='exit 1'; \
|
696
|
+
fi; \
|
666
697
|
dot_seen=no; \
|
667
698
|
target=`echo $@ | sed s/-recursive//`; \
|
668
699
|
case "$@" in \
|
@@ -758,7 +789,7 @@ distclean-tags:
|
|
758
789
|
$(MAKE) $(AM_MAKEFLAGS) $<
|
759
790
|
|
760
791
|
# Leading 'am--fnord' is there to ensure the list of targets does not
|
761
|
-
#
|
792
|
+
# expand to empty, as could happen e.g. with make check TESTS=''.
|
762
793
|
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
|
763
794
|
am--force-recheck:
|
764
795
|
@:
|
data/test/ext/Makefile.in
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
# Makefile.in generated by automake 1.
|
1
|
+
# Makefile.in generated by automake 1.14 from Makefile.am.
|
2
2
|
# @configure_input@
|
3
3
|
|
4
|
-
# Copyright (C) 1994-
|
4
|
+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
5
5
|
|
6
6
|
# This Makefile.in is free software; the Free Software Foundation
|
7
7
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -14,23 +14,51 @@
|
|
14
14
|
|
15
15
|
@SET_MAKE@
|
16
16
|
VPATH = @srcdir@
|
17
|
-
|
18
|
-
|
19
|
-
|
17
|
+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
18
|
+
am__make_running_with_option = \
|
19
|
+
case $${target_option-} in \
|
20
|
+
?) ;; \
|
21
|
+
*) echo "am__make_running_with_option: internal error: invalid" \
|
22
|
+
"target option '$${target_option-}' specified" >&2; \
|
23
|
+
exit 1;; \
|
24
|
+
esac; \
|
25
|
+
has_opt=no; \
|
26
|
+
sane_makeflags=$$MAKEFLAGS; \
|
27
|
+
if $(am__is_gnu_make); then \
|
28
|
+
sane_makeflags=$$MFLAGS; \
|
29
|
+
else \
|
20
30
|
case $$MAKEFLAGS in \
|
21
31
|
*\\[\ \ ]*) \
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
32
|
+
bs=\\; \
|
33
|
+
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
34
|
+
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
35
|
+
esac; \
|
36
|
+
fi; \
|
37
|
+
skip_next=no; \
|
38
|
+
strip_trailopt () \
|
39
|
+
{ \
|
40
|
+
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
41
|
+
}; \
|
42
|
+
for flg in $$sane_makeflags; do \
|
43
|
+
test $$skip_next = yes && { skip_next=no; continue; }; \
|
44
|
+
case $$flg in \
|
45
|
+
*=*|--*) continue;; \
|
46
|
+
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
47
|
+
-*I?*) strip_trailopt 'I';; \
|
48
|
+
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
49
|
+
-*O?*) strip_trailopt 'O';; \
|
50
|
+
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
51
|
+
-*l?*) strip_trailopt 'l';; \
|
52
|
+
-[dEDm]) skip_next=yes;; \
|
53
|
+
-[JT]) skip_next=yes;; \
|
54
|
+
esac; \
|
55
|
+
case $$flg in \
|
56
|
+
*$$target_option*) has_opt=yes; break;; \
|
31
57
|
esac; \
|
32
|
-
|
33
|
-
|
58
|
+
done; \
|
59
|
+
test $$has_opt = yes
|
60
|
+
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
61
|
+
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
34
62
|
pkgdatadir = $(datadir)/@PACKAGE@
|
35
63
|
pkgincludedir = $(includedir)/@PACKAGE@
|
36
64
|
pkglibdir = $(libdir)/@PACKAGE@
|
data/test/test_Array.cpp
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
#include "unittest.hpp"
|
2
2
|
#include "rice/Array.hpp"
|
3
3
|
#include "rice/String.hpp"
|
4
|
+
#include "rice/global_function.hpp"
|
4
5
|
|
5
6
|
using namespace Rice;
|
6
7
|
|
@@ -239,3 +240,15 @@ TESTCASE(assign_int)
|
|
239
240
|
ASSERT_EQUAL(10, from_ruby<int>(a[0]));
|
240
241
|
}
|
241
242
|
|
243
|
+
/**
|
244
|
+
* Issue 59 - Copy constructor compilation problem.
|
245
|
+
*/
|
246
|
+
|
247
|
+
namespace {
|
248
|
+
void testArrayArg(Object self, Array string) {
|
249
|
+
}
|
250
|
+
}
|
251
|
+
|
252
|
+
TESTCASE(use_array_in_wrapped_function) {
|
253
|
+
define_global_function("test_array_arg", &testArrayArg);
|
254
|
+
}
|
data/test/test_Director.cpp
CHANGED
@@ -184,6 +184,8 @@ namespace {
|
|
184
184
|
|
185
185
|
class CallsSelf {
|
186
186
|
public:
|
187
|
+
virtual ~CallsSelf() { }
|
188
|
+
|
187
189
|
int doIt(int in) {
|
188
190
|
return doItImpl(in);
|
189
191
|
}
|
@@ -195,6 +197,7 @@ namespace {
|
|
195
197
|
|
196
198
|
public:
|
197
199
|
CallsSelfDirector(Object self) : Director(self) { }
|
200
|
+
virtual ~CallsSelfDirector() { }
|
198
201
|
|
199
202
|
virtual int doItImpl(int in) {
|
200
203
|
return from_ruby<int>( getSelf().call("do_it_impl", in) );
|
@@ -208,6 +211,7 @@ namespace {
|
|
208
211
|
|
209
212
|
struct MyCallsSelf : CallsSelf {
|
210
213
|
MyCallsSelf() { }
|
214
|
+
virtual ~MyCallsSelf() { }
|
211
215
|
|
212
216
|
int doItImpl(int in) { return in * 12; }
|
213
217
|
};
|
data/test/test_Hash.cpp
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
#include "unittest.hpp"
|
2
2
|
#include "rice/Hash.hpp"
|
3
|
+
#include "rice/global_function.hpp"
|
3
4
|
#include <vector>
|
4
5
|
#include <map>
|
5
6
|
#include <algorithm>
|
@@ -196,3 +197,16 @@ TESTCASE(iterate_and_change)
|
|
196
197
|
ASSERT_EQUAL(to_ruby(m[6]), h[6]);
|
197
198
|
ASSERT_EQUAL(to_ruby(m[42]), h[42]);
|
198
199
|
}
|
200
|
+
|
201
|
+
/**
|
202
|
+
* Issue 59 - Copy constructor compilation problem.
|
203
|
+
*/
|
204
|
+
|
205
|
+
namespace {
|
206
|
+
void testHashArg(Object self, Hash string) {
|
207
|
+
}
|
208
|
+
}
|
209
|
+
|
210
|
+
TESTCASE(use_hash_in_wrapped_function) {
|
211
|
+
define_global_function("test_hash_arg", &testHashArg);
|
212
|
+
}
|
data/test/test_String.cpp
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
#include "unittest.hpp"
|
2
2
|
#include "rice/String.hpp"
|
3
|
+
#include "rice/global_function.hpp"
|
3
4
|
|
4
5
|
using namespace Rice;
|
5
6
|
|
@@ -92,3 +93,15 @@ TESTCASE(intern)
|
|
92
93
|
ASSERT_EQUAL(Identifier("foo"), s.intern());
|
93
94
|
}
|
94
95
|
|
96
|
+
/**
|
97
|
+
* Issue 59 - Copy constructor compilation problem.
|
98
|
+
*/
|
99
|
+
|
100
|
+
namespace {
|
101
|
+
void testStringArg(Object self, String string) {
|
102
|
+
}
|
103
|
+
}
|
104
|
+
|
105
|
+
TESTCASE(use_string_in_wrapped_function) {
|
106
|
+
define_global_function("test_string_arg", &testStringArg);
|
107
|
+
}
|
data/test/test_Struct.cpp
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
#include "unittest.hpp"
|
2
2
|
#include "rice/Struct.hpp"
|
3
3
|
#include "rice/Symbol.hpp"
|
4
|
+
#include "rice/global_function.hpp"
|
4
5
|
|
5
6
|
using namespace Rice;
|
6
7
|
|
@@ -190,3 +191,15 @@ TESTCASE(instance_swap)
|
|
190
191
|
ASSERT_EQUAL(to_ruby(3), Object(rb_struct_getmember(p2, rb_intern("z"))));
|
191
192
|
}
|
192
193
|
|
194
|
+
/**
|
195
|
+
* Issue 59 - Copy constructor compilation problem.
|
196
|
+
*/
|
197
|
+
|
198
|
+
namespace {
|
199
|
+
void testStructArg(Object self, Struct string) {
|
200
|
+
}
|
201
|
+
}
|
202
|
+
|
203
|
+
TESTCASE(use_struct_in_wrapped_function) {
|
204
|
+
define_global_function("test_struct_arg", &testStructArg);
|
205
|
+
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rice
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2013-
|
13
|
+
date: 2013-10-07 00:00:00.000000000 Z
|
14
14
|
dependencies: []
|
15
15
|
description: ! 'Rice is a C++ interface to Ruby''s C API. It provides a type-safe
|
16
16
|
and
|