ridl 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5b79c10b3a4bb8e2f0404004ec5201332bef859fc69c636c4750e8eb6f6b13
-  data.tar.gz: 0a23918976bfb9b7db6595409d974fc80be2b5a686f8b40220fa689edd9cc791
+  metadata.gz: d24bac3b0aa52e6c84a1ef61d0939d84b3277b139a69db8cfc1f7f95130bf6a2
+  data.tar.gz: 3f773ed9d639811aaba53a68e0ace506b5e6b11591875326665d102faeff5a8f
 SHA512:
-  metadata.gz: a187e41cc1d3c1d77f79f2ed9e43dccc4b83bc89b98ed4e2771627b2b1b771ba26390624f9abf779e1e2c5c89d7776698045408ca3ceb8ca9f10ecf87c6d0db6
-  data.tar.gz: b90d9a055d29d2de3dcee867df3ca57a26c8ddefd5b77fc3ff1a8a3ab7f645b395d8359c93b8a8a65122b006a76cd9f89815141239cd8e335cf21a78916b89b7
+  metadata.gz: 1aa10dbfdb821544c474bc3f41bf48c156a42bf51d909ed631c6030ebd546145f9f9e70945bf4aa54a68e74cfe4a4d27b38dfab937e1576338febc67ea18dc8c
+  data.tar.gz: b96af7bb90418102bfb030dbd798bd15384232ab2547887fd68d4a3e1dc4142c0d997ab15f4de93daf06f39e764d8d8d04720774e81031b537b343daf6570862

data/lib/ridl/backend.rb

@@ -50,7 +50,7 @@ module IDL
       rescue LoadError => ex
         IDL.error "ERROR: Cannot load RIDL backend [:#{be_name}]"
         IDL.error ex.inspect
-        IDL.error(ex.backtrace.join("\n")) if IDL.verbose_level>0
+        IDL.error(ex.backtrace.join("\n")) if IDL.verbose_level > 0
         exit 1
       end
     end

data/lib/ridl/delegate.rb

@@ -213,7 +213,7 @@ class Delegator
     params = { :filename => s, :fullpath => fullpath }
     params[:defined] = true
     params[:preprocessed] = @preprocess
-    @cur = @cur.define(IDL::AST::Include, "$INC:"+s, params)
+    @cur = @cur.define(IDL::AST::Include, "$INC:" + s, params)
     @includes[s] = @cur
     set_last
     @cur
@@ -228,7 +228,7 @@ class Delegator
     params = { :filename => s, :fullpath => @includes[s].fullpath }
     params[:defined] = false
     params[:preprocessed] = @includes[s].is_preprocessed?
-    @cur.define(IDL::AST::Include, "$INC:"+s, params)
+    @cur.define(IDL::AST::Include, "$INC:" + s, params)
   end
 
   def pragma_prefix(s)
@@ -258,7 +258,7 @@ class Delegator
   end
 
   def handle_pragma(pragma_string)
-    unless @@pragma_handlers.values.any? {|h| h.call(self, @cur, pragma_string)}
+    unless @@pragma_handlers.values.reduce(false) {|rc, h| h.call(self, @cur, pragma_string) || rc }
       IDL.log(1, "RIDL - unrecognized pragma encountered: #{pragma_string}.")
     end
   end
@@ -299,8 +299,8 @@ class Delegator
   end
 
   def define_template_module(global, names)
-    if global || names.size>1
-      raise "no scoped identifier allowed for template module: #{(global ? '::' : '')+names.join('::')}"
+    if global || names.size > 1
+      raise "no scoped identifier allowed for template module: #{(global ? '::' : '') + names.join('::')}"
     end
     @cur = @cur.define(IDL::AST::TemplateModule, names[0])
     @cur.annotations.concat(@annotation_stack)
@@ -562,7 +562,7 @@ class Delegator
     root.introduce(first)
     case node
     when IDL::AST::Module, IDL::AST::TemplateModule,
-         IDL::AST::Interface,IDL::AST::Home, IDL::AST::Component,
+         IDL::AST::Interface, IDL::AST::Home, IDL::AST::Component,
          IDL::AST::Porttype, IDL::AST::Connector,
          IDL::AST::Struct, IDL::AST::Union, IDL::AST::Typedef,
          IDL::AST::Exception, IDL::AST::Enum,

data/lib/ridl/expression.rb

@@ -86,7 +86,7 @@ module IDL
 
         if _operands.size != n
           raise format("%s must receive %d operand%s.",
-            self.typename, n, if (n>1) then "s" else "" end)
+            self.typename, n, if (n > 1) then "s" else "" end)
         end
 
         unless _operands.any? { |o| o.is_template? }
@@ -184,7 +184,7 @@ module IDL
           superclass.checktype(*types)
 
           # it's expected that Double, LongDouble is a Float.
-          s1,s2 = IDL::Type::Float, IDL::Type::Fixed
+          s1, s2 = IDL::Type::Float, IDL::Type::Fixed
           if (t1 === s1 && t2 === s2) or (t1 === s2 && t2 === s1)
             raise "#{self.name} about #{t1.typename} and #{t2.typename} is illegal."
           end
@@ -210,7 +210,7 @@ module IDL
         Applicable = Integer2::Applicable
         def calculate(op)
           if @idltype.is_unsigned?()
-            (2**@idltype.bits-1)-op
+            (2**@idltype.bits - 1) - op
           else
             ~op
           end
@@ -218,13 +218,13 @@ module IDL
       end
 
       class Or < Boolean2
-        def calculate(lop,rop); lop | rop; end
+        def calculate(lop, rop); lop | rop; end
       end
       class And < Boolean2
-        def calculate(lop,rop); lop & rop; end
+        def calculate(lop, rop); lop & rop; end
       end
       class Xor < Boolean2
-        def calculate(lop,rop); lop ^ rop; end
+        def calculate(lop, rop); lop ^ rop; end
       end
 
       class Shift < Integer2
@@ -236,32 +236,32 @@ module IDL
         end
       end
       class LShift < Shift
-        def calculate(lop,rop)
+        def calculate(lop, rop)
           check_rop(rop)
           lop << rop
         end
       end
       class RShift < Shift
-        def calculate(lop,rop)
+        def calculate(lop, rop)
           check_rop(rop)
           lop >> rop
         end
       end
 
       class Add < Float2
-        def calculate(lop,rop); lop + rop; end
+        def calculate(lop, rop); lop + rop; end
       end
       class Minus < Float2
-        def calculate(lop,rop); lop - rop; end
+        def calculate(lop, rop); lop - rop; end
       end
       class Mult < Float2
-        def calculate(lop,rop); lop * rop; end
+        def calculate(lop, rop); lop * rop; end
       end
       class Div < Float2
-        def calculate(lop,rop); lop / rop; end
+        def calculate(lop, rop); lop / rop; end
       end
       class Mod < Integer2
-        def calculate(lop,rop); lop % rop; end
+        def calculate(lop, rop); lop % rop; end
       end
     end #of class Operation
   end #of class Expression

data/lib/ridl/genfile.rb

@@ -67,7 +67,7 @@ module IDL
     class Content
       def initialize(sections = {})
         # copy content map transforming all keys to symbols
-        @sections = sections.inject({}) {|m,(k,v)| m[k.to_sym] = v; m }
+        @sections = sections.inject({}) {|m, (k, v)| m[k.to_sym] = v; m }
       end
 
       def sections
@@ -96,7 +96,7 @@ module IDL
         @path = path
         @fullpath = File.expand_path(path)
         @name = File.basename(path)
-        @ext = File.extname(path).sub(/^\./,'')
+        @ext = File.extname(path).sub(/^\./, '')
       else
         @path = @fullpath = @name = @ext = ''
       end

data/lib/ridl/node.rb

@@ -19,7 +19,7 @@ module IDL::AST
       @id = id.to_sym
       # copy field map transforming all keys to symbols and
       # detecting nested annotation objects
-      @fields = fields.inject({}) do |m,(k,v)|
+      @fields = fields.inject({}) do |m, (k, v)|
           m[k.to_sym] = case v
               when Array
                 v.collect { |ve| Hash === ve ? Annotation.new(*ve.to_a.first) : ve }
@@ -159,8 +159,8 @@ module IDL::AST
       if id_arr.first == 'IDL'
         id_arr.shift
         id_str = id_arr.shift.to_s
-        raise 'ID identifiers should not start or end with \'/\'' if id_str[0,1]=='/' or id_str[-1, 1]=='/'
-        raise "ID identifiers should not start with one of '#{REPO_ID_XCHARS.join("', '")}'" if REPO_ID_XCHARS.include?(id_str[0,1])
+        raise 'ID identifiers should not start or end with \'/\'' if id_str[0, 1] == '/' or id_str[-1, 1] == '/'
+        raise "ID identifiers should not start with one of '#{REPO_ID_XCHARS.join("', '")}'" if REPO_ID_XCHARS.include?(id_str[0, 1])
         raise 'Invalid ID! Only a..z, A..Z, 0..9, \'.\', \'-\', \'_\' or \'\/\' allowed for identifiers' unless REPO_ID_RE =~ id_str
       end
       @repo_id = id
@@ -184,8 +184,8 @@ module IDL::AST
 
     def prefix=(pfx)
       unless pfx.to_s.empty?
-        raise 'ID prefix should not start or end with \'/\'' if pfx[0,1]=='/' or pfx[-1, 1]=='/'
-        raise "ID prefix should not start with one of '#{REPO_ID_XCHARS.join("', '")}'" if REPO_ID_XCHARS.include?(pfx[0,1])
+        raise 'ID prefix should not start or end with \'/\'' if pfx[0, 1] == '/' or pfx[-1, 1] == '/'
+        raise "ID prefix should not start with one of '#{REPO_ID_XCHARS.join("', '")}'" if REPO_ID_XCHARS.include?(pfx[0, 1])
         raise 'Invalid ID prefix! Only a..z, A..Z, 0..9, \'.\', \'-\', \'_\' or \'\/\' allowed' unless REPO_ID_RE =~ pfx
       end
       self.set_prefix(pfx)
@@ -199,7 +199,7 @@ module IDL::AST
       if @repo_id.nil?
         @repo_ver = "1.0" unless @repo_ver
         format("IDL:%s%s:%s",
-                if @prefix.empty? then "" else @prefix+"/" end,
+                if @prefix.empty? then "" else @prefix + "/" end,
                 self.scopes.collect{|s| s.name}.join("/"),
                 @repo_ver)
       else
@@ -912,7 +912,7 @@ module IDL::AST
         # check if the matched name resulted in multiple different nodes or all the same
         r_one = results.shift
         unless results.all? {|r| r_one == r || (r_one.class == r.class && r_one.scoped_name == r.scoped_name) }
-          s = results.inject([r_one]) {|l,r| l << r unless l.include?(r); l }.collect{ |n| n.scoped_name }.join(", ")
+          s = results.inject([r_one]) {|l, r| l << r unless l.include?(r); l }.collect{ |n| n.scoped_name }.join(", ")
           raise "\"#{_name}\" is ambiguous. " + s
         end
       end
@@ -1048,13 +1048,13 @@ module IDL::AST
       @resolved_bases
     end
 
-    def operations(include_bases=false,traversed=nil)
+    def operations(include_bases=false, traversed=nil)
       ops = @children.find_all { |c| c.is_a?(IDL::AST::Operation) }
       ops.concat(base_operations(traversed || [])) if include_bases
       ops
     end
 
-    def attributes(include_bases=false,traversed=nil)
+    def attributes(include_bases=false, traversed=nil)
       atts = @children.find_all { |c| c.is_a?(IDL::AST::Attribute) }
       atts.concat(base_attributes(traversed || [])) if include_bases
       atts
@@ -1338,13 +1338,13 @@ module IDL::AST
       @primarykey = key.node if key
     end
 
-    def operations(include_bases=false,traversed=nil)
+    def operations(include_bases=false, traversed=nil)
       ops = @children.find_all { |c| c.is_a?(IDL::AST::Operation) }
       ops.concat(base_operations(traversed || [])) if include_bases
       ops
     end
 
-    def attributes(include_bases=false,traversed=nil)
+    def attributes(include_bases=false, traversed=nil)
       atts = @children.find_all { |c| c.is_a?(IDL::AST::Attribute) }
       atts.concat(base_attributes(traversed || [])) if include_bases
       atts
@@ -1393,7 +1393,7 @@ module IDL::AST
       @base = parent.node
     end
 
-    def ports(include_bases=false,traversed=nil)
+    def ports(include_bases=false, traversed=nil)
       ports = @children.inject([]) do |lst, c|
         lst.concat(c.ports) if IDL::AST::Port === c
         lst
@@ -1402,7 +1402,7 @@ module IDL::AST
       ports
     end
 
-    def attributes(include_bases=false,traversed=nil)
+    def attributes(include_bases=false, traversed=nil)
       atts = @children.inject([]) do |lst, c|
         if IDL::AST::Port === c
           lst.concat(c.attributes)
@@ -1472,7 +1472,7 @@ module IDL::AST
       @base = parent.node
     end
 
-    def ports(include_bases=false,traversed=nil)
+    def ports(include_bases=false, traversed=nil)
       ports = @children.inject([]) do |lst, c|
         lst.concat(c.ports) if IDL::AST::Port === c
         lst
@@ -1481,11 +1481,11 @@ module IDL::AST
       ports
     end
 
-    def operations(include_bases=false,traversed=nil)
+    def operations(include_bases=false, traversed=nil)
       include_bases ? base_operations(traversed || []) : []
     end
 
-    def attributes(include_bases=false,traversed=nil)
+    def attributes(include_bases=false, traversed=nil)
       atts = @children.inject([]) do |lst, c|
         if IDL::AST::Port === c
           lst.concat(c.attributes)
@@ -1556,7 +1556,7 @@ module IDL::AST
           raise "invalid type for #{typename} #{scoped_lm_name}:  #{@idltype.typename}"
         end
       else
-        unless @idltype.is_a?(IDL::Type::NodeType) && (@idltype.is_node?(IDL::AST::Eventtype) ||  @idltype.is_node?(IDL::AST::TemplateParam))
+        unless @idltype.is_a?(IDL::Type::NodeType) && (@idltype.is_node?(IDL::AST::Eventtype) || @idltype.is_node?(IDL::AST::TemplateParam))
           raise "invalid type for #{typename} #{scoped_lm_name}:  #{@idltype.typename}"
         end
       end
@@ -1794,7 +1794,7 @@ module IDL::AST
             raise "#{typename} #{scoped_lm_name} cannot inherit from #{tc.node.typename} #{tc.node.scoped_lm_name} multiple times"
           end
           if (not rtc.node.is_abstract?) and @bases.size > 0
-            raise "concrete basevalue #{tc.node.typename} #{tc.node.scoped_lm_name} MUST "+
+            raise "concrete basevalue #{tc.node.typename} #{tc.node.scoped_lm_name} MUST " +
                   "be first and only non-abstract in inheritance list for #{typename} #{scoped_lm_name}"
           end
           @resolved_bases << rtc.node
@@ -1946,7 +1946,7 @@ module IDL::AST
       @is_recursive = false
       @has_incomplete_type = false
       super(_name, _enclosure)
-      @idltype  = params[:type]
+      @idltype = params[:type]
       @visibility = (params[:visibility] == :public ? :public : :private)
       unless @idltype.is_a?(IDL::Type::ScopedName) && @idltype.is_node?(IDL::AST::TemplateParam)
         raise "Anonymous type definitions are not allowed!" if params[:type].is_anonymous?
@@ -2112,7 +2112,7 @@ module IDL::AST
     attr_reader :idltype, :expression, :value
     def initialize(_name, _enclosure, params)
       super(_name, _enclosure)
-      @idltype  = params[:type]
+      @idltype = params[:type]
       @expression = params[:expression]
       @value = nil
       unless @idltype.is_a?(IDL::Type::ScopedName) && @idltype.is_node?(IDL::AST::TemplateParam)
@@ -2158,7 +2158,7 @@ module IDL::AST
     attr_reader :idltype
     def initialize(_name, _enclosure, params)
       super(_name, _enclosure)
-      @idltype  = params[:type]
+      @idltype = params[:type]
       @attribute = params[:attribute]
       unless ATTRIBUTE_MAP.has_key?(@attribute)
         raise "invalid attribute for parameter: #{params[:attribute]}"
@@ -2210,7 +2210,7 @@ module IDL::AST
 
     def initialize(_name, _enclosure, params)
       super(_name, _enclosure)
-      @idltype  = params[:type]
+      @idltype = params[:type]
       @oneway = (params[:oneway] == true)
       @in = []
       @out = []
@@ -2322,7 +2322,7 @@ module IDL::AST
     attr_reader :get_raises, :set_raises
     def initialize(_name, _enclosure, params)
       super(_name, _enclosure)
-      @idltype  = params[:type]
+      @idltype = params[:type]
       @get_raises = []
       @set_raises = []
       unless @idltype.is_a?(IDL::Type::ScopedName) && @idltype.is_node?(IDL::AST::TemplateParam)
@@ -2726,7 +2726,7 @@ module IDL::AST
     attr_reader :idltype, :enum, :value
     def initialize(_name, _enclosure, params)
       super(_name, _enclosure)
-      @idltype  = IDL::Type::ULong.new
+      @idltype = IDL::Type::ULong.new
       @enum = params[:enum]
       @value = params[:value]
       @enum.add_enumerator(self)

data/lib/ridl/options.rb

@@ -124,7 +124,7 @@ module IDL
       when Array
         v.collect {|e| _dup_elem(e) }
       when Hash
-        v.inject({}) {|h, (k,e)| h[k] = _dup_elem(e); h }
+        v.inject({}) {|h, (k, e)| h[k] = _dup_elem(e); h }
       when OpenStruct
         v.class.new(_dup_elem(v.__send__(:table)))
       else

data/lib/ridl/optparse_ext.rb

@@ -134,7 +134,7 @@ module IDL
               key = to_key(spec)
               @params[key] = { :option_name => key }
             when Hash
-              spec.each do |k,v|
+              spec.each do |k, v|
                 @params[to_key(k)] = (if Hash === v
                   {
                     :option_name => to_key(v[:option_name] || k),

data/lib/ridl/runner.rb

@@ -185,7 +185,7 @@ module IDL
           @optparser.parse!(argv)
         rescue ArgumentError => ex
           IDL.error(ex.inspect)
-          IDL.error(ex.backtrace.join("\n")) if IDL.verbose_level>0
+          IDL.error(ex.backtrace.join("\n")) if IDL.verbose_level > 0
           return false
         end
 
@@ -201,7 +201,7 @@ module IDL
 
           input_base = File.basename(argv.first)
           if input_base != argv.first
-            options[:xincludepaths] << (File.dirname(argv.first)+'/')
+            options[:xincludepaths] << (File.dirname(argv.first) + '/')
           end
 
           return !parse("#include \"#{input_base}\"", options).nil?
@@ -222,7 +222,7 @@ module IDL
             raise 'cannot read from STDOUT' if $stdout == _fio
 
             # parse IDL source
-            IDL.log(1, "RIDL - parsing #{IO === _idlfile ? 'from STDIN': (StringIO === _idlfile ? 'from string' : _idlfile)}")
+            IDL.log(1, "RIDL - parsing #{IO === _idlfile ? 'from STDIN' : (StringIO === _idlfile ? 'from string' : _idlfile)}")
 
             unless _parser = parse(_fio, _opts)
               return false
@@ -248,7 +248,7 @@ module IDL
                 end
 
               rescue Backend::ProcessStop
-                IDL.log(2, "RIDL - processing #{IO === _idlfile ? 'from STDIN': (StringIO === _idlfile ? 'from string' : _idlfile)} stopped with \"#{$!.message}\"")
+                IDL.log(2, "RIDL - processing #{IO === _idlfile ? 'from STDIN' : (StringIO === _idlfile ? 'from string' : _idlfile)} stopped with \"#{$!.message}\"")
 
               rescue => ex
                 IDL.error(ex)
@@ -310,7 +310,7 @@ module IDL
                      end
             _arg = _fpath unless _fpath.nil?
           end
-          _opts[:xincludepaths] << (File.dirname(_arg)+'/')
+          _opts[:xincludepaths] << (File.dirname(_arg) + '/')
         end
 
         _opts[:outputdir] ||= '.'
@@ -329,20 +329,20 @@ module IDL
     def init_optparser
       script_name = File.basename($0, '.*')
       if not script_name =~ /ridlc/
-        script_name = 'ruby '+$0
+        script_name = 'ruby ' + $0
       end
 
       # set up option parser with common options
       opts = OptionParser.new
       opts.banner = "Usage: #{script_name} [:backend] [options] [<idlfile> [<idlfile> ...]]\n\n" +
-          "    backend\t\tSpecifies the IDL language mapping backend to use.\n"+
-          "           \t\tDefault = :null\n\n"+
+          "    backend\t\tSpecifies the IDL language mapping backend to use.\n" +
+          "           \t\tDefault = :null\n\n" +
           "    Active language mapping = :#{backend.name}"
       opts.separator ''
       opts.on('-I PATH', '--include=PATH', String,
               'Adds include searchpath.',
               'Default: none') { |v|
-        self.options[:includepaths] << (v.end_with?('\\','/') ? v : v+'/')
+        self.options[:includepaths] << (v.end_with?('\\', '/') ? v : v + '/')
       }
       opts.on('-Dmacro=[value]', String, 'defines preprocessor macro') { |v|
         name, value = v.split('=')

data/lib/ridl/scanner.rb

@@ -73,14 +73,14 @@ module IDL
             @pos.line += 1
             @pos.column = 1
           end
-              else
+        else
           @pos.column += 1
         end
 
         if false
           if not @bwd.nil? or cur.nil? or @fwd.nil?
           printf("%c(%02x), %c(%02x), %c(%02x) @(l:%d,c:%d)\n",
-                @bwd,@bwd,cur,cur,@fwd,@fwd, @pos.line, @pos.column)
+                @bwd, @bwd, cur, cur, @fwd, @fwd, @pos.line, @pos.column)
           end
         end
         @bwd = cur
@@ -281,7 +281,7 @@ module IDL
         end
         @stack << [:include, @prefix, @ifdef, @in, @ifskip]
         # record file dir as new searchpath
-        @xincludepaths << (File.dirname(fpath)+'/')
+        @xincludepaths << (File.dirname(fpath) + '/')
         @prefix = nil
         @ifdef = Array.new
         @in = In.new(File.open(fpath, 'r'), fpath)
@@ -299,7 +299,7 @@ module IDL
       @expansions.include?(define)
     end
     def more_source?
-      @stack.size>0
+      @stack.size > 0
     end
     def in_expansion?
       more_source? and @stack.last[0] == :define
@@ -308,7 +308,7 @@ module IDL
       # make sure to close the input source
       @in.close
       # check if we have any previous source still stacked up
-      if @stack.size>0
+      if @stack.size > 0
         if @stack.last[0] == :include
           @xincludepaths.pop # remove directory of finished include
           @directiver.leave_include
@@ -324,7 +324,7 @@ module IDL
       @ifdef.empty? || @ifdef.last
     end
     def positions
-      @stack.reverse.inject(@in.nil? ? [] : [@in.position]) {|pos_arr,(_, _, _,in_, _)| pos_arr << in_.position }
+      @stack.reverse.inject(@in.nil? ? [] : [@in.position]) {|pos_arr, (_, _, _, in_, _)| pos_arr << in_.position }
     end
     def parse_error(msg, ex = nil)
       e = IDL::ParseError.new(msg, positions)
@@ -334,7 +334,7 @@ module IDL
 
     LFCR = [ (?\n), (?\r) ]
     SPACES = [ (?\ ), (?\t) ]
-    WHITESPACE = SPACES+LFCR
+    WHITESPACE = SPACES + LFCR
 
     ANNOTATION = ?@
     ANNOTATION_STR = '@'
@@ -370,7 +370,7 @@ module IDL
       long manages mirrorport module multiple native Object octet oneway out port porttype primarykey private provides
       public publishes raises readonly setraises sequence short string struct supports switch TRUE truncatable typedef
       typeid typename typeprefix unsigned union uses ValueBase valuetype void wchar wstring
-    ).inject(TokenRegistry.new) { |h,a| h[a.downcase.to_sym] = a; h }
+    ).inject(TokenRegistry.new) { |h, a| h[a.downcase.to_sym] = a; h }
 
     LITERALS = [
       :integer_literal,
@@ -760,7 +760,7 @@ module IDL
 
     def resolve_define(id, stack = [])
       return id if %w(true false).include?(id)
-      IDL.log(3,"*** RIDL - resolve_define(#{id})")
+      IDL.log(3, "*** RIDL - resolve_define(#{id})")
       if @defined.has_key?(id)
         define_ = @defined[id]
         stack << id
@@ -773,7 +773,7 @@ module IDL
     end
 
     def eval_directive(s)
-      IDL.log(3,"** RIDL - eval_directive(#{s})")
+      IDL.log(3, "** RIDL - eval_directive(#{s})")
       rc = eval(s)
       case rc
       when FalseClass, TrueClass
@@ -789,7 +789,7 @@ module IDL
       @in.skipwhile {|c| SPACES.include?(c) }
       s = getline
       /^(\w*)\s*/ === s
-      s1,s2 = $1, $' #'
+      s1, s2 = $1, $' #'
 
       if /(else|endif|elif)/ === s1
 
@@ -822,7 +822,7 @@ module IDL
             else
               while s2 =~ /(^|[\W])defined\s*\(\s*(\w+)\s*\)/
                  def_id = $2
-                 s2.gsub!(/(^|[\W])(defined\s*\(\s*\w+\s*\))/, '\1'+"#{@defined.has_key?(def_id).to_s}")
+                 s2.gsub!(/(^|[\W])(defined\s*\(\s*\w+\s*\))/, '\1' + "#{@defined.has_key?(def_id).to_s}")
               end
               s2.gsub!(/(^|[\W])([A-Za-z_][\w]*)/) do |_| "#{$1}#{resolve_define($2)}" end
               begin
@@ -854,10 +854,10 @@ module IDL
           if do_parse?
             # match 'defined(Foo)' or 'defined Foo'
             while s2 =~ /(^|[\W])defined(\s*\(\s*(\w+)\s*\)|\s+(\w+))/
-              IDL.log(3,"** RIDL - parse_directive : resolving 'defined(#{$3 || $4})'")
+              IDL.log(3, "** RIDL - parse_directive : resolving 'defined(#{$3 || $4})'")
               def_id = $3 || $4
               # resolve 'defined' expression to 'true' or 'false' according to actual macro definition
-              s2.gsub!(/(^|[\W])(defined\s*[\s\(]\s*#{def_id}(\s*\))?)/, '\1'+"#{@defined.has_key?(def_id).to_s}")
+              s2.gsub!(/(^|[\W])(defined\s*[\s\(]\s*#{def_id}(\s*\))?)/, '\1' + "#{@defined.has_key?(def_id).to_s}")
             end
             # match and resolve any macro variables listed in conditional expression
             s2.gsub!(/(^|[\W])([A-Za-z_][\w]*)/) do |_| "#{$1}#{resolve_define($2)}" end
@@ -897,11 +897,11 @@ module IDL
           @defined.delete(s2)
 
         when 'include'
-          if s2[0,1] == '"' || s2[0,1] == '<'
-            quoted_inc = (s2[0,1] == '"')
-            if s2.size>2
+          if s2[0, 1] == '"' || s2[0, 1] == '<'
+            quoted_inc = (s2[0, 1] == '"')
+            if s2.size > 2
               s2.strip!
-              s2 = s2.slice(1..(s2.size-2))
+              s2 = s2.slice(1..(s2.size - 2))
             else
               s2 = ''
             end
@@ -941,7 +941,7 @@ module IDL
       while true
         ch = @in.getc
         if ch.nil?
-          if @ifdef.size>0 and !in_expansion?
+          if @ifdef.size > 0 and !in_expansion?
             parse_error 'mismatched #if/#endif'
           end
           if more_source?

data/lib/ridl/type.rb

@@ -480,7 +480,7 @@ module IDL
         0
       end
       def max
-        @node.enumerators.length-1
+        @node.enumerators.length - 1
       end
       def in_range?(val)
         val >= self.min && val <= self.max

data/lib/ridl/version.rb

@@ -14,7 +14,7 @@ module IDL
 
   RIDL_VERSION_MAJOR = 2
   RIDL_VERSION_MINOR = 8
-  RIDL_VERSION_RELEASE = 0
+  RIDL_VERSION_RELEASE = 1
   RIDL_VERSION = "#{RIDL_VERSION_MAJOR}.#{RIDL_VERSION_MINOR}.#{RIDL_VERSION_RELEASE}"
   RIDL_COPYRIGHT = "Copyright (c) 2007-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Martin Corino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies: []
 description: OMG v3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby OMG IDL compiler