ridl 2.8.0 → 2.8.2

data/lib/ridl/runner.rb

@@ -185,7 +185,7 @@ module IDL
           @optparser.parse!(argv)
         rescue ArgumentError => ex
           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
           return false
         end
 
@@ -201,7 +201,7 @@ module IDL
 
           input_base = File.basename(argv.first)
           if input_base != argv.first
-            options[:xincludepaths] << (File.dirname(argv.first)+'/')
+            options[:xincludepaths] << (File.dirname(argv.first) + '/')
           end
 
           return !parse("#include \"#{input_base}\"", options).nil?
@@ -222,7 +222,7 @@ module IDL
             raise 'cannot read from STDOUT' if $stdout == _fio
 
             # parse IDL source
-            IDL.log(1, "RIDL - parsing #{IO === _idlfile ? 'from STDIN': (StringIO === _idlfile ? 'from string' : _idlfile)}")
+            IDL.log(1, "RIDL - parsing #{IO === _idlfile ? 'from STDIN' : (StringIO === _idlfile ? 'from string' : _idlfile)}")
 
             unless _parser = parse(_fio, _opts)
               return false
@@ -248,7 +248,7 @@ module IDL
                 end
 
               rescue Backend::ProcessStop
-                IDL.log(2, "RIDL - processing #{IO === _idlfile ? 'from STDIN': (StringIO === _idlfile ? 'from string' : _idlfile)} stopped with \"#{$!.message}\"")
+                IDL.log(2, "RIDL - processing #{IO === _idlfile ? 'from STDIN' : (StringIO === _idlfile ? 'from string' : _idlfile)} stopped with \"#{$!.message}\"")
 
               rescue => ex
                 IDL.error(ex)
@@ -310,7 +310,7 @@ module IDL
                      end
             _arg = _fpath unless _fpath.nil?
           end
-          _opts[:xincludepaths] << (File.dirname(_arg)+'/')
+          _opts[:xincludepaths] << (File.dirname(_arg) + '/')
         end
 
         _opts[:outputdir] ||= '.'
@@ -329,20 +329,20 @@ module IDL
     def init_optparser
       script_name = File.basename($0, '.*')
       if not script_name =~ /ridlc/
-        script_name = 'ruby '+$0
+        script_name = 'ruby ' + $0
       end
 
       # set up option parser with common options
       opts = OptionParser.new
       opts.banner = "Usage: #{script_name} [:backend] [options] [<idlfile> [<idlfile> ...]]\n\n" +
-          "    backend\t\tSpecifies the IDL language mapping backend to use.\n"+
-          "           \t\tDefault = :null\n\n"+
+          "    backend\t\tSpecifies the IDL language mapping backend to use.\n" +
+          "           \t\tDefault = :null\n\n" +
           "    Active language mapping = :#{backend.name}"
       opts.separator ''
       opts.on('-I PATH', '--include=PATH', String,
               'Adds include searchpath.',
               'Default: none') { |v|
-        self.options[:includepaths] << (v.end_with?('\\','/') ? v : v+'/')
+        self.options[:includepaths] << (v.end_with?('\\', '/') ? v : v + '/')
       }
       opts.on('-Dmacro=[value]', String, 'defines preprocessor macro') { |v|
         name, value = v.split('=')

data/lib/ridl/scanner.rb

@@ -9,7 +9,6 @@
 #
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
-require 'racc/parser'
 require 'delegate'
 
 module IDL
@@ -73,14 +72,14 @@ module IDL
             @pos.line += 1
             @pos.column = 1
           end
-              else
+        else
           @pos.column += 1
         end
 
         if false
           if not @bwd.nil? or cur.nil? or @fwd.nil?
           printf("%c(%02x), %c(%02x), %c(%02x) @(l:%d,c:%d)\n",
-                @bwd,@bwd,cur,cur,@fwd,@fwd, @pos.line, @pos.column)
+                @bwd, @bwd, cur, cur, @fwd, @fwd, @pos.line, @pos.column)
           end
         end
         @bwd = cur
@@ -281,7 +280,7 @@ module IDL
         end
         @stack << [:include, @prefix, @ifdef, @in, @ifskip]
         # record file dir as new searchpath
-        @xincludepaths << (File.dirname(fpath)+'/')
+        @xincludepaths << (File.dirname(fpath) + '/')
         @prefix = nil
         @ifdef = Array.new
         @in = In.new(File.open(fpath, 'r'), fpath)
@@ -299,7 +298,7 @@ module IDL
       @expansions.include?(define)
     end
     def more_source?
-      @stack.size>0
+      @stack.size > 0
     end
     def in_expansion?
       more_source? and @stack.last[0] == :define
@@ -308,7 +307,7 @@ module IDL
       # make sure to close the input source
       @in.close
       # check if we have any previous source still stacked up
-      if @stack.size>0
+      if @stack.size > 0
         if @stack.last[0] == :include
           @xincludepaths.pop # remove directory of finished include
           @directiver.leave_include
@@ -324,7 +323,7 @@ module IDL
       @ifdef.empty? || @ifdef.last
     end
     def positions
-      @stack.reverse.inject(@in.nil? ? [] : [@in.position]) {|pos_arr,(_, _, _,in_, _)| pos_arr << in_.position }
+      @stack.reverse.inject(@in.nil? ? [] : [@in.position]) {|pos_arr, (_, _, _, in_, _)| pos_arr << in_.position }
     end
     def parse_error(msg, ex = nil)
       e = IDL::ParseError.new(msg, positions)
@@ -334,7 +333,7 @@ module IDL
 
     LFCR = [ (?\n), (?\r) ]
     SPACES = [ (?\ ), (?\t) ]
-    WHITESPACE = SPACES+LFCR
+    WHITESPACE = SPACES + LFCR
 
     ANNOTATION = ?@
     ANNOTATION_STR = '@'
@@ -370,7 +369,7 @@ module IDL
       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 }
+    ).inject(TokenRegistry.new) { |h, a| h[a.downcase.to_sym] = a; h }
 
     LITERALS = [
       :integer_literal,
@@ -477,7 +476,7 @@ module IDL
         @scan_comment = false
       end
       # check identifier for keywords
-      if token && token.first == :identifier
+      if token&.first == :identifier
         # keyword check
         if (a = KEYWORDS.assoc(token.last.to_s)).nil?
           token = [ :identifier, Identifier.new(token.last.to_s, chk_identifier(token.last.to_s), token.last.unescaped_name) ]
@@ -760,7 +759,7 @@ module IDL
 
     def resolve_define(id, stack = [])
       return id if %w(true false).include?(id)
-      IDL.log(3,"*** RIDL - resolve_define(#{id})")
+      IDL.log(3, "*** RIDL - resolve_define(#{id})")
       if @defined.has_key?(id)
         define_ = @defined[id]
         stack << id
@@ -773,7 +772,7 @@ module IDL
     end
 
     def eval_directive(s)
-      IDL.log(3,"** RIDL - eval_directive(#{s})")
+      IDL.log(3, "** RIDL - eval_directive(#{s})")
       rc = eval(s)
       case rc
       when FalseClass, TrueClass
@@ -789,7 +788,7 @@ module IDL
       @in.skipwhile {|c| SPACES.include?(c) }
       s = getline
       /^(\w*)\s*/ === s
-      s1,s2 = $1, $' #'
+      s1, s2 = $1, $' #'
 
       if /(else|endif|elif)/ === s1
 
@@ -822,7 +821,7 @@ module IDL
             else
               while s2 =~ /(^|[\W])defined\s*\(\s*(\w+)\s*\)/
                  def_id = $2
-                 s2.gsub!(/(^|[\W])(defined\s*\(\s*\w+\s*\))/, '\1'+"#{@defined.has_key?(def_id).to_s}")
+                 s2.gsub!(/(^|[\W])(defined\s*\(\s*\w+\s*\))/, '\1' + "#{@defined.has_key?(def_id).to_s}")
               end
               s2.gsub!(/(^|[\W])([A-Za-z_][\w]*)/) do |_| "#{$1}#{resolve_define($2)}" end
               begin
@@ -854,10 +853,10 @@ module IDL
           if do_parse?
             # match 'defined(Foo)' or 'defined Foo'
             while s2 =~ /(^|[\W])defined(\s*\(\s*(\w+)\s*\)|\s+(\w+))/
-              IDL.log(3,"** RIDL - parse_directive : resolving 'defined(#{$3 || $4})'")
+              IDL.log(3, "** RIDL - parse_directive : resolving 'defined(#{$3 || $4})'")
               def_id = $3 || $4
               # resolve 'defined' expression to 'true' or 'false' according to actual macro definition
-              s2.gsub!(/(^|[\W])(defined\s*[\s\(]\s*#{def_id}(\s*\))?)/, '\1'+"#{@defined.has_key?(def_id).to_s}")
+              s2.gsub!(/(^|[\W])(defined\s*[\s\(]\s*#{def_id}(\s*\))?)/, '\1' + "#{@defined.has_key?(def_id).to_s}")
             end
             # match and resolve any macro variables listed in conditional expression
             s2.gsub!(/(^|[\W])([A-Za-z_][\w]*)/) do |_| "#{$1}#{resolve_define($2)}" end
@@ -897,11 +896,11 @@ module IDL
           @defined.delete(s2)
 
         when 'include'
-          if s2[0,1] == '"' || s2[0,1] == '<'
-            quoted_inc = (s2[0,1] == '"')
-            if s2.size>2
+          if s2[0, 1] == '"' || s2[0, 1] == '<'
+            quoted_inc = (s2[0, 1] == '"')
+            if s2.size > 2
               s2.strip!
-              s2 = s2.slice(1..(s2.size-2))
+              s2 = s2.slice(1..(s2.size - 2))
             else
               s2 = ''
             end
@@ -941,7 +940,7 @@ module IDL
       while true
         ch = @in.getc
         if ch.nil?
-          if @ifdef.size>0 and !in_expansion?
+          if @ifdef.size > 0 and !in_expansion?
             parse_error 'mismatched #if/#endif'
           end
           if more_source?

data/lib/ridl/type.rb

@@ -480,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

data/lib/ridl/version.rb

@@ -14,7 +14,7 @@ module IDL
 
   RIDL_VERSION_MAJOR = 2
   RIDL_VERSION_MINOR = 8
-  RIDL_VERSION_RELEASE = 0
+  RIDL_VERSION_RELEASE = 2
   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.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Martin Corino
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies: []
 description: OMG v3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.
-email: mcorino@remedy.nl
+email: info@remedy.nl
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -56,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby OMG IDL compiler