r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (248) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE +5 -5
  3. data/README.rdoc +62 -0
  4. data/THANKS +4 -4
  5. data/lib/corba/cbase/IORMap.rb +0 -1
  6. data/lib/corba/cbase/ORB.rb +26 -24
  7. data/lib/corba/cbase/Request.rb +4 -5
  8. data/lib/corba/cbase/Streams.rb +2 -3
  9. data/lib/corba/cbase/Stub.rb +0 -1
  10. data/lib/corba/cbase/Typecode.rb +6 -7
  11. data/lib/corba/cbase/Values.rb +4 -3
  12. data/lib/corba/cbase/exception.rb +6 -5
  13. data/lib/corba/cbase/poa.rb +1 -2
  14. data/lib/corba/cbase/policies.rb +3 -4
  15. data/lib/corba/cbase/post_require.rb +1 -2
  16. data/lib/corba/cbase/require.rb +10 -2
  17. data/lib/corba/cmds/base.rb +1 -2
  18. data/lib/corba/cmds/test.rb +0 -1
  19. data/lib/corba/common/Any.rb +3 -3
  20. data/lib/corba/common/IDL.rb +6 -10
  21. data/lib/corba/common/ORB.rb +22 -23
  22. data/lib/corba/common/Object.rb +18 -15
  23. data/lib/corba/common/Request.rb +1 -2
  24. data/lib/corba/common/Servant.rb +4 -5
  25. data/lib/corba/common/Struct.rb +1 -2
  26. data/lib/corba/common/Stub.rb +6 -7
  27. data/lib/corba/common/Typecode.rb +91 -65
  28. data/lib/corba/common/Union.rb +6 -2
  29. data/lib/corba/common/Values.rb +2 -2
  30. data/lib/corba/common/const.rb +2 -3
  31. data/lib/corba/common/exception.rb +2 -2
  32. data/lib/corba/common/require.rb +8 -1
  33. data/lib/corba/common/version.rb +3 -4
  34. data/lib/corba/idl/BiDirPolicyC.rb +2 -3
  35. data/lib/corba/idl/CosNamingC.rb +4 -5
  36. data/lib/corba/idl/CosNamingS.rb +2 -3
  37. data/lib/corba/idl/IDL.rb +1 -2
  38. data/lib/corba/idl/IORTable.pidl +0 -1
  39. data/lib/corba/idl/IORTableC.rb +2 -3
  40. data/lib/corba/idl/MessagingC.rb +2 -3
  41. data/lib/corba/idl/POAC.rb +10 -11
  42. data/lib/corba/idl/TAO_Ext.pidl +0 -1
  43. data/lib/corba/idl/TAO_ExtC.rb +2 -3
  44. data/lib/corba/idl/r2c_orb.rb +5 -6
  45. data/lib/corba/idl/require.rb +0 -1
  46. data/lib/corba/jbase/Any.rb +29 -28
  47. data/lib/corba/jbase/IORMap.rb +1 -2
  48. data/lib/corba/jbase/ORB.rb +5 -6
  49. data/lib/corba/jbase/Object.rb +13 -14
  50. data/lib/corba/jbase/Request.rb +9 -10
  51. data/lib/corba/jbase/Servant.rb +11 -12
  52. data/lib/corba/jbase/ServerRequest.rb +8 -9
  53. data/lib/corba/jbase/Streams.rb +68 -5
  54. data/lib/corba/jbase/Stub.rb +0 -1
  55. data/lib/corba/jbase/Typecode.rb +17 -17
  56. data/lib/corba/jbase/Values.rb +2 -1
  57. data/lib/corba/jbase/exception.rb +2 -2
  58. data/lib/corba/jbase/poa.rb +21 -22
  59. data/lib/corba/jbase/policies.rb +33 -34
  60. data/lib/corba/jbase/post_require.rb +0 -1
  61. data/lib/corba/jbase/require.rb +5 -2
  62. data/lib/corba/naming.rb +0 -1
  63. data/lib/corba/naming_service.rb +0 -1
  64. data/lib/corba/poa.rb +1 -2
  65. data/lib/corba/policies.rb +1 -2
  66. data/lib/corba/require.rb +2 -3
  67. data/lib/corba/svcs/ins/cos_naming.rb +74 -68
  68. data/lib/corba/svcs/ins/ins.rb +58 -59
  69. data/lib/corba/svcs/ins/naming_service.rb +9 -10
  70. data/lib/corba.rb +1 -2
  71. data/lib/ridlbe/ruby/config.rb +78 -74
  72. data/lib/ridlbe/ruby/require.rb +0 -1
  73. data/lib/ridlbe/ruby/walker.rb +311 -288
  74. data/mkrf_conf_bingem.rb +4 -6
  75. data/rakelib/bin.rake +2 -3
  76. data/rakelib/bin.rb +4 -5
  77. data/rakelib/build.rake +22 -22
  78. data/rakelib/config.rake +2 -3
  79. data/rakelib/config.rb +32 -34
  80. data/rakelib/ext.rake +18 -77
  81. data/rakelib/ext.rb +19 -58
  82. data/rakelib/ext_r2tao.rb +33 -60
  83. data/rakelib/gem.rake +53 -38
  84. data/rakelib/gem.rb +9 -10
  85. data/rakelib/package.rake +2 -3
  86. data/rakelib/test.rake +0 -1
  87. data/test/BiDirectional/Test.idl +0 -1
  88. data/test/BiDirectional/client.rb +18 -19
  89. data/test/BiDirectional/run_test.rb +11 -12
  90. data/test/BiDirectional/server.rb +21 -23
  91. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
  92. data/test/CORBA_Services/Naming/BindingIterator/client.rb +17 -18
  93. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +13 -14
  94. data/test/CORBA_Services/Naming/BindingIterator/server.rb +19 -20
  95. data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
  96. data/test/CORBA_Services/Naming/Corbaname/client.rb +15 -16
  97. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +13 -14
  98. data/test/CORBA_Services/Naming/Corbaname/server.rb +27 -28
  99. data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
  100. data/test/CORBA_Services/Naming/Simple/client.rb +16 -17
  101. data/test/CORBA_Services/Naming/Simple/run_test.rb +13 -14
  102. data/test/CORBA_Services/Naming/Simple/server.rb +19 -20
  103. data/test/Collocation/Diamond.idl +0 -1
  104. data/test/Collocation/run_test.rb +10 -11
  105. data/test/Collocation/test.rb +27 -21
  106. data/test/Connect_Timeout/Test.idl +0 -1
  107. data/test/Connect_Timeout/client.rb +16 -18
  108. data/test/Connect_Timeout/run_test.rb +10 -11
  109. data/test/DII/Test.idl +0 -1
  110. data/test/DII/client.rb +30 -31
  111. data/test/DII/run_test.rb +11 -12
  112. data/test/DII/server.rb +16 -17
  113. data/test/DSI/Test.idl +0 -1
  114. data/test/DSI/client.rb +16 -17
  115. data/test/DSI/run_test.rb +11 -12
  116. data/test/DSI/server.rb +17 -18
  117. data/test/Exceptions/Test.idl +0 -1
  118. data/test/Exceptions/client.rb +22 -23
  119. data/test/Exceptions/run_test.rb +11 -12
  120. data/test/Exceptions/server.rb +16 -17
  121. data/test/Hello/Test.idl +0 -1
  122. data/test/Hello/client.rb +16 -17
  123. data/test/Hello/run_test.rb +11 -12
  124. data/test/Hello/server.rb +17 -18
  125. data/test/IDL_Test/Test.idl +4 -1
  126. data/test/IDL_Test/client.rb +24 -23
  127. data/test/IDL_Test/run_test.rb +11 -12
  128. data/test/IDL_Test/server.rb +23 -19
  129. data/test/IORMap/Test.idl +0 -1
  130. data/test/IORMap/client.rb +14 -15
  131. data/test/IORMap/run_test.rb +11 -12
  132. data/test/IORMap/server.rb +23 -24
  133. data/test/IORTable/Test.idl +0 -1
  134. data/test/IORTable/client.rb +14 -15
  135. data/test/IORTable/run_test.rb +11 -12
  136. data/test/IORTable/server.rb +23 -24
  137. data/test/Implicit_Conversion/Test.idl +0 -1
  138. data/test/Implicit_Conversion/client.rb +20 -18
  139. data/test/Implicit_Conversion/run_test.rb +11 -12
  140. data/test/Implicit_Conversion/server.rb +16 -17
  141. data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
  142. data/test/Multi_Threading/Multiple_ORB/client.rb +14 -15
  143. data/test/Multi_Threading/Multiple_ORB/run_test.rb +12 -13
  144. data/test/Multi_Threading/Multiple_ORB/server.rb +17 -18
  145. data/test/Multi_Threading/Simple/Test.idl +0 -1
  146. data/test/Multi_Threading/Simple/client.rb +17 -18
  147. data/test/Multi_Threading/Simple/run_test.rb +11 -12
  148. data/test/Multi_Threading/Simple/server.rb +17 -18
  149. data/test/Multi_Threading/Threads/Test.idl +0 -4
  150. data/test/Multi_Threading/Threads/client.rb +23 -26
  151. data/test/Multi_Threading/Threads/run_test.rb +11 -12
  152. data/test/Multi_Threading/Threads/server.rb +19 -22
  153. data/test/Multi_Threading/Threads/watchdog.rb +16 -16
  154. data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
  155. data/test/Multiple_Servant_Interfaces/client.rb +14 -15
  156. data/test/Multiple_Servant_Interfaces/run_test.rb +11 -12
  157. data/test/Multiple_Servant_Interfaces/server.rb +18 -19
  158. data/test/Nil/Test.idl +0 -1
  159. data/test/Nil/run_test.rb +10 -11
  160. data/test/Nil/test.rb +22 -20
  161. data/test/OBV/AbstractInterface/client.rb +14 -15
  162. data/test/OBV/AbstractInterface/run_test.rb +11 -12
  163. data/test/OBV/AbstractInterface/server.rb +20 -20
  164. data/test/OBV/AbstractInterface/test.idl +0 -1
  165. data/test/OBV/Custom/OBV_impl.rb +2 -1
  166. data/test/OBV/Custom/client.rb +14 -15
  167. data/test/OBV/Custom/run_test.rb +11 -12
  168. data/test/OBV/Custom/server.rb +16 -17
  169. data/test/OBV/Simple/OBV_impl.rb +1 -1
  170. data/test/OBV/Simple/client.rb +14 -15
  171. data/test/OBV/Simple/run_test.rb +11 -12
  172. data/test/OBV/Simple/server.rb +16 -17
  173. data/test/OBV/Simple_Event/Event_impl.rb +1 -1
  174. data/test/OBV/Simple_Event/client.rb +14 -15
  175. data/test/OBV/Simple_Event/run_test.rb +11 -12
  176. data/test/OBV/Simple_Event/server.rb +16 -17
  177. data/test/OBV/Supports/client.rb +19 -20
  178. data/test/OBV/Supports/run_test.rb +11 -12
  179. data/test/OBV/Supports/server.rb +15 -16
  180. data/test/OBV/Supports/supports.idl +0 -1
  181. data/test/OBV/Supports/supports_impl.rb +3 -1
  182. data/test/OBV/Tree/client.rb +14 -15
  183. data/test/OBV/Tree/run_test.rb +11 -12
  184. data/test/OBV/Tree/server.rb +19 -20
  185. data/test/OBV/Tree/test.idl +0 -1
  186. data/test/OBV/Truncatable/Extra.idl +0 -1
  187. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
  188. data/test/OBV/Truncatable/client.rb +57 -58
  189. data/test/OBV/Truncatable/run_test.rb +11 -12
  190. data/test/OBV/Truncatable/server.rb +15 -16
  191. data/test/OBV/ValueBox/client.rb +154 -154
  192. data/test/OBV/ValueBox/run_test.rb +11 -12
  193. data/test/OBV/ValueBox/server.rb +42 -42
  194. data/test/Object/Test.idl +0 -1
  195. data/test/Object/client.rb +15 -16
  196. data/test/Object/run_test.rb +11 -12
  197. data/test/Object/server.rb +19 -20
  198. data/test/POA/run_test.rb +10 -11
  199. data/test/POA/test.rb +17 -18
  200. data/test/Param_Test/client.rb +53 -54
  201. data/test/Param_Test/run_test.rb +11 -12
  202. data/test/Param_Test/server.rb +60 -61
  203. data/test/Performance/Simple/Test.idl +0 -1
  204. data/test/Performance/Simple/client.rb +16 -17
  205. data/test/Performance/Simple/run_test.rb +11 -12
  206. data/test/Performance/Simple/server.rb +16 -17
  207. data/test/Policies/Test.idl +0 -1
  208. data/test/Policies/run_test.rb +10 -11
  209. data/test/Policies/test.rb +23 -25
  210. data/test/Timeout/client.rb +21 -22
  211. data/test/Timeout/run_test.rb +11 -12
  212. data/test/Timeout/server.rb +19 -20
  213. data/test/Timeout/test.idl +0 -1
  214. data/test/lib/assert.rb +0 -2
  215. data/test/lib/test.rb +29 -25
  216. data/test/test_runner.rb +22 -24
  217. metadata +24 -52
  218. data/README +0 -62
  219. data/test/BiDirectional/server.ior +0 -1
  220. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
  221. data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
  222. data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
  223. data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
  224. data/test/DII/server.ior +0 -1
  225. data/test/DSI/server.ior +0 -1
  226. data/test/Exceptions/server.ior +0 -1
  227. data/test/IDL_Test/server.ior +0 -1
  228. data/test/IORMap/server.ior +0 -1
  229. data/test/IORTable/server.ior +0 -1
  230. data/test/Implicit_Conversion/server.ior +0 -1
  231. data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
  232. data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
  233. data/test/Multi_Threading/Simple/server.ior +0 -1
  234. data/test/Multi_Threading/Threads/server.ior +0 -1
  235. data/test/Multi_Threading/Threads/watchdog.ior +0 -1
  236. data/test/Multiple_Servant_Interfaces/server.ior +0 -1
  237. data/test/OBV/AbstractInterface/server.ior +0 -1
  238. data/test/OBV/Custom/server.ior +0 -1
  239. data/test/OBV/Simple/server.ior +0 -1
  240. data/test/OBV/Simple_Event/server.ior +0 -1
  241. data/test/OBV/Supports/server.ior +0 -1
  242. data/test/OBV/Tree/server.ior +0 -1
  243. data/test/OBV/Truncatable/server.ior +0 -1
  244. data/test/OBV/ValueBox/server.ior +0 -1
  245. data/test/Object/server.ior +0 -1
  246. data/test/Param_Test/server.ior +0 -1
  247. data/test/Performance/Simple/server.ior +0 -1
  248. data/test/Timeout/server.ior +0 -1
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
  require 'monitor'
14
13
 
@@ -16,7 +15,7 @@ module R2CORBA
16
15
  module CORBA
17
16
  class TypeCode
18
17
  def initialize
19
- raise RuntimeError, 'not allowed'
18
+ raise 'not allowed'
20
19
  end
21
20
 
22
21
  @@wrapper_klass = Class.new(CORBA::TypeCode) do
@@ -50,6 +49,7 @@ module R2CORBA
50
49
  @name_types = {}
51
50
  super
52
51
  end
52
+
53
53
  def []=(id, tc)
54
54
  synchronize do
55
55
  @id_types[id] = tc
@@ -58,6 +58,7 @@ module R2CORBA
58
58
  @name_types[tc.name] = types_for_name_
59
59
  end
60
60
  end
61
+
61
62
  def [](id)
62
63
  tc = nil
63
64
  synchronize do
@@ -65,6 +66,7 @@ module R2CORBA
65
66
  end
66
67
  tc
67
68
  end
69
+
68
70
  def types_for_name(name)
69
71
  tcs = nil
70
72
  synchronize do
@@ -93,10 +95,10 @@ module R2CORBA
93
95
  end
94
96
 
95
97
  def TypeCode.from_native(ntc)
96
- if [TK_NULL,TK_VOID,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
97
- TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
98
- TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,
99
- TK_TYPECODE,TK_PRINCIPAL].include?(native_kind(ntc))
98
+ if [TK_NULL, TK_VOID, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
99
+ TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
100
+ TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR,
101
+ TK_TYPECODE, TK_PRINCIPAL].include?(native_kind(ntc))
100
102
  ## primitive typecode; wrap it
101
103
  return TypeCode._wrap_native(ntc)
102
104
  else
@@ -158,9 +160,9 @@ module R2CORBA
158
160
  rtc = TypeCode::Valuetype.new(ntc)
159
161
  end
160
162
  when TK_NATIVE
161
- raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported',0,CORBA::COMPLETED_NO)
163
+ raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported', 0, CORBA::COMPLETED_NO)
162
164
  else
163
- raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]",0,CORBA::COMPLETED_NO)
165
+ raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]", 0, CORBA::COMPLETED_NO)
164
166
  end
165
167
  return rtc
166
168
  end
@@ -185,7 +187,7 @@ module R2CORBA
185
187
  end
186
188
 
187
189
  def equal?(tc)
188
- raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
190
+ raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
189
191
  begin
190
192
  self.tc_.equal(tc.tc_)
191
193
  rescue ::NativeException
@@ -194,7 +196,7 @@ module R2CORBA
194
196
  end
195
197
 
196
198
  def equivalent?(tc)
197
- raise ArgumentError, "expected CORBA::TypeCode" unless tc.is_a?(CORBA::TypeCode)
199
+ raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
198
200
  begin
199
201
  self.tc_.equivalent(tc.tc_)
200
202
  rescue ::NativeException
@@ -310,9 +312,9 @@ module R2CORBA
310
312
  def get_type
311
313
  @type ||= case self.kind
312
314
  when TK_SHORT, TK_LONG, TK_USHORT, TK_ULONG
313
- ::Fixnum
315
+ FIXNUM_KLASS
314
316
  when TK_LONGLONG, TK_ULONGLONG
315
- ::Bignum
317
+ BIGNUM_KLASS
316
318
  when TK_FLOAT, TK_DOUBLE
317
319
  ::Float
318
320
  when TK_LONGDOUBLE
@@ -322,7 +324,7 @@ module R2CORBA
322
324
  when TK_CHAR, TK_STRING
323
325
  ::String
324
326
  when TK_WCHAR, TK_OCTET
325
- ::Fixnum
327
+ FIXNUM_KLASS
326
328
  when TK_VOID, TK_NULL
327
329
  ::NilClass
328
330
  when TK_ANY
@@ -343,7 +345,7 @@ module R2CORBA
343
345
  when TK_ANY
344
346
  return CORBA::Any === val ? val : Any.to_any(val)
345
347
  when TK_BOOLEAN
346
- return val if ((val.is_a? TrueClass) || (val.is_a? FalseClass))
348
+ return val if (val.is_a? TrueClass) || (val.is_a? FalseClass)
347
349
  when TK_SHORT
348
350
  return val.to_int if val.respond_to?(:to_int) && ShortRange === val.to_int
349
351
  when TK_LONG
@@ -368,7 +370,7 @@ module R2CORBA
368
370
  return val.respond_to?(:to_str) ? val.to_str : val.to_int.chr
369
371
  end
370
372
  else
371
- return val if (val.nil? || val.is_a?(self.get_type))
373
+ return val if val.nil? || val.is_a?(self.get_type)
372
374
  end
373
375
  raise CORBA::MARSHAL.new(
374
376
  "value does not match type: value = #{val}, value type == #{val.class.name}, type == #{get_type.name}",
@@ -391,26 +393,31 @@ module R2CORBA
391
393
  class Recursive < CORBA::TypeCode
392
394
 
393
395
  def initialize(id)
394
- raise RuntimeError, 'overload required'
396
+ raise 'overload required'
395
397
  end
396
398
 
397
399
  def recursed_tc
398
400
  @recursive_tc ||= TypeCode.typecode_for_id(self.id)
399
401
  @recursive_tc || ::CORBA::TypeCode.new(TK_NULL)
400
402
  end
403
+
401
404
  def resolved_tc
402
405
  recursed_tc.resolved_tc
403
406
  end
407
+
404
408
  def is_recursive_tc?
405
409
  true
406
410
  end
411
+
407
412
  def get_type
408
413
  @recursive_tc ||= TypeCode.typecode_for_id(self.id)
409
414
  if @recursive_tc.nil? then nil; else @recursive_tc.get_type; end
410
415
  end
416
+
411
417
  def validate(val)
412
418
  recursed_tc.validate(val)
413
419
  end
420
+
414
421
  def needs_conversion(val)
415
422
  recursed_tc.needs_conversion(val)
416
423
  end
@@ -419,7 +426,7 @@ module R2CORBA
419
426
  class String < CORBA::TypeCode
420
427
 
421
428
  def initialize(*args)
422
- raise RuntimeError, 'overload required'
429
+ raise 'overload required'
423
430
  end
424
431
 
425
432
  def get_type
@@ -432,7 +439,7 @@ module R2CORBA
432
439
  val = ::String === val ? val : val.to_str
433
440
  raise ::CORBA::MARSHAL.new(
434
441
  "string size exceeds bound: #{self.length.to_s}",
435
- 1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
442
+ 1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
436
443
  val
437
444
  end
438
445
 
@@ -444,7 +451,7 @@ module R2CORBA
444
451
  class WString < CORBA::TypeCode
445
452
 
446
453
  def initialize(*args)
447
- raise RuntimeError, 'overload required'
454
+ raise 'overload required'
448
455
  end
449
456
 
450
457
  def get_type
@@ -465,9 +472,9 @@ module R2CORBA
465
472
  end
466
473
  raise ::CORBA::MARSHAL.new(
467
474
  "widestring size exceeds bound: #{self.length.to_s}",
468
- 1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
475
+ 1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
469
476
  raise ::CORBA::MARSHAL.new(
470
- "invalid widestring element(s)",
477
+ 'invalid widestring element(s)',
471
478
  1, ::CORBA::COMPLETED_NO) if val.any? { |el| !(UShortRange === (el.respond_to?(:to_int) ? el.to_int : el)) }
472
479
  val.any? { |el| !(::Integer === el) } ? val.collect { |el| el.to_int } : val
473
480
  end
@@ -490,7 +497,7 @@ module R2CORBA
490
497
  class Fixed < CORBA::TypeCode
491
498
 
492
499
  def initialize(*args)
493
- raise RuntimeError, 'overload required'
500
+ raise 'overload required'
494
501
  end
495
502
 
496
503
  def get_type
@@ -500,7 +507,7 @@ module R2CORBA
500
507
  def validate(val)
501
508
  return val if val.nil?
502
509
  super(val) unless ::BigDecimal === val || val.respond_to?(:to_str)
503
- val = ::BigDecimal === val ? val : BigDecimal.new(val.to_str)
510
+ val = ::BigDecimal === val ? val : BigDecimal(val.to_str)
504
511
  val
505
512
  end
506
513
 
@@ -512,7 +519,7 @@ module R2CORBA
512
519
  class Sequence < CORBA::TypeCode
513
520
 
514
521
  def initialize(*args)
515
- raise RuntimeError, 'overload required'
522
+ raise 'overload required'
516
523
  end
517
524
 
518
525
  def get_type
@@ -539,7 +546,7 @@ module R2CORBA
539
546
  end
540
547
  raise ::CORBA::MARSHAL.new(
541
548
  "sequence size exceeds bound: #{self.length.to_s}",
542
- 1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
549
+ 1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
543
550
  if ::Array === val
544
551
  if val.any? { |e| self.content_type.needs_conversion(e) }
545
552
  val.collect { |e| self.content_type.validate(e) }
@@ -560,8 +567,8 @@ module R2CORBA
560
567
  end
561
568
 
562
569
  def inspect
563
- "#{self.class.name}: "+
564
- "length=#{if self.length.nil? then ""; else self.length.to_s; end}; "+
570
+ "#{self.class.name}: " +
571
+ "length=#{if self.length.nil? then ""; else self.length.to_s; end}; " +
565
572
  "content=#{self.content_type.inspect}"
566
573
  end
567
574
  end
@@ -569,7 +576,7 @@ module R2CORBA
569
576
  class Array < CORBA::TypeCode
570
577
 
571
578
  def initialize(*args)
572
- raise RuntimeError, 'overload required'
579
+ raise 'overload required'
573
580
  end
574
581
 
575
582
  def get_type
@@ -581,10 +588,10 @@ module R2CORBA
581
588
  super(val)
582
589
  raise ::CORBA::MARSHAL.new(
583
590
  "array size exceeds bound: #{self.length.to_s}",
584
- 1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size<=self.length
591
+ 1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size <= self.length
585
592
  raise ::CORBA::MARSHAL.new(
586
593
  "array size too small: #{self.length.to_s}",
587
- 1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size>=self.length
594
+ 1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size >= self.length
588
595
  val.any? { |e| self.content_type.needs_conversion(e) } ? val.collect { |e| self.content_type.validate(e) } : val.each { |e| self.content_type.validate(e) }
589
596
  end
590
597
 
@@ -602,12 +609,13 @@ module R2CORBA
602
609
 
603
610
  class Alias < IdentifiedTypeCode
604
611
  def initialize(*args)
605
- raise RuntimeError, 'overload required'
612
+ raise 'overload required'
606
613
  end
607
614
 
608
615
  def get_type
609
616
  @type || self.content_type.get_type
610
617
  end
618
+
611
619
  def validate(val)
612
620
  self.content_type.validate(val)
613
621
  end
@@ -624,8 +632,9 @@ module R2CORBA
624
632
  class Valuetype < IdentifiedTypeCode
625
633
  attr_reader :members
626
634
  def initialize(*args)
627
- raise RuntimeError, 'overload required'
635
+ raise 'overload required'
628
636
  end
637
+
629
638
  def add_member(name, tc, access)
630
639
  raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
631
640
  @members << [name, tc, access]
@@ -654,7 +663,7 @@ module R2CORBA
654
663
  tc.members.each do |nm_, tc_, access_|
655
664
  value_type::Intf.module_eval(%Q{attr_accessor :#{nm_}})
656
665
  value_type::Intf.__send__(:private, nm_.intern)
657
- value_type::Intf.__send__(:private, (nm_+'=').intern)
666
+ value_type::Intf.__send__(:private, (nm_ + '=').intern)
658
667
  end
659
668
  value_type
660
669
  end
@@ -669,7 +678,7 @@ module R2CORBA
669
678
  if needs_conversion(val)
670
679
  vorg = val
671
680
  val = vorg.class.new
672
- @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
681
+ @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
673
682
  else
674
683
  @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
675
684
  end
@@ -678,24 +687,26 @@ module R2CORBA
678
687
 
679
688
  def needs_conversion(val)
680
689
  return false if val.nil?
681
- @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
690
+ @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
682
691
  end
683
692
 
684
693
  def member_count
685
694
  @members.size
686
695
  end
696
+
687
697
  def member_name(index)
688
- raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
698
+ raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
689
699
  @members[index][0]
690
700
  end
701
+
691
702
  def member_type(index)
692
- raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
703
+ raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
693
704
  @members[index][1]
694
705
  end
695
706
 
696
707
  def inspect
697
708
  s = "#{self.class.name}: #{name} - #{id}\n"
698
- @members.each { |n, t| s += " #{n} = "+t.inspect+"\n" }
709
+ @members.each { |n, t| s += " #{n} = " + t.inspect + "\n" }
699
710
  s
700
711
  end
701
712
  end # Valuetype
@@ -705,7 +716,7 @@ module R2CORBA
705
716
 
706
717
  class Valuebox < IdentifiedTypeCode
707
718
  def initialize(*args)
708
- raise RuntimeError, 'overload required'
719
+ raise 'overload required'
709
720
  end
710
721
 
711
722
  def Valuebox.define_type(tc)
@@ -751,7 +762,7 @@ module R2CORBA
751
762
 
752
763
  class ObjectRef < IdentifiedTypeCode
753
764
  def initialize(*args)
754
- raise RuntimeError, 'overload required'
765
+ raise 'overload required'
755
766
  end
756
767
 
757
768
  def get_type
@@ -761,7 +772,7 @@ module R2CORBA
761
772
 
762
773
  class AbstractInterface < IdentifiedTypeCode
763
774
  def initialize(*args)
764
- raise RuntimeError, 'overload required'
775
+ raise 'overload required'
765
776
  end
766
777
 
767
778
  def get_type
@@ -772,8 +783,9 @@ module R2CORBA
772
783
  class Struct < IdentifiedTypeCode
773
784
  attr_reader :members
774
785
  def initialize(*args)
775
- raise RuntimeError, 'overload required'
786
+ raise 'overload required'
776
787
  end
788
+
777
789
  def add_member(name, tc)
778
790
  raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
779
791
  @members << [name, tc]
@@ -786,7 +798,7 @@ module R2CORBA
786
798
  @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
787
799
  end
788
800
  def initialize(*param_)
789
- #{tc.members.collect {|n,t| "@#{n}"}.join(', ')} = param_
801
+ #{tc.members.collect {|n, t| "@#{n}"}.join(', ')} = param_
790
802
  end
791
803
  end
792
804
  #{tc.name}
@@ -808,7 +820,7 @@ module R2CORBA
808
820
  if needs_conversion(val)
809
821
  vorg = val
810
822
  val = vorg.class.new
811
- @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
823
+ @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
812
824
  else
813
825
  @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
814
826
  end
@@ -816,24 +828,26 @@ module R2CORBA
816
828
  end
817
829
 
818
830
  def needs_conversion(val)
819
- @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
831
+ @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
820
832
  end
821
833
 
822
834
  def member_count
823
835
  @members.size
824
836
  end
837
+
825
838
  def member_name(index)
826
- raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
839
+ raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
827
840
  @members[index][0]
828
841
  end
842
+
829
843
  def member_type(index)
830
- raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
844
+ raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
831
845
  @members[index][1]
832
846
  end
833
847
 
834
848
  def inspect
835
849
  s = "#{self.class.name}: #{name} - #{id}\n"
836
- @members.each { |n, t| s += " #{n} = "+t.inspect+"\n" }
850
+ @members.each { |n, t| s += " #{n} = " + t.inspect + "\n" }
837
851
  s
838
852
  end
839
853
  end # Struct
@@ -861,7 +875,7 @@ module R2CORBA
861
875
  @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
862
876
  end
863
877
  def initialize(*param_)
864
- #{tc.members.collect {|n,t| "@#{n}"}.join(',')} = param_
878
+ #{tc.members.collect {|n, t| "@#{n}"}.join(',')} = param_
865
879
  end
866
880
  end
867
881
  #{tc.name}
@@ -882,18 +896,22 @@ module R2CORBA
882
896
  attr_reader :switchtype
883
897
  attr_reader :implicit_default
884
898
  def initialize(*args)
885
- raise RuntimeError, 'overload required'
899
+ raise 'overload required'
886
900
  end
901
+
887
902
  # because creating the native tc involves creating Any's we postpone until actually needed
888
903
  def tc_
889
- raise RuntimeError, 'overload required'
904
+ raise 'overload required'
890
905
  end
906
+
891
907
  def id
892
908
  @id
893
909
  end
910
+
894
911
  def name
895
912
  @name
896
913
  end
914
+
897
915
  def add_member(label, name, tc)
898
916
  raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
899
917
  @switchtype.validate(label) unless label == :default
@@ -936,14 +954,14 @@ module R2CORBA
936
954
  return val if val.nil?
937
955
  super(val)
938
956
  @switchtype.validate(val._disc) unless val._disc == :default
939
- #raise CORBA::MARSHAL.new(
957
+ # raise CORBA::MARSHAL.new(
940
958
  # "invalid discriminator value (#{val._disc.to_s}) for union #{name}",
941
959
  # 1, CORBA::COMPLETED_NO) unless @labels.has_key?(val._disc)
942
960
  if @labels.has_key?(val._disc) # no need to check for implicit defaults
943
961
  if needs_conversion(val)
944
962
  vorg = val
945
963
  val = vorg.class.new
946
- val.__send__((@members[@labels[vorg._disc]][1]+'=').intern,
964
+ val.__send__((@members[@labels[vorg._disc]][1] + '=').intern,
947
965
  @members[@labels[vorg._disc]][2].validate(vorg._value))
948
966
  else
949
967
  @members[@labels[val._disc]][2].validate(val._value)
@@ -959,28 +977,33 @@ module R2CORBA
959
977
  def member_count
960
978
  @members.size
961
979
  end
980
+
962
981
  def member_name(index)
963
- raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
982
+ raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
964
983
  @members[index][1]
965
984
  end
985
+
966
986
  def member_type(index)
967
- raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
987
+ raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
968
988
  @members[index][2]
969
989
  end
990
+
970
991
  def member_label(index)
971
- raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
992
+ raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
972
993
  @members[index][0]
973
994
  end
995
+
974
996
  def discriminator_type
975
997
  @switchtype
976
998
  end
999
+
977
1000
  def default_index
978
1001
  if @labels.has_key? :default then @labels[:default]; else -1; end
979
1002
  end
980
1003
 
981
1004
  def label_index(val)
982
1005
  val = @switchtype.validate(val) unless val == :default
983
- #raise CORBA::MARSHAL.new(
1006
+ # raise CORBA::MARSHAL.new(
984
1007
  # "invalid discriminator value (#{val}) for union #{name}",
985
1008
  # 1, CORBA::COMPLETED_NO) unless val == :default || @labels.has_key?(val) || @labels.has_key?(:default)
986
1009
  if val == :default then @labels[:default]; elsif @labels.has_key?(val) then @labels[val] else nil end
@@ -993,7 +1016,7 @@ module R2CORBA
993
1016
 
994
1017
  def inspect
995
1018
  s = "#{self.class.name}: #{name} - #{id}\n"
996
- @members.each { |l, n, t| s += " case #{l.to_s}: #{n} = "+t.inspect+"\n" }
1019
+ @members.each { |l, n, t| s += " case #{l.to_s}: #{n} = " + t.inspect + "\n" }
997
1020
  s
998
1021
  end
999
1022
  end # Union
@@ -1001,8 +1024,9 @@ module R2CORBA
1001
1024
  class Enum < IdentifiedTypeCode
1002
1025
  attr_reader :members
1003
1026
  def initialize(*args)
1004
- raise RuntimeError, 'overload required'
1027
+ raise 'overload required'
1005
1028
  end
1029
+
1006
1030
  def get_type
1007
1031
  ::Integer
1008
1032
  end
@@ -1022,8 +1046,9 @@ module R2CORBA
1022
1046
  def member_count
1023
1047
  @members.size
1024
1048
  end
1049
+
1025
1050
  def member_name(index)
1026
- raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
1051
+ raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
1027
1052
  @members[index]
1028
1053
  end
1029
1054
  end # Enum
@@ -1041,7 +1066,7 @@ module R2CORBA
1041
1066
  end
1042
1067
 
1043
1068
  def TypeCode.get_primitive_tc(kind)
1044
- raise RuntimeError, 'overload required'
1069
+ raise 'overload required'
1045
1070
  end
1046
1071
 
1047
1072
  private
@@ -1094,24 +1119,25 @@ module R2CORBA
1094
1119
  end
1095
1120
 
1096
1121
  def CORBA._tc_CCMObject
1097
- @@tc_CCMObject ||= TypeCode::Component.new("IDL:omg.org/CORBA/CCMObject:1.0", "CCMObject", CORBA::Object).freeze
1122
+ @@tc_CCMObject ||= TypeCode::Component.new('IDL:omg.org/CORBA/CCMObject:1.0', 'CCMObject', CORBA::Object).freeze
1098
1123
  end
1099
1124
 
1100
1125
  def CORBA._tc_CCHome
1101
- @@tc_CCHome ||= TypeCode::Home.new("IDL:omg.org/CORBA/CCHome:1.0", "CCHome", CORBA::Object).freeze
1126
+ @@tc_CCHome ||= TypeCode::Home.new('IDL:omg.org/CORBA/CCHome:1.0', 'CCHome', CORBA::Object).freeze
1102
1127
  end
1103
1128
 
1104
1129
  # define system exception related typecode constants
1105
1130
 
1106
1131
  def CORBA._tc_CompletionStatus
1107
- @@tc_CompletionStatus ||= TypeCode::Enum.new("IDL:omg.org/CORBA/CompletionStatus:1.0", "CompletionStatus",
1132
+ @@tc_CompletionStatus ||= TypeCode::Enum.new('IDL:omg.org/CORBA/CompletionStatus:1.0', 'CompletionStatus',
1108
1133
  CORBA::COMPLETED_TXT.collect {|t| "COMPLETED_#{t}"})
1109
1134
  end
1110
1135
 
1111
1136
  class LongDouble
1112
1137
  def to_d(precision)
1113
- BigDecimal.new(self.to_s(precision))
1138
+ BigDecimal(self.to_s(precision))
1114
1139
  end
1140
+
1115
1141
  def LongDouble._tc
1116
1142
  CORBA._tc_longdouble
1117
1143
  end
@@ -9,7 +9,6 @@
9
9
  # included with this program.
10
10
  #
11
11
  # Copyright (c) Remedy IT Expertise BV
12
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
13
12
  #--------------------------------------------------------------------
14
13
 
15
14
  module R2CORBA
@@ -20,16 +19,20 @@ module R2CORBA
20
19
  @discriminator = nil
21
20
  @value = nil
22
21
  end
22
+
23
23
  def _is_at_default?
24
24
  @discriminator == :default
25
25
  end
26
+
26
27
  def _value_tc
27
28
  ix = self.class._tc.label_index(@discriminator)
28
29
  self.class._tc.member_type(ix)
29
30
  end
31
+
30
32
  def _disc
31
33
  @discriminator
32
34
  end
35
+
33
36
  def _disc=(val)
34
37
  m_cur = self.class._tc.label_member(@discriminator) unless @discriminator.nil?
35
38
  m_new = self.class._tc.label_member(val)
@@ -40,6 +43,7 @@ module R2CORBA
40
43
  @discriminator = val
41
44
  disc_
42
45
  end
46
+
43
47
  def _value
44
48
  @value
45
49
  end
@@ -53,4 +57,4 @@ module R2CORBA
53
57
  end
54
58
  end
55
59
  end
56
- end
60
+ end
@@ -9,7 +9,6 @@
9
9
  # included with this program.
10
10
  #
11
11
  # Copyright (c) Remedy IT Expertise BV
12
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
13
12
  #--------------------------------------------------------------------
14
13
 
15
14
  module R2CORBA
@@ -43,6 +42,7 @@ module R2CORBA
43
42
  def marshal(os)
44
43
  raise CORBA::NO_IMPLEMENT
45
44
  end
45
+
46
46
  def unmarshal(is)
47
47
  raise CORBA::NO_IMPLEMENT
48
48
  end
@@ -89,4 +89,4 @@ module R2CORBA
89
89
  PUBLIC_MEMBER = 1
90
90
 
91
91
  end # CORBA
92
- end # R2CORBA
92
+ end # R2CORBA
@@ -8,12 +8,11 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
  module R2CORBA
14
13
  module CORBA
15
- BIG_ENDIAN, LTL_ENDIAN = 0,1
16
- ENDIAN = ("Ruby".unpack("i")[0] == 2036495698)? LTL_ENDIAN: BIG_ENDIAN
14
+ BIG_ENDIAN, LTL_ENDIAN = 0, 1
15
+ ENDIAN = ('Ruby'.unpack('i')[0] == 2036495698) ? LTL_ENDIAN : BIG_ENDIAN
17
16
 
18
17
  ARG_IN = 1
19
18
  ARG_OUT = 2
@@ -8,13 +8,12 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  module R2CORBA
15
14
  module CORBA
16
15
  COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE = (0..2).to_a
17
- COMPLETED_TXT = ["YES", "NO", "MAYBE"].freeze
16
+ COMPLETED_TXT = ['YES', 'NO', 'MAYBE'].freeze
18
17
  class Exception < StandardError
19
18
  end
20
19
 
@@ -30,6 +29,7 @@ module R2CORBA
30
29
  def reason
31
30
  self.message
32
31
  end
32
+
33
33
  def to_s
34
34
  "CORBA::#{self.class::Name}(#{super}) [minor=#{@minor};completed=#{COMPLETED_TXT[@completed.to_i]}]"
35
35
  end