ridl 2.8.2 → 2.10.0

data/lib/ridl/type.rb

@@ -14,33 +14,43 @@ module IDL
     def typename
       self.class.name
     end
+
     def typeerror(val)
       raise "#{val.inspect} cannot narrow to #{self.typename}"
     end
+
     def narrow(obj)
       obj
     end
+
     def resolved_type
       self
     end
+
     def is_complete?
       true
     end
-    def is_local?(recurstk = nil)
+
+    def is_local?(_recurstk = nil)
       false
     end
+
     def is_anonymous?
       false
     end
-    def is_node?(node_class)
+
+    def is_node?(_node_class)
       false
     end
+
     def resolved_node
       nil
     end
+
     def is_template?
       false
     end
+
     def matches?(idltype)
       self.class == idltype.class
     end
@@ -50,7 +60,7 @@ module IDL
     end
 
     class UndefinedType
-      def initialize(*args)
+      def initialize(*_args)
         raise "#{self.class.name}'s not implemented yet."
       end
     end
@@ -64,19 +74,25 @@ module IDL
 
     class NodeType < Type
       attr_reader :node
+
       def initialize(node)
         raise node.inspect if node && !node.is_a?(IDL::AST::Leaf)
+
         @node = node
       end
-      def is_local?(recurstk = nil)
+
+      def is_local?(_recurstk = nil)
         @node.is_local?
       end
+
       def is_node?(node_class)
         @node.is_a?(node_class)
       end
+
       def resolved_node
         @node
       end
+
       def matches?(idltype)
         super && self.resolved_node == idltype.resolved_node
       end
@@ -86,27 +102,35 @@ module IDL
       def typename
         @node.name
       end
+
       def narrow(obj)
         @node.idltype.narrow(obj)
       end
+
       def resolved_type
         @node.idltype.resolved_type
       end
+
       def is_complete?
         resolved_type.is_complete?
       end
+
       def is_local?(recurstk = [])
         resolved_type.is_local?(recurstk)
       end
+
       def is_node?(node_class)
         @node.is_a?(IDL::AST::Typedef) ? @node.idltype.is_node?(node_class) : @node.is_a?(node_class)
       end
+
       def resolved_node
         @node.is_a?(IDL::AST::Typedef) ? @node.idltype.resolved_node : @node
       end
+
       def is_template?
         @node.is_template?
       end
+
       def instantiate(instantiation_context)
         if self.is_template?
           cp = IDL::AST::TemplateParam.concrete_param(instantiation_context, @node)
@@ -125,7 +149,7 @@ module IDL
       end
 
       def self.is_unsigned?
-        self::Range.first == 0
+        self::Range.first.zero?
       end
 
       def self.bits
@@ -152,6 +176,10 @@ module IDL
         val < self.max ? val + 1 : self.min
       end
 
+      def default
+        0
+      end
+
       def Integer.newclass(range, bits)
         k = Class.new(self)
         k.const_set('Range', range)
@@ -160,9 +188,11 @@ module IDL
       end
     end
     Octet     = Integer.newclass(0..0xFF, 8)
+    UTinyShort = Integer.newclass(0..0xFF, 8)
     UShort    = Integer.newclass(0..0xFFFF, 16)
     ULong     = Integer.newclass(0..0xFFFFFFFF, 32)
     ULongLong = Integer.newclass(0..0xFFFFFFFFFFFFFFFF, 64)
+    TinyShort = Integer.newclass(-0x80...0x800, 8)
     Short     = Integer.newclass(-0x8000...0x8000, 16)
     Long      = Integer.newclass(-0x80000000...0x80000000, 32)
     LongLong  = Integer.newclass(-0x8000000000000000...0x8000000000000000, 64)
@@ -173,37 +203,51 @@ module IDL
         typeerror(obj) unless [TrueClass, FalseClass].include? obj.class
         obj
       end
+
       def range_length
         2
       end
+
       def min
         false
       end
+
       def max
         true
       end
+
       def in_range?(val)
         Range.include?(val)
       end
+
+      def default
+        false
+      end
+
       def next(val)
         !val
       end
     end
+
     class Char < Type
       def narrow(obj)
         typeerror(obj) unless ::Integer === obj
         typeerror(obj) unless (0..255) === obj
         obj
       end
+
       def range_length
         256
       end
+
       def min
         0
       end
+
       def in_range?(val)
         val >= self.min && val <= self.max
       end
+
       def max
         255
       end
@@ -212,31 +256,41 @@ module IDL
         val < self.max ? val + 1 : self.min
       end
     end
+
     class Float < Type
       def narrow(obj)
         typeerror(obj) unless ::Float === obj
         obj
       end
     end
+
     class Double < Float; end
     class LongDouble < Float; end
+
     class Fixed < Type
       attr_reader :digits, :scale
-      def initialize(digits=nil, scale=nil)
+
+      def initialize(digits = nil, scale = nil)
+        raise "anonymous fixed definitions are not allowed!" if digits.nil? || scale.nil?
         raise "significant digits for Fixed should be in the range 0-31" unless digits.nil? || (0..31) === digits.to_i
-        @digits = digits.nil? ? digits : digits.to_i
-        @scale = scale.nil? ? scale : scale.to_i
+
+        @digits = digits.to_i
+        @scale = scale.to_i
       end
+
       def narrow(obj)
-        #typeerror(obj)
+        # typeerror(obj)
         obj
       end
+
       def is_anonymous?
         false
       end
+
       def is_template?
         (@size && @size.is_a?(IDL::Expression) && @size.is_template?)
       end
+
       def instantiate(instantiation_context)
         self.is_template? ? (Type::Fixed.new(@size.instantiate(instantiation_context).value)) : self
       end
@@ -244,11 +298,15 @@ module IDL
 
     class String < Type
       attr_reader :size
-      def length; @size; end
+
+      def length
+        @size
+      end
 
       def initialize(size = nil)
         @size = size
       end
+
       def narrow(obj)
         typeerror(obj) unless ::String === obj
         if @size.nil?
@@ -259,15 +317,19 @@ module IDL
           obj
         end
       end
+
       def is_anonymous?
         @size ? true : false
       end
+
       def is_template?
         (@size && @size.is_a?(IDL::Expression) && @size.is_template?)
       end
+
       def matches?(idltype)
         super && self.size == idltype.size
       end
+
       def instantiate(instantiation_context)
         self.is_template? ? (Type::String.new(@size.instantiate(instantiation_context).value)) : self
       end
@@ -276,9 +338,14 @@ module IDL
     class Sequence < Type
       attr_reader :size, :basetype
       attr_accessor :recursive
-      def length; @size; end
+
+      def length
+        @size
+      end
+
       def initialize(t, size)
         raise "Anonymous type definitions are not allowed!" if t.is_anonymous?
+
         @basetype = t
         @size = size
         @typename = format("sequence<%s%s>", t.typename,
@@ -289,30 +356,39 @@ module IDL
                            end)
         @recursive = false
       end
+
       def typename
         @typename
       end
+
       def narrow(obj)
         typeerror(obj)
       end
+
       def is_complete?
         @basetype.resolved_type.is_complete?
       end
+
       def is_local?(recurstk = [])
         @basetype.resolved_type.is_local?(recurstk)
       end
+
       def is_recursive?
         @recursive
       end
+
       def is_anonymous?
         true
       end
+
       def is_template?
         (@size && @size.is_a?(IDL::Expression::ScopedName) && @size.node.is_a?(IDL::AST::TemplateParam)) || @basetype.is_template?
       end
+
       def matches?(idltype)
         super && self.size == idltype.size && self.basetype.resolved_type.matches?(idltype.basetype.resolved_type)
       end
+
       def instantiate(instantiation_context)
         if self.is_template?
           Type::Sequence.new(@basetype.instantiate(instantiation_context), @size ? @size.instantiate(instantiation_context).value : nil)
@@ -322,11 +398,76 @@ module IDL
       end
     end
 
+    class Map < Type
+      attr_reader :size, :keytype, :valuetype
+      attr_accessor :recursive
+
+      def length
+        @size
+      end
+
+      def initialize(key, value, size)
+        raise "Anonymous type definitions are not allowed!" if key.is_anonymous? || value.is_anonymous?
+
+        @keytype = key
+        @valuetype = value
+        @size = size
+        @typename = format("map<%s,%s%s>", key.typename, value.typename,
+                           if @size.nil? then
+                              ""
+                           else
+                              ", #{IDL::Expression::ScopedName === size ? size.node.name : size.to_s}"
+                           end)
+        @recursive = false
+      end
+
+      def typename
+        @typename
+      end
+
+      def narrow(obj)
+        typeerror(obj)
+      end
+
+      def is_complete?
+        @keytype.resolved_type.is_complete? && @valuetype.resolved_type.is_complete?
+      end
+
+      def is_local?(recurstk = [])
+        @keytype.resolved_type.is_local?(recurstk) && @valuetype.resolved_type.is_local?(recurstk)
+      end
+
+      def is_recursive?
+        @recursive
+      end
+
+      def is_anonymous?
+        true
+      end
+
+      def is_template?
+        (@size && @size.is_a?(IDL::Expression::ScopedName) && @size.node.is_a?(IDL::AST::TemplateParam)) || @basetype.is_template?
+      end
+
+      def matches?(idltype)
+        super && self.size == idltype.size && self.keytype.resolved_type.matches?(idltype.keytype.resolved_type) && self.valuetype.resolved_type.matches?(idltype.valuetype.resolved_type)
+      end
+
+      def instantiate(instantiation_context)
+        if self.is_template?
+          Type::Map.new(@keytype.instantiate(instantiation_context), @valuetype.instantiate(instantiation_context), @size ? @size.instantiate(instantiation_context).value : nil)
+        else
+          self
+        end
+      end
+    end
+
     class Array < Type
-      attr_reader :basetype
-      attr_reader :sizes
+      attr_reader :basetype, :sizes
+
       def initialize(t, sizes)
         raise "Anonymous type definitions are not allowed!" if t.is_anonymous?
+
         @basetype = t
         if sizes.nil?
           @sizes = []
@@ -336,27 +477,35 @@ module IDL
           @typename = t.typename + sizes.collect { |s| "[#{IDL::Expression::ScopedName === s ? s.node.name : s.to_s}]" }.join
         end
       end
+
       def typename
         @typename
       end
+
       def narrow(obj)
         typeerror(obj)
       end
+
       def is_complete?
         @basetype.resolved_type.is_complete?
       end
+
       def is_local?(recurstk = [])
         @basetype.resolved_type.is_local?(recurstk)
       end
+
       def is_anonymous?
         true
       end
+
       def is_template?
         @sizes.any? { |sz| (sz.is_a?(IDL::Expression::ScopedName) && sz.node.is_a?(IDL::AST::TemplateParam)) } || @basetype.is_template?
       end
+
       def matches?(idltype)
         super && self.sizes == idltype.sizes && self.basetype.resolved_type.matches?(idltype.basetype.resolved_type)
       end
+
       def instantiate(instantiation_context)
         self.is_template? ? Type::Array.new(@basetype.instantiate(instantiation_context), @sizes.collect { |sz| sz.instantiate(instantiation_context).value }) : self
       end
@@ -364,11 +513,15 @@ module IDL
 
     class WString < Type
       attr_reader :size
-      def length; @size; end
+
+      def length
+        @size
+      end
 
       def initialize(size = nil)
         @size = size
       end
+
       def narrow(obj)
         typeerror(obj) unless ::Array === obj
         if @size.nil?
@@ -379,15 +532,19 @@ module IDL
           obj
         end
       end
+
       def is_anonymous?
         @size ? true : false
       end
+
       def is_template?
         (@size && @size.is_a?(IDL::Expression::ScopedName) && @size.node.is_a?(IDL::AST::TemplateParam))
       end
+
       def matches?(idltype)
         super && self.size == idltype.size
       end
+
       def instantiate(instantiation_context)
         self.is_template? ? Type::WString.new(@size.instantiate(instantiation_context).value) : self
       end
@@ -438,6 +595,7 @@ module IDL
       def is_complete?
         node.is_defined?
       end
+
       def is_local?(recurstk = [])
         node.is_local?(recurstk)
       end
@@ -450,6 +608,7 @@ module IDL
       def is_complete?
         node.is_defined?
       end
+
       def is_local?(recurstk = [])
         node.is_local?(recurstk)
       end
@@ -462,6 +621,7 @@ module IDL
       def is_complete?
         node.is_defined?
       end
+
       def is_local?(recurstk = [])
         node.is_local?(recurstk)
       end
@@ -473,18 +633,79 @@ module IDL
         typeerror(obj) unless (0...@node.enumerators.length) === obj
         obj
       end
+
       def range_length
         @node.enumerators.length
       end
+
       def min
         0
       end
+
       def max
         @node.enumerators.length - 1
       end
+
+      def in_range?(val)
+        val >= self.min && val <= self.max
+      end
+
+      def next(val)
+        val < self.max ? val + 1 : self.min
+      end
+    end
+
+    class BitMask < NodeType
+      def narrow(obj)
+        typeerror(obj) unless ::Integer === obj
+        typeerror(obj) unless (0...@node.bitvalues.length) === obj
+        obj
+      end
+
+      def range_length
+        @node.bitvalues.length
+      end
+
+      def min
+        0
+      end
+
+      def max
+        @node.bitvalues.length - 1
+      end
+
       def in_range?(val)
         val >= self.min && val <= self.max
       end
+
+      def next(val)
+        val < self.max ? val + 1 : self.min
+      end
+    end
+
+    class BitSet < NodeType
+      def narrow(obj)
+        typeerror(obj) unless ::Integer === obj
+        typeerror(obj) unless (0...@node.bitfields.length) === obj
+        obj
+      end
+
+      def range_length
+        @node.bitfields.length
+      end
+
+      def min
+        0
+      end
+
+      def max
+        @node.bitfields.length - 1
+      end
+
+      def in_range?(val)
+        val >= self.min && val <= self.max
+      end
+
       def next(val)
         val < self.max ? val + 1 : self.min
       end
@@ -492,41 +713,51 @@ module IDL
 
     class Const < Type
       attr_reader :type
+
       def initialize(t)
         @type = t
         @typename = "const #{t.typename}"
       end
+
       def typename
         @typename
       end
+
       def narrow(obj)
         @type.narrow(obj)
       end
+
       def is_complete?
         @type.resolved_type.is_complete?
       end
+
       def is_local?(recurstk = [])
         @type.resolved_type.is_local?(recurstk)
       end
+
       def is_anonymous?
         t.resolved_type.is_anonymous?
       end
+
       def is_template?
         @type.is_template?
       end
+
       def instantiate(instantiation_context)
         self.is_template? ? Type::Const.new(@type.instantiate(instantiation_context)) : self
       end
+
       def is_node?(node_class)
         @type.is_node?(node_class)
       end
+
       def resolved_node
         @type.resolved_node
       end
+
       def matches?(idltype)
         super && self.type.resolved_type.matches?(idltype.type.resolved_type)
       end
     end
-
   end
 end

data/lib/ridl/version.rb

@@ -11,11 +11,9 @@
 #--------------------------------------------------------------------
 
 module IDL
-
   RIDL_VERSION_MAJOR = 2
-  RIDL_VERSION_MINOR = 8
-  RIDL_VERSION_RELEASE = 2
+  RIDL_VERSION_MINOR = 10
+  RIDL_VERSION_RELEASE = 0
   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
-
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Martin Corino
 - Johnny Willemsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies: []
 description: OMG v3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.
@@ -29,7 +29,6 @@ files:
 - lib/ridl/node.rb
 - lib/ridl/options.rb
 - lib/ridl/optparse_ext.rb
-- lib/ridl/parser.diff
 - lib/ridl/parser.rb
 - lib/ridl/parser.ry
 - lib/ridl/require.rb
@@ -44,7 +43,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/RemedyIT/ridl/issues
   source_code_uri: https://github.com/RemedyIT/ridl
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -64,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby OMG IDL compiler
 test_files: []