ridl 2.8.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5b79c10b3a4bb8e2f0404004ec5201332bef859fc69c636c4750e8eb6f6b13
-  data.tar.gz: 0a23918976bfb9b7db6595409d974fc80be2b5a686f8b40220fa689edd9cc791
+  metadata.gz: 880d87c66c5e6542fd7a61744fd2c10db2344e75849e73efbc45e26f8c33511a
+  data.tar.gz: 3d8b9e40f5d9220f5a677e4ebee507042f31246a0cbdc680166512985a1ba6ee
 SHA512:
-  metadata.gz: a187e41cc1d3c1d77f79f2ed9e43dccc4b83bc89b98ed4e2771627b2b1b771ba26390624f9abf779e1e2c5c89d7776698045408ca3ceb8ca9f10ecf87c6d0db6
-  data.tar.gz: b90d9a055d29d2de3dcee867df3ca57a26c8ddefd5b77fc3ff1a8a3ab7f645b395d8359c93b8a8a65122b006a76cd9f89815141239cd8e335cf21a78916b89b7
+  metadata.gz: a79c369f080a3e914de2df4899bd523c312814abd400726c9315043495bbfa4b3870f9ebc696019804487c86b5b1edc4791c1252dd616ac342da214849764304
+  data.tar.gz: a136ede546812cafba12a925d7c86415d5e453f2ad4d513f65be54751434c2bbd43fca0bbcea36bc898d522a2bd644da71dedd56029c26473ca77645a1827cfd

data/README.rdoc

@@ -46,3 +46,7 @@ The RIDL Gem is a Ruby-only Gem without any dependencies.
 == Releasing new RIDL Ruby Gem
 
 A new RIDL ruby gem release can be made by incrementing the RIDL version in link:lib/ridl/version.rb and create a new release on {github}[https://github.com/RemedyIT/ridl/releases] matching the new version (for example v2.7.0). The github {Ruby Gem Release}[https://github.com/RemedyIT/ridl/actions?query=workflow%3A%22Ruby+Gem+Release%22] action will automatically create a new gem and push it to {Rubygems.org}[https://www.rubygems.org/gems/ridl].
+
+== Regenerating `lib/racc/parser.rb`
+
+The file `lib/racc/parser.rb` can be regenerated using `racc -o parser.rb -E parser.ry`. The option `-E` embeds the racc parser within RIDL which is required for RIDL because jruby doesn't contain `RACC` as cruby does.

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

@@ -25,7 +25,7 @@ class Delegator
   @@pragma_handlers = {}
 
   def self.add_pragma_handler(key, h = nil, &block)
-    raise 'add_pragma_handler requires a callable object or a block' unless (h && h.respond_to?(:call)) || block_given?
+    raise 'add_pragma_handler requires a callable object or a block' unless h&.respond_to?(:call) || block_given?
     @@pragma_handlers[key] = block_given? ? block : h
   end
 
@@ -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
@@ -1316,8 +1316,8 @@ module IDL::AST
     end
 
     def set_component_and_key(comp, key)
-      unless comp && comp.is_a?(IDL::Type::ScopedName) && comp.is_node?(IDL::AST::TemplateParam)
-        unless comp && comp.is_a?(IDL::Type::ScopedName) && comp.is_node?(IDL::AST::Component)
+      unless comp&.is_a?(IDL::Type::ScopedName) && comp.is_node?(IDL::AST::TemplateParam)
+        unless comp&.is_a?(IDL::Type::ScopedName) && comp.is_node?(IDL::AST::Component)
           raise (comp ?
                   "invalid managed component for #{typename} #{scoped_lm_name}: #{comp.typename}" :
                   "missing managed component specification for #{typename} #{scoped_lm_name}")
@@ -1327,7 +1327,7 @@ module IDL::AST
         end
         @resolved_comp = comp.resolved_type.node
       end
-      unless key && key.is_a?(IDL::Type::ScopedName) && key.is_node?(IDL::AST::TemplateParam)
+      unless key&.is_a?(IDL::Type::ScopedName) && key.is_node?(IDL::AST::TemplateParam)
         ## TODO : add check for Components::PrimaryKeyBase base type
         unless key.nil? || (key.is_a?(IDL::Type::ScopedName) && key.is_node?(IDL::AST::Valuetype))
           raise "invalid primary key for #{typename} #{scoped_lm_name}: #{key.typename}"
@@ -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)
@@ -2776,4 +2776,3 @@ module IDL::AST
     end
   end # Typedef
 end
-

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),