r2corba 1.6.2 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4b41ce29f4c04e4afcbb88bf9021b39af168cec3b266180d4ade18dfd1a8f3
-  data.tar.gz: de5474ca6e07b8eb5b168dfde39cea42b49ceae7673c3133b04e58db8fb53b98
+  metadata.gz: 6438dd52f53ac722b2d2b4e73d3dc5ed4a5fcecca3e3136ad861cfb1d8b31325
+  data.tar.gz: b1e070b75dd2248cdef44b194d7d8cf170be9e7c20626e444203d0dddbfa168f
 SHA512:
-  metadata.gz: 54a2a77db21524e9ae328fc453796eb7760a279cb0e4be0cc9b6e87f98ce5e3cc31272a89f9d1fabfc3807f421c0f8e15c4465baacc13ca574548a4397f702da
-  data.tar.gz: 751cde536093f73c0eebc7b1d0f5e86bcfeb91cafc35e7717a63862317bd5c5e4ed0c0c29c0c4e60300086c4ccd9ddb9838844cb56f6789ebaae716150bca5db
+  metadata.gz: bc68e17aa413f82c3597e5154f551f6fd5eade52deb9a4b6878ffb60a53ae9de2fb470d7f441a692736f96a338359df2e9cf986ef6bcd43b2ceb09d40e5624f5
+  data.tar.gz: 93c08f403b6609df24d818c1b72589b6fc203035a4c80ca3fb3b0022ec4ae063f4d57b4293c07e52995abb5d78d87cab802bdc07d2ea3c7f0b4d535543211a2b

data/README.rdoc

@@ -1,7 +1,7 @@
-{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
-{<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
+{rdoc-image:https://badge.fury.io/rb/r2corba.svg}[https://rubygems.org/gems/r2corba]
+{rdoc-image:https://www.codefactor.io/repository/github/remedyit/r2corba/badge}[https://www.codefactor.io/repository/github/remedyit/r2corba]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
 
 = R2CORBA
 
@@ -40,7 +40,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
 
 == License
 
-R2CORBA is Copyright (c) 2007-2022 Remedy IT Expertise BV, The Netherlands.
+R2CORBA is Copyright (c) 2007-2023 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
 

data/ext/libr2tao/orb.cpp

@@ -85,14 +85,14 @@ private:
 
   static VALUE c_signums;
   static int c_nsig;
-  static ACE_Auto_Ptr<ACE_SIGACTION> c_sa;
+  static std::unique_ptr<ACE_SIGACTION> c_sa;
 
   static void init_ ();
 
   CORBA::ORB_var  m_orb;
   bool m_signal_reactor;
   ACE_Sig_Handler m_sig_handler;
-  ACE_Auto_Ptr<Signal> m_signal;
+  std::unique_ptr<Signal> m_signal;
   bool m_signal_caught;
 #if defined (WIN32)
   R2CSigGuard*    m_prev_guard;
@@ -237,7 +237,7 @@ VALUE rCORBA_ORB_init(int _argc, VALUE *_argv, VALUE /*klass*/) {
   char **argv;
   int i;
   CORBA::ORB_var orb;
-  std::unique_ptr<char*> argv_safe;
+  std::unique_ptr<char*[]> argv_safe;
 
   rb_scan_args(_argc, _argv, "02", &v0, &v1);
 
@@ -867,7 +867,7 @@ VALUE rCORBA_ORB_lookup_value_factory(VALUE /*self*/, VALUE id)
 
 VALUE R2CSigGuard::c_signums = Qnil;
 int R2CSigGuard::c_nsig = 0;
-ACE_Auto_Ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
+std::unique_ptr<ACE_SIGACTION> R2CSigGuard::c_sa;
 
 void R2CSigGuard::init_ ()
 {

data/ext/libr2tao/values.cpp

@@ -1806,7 +1806,7 @@ VALUE r2tao_OStream_write_any_array (VALUE self, VALUE rval, VALUE offset, VALUE
       ACE_NEW_THROW_EX (any_array,
                         CORBA::Any[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Any> any_array_safe (any_array);
+      std::unique_ptr<CORBA::Any[]> any_array_safe (any_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1845,7 +1845,7 @@ VALUE r2tao_OStream_write_boolean_array (VALUE self, VALUE rval, VALUE offset, V
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Boolean[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Boolean> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Boolean[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1884,7 +1884,7 @@ VALUE r2tao_OStream_write_char_array (VALUE self, VALUE rval, VALUE offset, VALU
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Char[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Char> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Char[]> native_array_safe (native_array);
       char* s = RSTRING_PTR (rval);
       for (CORBA::ULong l=0; l<len ;++l)
       {
@@ -1923,7 +1923,7 @@ VALUE r2tao_OStream_write_wchar_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::WChar[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::WChar> native_array_safe (native_array);
+      std::unique_ptr<CORBA::WChar[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -1962,7 +1962,7 @@ VALUE r2tao_OStream_write_octet_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Octet[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Octet> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Octet[]> native_array_safe (native_array);
       unsigned char* s = (unsigned char*)RSTRING_PTR (rval);
       for (CORBA::ULong l=0; l<len ;++l)
       {
@@ -2001,7 +2001,7 @@ VALUE r2tao_OStream_write_short_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Short[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Short> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Short[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2040,7 +2040,7 @@ VALUE r2tao_OStream_write_ushort_array (VALUE self, VALUE rval, VALUE offset, VA
       ACE_NEW_THROW_EX (native_array,
                         CORBA::UShort[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::UShort> native_array_safe (native_array);
+      std::unique_ptr<CORBA::UShort[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2079,7 +2079,7 @@ VALUE r2tao_OStream_write_long_array (VALUE self, VALUE rval, VALUE offset, VALU
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Long[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Long> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Long[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2118,7 +2118,7 @@ VALUE r2tao_OStream_write_ulong_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::ULong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::ULong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::ULong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2157,7 +2157,7 @@ VALUE r2tao_OStream_write_longlong_array (VALUE self, VALUE rval, VALUE offset,
       ACE_NEW_THROW_EX (native_array,
                         CORBA::LongLong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::LongLong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::LongLong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2196,7 +2196,7 @@ VALUE r2tao_OStream_write_ulonglong_array (VALUE self, VALUE rval, VALUE offset,
       ACE_NEW_THROW_EX (native_array,
                         CORBA::ULongLong[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::ULongLong> native_array_safe (native_array);
+      std::unique_ptr<CORBA::ULongLong[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2235,7 +2235,7 @@ VALUE r2tao_OStream_write_float_array (VALUE self, VALUE rval, VALUE offset, VAL
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Float[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Float> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Float[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2274,7 +2274,7 @@ VALUE r2tao_OStream_write_double_array (VALUE self, VALUE rval, VALUE offset, VA
       ACE_NEW_THROW_EX (native_array,
                         CORBA::Double[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::Double> native_array_safe (native_array);
+      std::unique_ptr<CORBA::Double[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);
@@ -2313,7 +2313,7 @@ VALUE r2tao_OStream_write_longdouble_array (VALUE self, VALUE rval, VALUE offset
       ACE_NEW_THROW_EX (native_array,
                         CORBA::LongDouble[len],
                         CORBA::NO_MEMORY());
-      ACE_Auto_Ptr<CORBA::LongDouble> native_array_safe (native_array);
+      std::unique_ptr<CORBA::LongDouble[]> native_array_safe (native_array);
       for (CORBA::ULong l=0; l<len ;++l)
       {
         VALUE rel = rb_ary_entry (rval, offs+l);

data/ext/libr2tao/values.h

@@ -20,6 +20,7 @@
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
+#include <memory>
 
 extern VALUE r2tao_cBoxedValueBase;
 
@@ -37,16 +38,16 @@ public:
   R2TAO_ArrayAny_Impl_T (CORBA::TypeCode_ptr,
                          T * const,
                          CORBA::ULong);
-  virtual ~R2TAO_ArrayAny_Impl_T ();
+  ~R2TAO_ArrayAny_Impl_T () override;
 
   static void insert (CORBA::Any &,
                       CORBA::TypeCode_ptr,
                       T * const,
                       CORBA::ULong);
 
-  virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+  CORBA::Boolean marshal_value (TAO_OutputCDR &) override;
   virtual const void *value () const;
-  virtual void free_value ();
+  void free_value () override;
 
 private:
   void* value_;
@@ -62,18 +63,9 @@ private:
 //===================================================================
 
 class R2TAO_Value;
-typedef R2TAO_Value * R2TAO_Value_ptr;
-typedef
-  TAO_Value_Var_T<
-    R2TAO_Value
-    >
-  R2TAO_Value_var;
-
-typedef
-  TAO_Value_Out_T<
-    R2TAO_Value
-    >
-  R2TAO_Value_out;
+using R2TAO_Value_ptr = R2TAO_Value *;
+using R2TAO_Value_var = TAO_Value_Var_T<R2TAO_Value>;
+using R2TAO_Value_out = TAO_Value_Out_T<R2TAO_Value>;
 
 class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 {
@@ -81,7 +73,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
     R2TAO_Value (VALUE rbValue, bool for_unmarshal=false);
     ~R2TAO_Value () override;
 
-    virtual CORBA::ValueBase* _copy_value ();
+    CORBA::ValueBase* _copy_value () override;
 
     static void _tao_any_destructor (void *);
 
@@ -150,7 +142,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
 
     CORBA::TypeCode_var val_tc_; // the typecode for the valuetype
 
-    ACE_Auto_Ptr<Chunk> chunk_list_;
+    std::unique_ptr<Chunk> chunk_list_;
     Chunk* last_chunk_;
 };
 
@@ -206,19 +198,9 @@ VALUE r2tao_VFB_lookup_value_factory(VALUE self, VALUE id);
 //===================================================================
 
 class R2TAO_AbstractValue;
-typedef R2TAO_AbstractValue* R2TAO_AbstractValue_ptr;
-
-typedef
-  TAO_Objref_Var_T<
-    R2TAO_AbstractValue
-    >
-  R2TAO_AbstractValue_var;
-
-typedef
-  TAO_Objref_Out_T<
-    R2TAO_AbstractValue
-    >
-  R2TAO_AbstractValue_out;
+using R2TAO_AbstractValue_ptr = R2TAO_AbstractValue*;
+using R2TAO_AbstractValue_var = TAO_Objref_Var_T<R2TAO_AbstractValue>;
+using R2TAO_AbstractValue_out = TAO_Objref_Out_T<R2TAO_AbstractValue>;
 
 class R2TAO_AbstractValue :
   public ::CORBA::AbstractBase,
@@ -281,19 +263,9 @@ void operator<<= (::CORBA::Any &, R2TAO_AbstractValue_ptr *); // non-copying
 //===================================================================
 
 class R2TAO_AbstractObject;
-typedef R2TAO_AbstractObject* R2TAO_AbstractObject_ptr;
-
-typedef
-  TAO_Objref_Var_T<
-    R2TAO_AbstractObject
-    >
-  R2TAO_AbstractObject_var;
-
-typedef
-  TAO_Objref_Out_T<
-    R2TAO_AbstractObject
-    >
-  R2TAO_AbstractObject_out;
+using R2TAO_AbstractObject_ptr = R2TAO_AbstractObject*;
+using R2TAO_AbstractObject_var = TAO_Objref_Var_T<R2TAO_AbstractObject>;
+using R2TAO_AbstractObject_out = TAO_Objref_Out_T<R2TAO_AbstractObject>;
 
 class R2TAO_AbstractObject :
   public ::CORBA::AbstractBase,
@@ -366,26 +338,18 @@ namespace TAO
   template<>
   struct  Objref_Traits< R2TAO_AbstractValue>
   {
-    static R2TAO_AbstractValue_ptr duplicate (
-        R2TAO_AbstractValue_ptr p);
-    static void release (
-        R2TAO_AbstractValue_ptr p);
+    static R2TAO_AbstractValue_ptr duplicate (R2TAO_AbstractValue_ptr p);
+    static void release (R2TAO_AbstractValue_ptr p);
     static R2TAO_AbstractValue_ptr nil ();
-    static ::CORBA::Boolean marshal (
-        const R2TAO_AbstractValue_ptr p,
-        TAO_OutputCDR & cdr);
+    static ::CORBA::Boolean marshal (const R2TAO_AbstractValue_ptr p, TAO_OutputCDR & cdr);
   };
 
   template<>
   struct  Objref_Traits< R2TAO_AbstractObject>
   {
-    static R2TAO_AbstractObject_ptr duplicate (
-        R2TAO_AbstractObject_ptr p);
-    static void release (
-        R2TAO_AbstractObject_ptr p);
+    static R2TAO_AbstractObject_ptr duplicate (R2TAO_AbstractObject_ptr p);
+    static void release (R2TAO_AbstractObject_ptr p);
     static R2TAO_AbstractObject_ptr nil ();
-    static ::CORBA::Boolean marshal (
-        const R2TAO_AbstractObject_ptr p,
-        TAO_OutputCDR & cdr);
+    static ::CORBA::Boolean marshal (const R2TAO_AbstractObject_ptr p, TAO_OutputCDR & cdr);
   };
 }

data/lib/corba/cbase/ORB.rb

@@ -13,9 +13,7 @@ require 'monitor'
 
 module R2CORBA
   module CORBA
-
     module ORB
-
       class << self
         protected
         def _singleton_orb_init
@@ -42,23 +40,26 @@ module R2CORBA
           a1, a2, a3 = args
           if Array === a1
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 3
+
             argv = a1
             orb_id = (Hash === a2 ? nil : a2)
             prop = (Hash === a2 ? a2 : a3)
           elsif args.size == 1 || Hash === a2
             raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
+
             orb_id = a1
             prop = a2
           else
             argv = args
           end
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
-          unless prop.nil?()
-            prop.inject(argv) {|a, (k, v)| a << k; a << v; a}
+
+          unless prop.nil?
+            prop.inject(argv) { |a, (k, v)| a << k; a << v; a }
           end
-          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.concat(@@_default_args), orb_id.nil?() ? nil : orb_id.to_s)
+          @@cached_orb = CORBA::Native::ORB.init(argv.collect { |a| a.to_s }.concat(@@_default_args), orb_id.nil? ? nil : orb_id.to_s)
         end
-        unless n_orb.nil?() || @@vf_queue.empty?()
+        unless n_orb.nil? || @@vf_queue.empty?
           @@vf_queue.process_all { |vfklass| vfklass._check_factory }
         end
         @@wrapper_klass.new(n_orb)
@@ -98,6 +99,7 @@ module R2CORBA
         else
           @running ||= true
           raise CORBA::BAD_INV_ORDER.new('ORB has been shutdown', 0, CORBA::COMPLETED_NO) if @shutdown
+
           while (timeout.nil? or timeout > 0) and !@shutdown
             to = timeout || 0.05
             f, to = self.work_pending(to)
@@ -158,7 +160,7 @@ module R2CORBA
           end
         end
 
-        def empty?()
+        def empty?
           f = false
           synchronize do
             f = @q_.empty?
@@ -180,7 +182,6 @@ module R2CORBA
       def ior_map
         @iormap ||= R2CORBA::IORMap.new(self)
       end
-
     end # ORB
 
 =begin

data/lib/corba/cbase/Request.rb

@@ -11,9 +11,7 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
-
       def add_in_arg(tc, val, nm = '')
         self._arguments << [nm, CORBA::ARG_IN, tc, val]
         self._arguments.size
@@ -35,10 +33,11 @@ module R2CORBA
 
       def arguments=(*args)
         if args.size == 1
-          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless ::Array === args.first && args.first.all? { |a| ::Array === a }
+
           args = args.first
         else
-          raise ArgumentError, 'invalid argument list' unless args.all? {|a| ::Array === a }
+          raise ArgumentError, 'invalid argument list' unless args.all? { |a| ::Array === a }
         end
         # clear current arguments
         self._arguments.clear
@@ -74,14 +73,15 @@ module R2CORBA
 
       def return_value
         return nil if @_rettc.nil? || @_rettc.kind == CORBA::TK_VOID || @_rettc.kind == CORBA::TK_NULL
+
         self._return_value(@_rettc)
       end
 
       def invoke
         self._invoke({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 
@@ -91,9 +91,9 @@ module R2CORBA
 
       def send_deferred
         self._send_deferred({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 
@@ -126,8 +126,6 @@ module R2CORBA
       def _exceptions
         @_excl ||= []
       end
-
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/cbase/Streams.rb

@@ -18,51 +18,51 @@ module R2CORBA
           tc = tc.resolved_tc # takes care of recursive typecodes
           v = case tc.kind
           when TK_ANY
-            read_any()
+            read_any
           when TK_BOOLEAN
-            read_boolean()
+            read_boolean
           when TK_SHORT
-            read_short()
+            read_short
           when TK_LONG
-            read_long()
+            read_long
           when TK_USHORT
-            read_ushort()
+            read_ushort
           when TK_WCHAR
-            read_wchar()
+            read_wchar
           when TK_ULONG
-            read_ulong()
+            read_ulong
           when TK_LONGLONG
-            read_longlong()
+            read_longlong
           when TK_ULONGLONG
-            read_ulonglong()
+            read_ulonglong
           when TK_OCTET
-            read_octet()
+            read_octet
           when TK_FLOAT
-            read_float()
+            read_float
           when TK_DOUBLE
-            read_double()
+            read_double
           when TK_LONGDOUBLE
             raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
-            read_fixed()
+            read_fixed
           when TK_CHAR
-            read_char()
+            read_char
           when TK_STRING
-            read_string()
+            read_string
           when TK_WSTRING
-            read_wstring()
+            read_wstring
           when TK_OBJREF
-            read_Object()
+            read_Object
           when TK_TYPECODE
-            read_TypeCode()
+            read_TypeCode
           when TK_ARRAY, TK_SEQUENCE,
                TK_ENUM, TK_STRUCT, TK_EXCEPT, TK_UNION,
                TK_PRINCIPAL
             read_construct(tc)
           when TK_ABSTRACT_INTERFACE
-            read_Abstract()
+            read_Abstract
           when TK_VALUE, TK_VALUE_BOX, TK_EVENT
-            read_Value()
+            read_Value
             ## TODO: TK_NATIVE
           end
           v