adlint 3.2.10 → 3.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7800591707d3378396282fc1b60d34a9f075f546
-  data.tar.gz: ab3169c01ba31248a5e3f7f7ac64d07b4bd95574
+  metadata.gz: fa76355096835da637b733c8206bf5d759f01147
+  data.tar.gz: 8fa414fe9df4b715c950d45c07ace9d5a1356ac4
 SHA512:
-  metadata.gz: 386e78ec4f9a39f660c4146010eb6ee7cbf8b92ce4916815f19f6b5965512daf7f8a7793bb5448385845185d0827cb5b6a0f88a073572daf144e3eb82fd36ca8
-  data.tar.gz: bac0402535c63311bc98aa3b570b348b73e5b9350322b68ce7deae2557a70bb10191fffe34e9067de06127e6c217d3b8f14795e38b376bec03bb2c7df9a82cd0
+  metadata.gz: eb322d1d2e7d67215b23706ba00f3509386f2ba06f661816001867fa7513d63e34498afbb4cb1824591871b91a3ae3d4119ed6dd3127491719030c98e33c291c
+  data.tar.gz: 19c980d7ef83983142b54430609941a6fefec254cbb674f3dac9041db64bcd093b60081ca555b4d887cd4e55ff87b395c0155b684a8fb6de75f13f65f8846db3

data/ChangeLog

@@ -1,3 +1,62 @@
+Sat Apr 12 09:08:17 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.ga : 3.2.12
+	  - Fix the type and object model in order to correctly manage unnamed
+	    struct or union members.
+	  - Add examination package initializer.
+	  - Revise behavior of the CMA code structure collection so that an
+	    optional examination package can output its own special
+	    met-records.
+
+Thu Apr 10 18:48:43 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 3.2.11
+	  - Fix the type and object model in order to correctly manage unnamed
+	    struct or union members.
+	  - Add examination package initializer.
+	  - Revise behavior of the CMA code structure collection so that an
+	    optional examination package can output its own special
+	    met-records.
+
+Thu Apr 10 15:11:38 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/metric.rb : Revise behavior of the CMA code structure
+	  collection so that an optional examination package can output its own
+	  special met-records.
+	* lib/adlint/ld/object.rb : Ditto.
+	* lib/adlint/ld/typedef.rb : Ditto.
+
+Thu Apr 10 13:34:44 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/exam.rb : Add examination package initializer.
+
+Thu Apr 10 10:57:34 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/cc1/type.rb : Fix the type and object model in order to
+	  correctly manage unnamed struct or union members.
+	* lib/adlint/cc1/syntax.rb : Ditto.
+	* lib/adlint/cc1/resolver.rb : Ditto.
+	* lib/adlint/cc1/object.rb : Ditto.
+
+	* lib/adlint/exam/c_builtin/cc1_check.rb : Correct W0067 and W0492 code
+	  check according to changes of the type and object model.
+	* features/code_check/W0801.feature : Ditto.
+
+	* features/code_check/W0067.feature : Add scenario to reproduce
+	  false-positive of W0067 code check.
+	* MANIFEST : Ditto.
+
+Fri Mar  7 12:57:41 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/cc1/lexer.rb : Refactor a bit in order to clarify
+	  intention to take tail part of an array.
+	* lib/adlint/cc1/value.rb : Ditto.
+	* lib/adlint/cpp/eval.rb : Ditto.
+	* lib/adlint/cpp/macro.rb : Ditto.
+	* lib/adlint/cpp/subst.rb : Ditto.
+	* lib/adlint/exam/c_builtin/cc1_check.rb : Ditto.
+	* spec/adlint/cc1/syntax_spec.rb : Ditto.
+
 Mon Feb 17 12:56:05 2014  Yutaka Yanoh  <yanoh@users.sourceforge.net>
 
 	* release.ga : 3.2.10

data/MANIFEST

@@ -55,6 +55,7 @@ features/code_check/W0023.feature
 features/code_check/W0024.feature
 features/code_check/W0025.feature
 features/code_check/W0026.feature
+features/code_check/W0067.feature
 features/code_check/W0070.feature
 features/code_check/W0071.feature
 features/code_check/W0088.feature

data/NEWS

@@ -21,6 +21,19 @@
 
 ++
 
+=== \AdLint 3.2.12 is released (2014-04-12)
+
+==== Changes since the 3.2.10 release
+
+* Fix the type and object model in order to correctly manage unnamed struct or
+  union members
+* Add examination package initializer
+* Revise behavior of the CMA code structure collection so that an optional
+  examination package can output its own special met-records
+
+See the file {ChangeLog}[https://github.com/yanoh/adlint/blob/master/ChangeLog]
+for more details.
+
 === \AdLint 3.2.10 is released (2014-02-17)
 
 ==== Changes since the 3.2.8 release
@@ -28,9 +41,6 @@
 * Add new templates for MSVC100 (Visual C++ 2010) as a C compiler on 32bit
   Windows
 
-See the file {ChangeLog}[https://github.com/yanoh/adlint/blob/master/ChangeLog]
-for more details.
-
 === \AdLint 3.2.8 is released (2014-02-07)
 
 ==== Changes since the 3.2.6 release

data/etc/mesg.d/c_builtin/en_US/messages.yml

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "3.2.10"
+version: "3.2.12"
 
 message_definition:
   W0001:

data/etc/mesg.d/c_builtin/ja_JP/messages.yml

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "3.2.10"
+version: "3.2.12"
 
 message_definition:
   W0001:

data/etc/mesg.d/core/en_US/messages.yml

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "3.2.10"
+version: "3.2.12"
 
 message_definition:
   X0001:

data/etc/mesg.d/core/ja_JP/messages.yml

@@ -49,7 +49,7 @@
 #         - "ERR:X99"
 #       format: "Your custom message for the error of E9999."
 
-version: "3.2.10"
+version: "3.2.12"
 
 message_definition:
   X0001:

data/features/code_check/W0067.feature

@@ -0,0 +1,74 @@
+Feature: W0067
+
+  W0067 detects that the nested member of a composite data type is accessed
+  directly without parent member names.
+
+  Scenario: no direct access
+    Given a target source named "fixture.c" with:
+      """
+      static int foo(void)
+      {
+          struct {
+              int i;
+              struct {
+                  int j;
+              } baz;
+          } bar = { 0, { 0 } };
+
+          return bar.i + bar.baz.j; /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W1076 | 1    | 12     |
+      | W0100 | 8    | 7      |
+      | W0629 | 1    | 12     |
+      | W0628 | 1    | 12     |
+
+  Scenario: direct access to nested member included in a named member
+    Given a target source named "fixture.c" with:
+      """
+      static int foo(void)
+      {
+          struct {
+              int i;
+              struct {
+                  int j;
+              } baz;
+          } bar = { 0, { 0 } };
+
+          return bar.i + bar.j; /* W0067 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W1076 | 1    | 12     |
+      | W0067 | 10   | 23     |
+      | W0100 | 8    | 7      |
+      | W0629 | 1    | 12     |
+      | W0628 | 1    | 12     |
+
+  Scenario: direct access to nested member included in an unnamed member
+    Given a target source named "fixture.c" with:
+      """
+      static int foo(void)
+      {
+          struct {
+              int i;
+              struct {
+                  int j;
+              };
+          } bar = { 0, { 0 } };
+
+          return bar.i + bar.j; /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W1076 | 1    | 12     |
+      | W0100 | 8    | 7      |
+      | W0629 | 1    | 12     |
+      | W0628 | 1    | 12     |

data/features/code_check/W0801.feature

@@ -26,6 +26,7 @@ Feature: W0801
     When I successfully run `adlint fixture.c` on noarch
     Then the output should exactly match with:
       | mesg  | line | column |
+      | W0040 | 1    | 8      |
       | W0801 | 1    | 8      |
 
   Scenario: named member exists in the struct
@@ -65,6 +66,7 @@ Feature: W0801
     When I successfully run `adlint fixture.c` on noarch
     Then the output should exactly match with:
       | mesg  | line | column |
+      | W0040 | 1    | 7      |
       | W0551 | 1    | 7      |
       | W0801 | 1    | 7      |
 

data/lib/adlint/cc1/lexer.rb

@@ -170,7 +170,7 @@ module Cc1 #:nodoc:
       head_idx = @lst_toks.rindex { |tok| keys.include?(tok.type) }
 
       if head_idx
-        toks = @lst_toks[(head_idx + 1)..-1]
+        toks = @lst_toks.drop(head_idx + 1)
         case toks.size
         when 1
           patch_identifier_translation_mode1(*toks)

data/lib/adlint/cc1/object.rb

@@ -447,10 +447,18 @@ module Cc1 #:nodoc:
         # TODO: If linear searching is too slow, use an index of inner
         #       variables.
         target_name = CompositeMemberVariable.component_name_of(name)
-        @inner_variables.find { |inner| inner.component_name == target_name }
-      else
-        nil
+        @inner_variables.each do |inner|
+          case
+          when inner.component_name.nil?
+            if var = inner.inner_variable_named(name)
+              return var
+            end
+          when inner.component_name == target_name
+            return inner
+          end
+        end
       end
+      nil
     end
 
     private
@@ -619,10 +627,11 @@ module Cc1 #:nodoc:
     private
     def create_qualified_name(outer_var, component_name)
       if outer_var.named?
-        "#{outer_var.name}#{component_name}"
+        prefix = outer_var.name
       else
-        "__adlint__tempvar#{component_name}"
+        prefix = "__adlint__tempvar"
       end
+      component_name ? "#{prefix}#{component_name}" : prefix
     end
   end
 
@@ -638,7 +647,7 @@ module Cc1 #:nodoc:
 
   class CompositeMemberVariable < InnerVariable
     def self.component_name_of(name)
-      ".#{name}"
+      name ? ".#{name}" : nil
     end
 
     def initialize(mem, outer_var, type, name)

data/lib/adlint/cc1/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.10
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 

data/lib/adlint/cc1/resolver.rb

@@ -69,16 +69,18 @@ module Cc1 #:nodoc:
     def visit_member_declaration(node)
       checkpoint(node.location)
       node.specifier_qualifier_list.accept(self)
-      node.struct_declarator.accept(self)
+      node.struct_declarator.accept(self) if node.struct_declarator
 
       type_quals = node.specifier_qualifier_list.type_qualifiers
       type_specs = node.specifier_qualifier_list.type_specifiers
+      struct_dcr = node.struct_declarator
+
       type = lookup_variable_type(type_quals, type_specs,
-                                  node.struct_declarator.declarator)
+                                  struct_dcr ? struct_dcr.declarator : nil)
       type = @type_table.pointer_type(type) if type.function?
 
-      if node.struct_declarator.bitfield?
-        if bit_width = compute_bitfield_width(node.struct_declarator)
+      if struct_dcr and struct_dcr.bitfield?
+        if bit_width = compute_bitfield_width(struct_dcr)
           type = @type_table.bitfield_type(type, bit_width)
         else
           type = fallback_type

data/lib/adlint/cc1/syntax.rb

@@ -2867,10 +2867,14 @@ module Cc1 #:nodoc:
 
     private
     def build_items(spec_qual_list, struct_dcrs)
-      struct_dcrs.each_with_object([]) do |struct_dcr, items|
-        # FIXME: Must support unnamed bit padding.
-        next unless struct_dcr.declarator
-        items.push(MemberDeclaration.new(spec_qual_list, struct_dcr))
+      # FIXME: Must support unnamed bit padding.
+
+      if struct_dcrs.empty?
+        [MemberDeclaration.new(spec_qual_list, nil)]
+      else
+        struct_dcrs.map do |struct_dcr|
+          MemberDeclaration.new(spec_qual_list, struct_dcr)
+        end
       end
     end
   end
@@ -2888,20 +2892,35 @@ module Cc1 #:nodoc:
     attr_accessor :type
 
     def identifier
-      @struct_declarator.declarator.identifier
+      if @struct_declarator && @struct_declarator.declarator
+        @struct_declarator.declarator.identifier
+      else
+        nil
+      end
     end
 
     def location
-      identifier.location
+      case
+      when @struct_declarator && @struct_declarator.declarator
+        @struct_declarator.declarator.identifier.location
+      when @struct_declarator
+        @struct_declarator.head_location
+      else
+        @specifier_qualifier_list.head_location
+      end
     end
 
     def to_s
-      "#{type.brief_image} #{identifier.value}"
+      if id = identifier
+        "#{type.brief_image} #{id.value}"
+      else
+        type.brief_image
+      end
     end
 
     def inspect(indent = 0)
       " " * indent + "#{short_class_name} (#{location.inspect}) " +
-        identifier.value
+        ((id = identifier) ? id.value : "")
     end
   end
 

data/lib/adlint/cc1/type.rb

@@ -6306,7 +6306,17 @@ module Cc1 #:nodoc:
 
     def member_named(name)
       # FIXME: Should use the member name index.
-      @members.find { |memb| memb.name == name }
+      @members.each do |memb|
+        case
+        when memb.name.nil? && memb.type.composite?
+          if inner_memb = memb.type.member_named(name)
+            return inner_memb
+          end
+        when memb.name == name
+          return memb
+        end
+      end
+      nil
     end
 
     def min
@@ -6691,6 +6701,10 @@ module Cc1 #:nodoc:
     attr_reader :name
     attr_reader :type
 
+    def named?
+      !@name.nil?
+    end
+
     def dup
       Member.new(@name, @type.dup)
     end
@@ -7584,16 +7598,6 @@ module Cc1 #:nodoc:
       end
     end
 
-    def create_members(struct_dcls)
-      membs = []
-      struct_dcls.each do |struct_dcl|
-        struct_dcl.items.each do |item|
-          membs.push(Member.new(item.identifier.value, item.type))
-        end
-      end
-      membs
-    end
-
     def rewrite_struct_type(struct_type, type_dcl)
       struct_type.declarations.push(type_dcl)
       struct_type.image = type_dcl.struct_specifier.to_s
@@ -7608,6 +7612,14 @@ module Cc1 #:nodoc:
       union_type.members.replace(create_members(type_dcl.struct_declarations))
     end
 
+    def create_members(struct_dcls)
+      struct_dcls.map { |struct_dcl|
+        struct_dcl.items.map do |item|
+          Member.new(item.identifier ? item.identifier.value : nil, item.type)
+        end
+      }.flatten
+    end
+
     def rewrite_enum_type(enum_type, type_dcl)
       enum_type.declarations.push(type_dcl)
       enum_type.image = type_dcl.enum_specifier.to_s

data/lib/adlint/cc1/value.rb

@@ -2756,7 +2756,7 @@ module Cc1 #:nodoc:
     end
 
     def active_versioning_groups
-      @versioning_group_stack[1..-1]
+      @versioning_group_stack.drop(1)
     end
 
     def current_versioning_group

data/lib/adlint/cpp/constexpr.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.10
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 

data/lib/adlint/cpp/eval.rb

@@ -994,7 +994,7 @@ module Cpp #:nodoc:
 
         # NOTE: It's not completed when a new-line appears after the macro
         #       name.
-        return false unless pp_toks[idx..-1].any? { |t| t.value == "(" }
+        return false unless pp_toks.drop(idx).any? { |t| t.value == "(" }
 
         paren_cnt = 0
         while tok = pp_toks[idx]

data/lib/adlint/cpp/macro.rb

@@ -738,7 +738,7 @@ module Cpp #:nodoc:
       return nil unless tok = toks[idx] and macro = lookup(tok.value)
       return nil if repl_ctxt.hidden?(tok, macro.name.value)
 
-      size = macro.replaceable_size(toks[idx..-1])
+      size = macro.replaceable_size(toks.drop(idx))
 
       if toks[idx, size].all? { |t| t.need_no_further_replacement? }
         return nil

data/lib/adlint/cpp/subst.rb

@@ -81,7 +81,7 @@ module Cpp #:nodoc:
     end
 
     def rest_pattern_tokens
-      @pattern_tokens[@pattern_index..-1]
+      @pattern_tokens.drop(@pattern_index)
     end
 
     def next_pattern_token

data/lib/adlint/exam.rb

@@ -127,6 +127,7 @@ module AdLint #:nodoc:
   class ExaminationCatalog
     def initialize(loader_fpath)
       @loader_fpath = loader_fpath
+      @initializer = lambda {}
       yield(self) if block_given?
     end
 
@@ -136,6 +137,7 @@ module AdLint #:nodoc:
     attr_accessor :patch_version
     attr_accessor :release_date
     attr_accessor :examination_classes
+    attr_accessor :initializer
 
     def short_version
       "#{major_version}.#{minor_version}.#{patch_version}"
@@ -161,6 +163,7 @@ module AdLint #:nodoc:
 
     def load
       require "adlint/exam/#{@name}"
+      catalog.initializer.call
       true
     rescue LoadError
       false

data/lib/adlint/exam/c_builtin/cc1_check.rb

@@ -269,7 +269,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -315,7 +315,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -361,7 +361,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -1593,15 +1593,20 @@ module CBuiltin #:nodoc:
 
     private
     def check_member_access(expr, outer_var, inner_var)
-      type = outer_var.type
-      unqual_type = type.unqualify
-
-      if type.pointer? && unqual_type.base_type.incomplete? or
-          type.composite? && type.incomplete?
+      case expr
+      when Cc1::MemberAccessByValueExpression
+        outer_type = outer_var.type.unqualify
+      when Cc1::MemberAccessByPointerExpression
+        outer_type = outer_var.type.unqualify.base_type
+      else
         return
       end
 
-      W(expr.location) unless inner_var
+      if outer_type.composite? && !outer_type.incomplete?
+        unless outer_type.member_named(expr.identifier.value)
+          W(expr.location)
+        end
+      end
     end
   end
 
@@ -8216,7 +8221,7 @@ module CBuiltin #:nodoc:
       if enums = node.enum_specifier.enumerators
         exprs = enums.map { |enum| enum.expression }
         return if exprs.all? { |expr| expr.nil? }
-        return if exprs.first && exprs[1..-1].all? { |expr| expr.nil? }
+        return if exprs.first && exprs.drop(1).all? { |expr| expr.nil? }
         return if exprs.all? { |expr| !expr.nil? }
         W(node.location)
       end
@@ -10484,7 +10489,7 @@ module CBuiltin #:nodoc:
     def declare_members(struct_or_union_dcl)
       memb_dcls = MemberExtractor.new.tap { |extr|
         struct_or_union_dcl.accept(extr)
-      }.result
+      }.result.select { |memb| !memb.identifier.nil? }
 
       memb_dcls.each do |memb_dcl|
         pair_names =
@@ -12139,8 +12144,11 @@ module CBuiltin #:nodoc:
     private
     def check(node)
       return unless node.type.scalar? && node.type.integer?
-      if node.type.bitfield? && node.type.signed? && node.type.bit_size == 1
-        W(node.location)
+
+      if node.identifier
+        if node.type.bitfield? && node.type.signed? && node.type.bit_size == 1
+          W(node.location)
+        end
       end
     end
   end
@@ -12520,7 +12528,7 @@ module CBuiltin #:nodoc:
       }
 
       if params.size > 1
-        params.first.zip(*params[1..-1]) do |names|
+        params.first.zip(*params.drop(1)) do |names|
           unless names.tap { |ary| ary.delete("") }.uniq.size == 1
             W(node.location)
             break
@@ -13378,7 +13386,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          trailing_args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          trailing_args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, trailing_args, env)
         end
       end
@@ -14863,7 +14871,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -14912,7 +14920,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -14961,7 +14969,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15037,7 +15045,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15090,7 +15098,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15404,7 +15412,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15457,7 +15465,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15688,7 +15696,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::PrintfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15735,7 +15743,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15788,7 +15796,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -15954,7 +15962,7 @@ module CBuiltin #:nodoc:
       if fmt_str_idx
         fmt_str = funcall_expr.argument_expressions[fmt_str_idx]
         if fmt_str && fmt_str.literal.value =~ /\AL?"(.*)"\z/i
-          args = arg_vars[(fmt_str_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_str_idx + 1) || []
           return Cc1::ScanfFormat.new($1, fmt_str.location, args, env)
         end
       end
@@ -19969,7 +19977,7 @@ module CBuiltin #:nodoc:
 
     private
     def check(node)
-      W(node.location) if node.type.members.empty?
+      W(node.location) if node.type.members.none? { |memb| memb.named? }
     end
   end
 
@@ -20800,7 +20808,7 @@ module CBuiltin #:nodoc:
         fmt_arg = expr.argument_expressions[fmt_idx]
         if fmt_arg && fmt_arg.literal.value =~ /\AL?"(.*)"\z/i
           loc = fmt_arg.location
-          args = arg_vars[(fmt_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_idx + 1) || []
           return Cc1::PrintfFormat.new($1, loc, args, @environ)
         end
       end
@@ -20812,7 +20820,7 @@ module CBuiltin #:nodoc:
         fmt_arg = expr.argument_expressions[fmt_idx]
         if fmt_arg && fmt_arg.literal.value =~ /\AL?"(.*)"\z/i
           loc = fmt_arg.location
-          args = arg_vars[(fmt_idx + 1)..-1] || []
+          args = arg_vars.drop(fmt_idx + 1) || []
           return Cc1::ScanfFormat.new($1, loc, args, @environ)
         end
       end

data/lib/adlint/ld/object.rb

@@ -150,16 +150,17 @@ module Ld #:nodoc:
     def execute(met_fpath)
       sma_wd = Pathname.pwd
       CSV.foreach(met_fpath) do |csv_row|
-        rec = MetricRecord.of(csv_row, sma_wd)
-        case
-        when rec.version?
-          sma_wd = Pathname.new(rec.exec_working_directory)
-        when rec.variable_definition?
-          if rec.variable_linkage_type == "X"
-            @map.add_variable(Variable.new(rec))
+        if rec = MetricRecord.of(csv_row, sma_wd)
+          case
+          when rec.version?
+            sma_wd = Pathname.new(rec.exec_working_directory)
+          when rec.variable_definition?
+            if rec.variable_linkage_type == "X"
+              @map.add_variable(Variable.new(rec))
+            end
+          when rec.global_variable_declaration?
+            @map.add_variable_declaration(VariableDeclaration.new(rec))
           end
-        when rec.global_variable_declaration?
-          @map.add_variable_declaration(VariableDeclaration.new(rec))
         end
       end
     end
@@ -308,14 +309,15 @@ module Ld #:nodoc:
     def execute(met_fpath)
       sma_wd = Pathname.pwd
       CSV.foreach(met_fpath) do |csv_row|
-        rec = MetricRecord.of(csv_row, sma_wd)
-        case
-        when rec.version?
-          sma_wd = Pathname.new(rec.exec_working_directory)
-        when rec.function_definition?
-          @map.add_function(Function.new(rec))
-        when rec.function_declaration?
-          @map.add_function_declaration(FunctionDeclaration.new(rec))
+        if rec = MetricRecord.of(csv_row, sma_wd)
+          case
+          when rec.version?
+            sma_wd = Pathname.new(rec.exec_working_directory)
+          when rec.function_definition?
+            @map.add_function(Function.new(rec))
+          when rec.function_declaration?
+            @map.add_function_declaration(FunctionDeclaration.new(rec))
+          end
         end
       end
     end
@@ -490,23 +492,27 @@ module Ld #:nodoc:
     def execute(met_fpath)
       sma_wd = Pathname.pwd
       CSV.foreach(met_fpath) do |csv_row|
-        rec = MetricRecord.of(csv_row, sma_wd)
-        case
-        when rec.version?
-          sma_wd = Pathname.new(rec.exec_working_directory)
-        when rec.variable_xref?
-          var = @var_map.lookup_variables(rec.accessee_variable).first
-          fun_id = rec.accessor_function
-          if fun_id.named?
-            fun = @fun_map.lookup_functions(fun_id.name).first
-            ref = ObjectReferrer.of_function(fun)
-          else
-            ref = ObjectReferrer.of_ctors_section(rec.location)
+        if rec = MetricRecord.of(csv_row, sma_wd)
+          case
+          when rec.version?
+            sma_wd = Pathname.new(rec.exec_working_directory)
+          when rec.variable_xref?
+            if var = @var_map.lookup_variables(rec.accessee_variable).first
+              fun_id = rec.accessor_function
+              if fun_id.named?
+                fun = @fun_map.lookup_functions(fun_id.name).first
+                ref = ObjectReferrer.of_function(fun)
+              else
+                ref = ObjectReferrer.of_ctors_section(rec.location)
+              end
+              @graph.add(ObjectReference.new(ref, var, rec.location))
+            end
+          when rec.function_xref?
+            ref, fun = lookup_referrer_and_function_by_xref(rec)
+            if ref && fun
+              @graph.add(ObjectReference.new(ref, fun, rec.location))
+            end
           end
-          @graph.add(ObjectReference.new(ref, var, rec.location)) if var
-        when rec.function_xref?
-          ref, fun = lookup_referrer_and_function_by_xref(rec)
-          @graph.add(ObjectReference.new(ref, fun, rec.location)) if ref && fun
         end
       end
     end
@@ -614,14 +620,15 @@ module Ld #:nodoc:
     def execute(met_fpath)
       sma_wd = Pathname.pwd
       CSV.foreach(met_fpath) do |csv_row|
-        rec = MetricRecord.of(csv_row, sma_wd)
-        case
-        when rec.version?
-          sma_wd = Pathname.new(rec.exec_working_directory)
-        when rec.function_call?
-          caller_ref, callee_fun = lookup_functions_by_call(rec)
-          if caller_ref && callee_fun
-            @graph.add(FunctionCall.new(caller_ref, callee_fun))
+        if rec = MetricRecord.of(csv_row, sma_wd)
+          case
+          when rec.version?
+            sma_wd = Pathname.new(rec.exec_working_directory)
+          when rec.function_call?
+            caller_ref, callee_fun = lookup_functions_by_call(rec)
+            if caller_ref && callee_fun
+              @graph.add(FunctionCall.new(caller_ref, callee_fun))
+            end
           end
         end
       end

data/lib/adlint/ld/typedef.rb

@@ -91,12 +91,13 @@ module Ld #:nodoc:
     def execute(met_fpath)
       sma_wd = Pathname.pwd
       CSV.foreach(met_fpath) do |csv_row|
-        rec = MetricRecord.of(csv_row, sma_wd)
-        case
-        when rec.version?
-          sma_wd = Pathname.new(rec.exec_working_directory)
-        when rec.typedef_declaration?
-          @map.add(Typedef.new(rec.type_name, rec.location))
+        if rec = MetricRecord.of(csv_row, sma_wd)
+          case
+          when rec.version?
+            sma_wd = Pathname.new(rec.exec_working_directory)
+          when rec.typedef_declaration?
+            @map.add(Typedef.new(rec.type_name, rec.location))
+          end
         end
       end
     end

data/lib/adlint/metric.rb

@@ -190,7 +190,11 @@ module AdLint #:nodoc:
       when "MET"
         create_metric_record(csv_row, sma_wd)
       else
-        raise "invalid metric record."
+        # NOTE: Silently ignore unknown records so that an optional examination
+        #       package may output its own special ones.
+        #
+        #raise "invalid metric record."
+        nil
       end
     end
 

data/lib/adlint/version.rb

@@ -33,8 +33,8 @@ module AdLint #:nodoc:
 
   MAJOR_VERSION = 3
   MINOR_VERSION = 2
-  PATCH_VERSION = 10
-  RELEASE_DATE  = "2014-02-17"
+  PATCH_VERSION = 12
+  RELEASE_DATE  = "2014-04-12"
 
   TRAITS_SCHEMA_VERSION = "3.0.0"
 

data/share/doc/developers_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 3.2.10 開発者ガイド</title>
+<title>AdLint 3.2.12 開発者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 3.2.10 開発者ガイド">
+<meta name="description" content="AdLint 3.2.12 開発者ガイド">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -44,7 +44,7 @@ td { border: 1px solid black; }
 --></style>
 </head>
 <body>
-<h1 class="settitle">AdLint 3.2.10 開発者ガイド</h1>
+<h1 class="settitle">AdLint 3.2.12 開発者ガイド</h1>
 <div class="contents">
 <h2>Table of Contents</h2>
 <ul>

data/share/doc/developers_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename developers_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 3.2.10 開発者ガイド
+@settitle AdLint 3.2.12 開発者ガイド
 
 @copying
 Copyright (C) 2010-2014, OGIS-RI Co.,Ltd.

data/share/doc/users_guide_en.html

@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>AdLint 3.2.10 User's Guide</title>
+<title>AdLint 3.2.12 User's Guide</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 3.2.10 User's Guide">
+<meta name="description" content="AdLint 3.2.12 User's Guide">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -44,7 +44,7 @@ td { border: 1px solid black; }
 --></style>
 </head>
 <body>
-<h1 class="settitle">AdLint 3.2.10 User's Guide</h1>
+<h1 class="settitle">AdLint 3.2.12 User's Guide</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>

data/share/doc/users_guide_en.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_en.info
 @documentlanguage en
 @documentencoding utf-8
-@settitle AdLint 3.2.10 User's Guide
+@settitle AdLint 3.2.12 User's Guide
 
 @copying
 Copyright (C) 2010-2014, OGIS-RI Co.,Ltd.

data/share/doc/users_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 3.2.10 利用者ガイド</title>
+<title>AdLint 3.2.12 利用者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 3.2.10 利用者ガイド">
+<meta name="description" content="AdLint 3.2.12 利用者ガイド">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -44,7 +44,7 @@ td { border: 1px solid black; }
 --></style>
 </head>
 <body>
-<h1 class="settitle">AdLint 3.2.10 利用者ガイド</h1>
+<h1 class="settitle">AdLint 3.2.12 利用者ガイド</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>

data/share/doc/users_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 3.2.10 利用者ガイド
+@settitle AdLint 3.2.12 利用者ガイド
 
 @copying
 Copyright (C) 2010-2014, OGIS-RI Co.,Ltd.

data/spec/adlint/cc1/syntax_spec.rb

@@ -591,7 +591,7 @@ module Cc1
     private
     def comma_separated_expression(*exprs)
       CommaSeparatedExpression.new(exprs.first).tap do |obj|
-        exprs[1..-1].each { |expr| obj.push(expr) }
+        exprs.drop(1).each { |expr| obj.push(expr) }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adlint
 version: !ruby/object:Gem::Version
-  version: 3.2.10
+  version: 3.2.12
 platform: ruby
 authors:
 - Yutaka Yanoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies: []
 description: |
   AdLint is a source code static analyzer.
@@ -82,6 +82,7 @@ files:
 - features/code_check/W0024.feature
 - features/code_check/W0025.feature
 - features/code_check/W0026.feature
+- features/code_check/W0067.feature
 - features/code_check/W0070.feature
 - features/code_check/W0071.feature
 - features/code_check/W0088.feature
@@ -879,25 +880,25 @@ post_install_message: |
 
   -------------------------------------------------------------------------------
 rdoc_options:
-- --main
+- "--main"
 - README
-- --charset
+- "--charset"
 - utf-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'AdLint :: Advanced Lint - An open source and free source code static analyzer'