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

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
@@ -93,9 +92,9 @@ module R2CORBA
       end
 
       def run
-        STDERR.puts "INS - starting service run" if @options[:verbose]
-        if (defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT)
-          STDERR.puts "INS - running ORB" if @options[:verbose]
+        STDERR.puts 'INS - starting service run' if @options[:verbose]
+        if defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT
+          STDERR.puts 'INS - running ORB' if @options[:verbose]
           @orb.run
         else
           STDERR.puts "INS - starting #{@options[:threads]} ORB threads" if @options[:verbose]
@@ -103,16 +102,16 @@ module R2CORBA
           @options[:threads].times do
             @threads << Thread.new(@orb) { |orb| orb.run }
           end
-          STDERR.puts "INS - joining ORB threads" if @options[:verbose]
+          STDERR.puts 'INS - joining ORB threads' if @options[:verbose]
           @threads.each { |t| t.join }
         end
-        STDERR.puts "INS - service run ended" if @options[:verbose]
+        STDERR.puts 'INS - service run ended' if @options[:verbose]
       end
 
       def shutdown
-        STDERR.puts "INS - shutting down ORB" if @options[:verbose]
+        STDERR.puts 'INS - shutting down ORB' if @options[:verbose]
         @orb.shutdown if @orb
-        STDERR.puts "INS - shutdown finished" if @options[:verbose]
+        STDERR.puts 'INS - shutdown finished' if @options[:verbose]
       end
     end
   end

data/lib/corba.rb

@@ -8,9 +8,8 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
-require "corba/require.rb"
+require 'corba/require.rb'
 
 include R2CORBA

data/lib/ridlbe/ruby/config.rb

@@ -8,21 +8,23 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module IDL
 
   class StrOStream
     def initialize()
-      @str = ""
+      @str = ''
     end
+
     def clear
-      @str = ""
+      @str = ''
     end
+
     def to_s
       @str
     end
+
     def <<(s)
       @str << s
     end
@@ -32,7 +34,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])
@@ -44,6 +46,7 @@ module IDL
       end
       opts
     end
+
     def RIDL.parse0(src, params)
       params = merge_params(params)
       IDL.verbose_level = params[:verbose]
@@ -51,15 +54,16 @@ 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)
       s = parse0(src, params)
       s.to_s
     end
     public
-    def RIDL.eval(src, params={})
+    def RIDL.eval(src, params = {})
       params[:idl_eval] = true
       params[:expand_includes] = true
       params[:client_stubs] = true if params[:client_stubs].nil?
@@ -68,16 +72,18 @@ module IDL
       Kernel.eval(s.to_s, ::TOPLEVEL_BINDING)
       s = nil
     end
+
     def RIDL.fparse(fname, params = {})
       params[:client_stubs] = true if params[:client_stubs].nil?
       params[:stubs_only] ||= false
-      f = File.open(fname, "r")
+      f = File.open(fname, 'r')
       self.parse(f, params)
     ensure
       f.close
     end
+
     def RIDL.feval(fname, params = {})
-      File.open(fname, "r") { |io| self.eval(io, params) }
+      File.open(fname, 'r') { |io| self.eval(io, params) }
     end
   end # module RIDL
 
@@ -109,7 +115,7 @@ module IDL
         # ruby specific option switches
 
         unless ridl_params[:preprocess]   # same switch defined for IDL preprocessing mode
-          optlist.for_switch "--output=FILE", :type => String,
+          optlist.for_switch '--output=FILE', :type => String,
               :description => ['Specifies filename to generate output in.',
                                'Default: File.basename(idlfile, \'.idl\')+<postfix>+<ext>'] do |swcfg|
             swcfg.on_exec do |arg, params|
@@ -120,23 +126,23 @@ module IDL
         end
 
         optlist.for_switch '-o PATH', :type => String,
-            :description => ["Specifies output directory.",
-                             "Default: ./"] do |swcfg|
+            :description => ['Specifies output directory.',
+                             'Default: ./'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:outputdir] = arg
           end
         end
         optlist.for_switch '--stubs-only',
-            :description => ["Only generate client stubs, no servant code.",
-                             "Default: off"] do |swcfg|
+            :description => ['Only generate client stubs, no servant code.',
+                             'Default: off'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:client_stubs] = true
             params[:stubs_only] = true
           end
         end
         optlist.for_switch '--no-stubs',
-            :description => ["Do not generate client stubs, only servant code.",
-                             "Default: off"] do |swcfg|
+            :description => ['Do not generate client stubs, only servant code.',
+                             'Default: off'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:client_stubs] = false
             params[:stubs_only] = false
@@ -160,29 +166,29 @@ module IDL
         end
 
         optlist.for_switch '--skel-directory=PATH', :type => String,
-            :description => ["Specifies output directory for servant files.",
-                             "Default: outputdir or ./"] do |swcfg|
+            :description => ['Specifies output directory for servant files.',
+                             'Default: outputdir or ./'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:skel_outputdir] = arg
           end
         end
         optlist.for_switch '--expand-includes',
-            :description => ["Generate code for included IDL inline.",
-                             "Default: off"] do |swcfg|
+            :description => ['Generate code for included IDL inline.',
+                             'Default: off'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:expand_includes] = true
           end
         end
         optlist.for_switch '--no-libinit',
-            :description => ["Do not generate library initialization code as preamble.",
-                             "Default: on"] do |swcfg|
+            :description => ['Do not generate library initialization code as preamble.',
+                             'Default: on'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:libinit] = false
           end
         end
         optlist.for_switch '--interface-as-class=INTF', :type => String,
-            :description => ["Generate a Ruby class for interface INTF instead of a module in client stubs.",
-                             "Default: module"] do |swcfg|
+            :description => ['Generate a Ruby class for interface INTF instead of a module in client stubs.',
+                             'Default: module'] do |swcfg|
           swcfg.on_exec do |arg, params|
             params[:class_interfaces] << arg
           end
@@ -195,7 +201,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 +212,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 +238,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 +261,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_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"
-      ]
-
-      def self.included(klass)
-        klass.extend ClassMethods
+      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 = %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 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 +309,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|