r2corba 1.5.1-universal-java → 1.5.5-universal-java

data/lib/corba/svcs/ins/ins.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/svcs/ins/naming_service'
@@ -16,10 +15,10 @@ require 'optparse'
 
 module R2CORBA
   module INS
-    INS_VERSION_MAJOR = 0.freeze
-    INS_VERSION_MINOR = 1.freeze
-    INS_VERSION_RELEASE = 1.freeze
-    INS_COPYRIGHT = 'Copyright (c) 2011-2013 Remedy IT Expertise BV, The Netherlands'.freeze
+    INS_VERSION_MAJOR = 0
+    INS_VERSION_MINOR = 1
+    INS_VERSION_RELEASE = 1
+    INS_COPYRIGHT = "Copyright (c) 2011-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 
     IS_WIN32 = (RUBY_PLATFORM =~ /win32/ || RUBY_PLATFORM =~ /mingw32/ || ENV['OS'] =~ /windows/i) ? true : false
     IS_JRUBY = defined?(JRUBY_VERSION)
@@ -66,7 +65,7 @@ module R2CORBA
           end
 
           begin
-            File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+            File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
               f.write Process.pid
             end
             report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -136,7 +135,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile
@@ -218,7 +217,7 @@ module R2CORBA
             end
 
             begin
-              File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+              File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
                 f.write Process.pid
               end
               report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -327,7 +326,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile
@@ -386,12 +385,12 @@ module R2CORBA
     def INS.parse_arg
       script_name = File.basename($0, '.bat')
       if not script_name =~ /rins/
-        script_name = "ruby "+$0
+        script_name = "ruby " + $0
       end
 
       @@command = ARGV.shift.to_sym unless ARGV.empty?
       unless COMMANDS.include?(@@command)
-        STDERR.puts "ERROR: Invalid command [#{command}]!\n"+
+        STDERR.puts "ERROR: Invalid command [#{command}]!\n" +
                     "Usage: #{script_name} #{COMMANDS.join('|')} [options]\n"
         exit 1
       end
@@ -418,7 +417,7 @@ module R2CORBA
         puts "          provides help for the specified command\n\n"
         exit
       when :version
-        puts "R2CORBA Interoprable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
+        puts "R2CORBA Interoperable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
         puts INS_COPYRIGHT
         puts ''
         exit
@@ -430,42 +429,42 @@ module R2CORBA
 
             opts.on("-i FILE", "--ior=FILE", String,
                     "Specifies filename (incl. path) to write IOR to.",
-                    "Default: ./ins.ior") { |v| OPTIONS[:iorfile]=v }
+                    "Default: ./ins.ior") { |v| OPTIONS[:iorfile] = v }
             unless IS_WIN32
               opts.on("-p DIR", "--pid=DIR", String,
                       "Specifies path to write pidfile to.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+                      "Default: ./") { |v| OPTIONS[:piddir] = v }
               unless IS_JRUBY
                 opts.on("-o DIR", "--output=DIR", String,
                         "Specifies filename to write logfile to.",
-                        "Default: <piddir>") { |v| OPTIONS[:logdir]=v }
+                        "Default: <piddir>") { |v| OPTIONS[:logdir] = v }
               end
             else
               opts.on("-o DIR", "--output=DIR", String,
                       "Specifies path to write logfile to.",
-                      "Default: ./") { |v| OPTIONS[:logdir]=v }
+                      "Default: ./") { |v| OPTIONS[:logdir] = v }
             end
             opts.on("-l PORTNUM", "--listen=PORTNUM", Integer,
                     "Specifies port number for service endpoint.",
-                    "Default: none") { |v| OPTIONS[:port]=v }
-            if (IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+                    "Default: none") { |v| OPTIONS[:port] = v }
+            if IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT
               opts.on("-t THREADNUM", "--threads=THREADNUM", Integer,
                       "Specifies (minimum) number of threads for service.",
-                      "Default: 5") { |v| OPTIONS[:threads]=v }
+                      "Default: 5") { |v| OPTIONS[:threads] = v }
             end
 
             unless IS_JRUBY || !INS.daemons_installed
               opts.on("-d", "--daemon",
                       "Run as daemon.",
-                      "Default: off") { |v| OPTIONS[:daemon]=v }
+                      "Default: off") { |v| OPTIONS[:daemon] = v }
             end
             opts.on("-v", "--verbose",
                     "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+                    "Default: off") { |v| OPTIONS[:verbose] = v }
 
             opts.on("--debug=LVL", Integer,
                     "Specifies debug level.",
-                    "Default: 0") { |v| OPTIONS[:debug]=v }
+                    "Default: 0") { |v| OPTIONS[:debug] = v }
 
             opts.separator ""
 
@@ -484,18 +483,18 @@ module R2CORBA
             unless IS_WIN32
               opts.on("-p DIR", "--pid=DIR", String,
                       "Specifies path where pidfile is stored.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+                      "Default: ./") { |v| OPTIONS[:piddir] = v }
             end
 
             unless @@command == 'status'
               OPTIONS[:daemon] = true unless IS_JRUBY || !INS.daemons_installed
               opts.on("--[no-]daemon",
                       "Do not run in daemon mode.",
-                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon]=v }
+                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon] = v }
             end
             opts.on("-v", "--verbose",
                     "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+                    "Default: off") { |v| OPTIONS[:verbose] = v }
 
             opts.separator ""
 

data/lib/corba/svcs/ins/naming_service.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba'
@@ -28,7 +27,7 @@ module R2CORBA
 
       def initialize(options = {})
         @options = OPTIONS.merge(options)
-        raise RuntimeError, 'nr. of threads must >= 1' if @options[:threads] < 1
+        raise 'nr. of threads must >= 1' if @options[:threads] < 1
       end
 
       def setup
@@ -36,7 +35,7 @@ module R2CORBA
         #
         if defined?(JRUBY_VERSION)
           @options[:orbprop]['jacorb.poa.thread_pool_min'] = @options[:threads]
-          @options[:orbprop]['jacorb.poa.thread_pool_max'] = @options[:threads]*4
+          @options[:orbprop]['jacorb.poa.thread_pool_max'] = @options[:threads] * 4
           if @options[:debug] > 0
             @options[:orbprop]['jacorb.log.default.verbosity'] = case
             when @options[:debug] < 2
@@ -94,7 +93,7 @@ module R2CORBA
 
       def run
         STDERR.puts "INS - starting service run" if @options[:verbose]
-        if (defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+        if defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT
           STDERR.puts "INS - running ORB" if @options[:verbose]
           @orb.run
         else

data/lib/ridlbe/ruby/config.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module IDL
@@ -32,7 +31,7 @@ module IDL
     private
     def RIDL.merge_params(params)
       opts = IDL::OPTIONS.dup
-      params.each do |k,v|
+      params.each do |k, v|
         case opts[k]
         when Array
           opts[k] = opts[k] + (Array === v ? v : [v])
@@ -51,7 +50,7 @@ module IDL
       parser.parse(src)
       s = ::IDL::StrOStream.new
       s.clear
-      IDL::Ruby.process_input(parser,params,s)
+      IDL::Ruby.process_input(parser, params, s)
       s
     end
     def RIDL.parse(src, params)
@@ -195,7 +194,7 @@ module IDL
       #   in options - initialized option hash
       #
       becfg.on_process_input do |parser, options|
-        IDL::Ruby.process_input(parser,options)
+        IDL::Ruby.process_input(parser, options)
       end # becfg.on_process_input
 
     end # Backend.configure
@@ -206,7 +205,7 @@ module IDL
 
       # determine output file path for client stub code
       unless fixed_output || options[:idlfile].nil?
-        options[:output] = options[:outputdir]+'/'+File.basename(options[:idlfile], '.idl')+options[:stub_pfx]+'.rb'
+        options[:output] = options[:outputdir] + '/' + File.basename(options[:idlfile], '.idl') + options[:stub_pfx] + '.rb'
       end
       # generate client stubs if requested
       if options[:client_stubs]
@@ -232,7 +231,7 @@ module IDL
             options[:srv_output] = if fixed_output
                 options[:output]
               else
-                options[:outputdir]+'/'+File.basename(options[:idlfile], '.idl')+options[:srv_pfx]+'.rb'
+                options[:outputdir] + '/' + File.basename(options[:idlfile], '.idl') + options[:srv_pfx] + '.rb'
               end
             if fixed_output && options[:client_stubs]
               co
@@ -255,28 +254,45 @@ module IDL
 
     module LeafMixin
 
-      RESERVED_RUBY_CONST = [
-        'Array', 'Bignum', 'Binding', 'Class', 'Continuation', 'Dir', 'Exception',
-        'FalseClass', 'File', 'Fixnum', 'Float', 'Hash', 'Integer', 'IO', 'MatchData',
-        'Method', 'Module', 'NilClass', 'Numeric', 'Object', 'Proc', 'Process', 'Range',
-        'Regexp', 'String', 'Struct', 'Symbol', 'Thread', 'ThreadGroup', 'Time', 'TrueClass',
-        'UnboundMethod', 'Comparable', 'Enumerable', 'Errno', 'FileTest', 'GC', 'Kernel',
-        'Marshal', 'Math', 'ObjectSpace', 'Signal'
-      ]
+      RESERVED_RUBY_CONST = %w(Array Bignum Binding Class Continuation Dir Exception FalseClass File
+          Fixnum Float Hash Integer IO MatchData Method Module NilClass Numeric Object Proc Process
+          Range Regexp String Struct Symbol Thread ThreadGroup Time TrueClass UnboundMethod Comparable
+          Enumerable Errno FileTest GC Kernel Marshal Math ObjectSpace Signal)
 
-      RESERVED_RUBY_MEMBER = [
-        "untaint", "id", "instance_variable_get", "inspect", "taint", "public_methods", "__send__", "to_a", "display", "instance_eval",
-        "extend", "clone", "protected_methods", "hash", "freeze", "type", "instance_variable_set", "methods", "instance_variables", "to_s", "method", "dup",
-        "private_methods", "object_id", "send", "__id__", "singleton_methods",
-        "proc", "readline", "global_variables", "singleton_method_removed", "callcc", "syscall", "fail", "untrace_var", "load", "srand", "puts", "catch", "chomp",
-        "initialize_copy", "format", "scan", "print", "abort", "fork", "gsub", "trap", "test", "select", "initialize", "method_missing", "lambda", "readlines",
-        "local_variables", "singleton_method_undefined", "system", "open", "caller", "eval", "set_trace_func", "require", "rand", "singleton_method_added",
-        "throw", "gets", "binding", "raise", "warn", "getc", "exec", "trace_var", "irb_binding", "at_exit", "split", "putc", "loop", "chop", "sprintf", "p",
-        "remove_instance_variable", "exit", "printf", "sleep", "sub", "autoload"
-      ]
+      RESERVED_RUBY_MEMBER = %w(untaint id instance_variable_get inspect taint public_methods
+          __send__ to_a display instance_eval extend clone protected_methods hash freeze type
+          instance_variable_set methods instance_variables to_s method dup private_methods object_id
+          send __id__ singleton_methods proc readline global_variables singleton_method_removed callcc
+          syscall fail untrace_var load srand puts catch chomp initialize_copy format scan print abort
+          fork gsub trap test select initialize method_missing lambda readlines local_variables
+          singleton_method_undefined system open caller eval set_trace_func require rand
+          singleton_method_added throw gets binding raise warn getc exec trace_var irb_binding at_exit
+          split putc loop chop sprintf p remove_instance_variable exit printf sleep sub autoload)
 
-      def self.included(klass)
-        klass.extend ClassMethods
+      def ruby_lm_name
+        unless @lm_name
+          ret = @name.checked_name.dup
+          case self
+          when IDL::AST::Port,
+              IDL::AST::StateMember,
+              IDL::AST::Initializer,
+              IDL::AST::Parameter,
+              IDL::AST::Operation,
+              IDL::AST::Attribute,
+              IDL::AST::Member,
+              IDL::AST::UnionMember
+            # member names
+            ret = ret[0, 1].downcase + ret[1, ret.size].to_s
+            ret = 'r_' + ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
+          else
+            # class/module names
+            ret = ret[0, 1].upcase + ret[1, ret.size].to_s
+            is_scoped = @enclosure && !@enclosure.scopes.empty?
+            ret = 'R_' + ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
+          end
+          @lm_name = ret
+        end
+        @lm_name
       end
 
       def rubyname
@@ -286,43 +302,24 @@ module IDL
       def scoped_rubyname
         scoped_lm_name
       end
-
-      module ClassMethods
-        def mk_name(nm, is_scoped)
-          ret = nm.dup
-          case self::NAMETYPE
-          when :class
-            ret = ret[0,1].upcase + ret[1,ret.size].to_s
-            ret = 'R_'+ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
-          when :member
-            ret = ret[0,1].downcase + ret[1,ret.size].to_s
-            ret = 'r_'+ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
-          else
-            raise RuntimeError,
-              "invalid nametype for #{self.class}: #{self::NAMETYPE}"
-          end
-          ret
-        end
-      end
     end # module LeafMixin
 
     IDL::AST::Leaf.class_eval do
       include LeafMixin
+
+      alias :base_lm_name :lm_name
+      alias :lm_name :ruby_lm_name
     end
 
     module ScannerMixin
 
-      RUBYKW = [
-        '__FILE__', 'and',    'def',      'end',    'in',     'or',     'self',   'unless',
-        '__LINE__', 'begin',  'defined?', 'ensure', 'module', 'redo',   'super',  'until',
-        'BEGIN',    'break',  'do',       'false',  'next',   'rescue', 'then',   'when',
-        'END',      'case',   'else',     'for',    'nil',    'retry',  'true',   'while',
-        'alias',    'class',  'elsif',    'if',     'not',    'return', 'undef',  'yield',
-      ].collect! { |w| w.to_sym }
+      RUBYKW = %w(__FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo
+          super until BEGIN break do false next rescue then when END case else for nil retry true while
+          alias class elsif if not return undef yield).collect! { |w| w.to_sym }
 
       def chk_identifier(ident)
         # prefix Ruby keywords with 'r_'
-        RUBYKW.include?(ident.to_sym) ? 'r_'+ident : ident
+        RUBYKW.include?(ident.to_sym) ? 'r_' + ident : ident
       end
 
     end # module ScannerMixin

data/lib/ridlbe/ruby/require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 (Dir.glob(File.join(File.dirname(__FILE__), '*.rb')) - [__FILE__]).each do |f|

data/lib/ridlbe/ruby/walker.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module IDL
   class RubyWriterBase
@@ -55,10 +54,9 @@ module IDL
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl \ http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 })
       println("require 'corba'") if @params[:libinit]
@@ -81,7 +79,7 @@ module IDL
     end
 
     def visit_include(node)
-      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/,@params[:stub_pfx])))
+      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/, @params[:stub_pfx])))
       println()
     end
 
@@ -135,7 +133,7 @@ module IDL
         println()
         @nest += 1
 
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             printiln("include #{n.scoped_rubyname}")
           end
@@ -148,7 +146,7 @@ module IDL
           println(",")
           printi("        'IDL:omg.org/CORBA/AbstractBase:1.0'")
         end
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             println(",")
             printi("        #{n.scoped_rubyname}::Id")
@@ -521,7 +519,7 @@ module IDL
 
           ##  validate data for IN/INOUT args
           ##
-          if _parm.size>0
+          if _parm.size > 0
             _parm.each do |p|
               if p.attribute != IDL::AST::Parameter::OUT
                 printiln("#{p.rubyname} = #{get_typecode(p.idltype)}.validate(#{p.rubyname})")
@@ -538,7 +536,7 @@ module IDL
           end
 
           newln = ""
-          if _parm.size>0
+          if _parm.size > 0
             println(newln)
             nest do
               printi(":arg_list => [")
@@ -567,7 +565,7 @@ module IDL
             newln = ","
           end
 
-          if node.raises.size>0
+          if node.raises.size > 0
             println(newln)
             nest {
               printi(":exc_list => [")
@@ -614,7 +612,7 @@ module IDL
 
           printiln("_ret = self._invoke('_get_#{node.name}', {")
           nest { printi(":result_type => #{get_typecode(node.idltype)}") }
-          if node.get_raises.size>0
+          if node.get_raises.size > 0
             println(',')
             nest {
               printi(":exc_list => [")
@@ -658,7 +656,7 @@ module IDL
                 printiln("['val', CORBA::ARG_IN, #{get_typecode(node.idltype)}, val]],");
               }
               printi(":result_type => CORBA._tc_void")
-              if node.set_raises.size>0
+              if node.set_raises.size > 0
                 println(',')
                 printi(":exc_list => [")
                 pfx = ""
@@ -691,7 +689,7 @@ module IDL
         s = _type.class.name.split("::") # IDL::Type::Octet -> [IDL, Type, Octet]
         s = s[s.length - 1]
         s.downcase!
-        format("CORBA._tc_%s",s)
+        format("CORBA._tc_%s", s)
 
       when Type::Object
         "CORBA._tc_Object"
@@ -714,7 +712,7 @@ module IDL
         scoped_type = _type.node.idltype
         if scoped_type.is_a?(IDL::Type::Interface) && scoped_type.node.is_forward?()
           node = scoped_type.node
-          "(CORBA::TypeCode.typecode_for_id('#{node.repository_id}') || "+
+          "(CORBA::TypeCode.typecode_for_id('#{node.repository_id}') || " +
             "CORBA::TypeCode::ObjectRef.new('#{node.repository_id}', '#{node.rubyname}', #{node.scoped_rubyname}))"
         else
           _type.node.scoped_rubyname + '._tc'
@@ -740,7 +738,7 @@ module IDL
         end
 
       else
-        raise RuntimeError, "invalid type for (un)marshalling: #{_type.typename}"
+        raise "invalid type for (un)marshalling: #{_type.typename}"
       end
     end
 
@@ -764,7 +762,7 @@ module IDL
       when Expression::ScopedName, Expression::Enumerator
         exp.node.scoped_rubyname
       else
-        raise RuntimeError, "unknown expression type: #{exp.class.name}"
+        raise "unknown expression type: #{exp.class.name}"
       end
     end
 
@@ -821,7 +819,7 @@ module IDL
       when Type::ScopedName
         s = value_to_s(Expression::Value.new(exp.idltype.node.idltype, v))
       else
-        raise RuntimeError, "#{exp.typename}'s not been supported yet."
+        raise "#{exp.typename}'s not been supported yet."
       end
       s
     end
@@ -855,7 +853,7 @@ module IDL
       when Expression::Operation::Mod
         s = expression_to_s(op[0]) + " % " + expression_to_s(op[1])
       else
-        raise RuntimeError, "unknown operation: #{exp.type.name}"
+        raise "unknown operation: #{exp.type.name}"
       end
       "(" + s + ")"
     end
@@ -895,7 +893,7 @@ module IDL
         printiln(format("attr_accessor :%s", m.rubyname))
       end
 
-      if struct_members_.size>0
+      if struct_members_.size > 0
         printiln('def initialize(*param_)')
         nest {
           struct_members_.each do |m|
@@ -936,7 +934,7 @@ module IDL
         printiln(format("@@tc_%s ||= CORBA::TypeCode::Union.new('%s'.freeze, '%s',",
                       node.rubyname, node.repository_id, node.rubyname))
         printi("    #{get_typecode(node.switchtype)}")
-        if node.members.size>0
+        if node.members.size > 0
           pfx = "   ["
           node.members.each do |m|
             m.labels.each do |lbl|
@@ -960,7 +958,7 @@ module IDL
       printiln("end")
       printiln("self._tc  # register typecode");
       ix = 0
-      if node.members.size>0
+      if node.members.size > 0
         node.members.each do |m|
           printiln(format("def %s; @value; end", m.rubyname))
           printiln(format("def %s=(val); _set_value(%d, val); end", m.rubyname, ix))
@@ -979,7 +977,7 @@ module IDL
     end
 
     def visit_enum(node)
-      printiln(format("class %s < ::Fixnum", node.rubyname))
+      printiln(format("class %s < ::R2CORBA::FIXNUM_KLASS", node.rubyname))
       nest {
         printiln(format("def %s._tc", node.rubyname))
         nest {
@@ -1096,8 +1094,11 @@ module IDL
         }
         printiln(format("end # typedef %s", node.rubyname))
 
+      when IDL::Type::Object
+        printiln(format("%s = CORBA::Object # typedef %s\n", node.rubyname, node.rubyname))
+
       else
-        raise RuntimeError, "unsupported typedef for #{t.class.name}."
+        raise "unsupported typedef for #{t.class.name}."
       end
     end
   end ## RubyStubWriter
@@ -1114,16 +1115,15 @@ module IDL
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl \ http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 })
       idleval = @params[:idl_eval] || false
       println("require 'corba/poa.rb'") if @params[:libinit]
       if !@params[:expand_includes]
-        println("require '"+@params[:idlfile].sub(/\.[^\.]*$/,@params[:stub_pfx])+"'")
+        println("require '" + @params[:idlfile].sub(/\.[^\.]*$/, @params[:stub_pfx]) + "'")
       end
       println()
       printiln("module POA")
@@ -1147,7 +1147,7 @@ module IDL
     end
 
     def visit_include(node)
-      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/,@params[:srv_pfx])))
+      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/, @params[:srv_pfx])))
       println()
     end
 
@@ -1207,7 +1207,7 @@ module IDL
         printiln("Id = Intf::Id")
         println()
 
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             printiln("include_interface(#{n.scoped_rubyname}::Intf)")
           end
@@ -1264,7 +1264,7 @@ module IDL
 
       printi("Operations.store(:#{node.name}, {")
       newln = ""
-      if _parm.size>0
+      if _parm.size > 0
         println(newln)
         nest do
           printi(":arg_list => [")
@@ -1289,7 +1289,7 @@ module IDL
         newln = ","
       end
 
-      if node.raises.size>0
+      if node.raises.size > 0
         println(newln)
         nest {
           printi(":exc_list => [")
@@ -1339,7 +1339,7 @@ module IDL
       nest {
         nest {
           printiln(":result_type => #{get_typecode(node.idltype)},")
-          if node.get_raises.size>0
+          if node.get_raises.size > 0
             printi(":exc_list => [")
             pfx = ""
             nest {
@@ -1374,7 +1374,7 @@ module IDL
               printiln("['val', CORBA::ARG_IN, #{get_typecode(node.idltype)}]],");
             }
             printiln(":result_type => CORBA._tc_void,")
-            if node.set_raises.size>0
+            if node.set_raises.size > 0
               printi(":exc_list => [")
               pfx = ""
               nest {
@@ -1414,7 +1414,7 @@ module IDL
         s = _type.class.name.split("::") # IDL::Type::Octet -> [IDL, Type, Octet]
         s = s[s.length - 1]
         s.downcase!
-        format("CORBA._tc_%s",s)
+        format("CORBA._tc_%s", s)
 
       when Type::Object
         "CORBA._tc_Object"
@@ -1457,7 +1457,7 @@ module IDL
         end
 
       else
-        raise RuntimeError, "invalid type for (un)marshalling: #{_type.typename}"
+        raise "invalid type for (un)marshalling: #{_type.typename}"
       end
     end
 
@@ -1481,7 +1481,7 @@ module IDL
       when Expression::ScopedName
         @stub_root + exp.node.scoped_rubyname
       else
-        raise RuntimeError, "unknown expression type: #{exp.class.name}"
+        raise "unknown expression type: #{exp.class.name}"
       end
     end
 
@@ -1511,7 +1511,7 @@ module IDL
       when Type::ScopedName
         s = value_to_s(Expression::Value.new(exp.idltype.node.idltype, v))
       else
-        raise RuntimeError, "#{exp.typename}'s not been supported yet."
+        raise "#{exp.typename}'s not been supported yet."
       end
       s
     end
@@ -1545,7 +1545,7 @@ module IDL
       when Expression::Mod
         s = expression_to_s(op[0]) + " % " + expression_to_s(op[1])
       else
-        raise RuntimeError, "unknown operation: #{exp.type.name}"
+        raise "unknown operation: #{exp.type.name}"
       end
       "(" + s + ")"
     end