r2corba 1.7.0-x64-mingw32 → 1.7.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/lib/corba/cbase/ORB.rb +9 -8
  3. data/lib/corba/cbase/Request.rb +4 -6
  4. data/lib/corba/cbase/Streams.rb +20 -20
  5. data/lib/corba/cbase/Typecode.rb +12 -41
  6. data/lib/corba/cbase/Values.rb +1 -4
  7. data/lib/corba/cbase/exception.rb +0 -2
  8. data/lib/corba/cbase/poa.rb +2 -2
  9. data/lib/corba/cbase/policies.rb +9 -8
  10. data/lib/corba/cbase/require.rb +1 -1
  11. data/lib/corba/cmds/base.rb +0 -1
  12. data/lib/corba/common/Any.rb +1 -2
  13. data/lib/corba/common/IDL.rb +3 -7
  14. data/lib/corba/common/ORB.rb +19 -19
  15. data/lib/corba/common/Object.rb +32 -22
  16. data/lib/corba/common/Request.rb +0 -2
  17. data/lib/corba/common/Servant.rb +4 -9
  18. data/lib/corba/common/Stub.rb +9 -7
  19. data/lib/corba/common/Typecode.rb +44 -27
  20. data/lib/corba/common/Values.rb +0 -1
  21. data/lib/corba/common/require.rb +1 -3
  22. data/lib/corba/common/version.rb +1 -3
  23. data/lib/corba/idl/IDL.rb +0 -2
  24. data/lib/corba/idl/require.rb +2 -2
  25. data/lib/corba/jbase/Any.rb +34 -35
  26. data/lib/corba/jbase/ORB.rb +5 -6
  27. data/lib/corba/jbase/Object.rb +10 -10
  28. data/lib/corba/jbase/Request.rb +8 -9
  29. data/lib/corba/jbase/Servant.rb +28 -32
  30. data/lib/corba/jbase/ServerRequest.rb +10 -8
  31. data/lib/corba/jbase/Streams.rb +80 -78
  32. data/lib/corba/jbase/Stub.rb +1 -1
  33. data/lib/corba/jbase/Typecode.rb +18 -46
  34. data/lib/corba/jbase/Values.rb +0 -1
  35. data/lib/corba/jbase/exception.rb +2 -1
  36. data/lib/corba/jbase/poa.rb +18 -17
  37. data/lib/corba/jbase/policies.rb +42 -45
  38. data/lib/corba/jbase/require.rb +3 -3
  39. data/lib/corba/naming_service.rb +1 -1
  40. data/lib/corba/poa.rb +1 -1
  41. data/lib/corba/policies.rb +2 -2
  42. data/lib/corba/svcs/ins/cos_naming.rb +23 -12
  43. data/lib/corba/svcs/ins/ins.rb +5 -5
  44. data/lib/corba/svcs/ins/naming_service.rb +1 -1
  45. data/lib/corba.rb +1 -1
  46. data/lib/ridlbe/ruby/config.rb +2 -8
  47. data/lib/ridlbe/ruby/orb.pidlc +0 -0
  48. data/lib/ridlbe/ruby/walker.rb +94 -108
  49. data/rakelib/ext.rake +1 -1
  50. data/rakelib/ext_r2tao.rb +1 -1
  51. data/rakelib/gem.rake +0 -30
  52. metadata +3 -4
@@ -26,6 +26,7 @@ module R2CORBA
26
26
  if jobj.nil? || !jobj.is_a?(Native::V2_3::Portable::InputStream)
27
27
  raise ArgumentError, 'Expected org.omg.CORBA.portable.InputStream'
28
28
  end
29
+
29
30
  @@wrapper_klass.new(jobj)
30
31
  end
31
32
 
@@ -33,51 +34,51 @@ module R2CORBA
33
34
  tc = tc.resolved_tc # takes care of recursive typecodes
34
35
  v = case tc.kind
35
36
  when TK_ANY
36
- read_any()
37
+ read_any
37
38
  when TK_BOOLEAN
38
- read_boolean()
39
+ read_boolean
39
40
  when TK_SHORT
40
- read_short()
41
+ read_short
41
42
  when TK_LONG
42
- read_long()
43
+ read_long
43
44
  when TK_USHORT
44
- read_ushort()
45
+ read_ushort
45
46
  when TK_WCHAR
46
- read_wchar()
47
+ read_wchar
47
48
  when TK_ULONG
48
- read_ulong()
49
+ read_ulong
49
50
  when TK_LONGLONG
50
- read_longlong()
51
+ read_longlong
51
52
  when TK_ULONGLONG
52
- read_ulonglong()
53
+ read_ulonglong
53
54
  when TK_OCTET
54
- read_octet()
55
+ read_octet
55
56
  when TK_FLOAT
56
- read_float()
57
+ read_float
57
58
  when TK_DOUBLE
58
- read_double()
59
+ read_double
59
60
  when TK_LONGDOUBLE
60
61
  raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
61
62
  when TK_FIXED
62
- read_fixed()
63
+ read_fixed
63
64
  when TK_CHAR
64
- read_char()
65
+ read_char
65
66
  when TK_STRING
66
- read_string()
67
+ read_string
67
68
  when TK_WSTRING
68
- read_wstring()
69
+ read_wstring
69
70
  when TK_OBJREF
70
- read_Object()
71
+ read_Object
71
72
  when TK_TYPECODE
72
- read_TypeCode()
73
+ read_TypeCode
73
74
  when TK_ARRAY, TK_SEQUENCE,
74
75
  TK_ENUM, TK_STRUCT, TK_EXCEPT, TK_UNION,
75
76
  TK_PRINCIPAL
76
77
  read_construct(tc)
77
78
  when TK_ABSTRACT_INTERFACE
78
- read_Abstract()
79
+ read_Abstract
79
80
  when TK_VALUE
80
- read_value()
81
+ read_value
81
82
  when TK_VALUE_BOX
82
83
  read_valuebox(tc.get_type.boxedvalue_helper)
83
84
  ## TODO: TK_NATIVE
@@ -85,17 +86,17 @@ module R2CORBA
85
86
  v
86
87
  end
87
88
 
88
- def read_any()
89
+ def read_any
89
90
  begin
90
- self.stream_.read_any()
91
+ self.stream_.read_any
91
92
  rescue ::NativeException
92
93
  CORBA::Exception.native2r($!)
93
94
  end
94
95
  end
95
96
 
96
- def read_boolean()
97
+ def read_boolean
97
98
  begin
98
- self.stream_.read_boolean()
99
+ self.stream_.read_boolean
99
100
  rescue ::NativeException
100
101
  CORBA::Exception.native2r($!)
101
102
  end
@@ -108,12 +109,12 @@ module R2CORBA
108
109
  rescue ::NativeException
109
110
  CORBA::Exception.native2r($!)
110
111
  end
111
- arr.fill(offset, length) {|i| jarr[i]}
112
+ arr.fill(offset, length) { |i| jarr[i] }
112
113
  end
113
114
 
114
- def read_char()
115
+ def read_char
115
116
  begin
116
- self.stream_.read_char().chr
117
+ self.stream_.read_char.chr
117
118
  rescue ::NativeException
118
119
  CORBA::Exception.native2r($!)
119
120
  end
@@ -126,12 +127,12 @@ module R2CORBA
126
127
  rescue ::NativeException
127
128
  CORBA::Exception.native2r($!)
128
129
  end
129
- arr.fill(offset, length) {|i| jarr[i].chr }
130
+ arr.fill(offset, length) { |i| jarr[i].chr }
130
131
  end
131
132
 
132
- def read_wchar()
133
+ def read_wchar
133
134
  begin
134
- self.stream_.read_wchar()
135
+ self.stream_.read_wchar
135
136
  rescue ::NativeException
136
137
  CORBA::Exception.native2r($!)
137
138
  end
@@ -144,12 +145,12 @@ module R2CORBA
144
145
  rescue ::NativeException
145
146
  CORBA::Exception.native2r($!)
146
147
  end
147
- arr.fill(offset, length) {|i| jarr[i] }
148
+ arr.fill(offset, length) { |i| jarr[i] }
148
149
  end
149
150
 
150
151
  def read_octet(value)
151
152
  begin
152
- [self.stream_.read_octet()].pack('c').unpack('C').first
153
+ [self.stream_.read_octet].pack('c').unpack('C').first
153
154
  rescue ::NativeException
154
155
  CORBA::Exception.native2r($!)
155
156
  end
@@ -163,12 +164,12 @@ module R2CORBA
163
164
  CORBA::Exception.native2r($!)
164
165
  end
165
166
  jarr = jarr.pack('c*').unpack('C*')
166
- arr.fill(offset, length) {|i| jarr[i] }
167
+ arr.fill(offset, length) { |i| jarr[i] }
167
168
  end
168
169
 
169
- def read_short()
170
+ def read_short
170
171
  begin
171
- self.stream_.read_short()
172
+ self.stream_.read_short
172
173
  rescue ::NativeException
173
174
  CORBA::Exception.native2r($!)
174
175
  end
@@ -181,12 +182,12 @@ module R2CORBA
181
182
  rescue ::NativeException
182
183
  CORBA::Exception.native2r($!)
183
184
  end
184
- arr.fill(offset, length) {|i| jarr[i] }
185
+ arr.fill(offset, length) { |i| jarr[i] }
185
186
  end
186
187
 
187
- def read_ushort()
188
+ def read_ushort
188
189
  begin
189
- [self.stream_.read_ushort()].pack('s').unpack('S').first
190
+ [self.stream_.read_ushort].pack('s').unpack('S').first
190
191
  rescue ::NativeException
191
192
  CORBA::Exception.native2r($!)
192
193
  end
@@ -200,12 +201,12 @@ module R2CORBA
200
201
  CORBA::Exception.native2r($!)
201
202
  end
202
203
  jarr = jarr.pack('s*').unpack('S*')
203
- arr.fill(offset, length) {|i| jarr[i] }
204
+ arr.fill(offset, length) { |i| jarr[i] }
204
205
  end
205
206
 
206
- def read_long()
207
+ def read_long
207
208
  begin
208
- self.stream_.read_long()
209
+ self.stream_.read_long
209
210
  rescue ::NativeException
210
211
  CORBA::Exception.native2r($!)
211
212
  end
@@ -218,12 +219,12 @@ module R2CORBA
218
219
  rescue ::NativeException
219
220
  CORBA::Exception.native2r($!)
220
221
  end
221
- arr.fill(offset, length) {|i| jarr[i] }
222
+ arr.fill(offset, length) { |i| jarr[i] }
222
223
  end
223
224
 
224
- def read_ulong()
225
+ def read_ulong
225
226
  begin
226
- [self.stream_.read_ulong()].pack('l').unpack('L').first
227
+ [self.stream_.read_ulong].pack('l').unpack('L').first
227
228
  rescue ::NativeException
228
229
  CORBA::Exception.native2r($!)
229
230
  end
@@ -237,12 +238,12 @@ module R2CORBA
237
238
  CORBA::Exception.native2r($!)
238
239
  end
239
240
  jarr = jarr.pack('l*').unpack('L*')
240
- arr.fill(offset, length) {|i| jarr[i] }
241
+ arr.fill(offset, length) { |i| jarr[i] }
241
242
  end
242
243
 
243
- def read_longlong()
244
+ def read_longlong
244
245
  begin
245
- self.stream_.read_longlong()
246
+ self.stream_.read_longlong
246
247
  rescue ::NativeException
247
248
  CORBA::Exception.native2r($!)
248
249
  end
@@ -255,12 +256,12 @@ module R2CORBA
255
256
  rescue ::NativeException
256
257
  CORBA::Exception.native2r($!)
257
258
  end
258
- arr.fill(offset, length) {|i| jarr[i] }
259
+ arr.fill(offset, length) { |i| jarr[i] }
259
260
  end
260
261
 
261
- def read_ulonglong()
262
+ def read_ulonglong
262
263
  begin
263
- [self.stream_.read_ulonglong()].pack('q').unpack('Q').first
264
+ [self.stream_.read_ulonglong].pack('q').unpack('Q').first
264
265
  rescue ::NativeException
265
266
  CORBA::Exception.native2r($!)
266
267
  end
@@ -274,12 +275,12 @@ module R2CORBA
274
275
  CORBA::Exception.native2r($!)
275
276
  end
276
277
  jarr = jarr.pack('q*').unpack('Q*')
277
- arr.fill(offset, length) {|i| jarr[i] }
278
+ arr.fill(offset, length) { |i| jarr[i] }
278
279
  end
279
280
 
280
- def read_float()
281
+ def read_float
281
282
  begin
282
- self.stream_.read_float()
283
+ self.stream_.read_float
283
284
  rescue ::NativeException
284
285
  CORBA::Exception.native2r($!)
285
286
  end
@@ -292,12 +293,12 @@ module R2CORBA
292
293
  rescue ::NativeException
293
294
  CORBA::Exception.native2r($!)
294
295
  end
295
- arr.fill(offset, length) {|i| jarr[i] }
296
+ arr.fill(offset, length) { |i| jarr[i] }
296
297
  end
297
298
 
298
- def read_double()
299
+ def read_double
299
300
  begin
300
- self.stream_.read_double()
301
+ self.stream_.read_double
301
302
  rescue ::NativeException
302
303
  CORBA::Exception.native2r($!)
303
304
  end
@@ -310,44 +311,44 @@ module R2CORBA
310
311
  rescue ::NativeException
311
312
  CORBA::Exception.native2r($!)
312
313
  end
313
- arr.fill(offset, length) {|i| jarr[i] }
314
+ arr.fill(offset, length) { |i| jarr[i] }
314
315
  end
315
316
 
316
- def read_string()
317
+ def read_string
317
318
  begin
318
- self.stream_.read_string()
319
+ self.stream_.read_string
319
320
  rescue ::NativeException
320
321
  CORBA::Exception.native2r($!)
321
322
  end
322
323
  end
323
324
 
324
- def read_wstring()
325
+ def read_wstring
325
326
  begin
326
- self.stream_.read_wstring()
327
+ self.stream_.read_wstring
327
328
  rescue ::NativeException
328
329
  CORBA::Exception.native2r($!)
329
330
  end
330
331
  end
331
332
 
332
- def read_Object()
333
+ def read_Object
333
334
  begin
334
- CORBA::Object._wrap_native(self.stream_().read_Object())
335
+ CORBA::Object._wrap_native(self.stream_.read_Object)
335
336
  rescue ::NativeException
336
337
  CORBA::Exception.native2r($!)
337
338
  end
338
339
  end
339
340
 
340
- def read_TypeCode()
341
+ def read_TypeCode
341
342
  begin
342
- CORBA::TypeCode._wrap_native(self.stream_().read_TypeCode())
343
+ CORBA::TypeCode._wrap_native(self.stream_.read_TypeCode)
343
344
  rescue ::NativeException
344
345
  CORBA::Exception.native2r($!)
345
346
  end
346
347
  end
347
348
 
348
- def read_fixed()
349
+ def read_fixed
349
350
  begin
350
- java.math.BigDecimal.new(self.stream_.read_fixed().toString())
351
+ java.math.BigDecimal.new(self.stream_.read_fixed.toString)
351
352
  rescue ::NativeException
352
353
  CORBA::Exception.native2r($!)
353
354
  end
@@ -355,17 +356,17 @@ module R2CORBA
355
356
 
356
357
  def read_construct(tc)
357
358
  begin
358
- jany = self.stream_.orb().create_any()
359
+ jany = self.stream_.orb.create_any
359
360
  jany.read_value(self.stream_, tc.tc_)
360
- CORBA::Any.from_java(jany, self.stream_.orb(), tc)
361
+ CORBA::Any.from_java(jany, self.stream_.orb, tc)
361
362
  rescue ::NativeException
362
363
  CORBA::Exception.native2r($!)
363
364
  end
364
365
  end
365
366
 
366
- def read_Abstract()
367
+ def read_Abstract
367
368
  begin
368
- obj = self.stream_.read_abstract_interface()
369
+ obj = self.stream_.read_abstract_interface
369
370
  rescue ::NativeException
370
371
  CORBA::Exception.native2r($!)
371
372
  end
@@ -373,9 +374,9 @@ module R2CORBA
373
374
  obj
374
375
  end
375
376
 
376
- def read_value()
377
+ def read_value
377
378
  begin
378
- self.stream_.read_value()
379
+ self.stream_.read_value
379
380
  rescue ::NativeException
380
381
  CORBA::Exception.native2r($!)
381
382
  end
@@ -403,6 +404,7 @@ module R2CORBA
403
404
  if jobj.nil? || !jobj.is_a?(Native::V2_3::Portable::OutputStream)
404
405
  raise ArgumentError, 'Expected org.omg.CORBA.portable.OutputStream'
405
406
  end
407
+
406
408
  @@wrapper_klass.new(jobj)
407
409
  end
408
410
 
@@ -456,7 +458,7 @@ module R2CORBA
456
458
  when TK_VALUE
457
459
  write_value(value)
458
460
  when TK_VALUE_BOX
459
- write_valuebox(value, tc.get_type().boxedvalue_helper())
461
+ write_valuebox(value, tc.get_type.boxedvalue_helper)
460
462
  ## TODO: TK_NATIVE
461
463
  end
462
464
  end
@@ -495,7 +497,7 @@ module R2CORBA
495
497
 
496
498
  def write_char_array(value, offset, length)
497
499
  begin
498
- self.stream_.write_char_array(value.collect{|c| c[0]}.to_java(:char), offset, length)
500
+ self.stream_.write_char_array(value.collect{ |c| c[0] }.to_java(:char), offset, length)
499
501
  rescue ::NativeException
500
502
  CORBA::Exception.native2r($!)
501
503
  end
@@ -667,7 +669,7 @@ module R2CORBA
667
669
 
668
670
  def write_wstring(value)
669
671
  begin
670
- self.stream_.write_wstring(value.inject('') {|s, b| s << b.chr})
672
+ self.stream_.write_wstring(value.inject('') { |s, b| s << b.chr })
671
673
  rescue ::NativeException
672
674
  CORBA::Exception.native2r($!)
673
675
  end
@@ -699,7 +701,7 @@ module R2CORBA
699
701
 
700
702
  def write_construct(value, tc)
701
703
  begin
702
- CORBA::Any.to_any(value, tc).to_java(self.stream_().orb()).write_value(self.stream_)
704
+ CORBA::Any.to_any(value, tc).to_java(self.stream_.orb).write_value(self.stream_)
703
705
  rescue ::NativeException
704
706
  CORBA::Exception.native2r($!)
705
707
  end
@@ -707,7 +709,7 @@ module R2CORBA
707
709
 
708
710
  def write_Abstract(value)
709
711
  begin
710
- self.stream_().write_abstract_interface(value.is_a?(CORBA::Object) ? value.objref_ : value)
712
+ self.stream_.write_abstract_interface(value.is_a?(CORBA::Object) ? value.objref_ : value)
711
713
  rescue ::NativeException
712
714
  CORBA::Exception.native2r($!)
713
715
  end
@@ -20,6 +20,7 @@ module R2CORBA
20
20
  # Handle IDL generated invocation
21
21
  def _invoke(operation, param = {})
22
22
  raise ArgumentError, 'expected Hash' unless ::Hash === param
23
+
23
24
  req = self._request(operation)
24
25
  req.arguments = param[:arg_list] if param.has_key?(:arg_list)
25
26
  req.exceptions = param[:exc_list] if param.has_key?(:exc_list)
@@ -31,7 +32,6 @@ module R2CORBA
31
32
  return nil
32
33
  end
33
34
  end
34
-
35
35
  end # Stub
36
36
  end # CORBA
37
37
  end # R2CORBA