ridl 2.5.6 → 2.8.1

data/lib/ridl/type.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module IDL
   class Type
@@ -16,7 +15,7 @@ module IDL
       self.class.name
     end
     def typeerror(val)
-      raise RuntimeError, "#{val.inspect} cannot narrow to #{self.typename}"
+      raise "#{val.inspect} cannot narrow to #{self.typename}"
     end
     def narrow(obj)
       obj
@@ -42,14 +41,17 @@ module IDL
     def is_template?
       false
     end
+    def matches?(idltype)
+      self.class == idltype.class
+    end
 
-    def instantiate(_context)
+    def instantiate(_)
       self
     end
 
     class UndefinedType
       def initialize(*args)
-        raise RuntimeError, "#{self.class.name}'s not implemented yet."
+        raise "#{self.class.name}'s not implemented yet."
       end
     end
 
@@ -63,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)
@@ -74,6 +77,9 @@ module IDL
       def resolved_node
         @node
       end
+      def matches?(idltype)
+        super && self.resolved_node == idltype.resolved_node
+      end
     end
 
     class ScopedName < NodeType
@@ -101,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
@@ -217,7 +223,7 @@ module IDL
     class Fixed < Type
       attr_reader :digits, :scale
       def initialize(digits=nil, scale=nil)
-        raise RuntimeError, "significant digits for Fixed should be in the range 0-31" unless digits.nil? || (0..31) === digits.to_i
+        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
       end
@@ -231,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
 
@@ -259,8 +265,11 @@ module IDL
       def is_template?
         (@size && @size.is_a?(IDL::Expression) && @size.is_template?)
       end
-      def instantiate(_context)
-        self.is_template? ? (Type::String.new(@size.instantiate(_context).value)) : self
+      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
     end
 
@@ -269,7 +278,7 @@ module IDL
       attr_accessor :recursive
       def length; @size; end
       def initialize(t, size)
-        raise RuntimeError, "Anonymous type definitions are not allowed!" if t.is_anonymous?
+        raise "Anonymous type definitions are not allowed!" if t.is_anonymous?
         @basetype = t
         @size = size
         @typename = format("sequence<%s%s>", t.typename,
@@ -301,8 +310,15 @@ module IDL
       def is_template?
         (@size && @size.is_a?(IDL::Expression::ScopedName) && @size.node.is_a?(IDL::AST::TemplateParam)) || @basetype.is_template?
       end
-      def instantiate(_context)
-        self.is_template? ? Type::Sequence.new(@basetype.instantiate(_context), @size.instantiate(_context).value) : self
+      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)
+        else
+          self
+        end
       end
     end
 
@@ -310,7 +326,7 @@ module IDL
       attr_reader :basetype
       attr_reader :sizes
       def initialize(t, sizes)
-        raise RuntimeError, "Anonymous type definitions are not allowed!" if t.is_anonymous?
+        raise "Anonymous type definitions are not allowed!" if t.is_anonymous?
         @basetype = t
         if sizes.nil?
           @sizes = []
@@ -338,8 +354,11 @@ module IDL
       def is_template?
         @sizes.any? { |sz| (sz.is_a?(IDL::Expression::ScopedName) && sz.node.is_a?(IDL::AST::TemplateParam)) } || @basetype.is_template?
       end
-      def instantiate(_context)
-        self.is_template? ? Type::Array.new(@basetype.instantiate(_context), @sizes.collect { |sz| sz.instantiate(_context).value }) : self
+      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
     end
 
@@ -366,8 +385,11 @@ module IDL
       def is_template?
         (@size && @size.is_a?(IDL::Expression::ScopedName) && @size.node.is_a?(IDL::AST::TemplateParam))
       end
-      def instantiate(_context)
-        self.is_template? ? Type::WString.new(@size.instantiate(_context).value) : self
+      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
     end
 
@@ -458,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
@@ -492,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)
@@ -501,6 +523,9 @@ module IDL
       def resolved_node
         @type.resolved_node
       end
+      def matches?(idltype)
+        super && self.type.resolved_type.matches?(idltype.type.resolved_type)
+      end
     end
 
   end

data/lib/ridl/version.rb

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module IDL
 
-  RIDL_VERSION_MAJOR = 2.freeze
-  RIDL_VERSION_MINOR = 5.freeze
-  RIDL_VERSION_RELEASE = 6.freeze
+  RIDL_VERSION_MAJOR = 2
+  RIDL_VERSION_MINOR = 8
+  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,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.8.1
 platform: ruby
 authors:
 - Martin Corino
+- Johnny Willemsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies: []
-description: OMG v. 3.3 compliant native Ruby IDL compiler frontend with support for
+description: OMG v3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.
 email: mcorino@remedy.nl
 executables: []
@@ -21,18 +22,12 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.rdoc
-- lib/idl/BiDirPolicy.pidl
-- lib/idl/CosNaming.idl
-- lib/idl/IOP.pidl
-- lib/idl/Messaging.pidl
-- lib/idl/PortableServer.pidl
-- lib/idl/TimeBase.pidl
-- lib/idl/orb.idl
 - lib/ridl/backend.rb
 - lib/ridl/delegate.rb
 - lib/ridl/expression.rb
 - lib/ridl/genfile.rb
 - lib/ridl/node.rb
+- lib/ridl/options.rb
 - lib/ridl/optparse_ext.rb
 - lib/ridl/parser.diff
 - lib/ridl/parser.rb
@@ -43,31 +38,32 @@ files:
 - lib/ridl/scanner.rb
 - lib/ridl/type.rb
 - lib/ridl/version.rb
-homepage: https://osportal.remedy.nl/projects/ridl
+homepage: https://www.remedy.nl/opensource/ridl.html
 licenses:
-- RIDL
-metadata: {}
+- MIT
+metadata:
+  bug_tracker_uri: https://github.com/RemedyIT/ridl/issues
+  source_code_uri: https://github.com/RemedyIT/ridl
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --exclude
-- \.(idl|pidl|diff|ry)
+- "--exclude"
+- "\\.(idl|pidl|diff|ry)"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby OMG IDL compiler

data/lib/idl/BiDirPolicy.pidl

@@ -1,28 +0,0 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
- * $Id$
- */
-
-#ifndef __BiDirPolicy_IDL
-#define __BiDirPolicy_IDL
-
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-// Self contained module for Bi-directional GIOP policy
-
-module BiDirPolicy {
-
-  typedef unsigned short BidirectionalPolicyValue;
-
-  const BidirectionalPolicyValue NORMAL = 0;
-  const BidirectionalPolicyValue BOTH = 1;
-
-  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37;
-
-  interface BidirectionalPolicy : CORBA::Policy {
-    readonly attribute BidirectionalPolicyValue value;
-  };
-};
-
-#endif /* __BiDirPolicy_IDL */

data/lib/idl/CosNaming.idl

@@ -1,260 +0,0 @@
-// $Id$
-
-#ifndef COS_NAMING_IDL
-#define COS_NAMING_IDL
-
-#pragma prefix "omg.org"
-
-/**
- * This module provides interface for using COS Naming Service.
- */
-module CosNaming
-{
-  /// Define a typedef for String.  Maybe at some point, <Istring> will
-  /// be different to support Internationalization.
-  typedef string Istring;
-
-  /*
-   * This is a 'simple' name.
-   *
-   * Both id and kind fields are used in resolving names.
-   */
-  struct NameComponent
-  {
-    /// This is the name that is used to identify object references.
-    Istring id;
-
-    /// Stores any additional info about the object reference.
-    Istring kind;
-  };
-
-  /// This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
-  /// the names of the nested contexts, and cn is the name of the
-  /// object bound in cn-1.
-  typedef sequence <NameComponent> Name;
-
-  enum BindingType
-  {
-    /// object binding.
-    nobject,
-
-    /// Naming context binding.
-    ncontext
-  };
-
-  struct Binding
-  {
-    /// Simple name, under which an object is bound in a given context.
-    Name binding_name;
-
-    /// Indicates whether the binding_name identifies a context, and, therefore, can
-    /// participate in name resolution.
-    BindingType binding_type;
-  };
-
-  typedef sequence <Binding> BindingList;
-
-  // Forward declaration.
-  interface BindingIterator;
-
-  /// Interface for managing name bindings and naming contexts.
-  interface NamingContext
-    {
-      // = Exceptions.
-
-      enum NotFoundReason
-      {
-        missing_node,
-        not_context,
-        not_object
-      };
-
-      /// Indicates that the name does not identify a binding.
-      exception NotFound
-      {
-
-        NotFoundReason why;
-        Name rest_of_name;
-      };
-
-      /// Implementation may throw this exception if some reason it cannot
-      /// complete the operation.  This is currently not used in TAO.
-      exception CannotProceed
-      {
-
-        NamingContext cxt;
-        Name rest_of_name;
-      };
-
-      /// A name of length 0 is invalid.  Implementations may place
-      /// further restrictions.
-      exception InvalidName
-      {
-      };
-
-      /// Indicates that the specified name is already bound to
-      /// some object.  Only one object can be bound to a
-      /// particular name in an context.  To change the binding,
-      /// <rebind> and <rebind_context> can be used.
-      exception AlreadyBound
-      {
-      };
-
-      /// Indicates that the context is not empty.
-      exception NotEmpty
-      {
-      };
-
-      // = Binding operations.
-
-      /// Create a binding for name <n> and object <obj> in the naming
-      /// context.  Compound names are treated as follows: ctx->bind
-      /// (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-      /// cn-1>))->bind (<cn>, obj) if the there already exists a
-      /// binding for the specified name, <AlreadyBound> exception is
-      /// thrown.  Naming contexts should be bound using <bind_context>
-      /// and <rebind_context> in order to participate in name
-      /// resolution later.
-      void bind (in Name n, in Object obj)
-        raises (NotFound, CannotProceed, InvalidName, AlreadyBound);
-
-      /// This is similar to <bind> operation above, except for when
-      /// the binding for the specified name already exists in the
-      /// specified context.  In that case, the existing binding is
-      /// replaced with the new one.
-      void rebind (in Name n, in Object obj)
-        raises (NotFound, CannotProceed, InvalidName);
-
-      /// This is the version of <bind> specifically for binding naming
-      /// contexts, so that they will participate in name resolution
-      /// when compound names are passed to be resolved.
-      void bind_context (in Name n, in NamingContext nc)
-        raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-
-      /// This is a version of <rebind> specifically for naming
-      /// contexts, so that they can participate in name resolution
-      /// when compound names are passed.
-      void rebind_context (in Name n, in NamingContext nc)
-        raises (NotFound, CannotProceed, InvalidName);
-
-      // = Resolving names.
-
-      /// Return object reference that is bound to the name.  Compound
-      /// name resolve is defined as follows: ctx->resolve (<c1; c2;
-      /// cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-      /// naming service does not return the type of the object.
-      /// Clients are responsible for "narrowing" the object to the
-      /// appropriate type.
-      Object resolve (in Name n)
-        raises (NotFound, CannotProceed, InvalidName);
-
-      // = Unbinding names.
-
-      /// Remove the name binding from the context.  When compound
-      /// names are used, unbind is defined as follows: ctx->unbind
-      /// (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-      /// (<cn>)
-      void unbind (in Name n)
-        raises (NotFound, CannotProceed, InvalidName);
-
-      // = Creating Naming Contexts.
-
-      /// This operation returns a new naming context implemented by
-      /// the same naming server in which the operation was invoked.
-      /// The context is not bound.
-      NamingContext new_context ();
-
-      /// This operation creates a new context and binds it to the name
-      /// supplied as an argument.  The newly-created context is
-      /// implemented by the same server as the context in which it was
-      /// bound (the name argument excluding the last component).
-      NamingContext bind_new_context (in Name n)
-        raises (NotFound, AlreadyBound, CannotProceed, InvalidName);
-
-      // = Deleting contexts.
-
-      /// Delete the naming context.  @note the user should <unbind>
-      /// any bindings in which the given context is bound to some
-      /// names before invoking <destroy> operation on it.
-      void destroy ()
-        raises (NotEmpty);
-
-
-      // = Listing the naming context.
-
-      /// Returns at most the requested number of bindings @a how_many
-      /// in @a bl.  If the naming context contains additional bindings,
-      /// they are returned with a BindingIterator.  In the naming
-      /// context does not contain any additional bindings @a bi
-      /// returned as null.
-      void list (in unsigned long how_many,
-                 out BindingList bl,
-                 out BindingIterator bi);
-    };
-
-  /// Interface for iterating over Bindings returned with the
-  /// <list> operation.
-  interface BindingIterator
-    {
-      /// This operation returns the next binding.  If there are no
-      /// more bindings false is returned.
-      boolean next_one (out Binding b);
-
-      /// This operation returns at most the requested number of
-      /// bindings.
-      boolean next_n (in unsigned long how_many,
-                      out BindingList bl);
-
-      /// This operation destroys the iterator.
-      void destroy ();
-    };
-
-  /// Interface for providing operations required to use URLs and
-  /// stringified names.
-  ///
-  /// Reference to: Document orbos/98-10-11 (Interoperable Naming Joint Revised Submission)
-  /// Joint Submission by BEA Systems, DSTC, IONA, and Inprise
-  interface NamingContextExt : NamingContext
-    {
-      /// Stringified form of a Name.
-      typedef string StringName;
-
-      /// URL address such as myhost.xyz.com.
-      typedef string Address;
-
-      /// Stringified form of a URL address componoent.
-      typedef string URLString;
-
-      /// This operation accepts a Name and returns a stringified
-      /// name. If the name is invalid, an InvalidName exception is
-      /// raised.
-      StringName to_string (in Name n)
-        raises (InvalidName);
-
-      /// This operation returns a Name. If the input stringified
-      /// name is syntactically malformed or violates an
-      /// implementation limit, an InvalidName exception is
-      /// raised.
-      Name to_name (in StringName sn)
-        raises (InvalidName);
-
-      /// Indicates that the URL address is invalid.
-      exception InvalidAddress {
-      };
-
-      /// It performs any escapes necessary on the stringified name
-      /// and returns a fully formed URL string. An exception is
-      /// raised if either the protocol or name parameters are invalid.
-      URLString to_url (in Address addr,
-                        in StringName sn)
-        raises (InvalidAddress, InvalidName);
-
-      /// This is similar to @c resolve as in the
-      /// CosNaming::NamingContext interface, except that it accepts
-      /// a stringified name as an argument instead of a Name.
-      Object resolve_str (in StringName n)
-        raises (NotFound, CannotProceed, InvalidName);
-    };
-};
-
-#endif /* COS_NAMING_IDL */