ridl 2.5.6 → 2.7.0

data/lib/ridl/scanner.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'racc/parser'
 require 'delegate'
@@ -44,7 +43,9 @@ module IDL
 
     class In
       def initialize(src, name = '', line = 0, column = 1)
-        @src, @fwd, @bwd = src, src.getc, nil
+        @src = src
+        @fwd = src.getc     # look ahead character
+        @bwd = nil          # look back character
         @pos = Position.new(name, line, column)
         @mark = nil
       end
@@ -97,46 +98,24 @@ module IDL
       end
       alias skipc getc
 
-      def _include?(ch, *chars)
-        chars.each { |v|
-          return true if case v
-            when Array
-              _include?(ch, *v)
-            when Enumerable
-              v.include? ch
-            when Fixnum
-              v == ch
-            when String
-              v == ch
-            else
-              false
-            end
-        }
-        false
-      end
-
       def skipwhile(*chars, &block)
-        if block.nil?
-          block = Proc.new { |ch| _include?(ch, *chars) }
-        end
-
-        until (ch = lookc).nil?
-          break unless block.call(ch)
-          skipc
+        if block
+          until (ch = lookc).nil?
+            return ch unless block.call(ch)
+            skipc
+          end
         end
-        ch
+        nil
       end
 
       def skipuntil(*chars, &block)
-        if block.nil?
-          block = Proc.new { |ch| _include?(ch, *chars) }
-        end
-
-        until (ch = lookc).nil?
-          break if block.call(ch)
-          skipc
+        if block
+          until (ch = lookc).nil?
+            return ch if block.call(ch)
+            skipc
+          end
         end
-        ch
+        nil
       end
 
       def mark(*ini)
@@ -159,6 +138,10 @@ module IDL
         @mark = nil
         ret
       end
+
+      def close
+        @src.close # close input source
+      end
     end ## of class In
 
     class StrIStream
@@ -249,7 +232,7 @@ module IDL
       when File
         i = src
         nm = src.path
-      when IO
+      when IO, StringIO
         i = src
         nm = '<io>'
       else
@@ -261,7 +244,7 @@ module IDL
     end
     def find_include(fname, all = true)
       if File.file?(fname) && File.readable?(fname)
-        fname
+        File.expand_path(fname)
       else
         # search transient include paths if allowed (quoted includes)
         fp = if all then
@@ -322,6 +305,9 @@ module IDL
       more_source? and @stack.last[0] == :define
     end
     def leave_source
+      # 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.last[0] == :include
           @xincludepaths.pop # remove directory of finished include
@@ -347,7 +333,8 @@ module IDL
     end
 
     LFCR = [ (?\n), (?\r) ]
-    WHITESPACE = [ (?\ ), (?\t) ].concat(LFCR)
+    SPACES = [ (?\ ), (?\t) ]
+    WHITESPACE = SPACES+LFCR
 
     ANNOTATION = ?@
     ANNOTATION_STR = '@'
@@ -361,9 +348,16 @@ module IDL
 
     SHIFTCHARS = [ ?<, ?> ]
 
-    HEXCHARS = [(?0..?9).to_a, (?a..?f).to_a, (?A..?F).to_a].flatten
+    DIGITS = (?0..?9).to_a
+    ALPHA_LC = (?a..?z).to_a
+    ALPHA_UC = (?A..?Z).to_a
+    OCTALS = (?0..?7).to_a
+    HEXCHARS = DIGITS + (?a..?f).to_a + (?A..?F).to_a
+    SIGNS = [?-, ?+]
+    DOT = ?.
 
-    IDCHARS = [?_ , (?a..?z).to_a, (?A..?Z).to_a].flatten
+    IDCHARS = [?_ ] + ALPHA_LC + ALPHA_UC
+    FULL_IDCHARS = IDCHARS + DIGITS
 
     ESCTBL = CharRegistry.new({
       :n => ?\n, :t => ?\t, :v => ?\v, :b => ?\b,
@@ -432,8 +426,9 @@ module IDL
       annotation_body = nil
       # next token should be '(' in case of normal/single value annotation
       # or anything else in case of marker annotation
-      token = next_token
-      if token.first == '('
+      skip_spaces # skip till next non-space or eol
+      if peek_next == '('
+        token = next_token # parse '('
         begin
           # identifier or value (in case of single value annotation) expected
           token = next_token
@@ -454,9 +449,9 @@ module IDL
             end
           end
         end until token.first == ')'
-#        token = next_token # need to get next token
-        token = nil
+        token = next_token_before_eol
       else
+        token = next_token_before_eol
         # marker annotation or symbolic value; leave body nil
       end
       [token, annotation_body]
@@ -495,13 +490,18 @@ module IDL
       token
     end
 
+    def peek_next
+      @in.lookc
+    end
+
+    def skip_spaces
+      @in.skipwhile {|c| SPACES.include?(c) }
+    end
+
     def next_identifier(first = nil)
       @in.mark(first)
-      while TRUE
-        case @in.lookc
-        when nil
-          break
-        when ?0..?9, ?a..?z, ?A..?Z, ?_
+      while true
+        if FULL_IDCHARS.include?(@in.lookc)
           @in.skipc
         else
           break
@@ -512,17 +512,13 @@ module IDL
       s2 = s0.dup               # (to be) unescaped id
 
       # simple check
-      escape = false
       if s2.length == 0
         parse_error 'identifier expected!'
       else
-        case s2[0]
-        when ?a..?z, ?A..?Z
-        when ?_   ## if starts with CORBA IDL escape => remove
-          escape = true
-          s2.slice!(0)
+        if s2[0] == ?_
+          s2.slice!(0) ## if starts with CORBA IDL escape => remove
         else
-          parse_error "identifier must begin with alphabet character: #{s2}"
+          parse_error "identifier must begin with alphabet character: #{s2}" unless ALPHA_LC.include?(s2[0]) || ALPHA_UC.include?(s2[0])
         end
       end
 
@@ -540,9 +536,8 @@ module IDL
           [ :identifier, Identifier.new(s2, s2, s0) ]
         end
       elsif (a = KEYWORDS.assoc(s1)).nil?
-        # check for language mapping keyword except when
-        # - this is an IDL escaped ('_' prefix) identifier
-        [ :identifier, Identifier.new(s2, escape ? s2 : chk_identifier(s2), s0) ]
+        # check for language mapping keyword
+        [ :identifier, Identifier.new(s2, chk_identifier(s2), s0) ]
       elsif s0 == a[1]
         [ a[1], nil ]
       else
@@ -657,26 +652,26 @@ module IDL
     end
 
     def skipfloat_or_fixed
-      if @in.lookc == ?.
+      if @in.lookc == DOT
         @in.skipc
-        @in.skipwhile(?0..?9)
+        @in.skipwhile {|c| DIGITS.include?(c) }
       end
       if [?e, ?E].include? @in.lookc
         @in.skipc
-        @in.skipc if [?+, ?-].include? @in.lookc
-        @in.skipwhile(?0..?9)
+        @in.skipc if SIGNS.include? @in.lookc
+        @in.skipwhile {|c| DIGITS.include?(c) }
         return :floating_pt_literal
       elsif [?d, ?D].include? @in.lookc
         @in.skipc
-        @in.skipc if [?+, ?-].include? @in.lookc
-        @in.skipwhile(?0..?9)
+        @in.skipc if SIGNS.include? @in.lookc
+        @in.skipwhile {|c| DIGITS.include?(c) }
         return :fixed_pt_literal
       end
       :floating_pt_literal
     end
 
     def skipline
-      while TRUE
+      while true
         s = @in.gets
         until s.chomp!.nil?; end
         break unless s[s.length - 1] == ?\\
@@ -685,13 +680,13 @@ module IDL
 
     def getline
       s = ''
-      while TRUE
+      while true
         ch = @in.lookc
         break if ch.nil?
         case
         when (ch == ?\") #"
           s << @in.getc # opening quote
-          while TRUE
+          while true
             if @in.lookc == ?\\
               # escape sequence
               s << @in.getc
@@ -779,7 +774,7 @@ module IDL
     end
 
     def eval_directive(s)
-      IDL.log(2,"** RIDL - eval_directive(#{s})")
+      IDL.log(3,"** RIDL - eval_directive(#{s})")
       rc = eval(s)
       case rc
       when FalseClass, TrueClass
@@ -792,7 +787,7 @@ module IDL
     end
 
     def parse_directive
-      @in.skipwhile(?\ , ?\t)
+      @in.skipwhile {|c| SPACES.include?(c) }
       s = getline
       /^(\w*)\s*/ === s
       s1,s2 = $1, $' #'
@@ -860,7 +855,7 @@ module IDL
           if do_parse?
             # match 'defined(Foo)' or 'defined Foo'
             while s2 =~ /(^|[\W])defined(\s*\(\s*(\w+)\s*\)|\s+(\w+))/
-              IDL.log(2,"** 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}")
@@ -936,10 +931,15 @@ module IDL
       end
     end
 
+    def next_token_before_eol
+      @in.skipwhile {|c| SPACES.include?(c)}
+      LFCR.include?(@in.lookc) ? nil : next_token
+    end
+
     def next_token
       sign = nil
       str = '' #initialize empty string
-      while TRUE
+      while true
         ch = @in.getc
         if ch.nil?
           if @ifdef.size>0 and !in_expansion?
@@ -949,12 +949,12 @@ module IDL
             leave_source
             next
           else
-            return [FALSE, nil]
+            return [false, nil]
           end
         end
 
         if WHITESPACE.include? ch
-          @in.skipwhile( WHITESPACE )
+          @in.skipwhile {|c| WHITESPACE.include?(c) }
           next
         end
 
@@ -1017,7 +1017,7 @@ module IDL
             ret = []
             chs = ''
             @in.skipc # skip 'L'
-            while TRUE
+            while true
               _nxtc = @in.lookc
               if _nxtc == ?\\
                 @in.skipc
@@ -1067,7 +1067,7 @@ module IDL
                 # return token returned by parse_annotation or parse next token recursively
                 return parse_annotation(true) || next_token
               else
-                @in.skipuntil(?\n, ?\r)
+                @in.skipuntil {|c| LFCR.include?(c) }
               end
             end
             str = '' # reset
@@ -1077,9 +1077,9 @@ module IDL
             return %w(/ /)
           end
 
-        when ch == ?+ || ch == ?-
+        when SIGNS.include?(ch)
           _nxtc = @in.lookc
-          if (?0..?9).include? _nxtc
+          if DIGITS.include? _nxtc
             sign = ch
             str = '' # reset
             next
@@ -1089,7 +1089,7 @@ module IDL
 
         when (?1..?9).include?(ch)
           @in.mark(sign, ch)
-          @in.skipwhile(?0..?9)
+          @in.skipwhile {|c| DIGITS.include?(c) }
           num_type = ([?., ?e, ?E, ?d, ?D].include?(@in.lookc)) ? skipfloat_or_fixed : :integer_literal
 
           r = @in.getregion
@@ -1102,10 +1102,10 @@ module IDL
             return [:integer_literal, r.to_i]
           end
 
-        when ch == ?. #
+        when ch == DOT #
           @in.mark(ch)
-          @in.skipwhile(?0..?9)
-          num_type = (?. != @in.lookc) ? skipfloat_or_fixed : nil
+          @in.skipwhile {|c| DIGITS.include?(c) }
+          num_type = (DOT != @in.lookc) ? skipfloat_or_fixed : nil
           s = @in.getregion
           if s == '.'
             parse_error 'token consisting of single dot (.) is invalid.'
@@ -1128,11 +1128,11 @@ module IDL
             s = @in.getregion
             return [:integer_literal, s.hex]
           else
-            dec = FALSE
-            @in.skipwhile(?0..?7)
+            dec = false
+            @in.skipwhile {|c| OCTALS.include?(c) }
             if (?8..?9).include? @in.lookc
               dec = TRUE
-              @in.skipwhile(?0..?9)
+              @in.skipwhile {|c| DIGITS.include?(c) }
             end
 
             num_type = ([?., ?e, ?E, ?d, ?D].include?(@in.lookc)) ? skipfloat_or_fixed : :integer_literal
@@ -1170,7 +1170,7 @@ module IDL
 
         when ch == ?\" #" #double quote, for a string literal.
           ret = ''
-          while TRUE
+          while true
             _nxtc = @in.lookc
             if _nxtc == ?\\
               @in.skipc

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
@@ -42,6 +41,9 @@ module IDL
     def is_template?
       false
     end
+    def matches?(idltype)
+      self.class == idltype.class
+    end
 
     def instantiate(_context)
       self
@@ -74,6 +76,9 @@ module IDL
       def resolved_node
         @node
       end
+      def matches?(idltype)
+        super && self.resolved_node == idltype.resolved_node
+      end
     end
 
     class ScopedName < NodeType
@@ -259,6 +264,9 @@ module IDL
       def is_template?
         (@size && @size.is_a?(IDL::Expression) && @size.is_template?)
       end
+      def matches?(idltype)
+        super && self.size == idltype.size
+      end
       def instantiate(_context)
         self.is_template? ? (Type::String.new(@size.instantiate(_context).value)) : self
       end
@@ -301,8 +309,11 @@ module IDL
       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(_context)
-        self.is_template? ? Type::Sequence.new(@basetype.instantiate(_context), @size.instantiate(_context).value) : self
+        self.is_template? ? Type::Sequence.new(@basetype.instantiate(_context), @size ? @size.instantiate(_context).value : nil) : self
       end
     end
 
@@ -338,6 +349,9 @@ 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 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
       end
@@ -366,6 +380,9 @@ module IDL
       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(_context)
         self.is_template? ? Type::WString.new(@size.instantiate(_context).value) : self
       end
@@ -501,6 +518,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