ridl 2.7.1 → 2.8.0

data/lib/ridl/parser.ry

@@ -122,9 +122,7 @@ rule
                                   | template_module_inst_parameters "," template_module_inst_parameter
                                     { val[0] << val[2]; val[0] }
 
-  template_module_inst_parameter : base_type_spec
-                                   { val[0] }
-                                 | template_type_spec
+  template_module_inst_parameter : simple_type_spec
                                    { val[0] }
                                  | const_exp
                                    { val[0] }

data/lib/ridl/runner.rb

@@ -19,11 +19,6 @@ require 'ridl/options'
 
 module IDL
 
-  # TODO : LEGACY solution for R2CORBA; to be removed when R2CORBA has been updated
-  #        See also IDL#init
-  @@embedded = false unless class_variable_defined?(:@@embedded)
-  @@be_name = nil unless class_variable_defined?(:@@be_name)
-
   OPTIONS = Options.new({
       :outputdir       => nil,
       :includepaths    => [],
@@ -39,6 +34,55 @@ module IDL
   CORE_OPTIONS = OPTIONS.keys
 
   class Engine
+
+    class ProductionStack
+      def initialize
+        @stack = []
+        @index = {}
+      end
+
+      def size
+        @stack.size
+      end
+
+      def empty?
+        @stack.empty?
+      end
+
+      def push(id, prod)
+        @index[id.to_sym] = @stack.size
+        @stack << [id.to_sym, prod]
+      end
+
+      def pop
+        return nil if empty?
+        id, prod = @stack.shift
+        @index.delete(id)
+        prod
+      end
+
+      def peek
+        return nil if empty?
+        id, _ = @stack.first
+        id
+      end
+
+      def remove(id)
+        return nil unless has?(id)
+        i = @index.delete(id.to_sym)
+        _, producer = @productionstack.delete(i)
+        producer
+      end
+
+      def has?(id)
+        @index.has_key?(id.to_sym)
+      end
+
+      def [](id)
+        @stack[@index[id.to_sym]].last
+      end
+    end
+
     def initialize(backend, options)
       @backend = backend ? Backend.load(backend) : Backend.null_be
       @initopts = options.merge({
@@ -51,8 +95,7 @@ module IDL
       })
       @optparser = init_optparser
       @inputstack = []
-      @productionbatch = {}
-      @productionstack = []
+      @productionstack = ProductionStack.new
       @options = nil
     end
 
@@ -85,29 +128,20 @@ module IDL
     # Production management
 
     def push_production(id, producer)
-      raise "Producer #{id} already queued" if @productionbatch.has_key?(id.to_sym)
-      @productionbatch[id.to_sym] = @productionstack.size
-      @productionstack << [id.to_sym, producer]
+      raise "Producer #{id} already queued" if @productionstack.has?(id)
+      @productionstack.push(id, producer)
     end
 
     def pop_production
-      return nil unless has_productions?
-      id, producer = @productionstack.shift
-      @productionbatch.delete(id)
-      producer
+      @productionstack.pop
     end
 
     def peek_production
-      return nil unless has_productions?
-      id, _ = @productionstack.first
-      id
+      @productionstack.peek
     end
 
     def remove_production(id)
-      return nil unless has_production?(id)
-      i = @productionbatch.delete(id.to_sym)
-      _, producer = @productionstack.delete(i)
-      producer
+      @productionstack.remove(id)
     end
 
     def has_productions?
@@ -115,11 +149,11 @@ module IDL
     end
 
     def has_production?(id)
-      @productionbatch.has_key?(id.to_sym)
+      @productionstack.has?(id)
     end
 
     def production(id)
-      @productionstack[@productionbatch[id.to_sym]].last
+      @productionstack[id]
     end
 
     # Verbosity control
@@ -452,39 +486,37 @@ module IDL
   def IDL.init(argv = ARGV)
     options = OPTIONS.dup
 
-    unless @@embedded
-      # load config file(s) if any
-      Options.load_config(options)
+    # load config file(s) if any
+    Options.load_config(options)
 
-      IDL.log(2, "Configuration [#{options}]")
+    IDL.log(2, "Configuration [#{options}]")
 
-      # check commandline args for explicit language mapping backend
-      if argv.first =~ /^:\S+/
-        @@be_name = argv.shift.reverse.chop.reverse.to_sym
-      elsif ENV['RIDL_BE_SELECT']   # or from environment
-        @@be_name = ENV['RIDL_BE_SELECT'].to_sym
-      elsif options[:backend]       # or from configuration
-        @@be_name = options[:backend].to_sym
-      end
+    # check commandline args for explicit language mapping backend
+    if argv.first =~ /^:\S+/
+      be_name = argv.shift.reverse.chop.reverse.to_sym
+    elsif ENV['RIDL_BE_SELECT']   # or from environment
+      be_name = ENV['RIDL_BE_SELECT'].to_sym
+    elsif options[:backend]       # or from configuration
+      be_name = options[:backend].to_sym
+    end
 
-      # add optional search paths for RIDL backends
-      options[:be_path] ||= []
-      options[:be_path].unshift(*ENV['RIDL_BE_PATH'].split(/#{File::PATH_SEPARATOR}/)) if ENV['RIDL_BE_PATH']
-      options[:be_path].collect! {|p| p.gsub('\\', '/') } # cleanup to prevent mixed path separators
-      $:.concat(options[:be_path]) unless options[:be_path].empty?
-
-      # check for special bootstrapping switches
-      if argv.first == '--preprocess'
-        options[:preprocess] = true
-        argv.shift
-      elsif argv.first == '--ignore-pidl'
-        options[:ignore_pidl] = true
-        argv.shift
-      end
+    # add optional search paths for RIDL backends
+    options[:be_path] ||= []
+    options[:be_path].unshift(*ENV['RIDL_BE_PATH'].split(/#{File::PATH_SEPARATOR}/)) if ENV['RIDL_BE_PATH']
+    options[:be_path].collect! {|p| p.gsub('\\', '/') } # cleanup to prevent mixed path separators
+    $:.concat(options[:be_path]) unless options[:be_path].empty?
+
+    # check for special bootstrapping switches
+    if argv.first == '--preprocess'
+      options[:preprocess] = true
+      argv.shift
+    elsif argv.first == '--ignore-pidl'
+      options[:ignore_pidl] = true
+      argv.shift
     end
 
     # create RIDL engine
-    Thread.current[:ridl_engine] = Engine.new(@@be_name, options)
+    Thread.current[:ridl_engine] = Engine.new(be_name, options)
   end
 
   # main run method

data/lib/ridl/type.rb

@@ -45,7 +45,7 @@ module IDL
       self.class == idltype.class
     end
 
-    def instantiate(_context)
+    def instantiate(_)
       self
     end
 
@@ -65,6 +65,7 @@ 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)
@@ -106,9 +107,9 @@ module IDL
       def is_template?
         @node.is_template?
       end
-      def instantiate(_context)
+      def instantiate(instantiation_context)
         if self.is_template?
-          cp = IDL::AST::TemplateParam.concrete_param(_context, @node)
+          cp = IDL::AST::TemplateParam.concrete_param(instantiation_context, @node)
           cp.is_a?(Type) ? cp : ScopedName.new(cp)
         else
           self
@@ -236,8 +237,8 @@ module IDL
       def is_template?
         (@size && @size.is_a?(IDL::Expression) && @size.is_template?)
       end
-      def instantiate(_context)
-        self.is_template? ? (Type::Fixed.new(@size.instantiate(_context).value)) : self
+      def instantiate(instantiation_context)
+        self.is_template? ? (Type::Fixed.new(@size.instantiate(instantiation_context).value)) : self
       end
     end
 
@@ -267,8 +268,8 @@ module IDL
       def matches?(idltype)
         super && self.size == idltype.size
       end
-      def instantiate(_context)
-        self.is_template? ? (Type::String.new(@size.instantiate(_context).value)) : self
+      def instantiate(instantiation_context)
+        self.is_template? ? (Type::String.new(@size.instantiate(instantiation_context).value)) : self
       end
     end
 
@@ -312,8 +313,12 @@ module IDL
       def matches?(idltype)
         super && self.size == idltype.size && self.basetype.resolved_type.matches?(idltype.basetype.resolved_type)
       end
-      def instantiate(_context)
-        self.is_template? ? Type::Sequence.new(@basetype.instantiate(_context), @size ? @size.instantiate(_context).value : nil) : self
+      def instantiate(instantiation_context)
+        if self.is_template?
+          Type::Sequence.new(@basetype.instantiate(instantiation_context), @size ? @size.instantiate(instantiation_context).value : nil)
+        else
+          self
+        end
       end
     end
 
@@ -352,8 +357,8 @@ module IDL
       def matches?(idltype)
         super && self.sizes == idltype.sizes && self.basetype.resolved_type.matches?(idltype.basetype.resolved_type)
       end
-      def instantiate(_context)
-        self.is_template? ? Type::Array.new(@basetype.instantiate(_context), @sizes.collect { |sz| sz.instantiate(_context).value }) : self
+      def instantiate(instantiation_context)
+        self.is_template? ? Type::Array.new(@basetype.instantiate(instantiation_context), @sizes.collect { |sz| sz.instantiate(instantiation_context).value }) : self
       end
     end
 
@@ -383,8 +388,8 @@ module IDL
       def matches?(idltype)
         super && self.size == idltype.size
       end
-      def instantiate(_context)
-        self.is_template? ? Type::WString.new(@size.instantiate(_context).value) : self
+      def instantiate(instantiation_context)
+        self.is_template? ? Type::WString.new(@size.instantiate(instantiation_context).value) : self
       end
     end
 
@@ -509,8 +514,8 @@ module IDL
       def is_template?
         @type.is_template?
       end
-      def instantiate(_context)
-        self.is_template? ? Type::Const.new(@type.instantiate(_context)) : self
+      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)

data/lib/ridl/version.rb

@@ -13,8 +13,8 @@
 module IDL
 
   RIDL_VERSION_MAJOR = 2
-  RIDL_VERSION_MINOR = 7
-  RIDL_VERSION_RELEASE = 1
+  RIDL_VERSION_MINOR = 8
+  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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Martin Corino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-10-07 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.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby OMG IDL compiler