dub 0.6.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/History.txt +5 -0
  2. data/dub.gemspec +1 -1
  3. data/lib/dub/klass.rb +1 -0
  4. data/lib/dub/version.rb +1 -1
  5. data/test/fixtures/app/include/matrix.h +13 -0
  6. data/test/fixtures/app/xml/classdub_1_1_matrix.xml +43 -11
  7. data/test/fixtures/app/xml/classdub_1_1_t_mat.xml +37 -18
  8. data/test/fixtures/app/xml/index.xml +4 -1
  9. data/test/fixtures/app/xml/matrix_8h.xml +69 -51
  10. data/test/fixtures/app/xml/namespacedub.xml +2 -2
  11. data/test/klass_test.rb +8 -0
  12. metadata +2 -2
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ == 0.6.3 2010-07-07
2
+
3
+ * 1 enhancement
4
+ * Should ignore non-public member methods.
5
+
1
6
  == 0.6.2 2010-07-07
2
7
 
3
8
  * 1 enhancement
data/dub.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{dub}
8
- s.version = "0.6.2"
8
+ s.version = "0.6.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Gaspard Bucher"]
data/lib/dub/klass.rb CHANGED
@@ -191,6 +191,7 @@ module Dub
191
191
  end
192
192
 
193
193
  def make_member(name, member, overloaded_index = nil)
194
+ return nil unless member[:prot] == 'public'
194
195
  if names.include?(name)
195
196
  # keep constructors out of members list
196
197
  if @constructor.kind_of?(FunctionGroup)
data/lib/dub/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dub
2
- VERSION = '0.6.2'
2
+ VERSION = '0.6.3'
3
3
  end
data/test/fixtures/app/include/matrix.h CHANGED
@@ -68,6 +68,19 @@ public:
68
68
  }
69
69
 
70
70
  private:
71
+
72
+ int private_method() {
73
+ // should not be implemented
74
+ return 0;
75
+ }
76
+
77
+ protected:
78
+
79
+ int protected_method() {
80
+ // should not be implemented
81
+ return 0;
82
+ }
83
+
71
84
  double *data_;
72
85
  size_t rows_;
73
86
  size_t cols_;
data/test/fixtures/app/xml/classdub_1_1_matrix.xml CHANGED
@@ -2,8 +2,8 @@
2
2
  <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.6.3">
3
3
  <compounddef id="classdub_1_1_matrix" kind="class" prot="public">
4
4
  <compoundname>dub::Matrix</compoundname>
5
- <sectiondef kind="private-attrib">
6
- <memberdef kind="variable" id="classdub_1_1_matrix_1a134af4a94d273c34cc99e7645fb97917" prot="private" static="no" mutable="no">
5
+ <sectiondef kind="protected-attrib">
6
+ <memberdef kind="variable" id="classdub_1_1_matrix_1a134af4a94d273c34cc99e7645fb97917" prot="protected" static="no" mutable="no">
7
7
  <type>double *</type>
8
8
  <definition>double* dub::Matrix::data_</definition>
9
9
  <argsstring></argsstring>
@@ -14,9 +14,9 @@
14
14
  </detaileddescription>
15
15
  <inbodydescription>
16
16
  </inbodydescription>
17
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="71" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="71" bodyend="-1"/>
17
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="84" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="84" bodyend="-1"/>
18
18
  </memberdef>
19
- <memberdef kind="variable" id="classdub_1_1_matrix_1afbb3dac9aac8db0e6feffb8c61954065" prot="private" static="no" mutable="no">
19
+ <memberdef kind="variable" id="classdub_1_1_matrix_1afbb3dac9aac8db0e6feffb8c61954065" prot="protected" static="no" mutable="no">
20
20
  <type>size_t</type>
21
21
  <definition>size_t dub::Matrix::rows_</definition>
22
22
  <argsstring></argsstring>
@@ -27,9 +27,9 @@
27
27
  </detaileddescription>
28
28
  <inbodydescription>
29
29
  </inbodydescription>
30
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="72" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="72" bodyend="-1"/>
30
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="85" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="85" bodyend="-1"/>
31
31
  </memberdef>
32
- <memberdef kind="variable" id="classdub_1_1_matrix_1a9820706da6cb36cf14dfefbb4eabc92d" prot="private" static="no" mutable="no">
32
+ <memberdef kind="variable" id="classdub_1_1_matrix_1a9820706da6cb36cf14dfefbb4eabc92d" prot="protected" static="no" mutable="no">
33
33
  <type>size_t</type>
34
34
  <definition>size_t dub::Matrix::cols_</definition>
35
35
  <argsstring></argsstring>
@@ -40,7 +40,7 @@
40
40
  </detaileddescription>
41
41
  <inbodydescription>
42
42
  </inbodydescription>
43
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="73" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="73" bodyend="-1"/>
43
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="86" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="86" bodyend="-1"/>
44
44
  </memberdef>
45
45
  </sectiondef>
46
46
  <sectiondef kind="public-func">
@@ -254,15 +254,45 @@
254
254
  <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="66" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="66" bodyend="68"/>
255
255
  </memberdef>
256
256
  </sectiondef>
257
+ <sectiondef kind="private-func">
258
+ <memberdef kind="function" id="classdub_1_1_matrix_1a068b8c574a47b79df894bf1f4b3e1946" prot="private" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
259
+ <type>int</type>
260
+ <definition>int dub::Matrix::private_method</definition>
261
+ <argsstring>()</argsstring>
262
+ <name>private_method</name>
263
+ <briefdescription>
264
+ </briefdescription>
265
+ <detaileddescription>
266
+ </detaileddescription>
267
+ <inbodydescription>
268
+ </inbodydescription>
269
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="72" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="72" bodyend="75"/>
270
+ </memberdef>
271
+ </sectiondef>
272
+ <sectiondef kind="protected-func">
273
+ <memberdef kind="function" id="classdub_1_1_matrix_1aea9c51add856fe990e6474410849f8e3" prot="protected" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
274
+ <type>int</type>
275
+ <definition>int dub::Matrix::protected_method</definition>
276
+ <argsstring>()</argsstring>
277
+ <name>protected_method</name>
278
+ <briefdescription>
279
+ </briefdescription>
280
+ <detaileddescription>
281
+ </detaileddescription>
282
+ <inbodydescription>
283
+ </inbodydescription>
284
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="79" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="79" bodyend="82"/>
285
+ </memberdef>
286
+ </sectiondef>
257
287
  <briefdescription>
258
288
  </briefdescription>
259
289
  <detaileddescription>
260
290
  </detaileddescription>
261
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="12" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="12" bodyend="74"/>
291
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="12" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="12" bodyend="87"/>
262
292
  <listofallmembers>
263
293
  <member refid="classdub_1_1_matrix_1ac13eec5120f1be537122fc2b9a35d12e" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>cols</name></member>
264
- <member refid="classdub_1_1_matrix_1a9820706da6cb36cf14dfefbb4eabc92d" prot="private" virt="non-virtual"><scope>dub::Matrix</scope><name>cols_</name></member>
265
- <member refid="classdub_1_1_matrix_1a134af4a94d273c34cc99e7645fb97917" prot="private" virt="non-virtual"><scope>dub::Matrix</scope><name>data_</name></member>
294
+ <member refid="classdub_1_1_matrix_1a9820706da6cb36cf14dfefbb4eabc92d" prot="protected" virt="non-virtual"><scope>dub::Matrix</scope><name>cols_</name></member>
295
+ <member refid="classdub_1_1_matrix_1a134af4a94d273c34cc99e7645fb97917" prot="protected" virt="non-virtual"><scope>dub::Matrix</scope><name>data_</name></member>
266
296
  <member refid="classdub_1_1_matrix_1a5bf5b5aee77c4e4a4cf906ce785fe37b" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>do_something</name></member>
267
297
  <member refid="classdub_1_1_matrix_1a7a47bc085de140093ba358d345d58df7" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>give_me_tea</name></member>
268
298
  <member refid="classdub_1_1_matrix_1ad21255c4a1457c9969b6092ee40e0870" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>MakeMatrix</name></member>
@@ -270,9 +300,11 @@
270
300
  <member refid="classdub_1_1_matrix_1a87d276a9bfb52dbe228a19c2eae63b4b" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>Matrix</name></member>
271
301
  <member refid="classdub_1_1_matrix_1ac159906fa5480fdc9539a7be1e1825ed" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>mul</name></member>
272
302
  <member refid="classdub_1_1_matrix_1a27fea405cf08ac087a11eefbaf4a342f" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>operator size_t</name></member>
303
+ <member refid="classdub_1_1_matrix_1a068b8c574a47b79df894bf1f4b3e1946" prot="private" virt="non-virtual"><scope>dub::Matrix</scope><name>private_method</name></member>
304
+ <member refid="classdub_1_1_matrix_1aea9c51add856fe990e6474410849f8e3" prot="protected" virt="non-virtual"><scope>dub::Matrix</scope><name>protected_method</name></member>
273
305
  <member refid="classdub_1_1_matrix_1a90798c27b8b4017a939f804481eb50ad" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>ptr</name></member>
274
306
  <member refid="classdub_1_1_matrix_1aad380f21efca0eb8d076fa7801efe903" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>rows</name></member>
275
- <member refid="classdub_1_1_matrix_1afbb3dac9aac8db0e6feffb8c61954065" prot="private" virt="non-virtual"><scope>dub::Matrix</scope><name>rows_</name></member>
307
+ <member refid="classdub_1_1_matrix_1afbb3dac9aac8db0e6feffb8c61954065" prot="protected" virt="non-virtual"><scope>dub::Matrix</scope><name>rows_</name></member>
276
308
  <member refid="classdub_1_1_matrix_1a91cd7ece7296a2f2b37f2b629dc66fed" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>size</name></member>
277
309
  <member refid="classdub_1_1_matrix_1a5d8ae4699d499cb9e4292c2ff765d3a1" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>use_other_lib</name></member>
278
310
  <member refid="classdub_1_1_matrix_1a7bbf87936b3a48a69fcc1a74038bdd25" prot="public" virt="non-virtual"><scope>dub::Matrix</scope><name>~Matrix</name></member>
data/test/fixtures/app/xml/classdub_1_1_t_mat.xml CHANGED
@@ -19,7 +19,7 @@
19
19
  </detaileddescription>
20
20
  <inbodydescription>
21
21
  </inbodydescription>
22
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="121" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="121" bodyend="-1"/>
22
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="141" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="141" bodyend="-1"/>
23
23
  </memberdef>
24
24
  <memberdef kind="variable" id="classdub_1_1_t_mat_1af4189290104841dd5a9a6f02bf83a7d8" prot="private" static="no" mutable="no">
25
25
  <type>size_t</type>
@@ -32,7 +32,7 @@
32
32
  </detaileddescription>
33
33
  <inbodydescription>
34
34
  </inbodydescription>
35
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="122" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="122" bodyend="-1"/>
35
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="142" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="142" bodyend="-1"/>
36
36
  </memberdef>
37
37
  <memberdef kind="variable" id="classdub_1_1_t_mat_1ae61dde1ed3a5f0a50cedef0fdbc79a06" prot="private" static="no" mutable="no">
38
38
  <type>size_t</type>
@@ -45,7 +45,7 @@
45
45
  </detaileddescription>
46
46
  <inbodydescription>
47
47
  </inbodydescription>
48
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="123" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="123" bodyend="-1"/>
48
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="143" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="143" bodyend="-1"/>
49
49
  </memberdef>
50
50
  </sectiondef>
51
51
  <sectiondef kind="public-func">
@@ -60,7 +60,7 @@
60
60
  </detaileddescription>
61
61
  <inbodydescription>
62
62
  </inbodydescription>
63
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="80" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="80" bodyend="80"/>
63
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="93" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="93" bodyend="93"/>
64
64
  </memberdef>
65
65
  <memberdef kind="function" id="classdub_1_1_t_mat_1afdc6150359c9b1914cd5af9e273757be" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
66
66
  <type></type>
@@ -81,7 +81,7 @@
81
81
  </detaileddescription>
82
82
  <inbodydescription>
83
83
  </inbodydescription>
84
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="82" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="82" bodyend="84"/>
84
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="95" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="95" bodyend="97"/>
85
85
  </memberdef>
86
86
  <memberdef kind="function" id="classdub_1_1_t_mat_1ad6fe3f080e15ae4f7cf0b55abc64469e" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
87
87
  <type></type>
@@ -98,7 +98,7 @@
98
98
  </detaileddescription>
99
99
  <inbodydescription>
100
100
  </inbodydescription>
101
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="87" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="87" bodyend="89"/>
101
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="100" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="100" bodyend="102"/>
102
102
  </memberdef>
103
103
  <memberdef kind="function" id="classdub_1_1_t_mat_1aa2f979b486bd17cf3a840976983d7ebb" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
104
104
  <type></type>
@@ -111,7 +111,25 @@
111
111
  </detaileddescription>
112
112
  <inbodydescription>
113
113
  </inbodydescription>
114
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="91" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="91" bodyend="93"/>
114
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="104" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="104" bodyend="106"/>
115
+ </memberdef>
116
+ <memberdef kind="function" id="classdub_1_1_t_mat_1a2be2ba15b604f9529a9fce4eff4379e9" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
117
+ <templateparamlist>
118
+ <param>
119
+ <type>class T2</type>
120
+ </param>
121
+ </templateparamlist>
122
+ <type>T2 *</type>
123
+ <definition>T2* dub::TMat&lt; T &gt;::give_me_tea</definition>
124
+ <argsstring>()</argsstring>
125
+ <name>give_me_tea</name>
126
+ <briefdescription>
127
+ </briefdescription>
128
+ <detaileddescription>
129
+ <para>Dummy template based class method. </para> </detaileddescription>
130
+ <inbodydescription>
131
+ </inbodydescription>
132
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="111" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="111" bodyend="113"/>
115
133
  </memberdef>
116
134
  <memberdef kind="function" id="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
117
135
  <type>size_t</type>
@@ -124,7 +142,7 @@
124
142
  <para>Return size of matrix (rows * cols). </para> </detaileddescription>
125
143
  <inbodydescription>
126
144
  </inbodydescription>
127
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="96" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="96" bodyend="98"/>
145
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="116" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="116" bodyend="118"/>
128
146
  </memberdef>
129
147
  <memberdef kind="function" id="classdub_1_1_t_mat_1a1fac3175ad4602f3212c08e41f4383bb" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
130
148
  <type>size_t</type>
@@ -137,7 +155,7 @@
137
155
  </detaileddescription>
138
156
  <inbodydescription>
139
157
  </inbodydescription>
140
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="100" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="100" bodyend="102"/>
158
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="120" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="120" bodyend="122"/>
141
159
  </memberdef>
142
160
  <memberdef kind="function" id="classdub_1_1_t_mat_1ac66d2c59eba113fd4416c24460b04582" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
143
161
  <type>size_t</type>
@@ -150,7 +168,7 @@
150
168
  </detaileddescription>
151
169
  <inbodydescription>
152
170
  </inbodydescription>
153
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="104" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="104" bodyend="106"/>
171
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="124" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="124" bodyend="126"/>
154
172
  </memberdef>
155
173
  <memberdef kind="function" id="classdub_1_1_t_mat_1a2a28668935a895001309f6ab05922a9c" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
156
174
  <type>void</type>
@@ -167,11 +185,11 @@
167
185
  </detaileddescription>
168
186
  <inbodydescription>
169
187
  </inbodydescription>
170
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="108" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="108" bodyend="110"/>
188
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="128" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="128" bodyend="130"/>
171
189
  </memberdef>
172
- <memberdef kind="function" id="classdub_1_1_t_mat_1a9051bdd635c65f18aa3938caa4f5b106" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
173
- <type></type>
174
- <definition>dub::TMat&lt; T &gt;::FunkyThing</definition>
190
+ <memberdef kind="function" id="classdub_1_1_t_mat_1a6543ef3e46f91cfa4785be0070624b67" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
191
+ <type>void</type>
192
+ <definition>void dub::TMat&lt; T &gt;::FunkyThing</definition>
175
193
  <argsstring>(double v[7])</argsstring>
176
194
  <name>FunkyThing</name>
177
195
  <param>
@@ -185,7 +203,7 @@
185
203
  </detaileddescription>
186
204
  <inbodydescription>
187
205
  </inbodydescription>
188
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="112" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="112" bodyend="114"/>
206
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="132" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="132" bodyend="134"/>
189
207
  </memberdef>
190
208
  <memberdef kind="function" id="classdub_1_1_t_mat_1ad5daa1d61af70c79402f4cb3acd770b3" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
191
209
  <type>T</type>
@@ -206,21 +224,22 @@
206
224
  </detaileddescription>
207
225
  <inbodydescription>
208
226
  </inbodydescription>
209
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="116" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="116" bodyend="118"/>
227
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="136" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="136" bodyend="138"/>
210
228
  </memberdef>
211
229
  </sectiondef>
212
230
  <briefdescription>
213
231
  </briefdescription>
214
232
  <detaileddescription>
215
233
  </detaileddescription>
216
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="78" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="78" bodyend="124"/>
234
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="91" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="91" bodyend="144"/>
217
235
  <listofallmembers>
218
236
  <member refid="classdub_1_1_t_mat_1a1fac3175ad4602f3212c08e41f4383bb" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>cols</name></member>
219
237
  <member refid="classdub_1_1_t_mat_1ae61dde1ed3a5f0a50cedef0fdbc79a06" prot="private" virt="non-virtual"><scope>dub::TMat</scope><name>cols_</name></member>
220
238
  <member refid="classdub_1_1_t_mat_1a325c9dcebf13b0804997d014e7287606" prot="private" virt="non-virtual"><scope>dub::TMat</scope><name>data_</name></member>
221
239
  <member refid="classdub_1_1_t_mat_1a2a28668935a895001309f6ab05922a9c" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>fill</name></member>
222
- <member refid="classdub_1_1_t_mat_1a9051bdd635c65f18aa3938caa4f5b106" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>FunkyThing</name></member>
240
+ <member refid="classdub_1_1_t_mat_1a6543ef3e46f91cfa4785be0070624b67" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>FunkyThing</name></member>
223
241
  <member refid="classdub_1_1_t_mat_1ad5daa1d61af70c79402f4cb3acd770b3" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>get</name></member>
242
+ <member refid="classdub_1_1_t_mat_1a2be2ba15b604f9529a9fce4eff4379e9" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>give_me_tea</name></member>
224
243
  <member refid="classdub_1_1_t_mat_1ac66d2c59eba113fd4416c24460b04582" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>rows</name></member>
225
244
  <member refid="classdub_1_1_t_mat_1af4189290104841dd5a9a6f02bf83a7d8" prot="private" virt="non-virtual"><scope>dub::TMat</scope><name>rows_</name></member>
226
245
  <member refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" prot="public" virt="non-virtual"><scope>dub::TMat</scope><name>size</name></member>
data/test/fixtures/app/xml/index.xml CHANGED
@@ -17,6 +17,8 @@
17
17
  <member refid="classdub_1_1_matrix_1a5d8ae4699d499cb9e4292c2ff765d3a1" kind="function"><name>use_other_lib</name></member>
18
18
  <member refid="classdub_1_1_matrix_1a90798c27b8b4017a939f804481eb50ad" kind="function"><name>ptr</name></member>
19
19
  <member refid="classdub_1_1_matrix_1ad21255c4a1457c9969b6092ee40e0870" kind="function"><name>MakeMatrix</name></member>
20
+ <member refid="classdub_1_1_matrix_1a068b8c574a47b79df894bf1f4b3e1946" kind="function"><name>private_method</name></member>
21
+ <member refid="classdub_1_1_matrix_1aea9c51add856fe990e6474410849f8e3" kind="function"><name>protected_method</name></member>
20
22
  </compound>
21
23
  <compound refid="classdub_1_1_t_mat" kind="class"><name>dub::TMat</name>
22
24
  <member refid="classdub_1_1_t_mat_1a325c9dcebf13b0804997d014e7287606" kind="variable"><name>data_</name></member>
@@ -26,11 +28,12 @@
26
28
  <member refid="classdub_1_1_t_mat_1afdc6150359c9b1914cd5af9e273757be" kind="function"><name>TMat</name></member>
27
29
  <member refid="classdub_1_1_t_mat_1ad6fe3f080e15ae4f7cf0b55abc64469e" kind="function"><name>TMat</name></member>
28
30
  <member refid="classdub_1_1_t_mat_1aa2f979b486bd17cf3a840976983d7ebb" kind="function"><name>~TMat</name></member>
31
+ <member refid="classdub_1_1_t_mat_1a2be2ba15b604f9529a9fce4eff4379e9" kind="function"><name>give_me_tea</name></member>
29
32
  <member refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" kind="function"><name>size</name></member>
30
33
  <member refid="classdub_1_1_t_mat_1a1fac3175ad4602f3212c08e41f4383bb" kind="function"><name>cols</name></member>
31
34
  <member refid="classdub_1_1_t_mat_1ac66d2c59eba113fd4416c24460b04582" kind="function"><name>rows</name></member>
32
35
  <member refid="classdub_1_1_t_mat_1a2a28668935a895001309f6ab05922a9c" kind="function"><name>fill</name></member>
33
- <member refid="classdub_1_1_t_mat_1a9051bdd635c65f18aa3938caa4f5b106" kind="function"><name>FunkyThing</name></member>
36
+ <member refid="classdub_1_1_t_mat_1a6543ef3e46f91cfa4785be0070624b67" kind="function"><name>FunkyThing</name></member>
34
37
  <member refid="classdub_1_1_t_mat_1ad5daa1d61af70c79402f4cb3acd770b3" kind="function"><name>get</name></member>
35
38
  </compound>
36
39
  <compound refid="namespacedub" kind="namespace"><name>dub</name>
data/test/fixtures/app/xml/matrix_8h.xml CHANGED
@@ -91,66 +91,84 @@
91
91
  <codeline lineno="68"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
92
92
  <codeline lineno="69"><highlight class="normal"></highlight></codeline>
93
93
  <codeline lineno="70"><highlight class="normal"></highlight><highlight class="keyword">private</highlight><highlight class="normal">:</highlight></codeline>
94
- <codeline lineno="71"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">double</highlight><highlight class="normal"><sp/>*data_;</highlight></codeline>
95
- <codeline lineno="72"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
96
- <codeline lineno="73"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
97
- <codeline lineno="74"><highlight class="normal">};</highlight></codeline>
98
- <codeline lineno="75"><highlight class="normal"></highlight></codeline>
94
+ <codeline lineno="71"><highlight class="normal"></highlight></codeline>
95
+ <codeline lineno="72"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>private_method()<sp/>{</highlight></codeline>
96
+ <codeline lineno="73"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="comment">//<sp/>should<sp/>not<sp/>be<sp/>implemented</highlight><highlight class="normal"></highlight></codeline>
97
+ <codeline lineno="74"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>0;</highlight></codeline>
98
+ <codeline lineno="75"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
99
99
  <codeline lineno="76"><highlight class="normal"></highlight></codeline>
100
- <codeline lineno="77"><highlight class="normal"></highlight><highlight class="keyword">template</highlight><highlight class="normal">&lt;</highlight><highlight class="keyword">class</highlight><highlight class="normal"><sp/>T&gt;</highlight></codeline>
101
- <codeline lineno="78" refid="classdub_1_1_t_mat" refkind="compound"><highlight class="normal"></highlight><highlight class="keyword">class<sp/></highlight><highlight class="normal"><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref><sp/>{</highlight></codeline>
102
- <codeline lineno="79"><highlight class="normal"></highlight><highlight class="keyword">public</highlight><highlight class="normal">:</highlight></codeline>
103
- <codeline lineno="80"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>()<sp/>:<sp/>data_(NULL),<sp/>rows_(0),<sp/>cols_(0)<sp/>{}</highlight></codeline>
104
- <codeline lineno="81"><highlight class="normal"></highlight></codeline>
105
- <codeline lineno="82"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>(</highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>rows,<sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>cols)<sp/>:<sp/>rows_(rows),<sp/>cols_(cols)<sp/>{</highlight></codeline>
106
- <codeline lineno="83"><highlight class="normal"><sp/><sp/><sp/><sp/>data_<sp/>=<sp/>(T*)malloc(<ref refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" kindref="member">size</ref>()<sp/>*<sp/></highlight><highlight class="keyword">sizeof</highlight><highlight class="normal">(T));</highlight></codeline>
107
- <codeline lineno="84"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
108
- <codeline lineno="85"><highlight class="normal"></highlight></codeline>
109
- <codeline lineno="86"><highlight class="normal"><sp/><sp/></highlight><highlight class="comment">//<sp/>test<sp/>constructor<sp/>with<sp/>T<sp/>parameter</highlight><highlight class="normal"></highlight></codeline>
110
- <codeline lineno="87"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>(T<sp/>dummy)<sp/>{</highlight></codeline>
100
+ <codeline lineno="77"><highlight class="normal"></highlight><highlight class="keyword">protected</highlight><highlight class="normal">:</highlight></codeline>
101
+ <codeline lineno="78"><highlight class="normal"></highlight></codeline>
102
+ <codeline lineno="79"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>protected_method()<sp/>{</highlight></codeline>
103
+ <codeline lineno="80"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="comment">//<sp/>should<sp/>not<sp/>be<sp/>implemented</highlight><highlight class="normal"></highlight></codeline>
104
+ <codeline lineno="81"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>0;</highlight></codeline>
105
+ <codeline lineno="82"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
106
+ <codeline lineno="83"><highlight class="normal"></highlight></codeline>
107
+ <codeline lineno="84"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">double</highlight><highlight class="normal"><sp/>*data_;</highlight></codeline>
108
+ <codeline lineno="85"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
109
+ <codeline lineno="86"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
110
+ <codeline lineno="87"><highlight class="normal">};</highlight></codeline>
111
111
  <codeline lineno="88"><highlight class="normal"></highlight></codeline>
112
- <codeline lineno="89"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
113
- <codeline lineno="90"><highlight class="normal"></highlight></codeline>
114
- <codeline lineno="91"><highlight class="normal"><sp/><sp/>~<ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>()<sp/>{</highlight></codeline>
115
- <codeline lineno="92"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal"><sp/>(data_)<sp/>free(data_);</highlight></codeline>
116
- <codeline lineno="93"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
112
+ <codeline lineno="89"><highlight class="normal"></highlight></codeline>
113
+ <codeline lineno="90"><highlight class="normal"></highlight><highlight class="keyword">template</highlight><highlight class="normal">&lt;</highlight><highlight class="keyword">class</highlight><highlight class="normal"><sp/>T&gt;</highlight></codeline>
114
+ <codeline lineno="91" refid="classdub_1_1_t_mat" refkind="compound"><highlight class="normal"></highlight><highlight class="keyword">class<sp/></highlight><highlight class="normal"><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref><sp/>{</highlight></codeline>
115
+ <codeline lineno="92"><highlight class="normal"></highlight><highlight class="keyword">public</highlight><highlight class="normal">:</highlight></codeline>
116
+ <codeline lineno="93"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>()<sp/>:<sp/>data_(NULL),<sp/>rows_(0),<sp/>cols_(0)<sp/>{}</highlight></codeline>
117
117
  <codeline lineno="94"><highlight class="normal"></highlight></codeline>
118
- <codeline lineno="96" refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" refkind="member"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/><ref refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" kindref="member">size</ref>()<sp/>{</highlight></codeline>
119
- <codeline lineno="97"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>rows_<sp/>*<sp/>cols_;</highlight></codeline>
120
- <codeline lineno="98"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
121
- <codeline lineno="99"><highlight class="normal"></highlight></codeline>
122
- <codeline lineno="100"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols()<sp/>{</highlight></codeline>
123
- <codeline lineno="101"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
118
+ <codeline lineno="95"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>(</highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>rows,<sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>cols)<sp/>:<sp/>rows_(rows),<sp/>cols_(cols)<sp/>{</highlight></codeline>
119
+ <codeline lineno="96"><highlight class="normal"><sp/><sp/><sp/><sp/>data_<sp/>=<sp/>(T*)malloc(<ref refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" kindref="member">size</ref>()<sp/>*<sp/></highlight><highlight class="keyword">sizeof</highlight><highlight class="normal">(T));</highlight></codeline>
120
+ <codeline lineno="97"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
121
+ <codeline lineno="98"><highlight class="normal"></highlight></codeline>
122
+ <codeline lineno="99"><highlight class="normal"><sp/><sp/></highlight><highlight class="comment">//<sp/>test<sp/>constructor<sp/>with<sp/>T<sp/>parameter</highlight><highlight class="normal"></highlight></codeline>
123
+ <codeline lineno="100"><highlight class="normal"><sp/><sp/><ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>(T<sp/>dummy)<sp/>{</highlight></codeline>
124
+ <codeline lineno="101"><highlight class="normal"></highlight></codeline>
124
125
  <codeline lineno="102"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
125
126
  <codeline lineno="103"><highlight class="normal"></highlight></codeline>
126
- <codeline lineno="104"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows()<sp/>{</highlight></codeline>
127
- <codeline lineno="105"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
127
+ <codeline lineno="104"><highlight class="normal"><sp/><sp/>~<ref refid="classdub_1_1_t_mat" kindref="compound">TMat</ref>()<sp/>{</highlight></codeline>
128
+ <codeline lineno="105"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal"><sp/>(data_)<sp/>free(data_);</highlight></codeline>
128
129
  <codeline lineno="106"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
129
130
  <codeline lineno="107"><highlight class="normal"></highlight></codeline>
130
- <codeline lineno="108"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>fill(T<sp/>value)<sp/>{</highlight></codeline>
131
- <codeline lineno="109"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="comment">//<sp/>dummy</highlight><highlight class="normal"></highlight></codeline>
132
- <codeline lineno="110"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
133
- <codeline lineno="111"><highlight class="normal"></highlight></codeline>
134
- <codeline lineno="112"><highlight class="normal"><sp/><sp/>FunkyThing(</highlight><highlight class="keywordtype">double</highlight><highlight class="normal"><sp/>v[7])<sp/>{</highlight></codeline>
135
- <codeline lineno="113"><highlight class="normal"></highlight></codeline>
136
- <codeline lineno="114"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
137
- <codeline lineno="115"><highlight class="normal"></highlight></codeline>
138
- <codeline lineno="116"><highlight class="normal"><sp/><sp/>T<sp/></highlight><highlight class="keyword">get</highlight><highlight class="normal">(</highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>row,<sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>col)<sp/>{</highlight></codeline>
139
- <codeline lineno="117"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>data_[row<sp/>*<sp/>cols_<sp/>+<sp/>col];</highlight></codeline>
131
+ <codeline lineno="110"><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">template</highlight><highlight class="normal">&lt;</highlight><highlight class="keyword">class</highlight><highlight class="normal"><sp/>T2&gt;</highlight></codeline>
132
+ <codeline lineno="111" refid="classdub_1_1_t_mat_1a2be2ba15b604f9529a9fce4eff4379e9" refkind="member"><highlight class="normal"><sp/><sp/>T2<sp/>*<ref refid="classdub_1_1_t_mat_1a2be2ba15b604f9529a9fce4eff4379e9" kindref="member">give_me_tea</ref>()<sp/>{</highlight></codeline>
133
+ <codeline lineno="112"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/></highlight><highlight class="keyword">new</highlight><highlight class="normal"><sp/>T2();</highlight></codeline>
134
+ <codeline lineno="113"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
135
+ <codeline lineno="114"><highlight class="normal"></highlight></codeline>
136
+ <codeline lineno="116" refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" refkind="member"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/><ref refid="classdub_1_1_t_mat_1affa049645f25277333d2d000051c762f" kindref="member">size</ref>()<sp/>{</highlight></codeline>
137
+ <codeline lineno="117"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>rows_<sp/>*<sp/>cols_;</highlight></codeline>
140
138
  <codeline lineno="118"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
141
139
  <codeline lineno="119"><highlight class="normal"></highlight></codeline>
142
- <codeline lineno="120"><highlight class="normal"></highlight><highlight class="keyword">private</highlight><highlight class="normal">:</highlight></codeline>
143
- <codeline lineno="121"><highlight class="normal"><sp/><sp/>T<sp/>*data_;</highlight></codeline>
144
- <codeline lineno="122"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
145
- <codeline lineno="123"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
146
- <codeline lineno="124"><highlight class="normal">};</highlight></codeline>
147
- <codeline lineno="125"><highlight class="normal"></highlight></codeline>
148
- <codeline lineno="128"><highlight class="keyword">typedef</highlight><highlight class="normal"><sp/>TMat&lt;float&gt;<sp/>FloatMat;</highlight></codeline>
149
- <codeline lineno="129"><highlight class="normal"></highlight><highlight class="keyword">typedef</highlight><highlight class="normal"><sp/>FloatMat<sp/>FMatrix;</highlight></codeline>
150
- <codeline lineno="130"><highlight class="normal"></highlight></codeline>
151
- <codeline lineno="131"><highlight class="normal">}<sp/></highlight><highlight class="comment">//<sp/>dub</highlight><highlight class="normal"></highlight></codeline>
152
- <codeline lineno="132"><highlight class="normal"></highlight></codeline>
153
- <codeline lineno="133"><highlight class="normal"></highlight><highlight class="preprocessor">#endif<sp/>//<sp/>DOXY_GENERATOR_TEST_FIXTURES_APP_MATRIX_H_</highlight></codeline>
140
+ <codeline lineno="120"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols()<sp/>{</highlight></codeline>
141
+ <codeline lineno="121"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
142
+ <codeline lineno="122"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
143
+ <codeline lineno="123"><highlight class="normal"></highlight></codeline>
144
+ <codeline lineno="124"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows()<sp/>{</highlight></codeline>
145
+ <codeline lineno="125"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
146
+ <codeline lineno="126"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
147
+ <codeline lineno="127"><highlight class="normal"></highlight></codeline>
148
+ <codeline lineno="128"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>fill(T<sp/>value)<sp/>{</highlight></codeline>
149
+ <codeline lineno="129"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="comment">//<sp/>dummy</highlight><highlight class="normal"></highlight></codeline>
150
+ <codeline lineno="130"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
151
+ <codeline lineno="131"><highlight class="normal"></highlight></codeline>
152
+ <codeline lineno="132"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>FunkyThing(</highlight><highlight class="keywordtype">double</highlight><highlight class="normal"><sp/>v[7])<sp/>{</highlight></codeline>
153
+ <codeline lineno="133"><highlight class="normal"></highlight></codeline>
154
+ <codeline lineno="134"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
155
+ <codeline lineno="135"><highlight class="normal"></highlight></codeline>
156
+ <codeline lineno="136"><highlight class="normal"><sp/><sp/>T<sp/></highlight><highlight class="keyword">get</highlight><highlight class="normal">(</highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>row,<sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>col)<sp/>{</highlight></codeline>
157
+ <codeline lineno="137"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>data_[row<sp/>*<sp/>cols_<sp/>+<sp/>col];</highlight></codeline>
158
+ <codeline lineno="138"><highlight class="normal"><sp/><sp/>}</highlight></codeline>
159
+ <codeline lineno="139"><highlight class="normal"></highlight></codeline>
160
+ <codeline lineno="140"><highlight class="normal"></highlight><highlight class="keyword">private</highlight><highlight class="normal">:</highlight></codeline>
161
+ <codeline lineno="141"><highlight class="normal"><sp/><sp/>T<sp/>*data_;</highlight></codeline>
162
+ <codeline lineno="142"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>rows_;</highlight></codeline>
163
+ <codeline lineno="143"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">size_t</highlight><highlight class="normal"><sp/>cols_;</highlight></codeline>
164
+ <codeline lineno="144"><highlight class="normal">};</highlight></codeline>
165
+ <codeline lineno="145"><highlight class="normal"></highlight></codeline>
166
+ <codeline lineno="148"><highlight class="keyword">typedef</highlight><highlight class="normal"><sp/>TMat&lt;float&gt;<sp/>FloatMat;</highlight></codeline>
167
+ <codeline lineno="149"><highlight class="normal"></highlight><highlight class="keyword">typedef</highlight><highlight class="normal"><sp/>FloatMat<sp/>FMatrix;</highlight></codeline>
168
+ <codeline lineno="150"><highlight class="normal"></highlight></codeline>
169
+ <codeline lineno="151"><highlight class="normal">}<sp/></highlight><highlight class="comment">//<sp/>dub</highlight><highlight class="normal"></highlight></codeline>
170
+ <codeline lineno="152"><highlight class="normal"></highlight></codeline>
171
+ <codeline lineno="153"><highlight class="normal"></highlight><highlight class="preprocessor">#endif<sp/>//<sp/>DOXY_GENERATOR_TEST_FIXTURES_APP_MATRIX_H_</highlight></codeline>
154
172
  </programlisting>
155
173
  <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h"/>
156
174
  </compounddef>
data/test/fixtures/app/xml/namespacedub.xml CHANGED
@@ -16,7 +16,7 @@
16
16
  </detaileddescription>
17
17
  <inbodydescription>
18
18
  </inbodydescription>
19
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="128" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="128" bodyend="-1"/>
19
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="148" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="148" bodyend="-1"/>
20
20
  </memberdef>
21
21
  <memberdef kind="typedef" id="namespacedub_1a1f14f9a863b395dbbc9cdbf168855673" prot="public" static="no">
22
22
  <type><ref refid="classdub_1_1_t_mat" kindref="compound">FloatMat</ref></type>
@@ -29,7 +29,7 @@
29
29
  </detaileddescription>
30
30
  <inbodydescription>
31
31
  </inbodydescription>
32
- <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="129" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="129" bodyend="-1"/>
32
+ <location file="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" line="149" bodyfile="/Users/gaspard/git/dub/test/fixtures/app/include/matrix.h" bodystart="149" bodyend="-1"/>
33
33
  </memberdef>
34
34
  </sectiondef>
35
35
  <briefdescription>
data/test/klass_test.rb CHANGED
@@ -71,6 +71,14 @@ class KlassTest < Test::Unit::TestCase
71
71
  assert_no_match %r{Matrix_mul}, @class.to_s
72
72
  end
73
73
 
74
+ should 'ignore private members' do
75
+ assert !@list.include?("private_method")
76
+ end
77
+
78
+ should 'ignore protected members' do
79
+ assert !@list.include?("protected_method")
80
+ end
81
+
74
82
  should 'ignore operator methods in member list' do
75
83
  assert !@list.include?("operator size_t")
76
84
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 6
8
- - 2
9
- version: 0.6.2
8
+ - 3
9
+ version: 0.6.3
10
10
  platform: ruby
11
11
  authors:
12
12
  - Gaspard Bucher