ridl 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf34fc099b40aa14fd02ec34323831225dce823
-  data.tar.gz: dd3dcb56caf4338fcf0ba487850d6db251590bc8
+  metadata.gz: 6b4f57fea70c3afc0799ca7d925b19f567476cf0
+  data.tar.gz: 935963ed742a214a0dc67a2b72df6454e8716e10
 SHA512:
-  metadata.gz: 2779b950bf28dded230a3b4a89d127f4663c2b33632df056000a825c5ea17b902970a5e05bd4ec7971052bc2e658e91a41e7a746388a0dd19f4380aceb89bb45
-  data.tar.gz: e5f56246051d5083ee5f09e47f2a7841427bd6c471d038f503c12adc2712d6397625aae63e51874945b60dee15a5f3e34502bd1fde83f7a9aa599d703df87527
+  metadata.gz: 1484766696c20592f73ea92c88d6e8ba4dde89dc8c9220403fb6aa0ffe948c60e66cb29fe18f3f6241bd48d0cb8a196bf87ac4cc9b0eefb762c2a404eec8aed6
+  data.tar.gz: 1818e868e7f680f256b1b74f36ef9ee572f9c4ca1c4e4dadcf05814f40a05a8baf0e6ba9610b3c038dfaea527633bbeceac6c912ba88f309495ff01bac963f68

data/lib/ridl/backend.rb

@@ -100,10 +100,11 @@ module IDL
     end
 
     def process_input(parser, params)
-      # process input top-down; return true when input handled
+      # process input top-down; return true and stop processing when input handled
       unless _process_input(parser, params)
-        return @base_backends.each {|be| be.process_input(parser, params) } != nil
+        return @base_backends.any? {|be| be.process_input(parser, params) }
       end
+      true
     end
 
     @@null_be = nil

data/lib/ridl/node.rb

@@ -1836,11 +1836,11 @@ module IDL::AST
           ### @@TODO@@ further validation
           if (not rif_.node.is_abstract?) and @interfaces.size > 0
             raise RuntimeError,
-                  "concrete interface #{tc.node.typename} #{tc.node.scoped_lm_name} MUST be first and only in supports list for #{typename} #{scoped_lm_name}"
+                  "concrete interface '#{rif_.node.scoped_lm_name}' inheritance not allowed for #{typename} #{scoped_lm_name}. Valuetypes can only inherit (support) a single concrete interface."
           end
           if (not rif_.node.is_abstract?) && (not is_interface_compatible?(rif_.node))
             raise RuntimeError,
-                  "#{typename} #{scoped_lm_name} cannot support #{tc.node.typename} #{tc.node.scoped_lm_name} because it does not derive from inherited interfaces"
+                  "#{typename} #{scoped_lm_name} cannot support concrete interface #{rif_.node.scoped_lm_name} because it does not derive from inherited concrete interfaces"
           end
           @resolved_interfaces << rif_.node
         end

data/lib/ridl/parser.rb

@@ -462,7 +462,7 @@ def parse_type_declarator(type_spec, declarators)
   t = type_spec
   declarators.each do |d|
     case d
-    when ::String
+    when ::String, IDL::Scanner::Identifier
       ret << [t, d]
     when ::Array # array_declarator -> [identifier, size]
       ret << [IDL::Type::Array.new(t, d[1]), d[0]]

data/lib/ridl/parser.ry

@@ -836,7 +836,7 @@ def parse_type_declarator(type_spec, declarators)
   t = type_spec
   declarators.each do |d|
     case d
-    when ::String
+    when ::String, IDL::Scanner::Identifier
       ret << [t, d]
     when ::Array # array_declarator -> [identifier, size]
       ret << [IDL::Type::Array.new(t, d[1]), d[0]]

data/lib/ridl/scanner.rb

@@ -11,6 +11,7 @@
 # Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'racc/parser'
+require 'delegate'
 
 module IDL
   class ParseError < StandardError
@@ -210,7 +211,7 @@ module IDL
     # string derivative for IDL parsed identifiers able
     # to carry both 'raw' IDL name as well as language mapped
     # name
-    class Identifier < ::String
+    class Identifier < DelegateClass(::String)
       attr_reader :checked_name
       def initialize(idl_id, checked_id)
         super(idl_id)
@@ -344,79 +345,13 @@ module IDL
       :r => ?\r, :f => ?\f, :a => ?\a
     })
 
-    KEYWORDS = [ # see 7.2.4 "Keywords" of CORBA V3.2 specification (part1) and 7.3.6 (part3; IDL3+ keywords)
-      "abstract",
-      "alias",
-      "any",
-      "attribute",
-      "boolean",
-      "case",
-      "char",
-      "component",
-      "connector",
-      "const",
-      "consumes",
-      "context",
-      "custom",
-      "default",
-      "double",
-      "exception",
-      "emits",
-      "enum",
-      "eventtype",
-      "factory",
-      "FALSE",
-      "finder",
-      "fixed",
-      "float",
-      "getraises",
-      "home",
-      "import",
-      "in",
-      "inout",
-      "interface",
-      "local",
-      "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 }
+    KEYWORDS = %w(
+      abstract alias any attribute boolean case char component connector const consumes context custom default double
+      exception emits enum eventtype factory FALSE finder fixed float getraises home import in inout interface local
+      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 }
 
     LITERALS = [
       :integer_literal,

data/lib/ridl/version.rb

@@ -15,8 +15,8 @@ module IDL
 
   RIDL_VERSION_MAJOR = 2.freeze
   RIDL_VERSION_MINOR = 2.freeze
-  RIDL_VERSION_RELEASE = 4.freeze
+  RIDL_VERSION_RELEASE = 5.freeze
   RIDL_VERSION = "#{RIDL_VERSION_MAJOR}.#{RIDL_VERSION_MINOR}.#{RIDL_VERSION_RELEASE}"
-  RIDL_COPYRIGHT = 'Copyright (c) 2007-2013 Remedy IT Expertise BV, The Netherlands'.freeze
+  RIDL_COPYRIGHT = 'Copyright (c) 2007-2014 Remedy IT Expertise BV, The Netherlands'.freeze
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies: []
 description: OMG v. 3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.