adlint 2.2.0 → 2.4.0

data/features/code_check/W0071.feature

@@ -0,0 +1,51 @@
+Feature: W0071
+
+  W0071 detects that contents of a header included by #include "..." directive
+  are not referred by other files in a translation-unit.
+
+  Scenario: a typedef in the header and no reference to it
+    Given a target source named "fixture.c" with:
+      """
+      #include "test.h" /* W0071 */
+
+      int bar(void) { return 0; }
+      """
+    And a target source named "test.h" with:
+      """
+      #if !defined(TEST_H)
+      #define TEST_H
+
+      typedef int foo;
+
+      #endif
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 3    | 5      |
+      | W0071 | 1    | 1      |
+      | W0628 | 3    | 5      |
+
+  Scenario: a typedef in the header and reference to it in other file.
+    Given a target source named "fixture.c" with:
+      """
+      #include "test.h" /* OK */
+
+      foo bar(void) { return 0; }
+      """
+    And a target source named "test.h" with:
+      """
+      #if !defined(TEST_H)
+      #define TEST_H
+
+      typedef int foo;
+
+      #endif
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 3    | 5      |
+      | W0628 | 3    | 5      |
+
+# vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W0425.feature

@@ -0,0 +1,279 @@
+Feature: W0425
+
+  W0425 detects that two or more declarations or statements are in a line.
+
+  Scenario: two declarations in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(void)
+      {
+          int i = 0; int j = 0; /* W0425 */
+          return i + j;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0100 | 3    | 9      |
+      | W0100 | 3    | 20     |
+      | W0425 | 3    | 20     |
+      | W0628 | 1    | 5      |
+
+  Scenario: two declarators in a declaration
+    Given a target source named "fixture.c" with:
+      """
+      int foo(void)
+      {
+          int i = 0, j = 0; /* W0425 */
+          return i + j;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0100 | 3    | 9      |
+      | W0100 | 3    | 16     |
+      | W0425 | 3    | 16     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a declaration and a jump-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(void)
+      {
+          int i = 0; return i + 1; /* W0425 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0100 | 3    | 9      |
+      | W0425 | 3    | 16     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a expression-statement and a jump-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(void)
+      {
+          int i;
+          i = 0; return i + 1; /* W0425 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0100 | 3    | 9      |
+      | W0425 | 4    | 12     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a if-else-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          if (i == 0) return 0; else return 1; /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W1071 | 1    | 5      |
+      | W0414 | 3    | 17     |
+      | W0414 | 3    | 32     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a if-else-statement with compound-statements in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          if (i == 0) { return 0; } else { return 1; } /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W1071 | 1    | 5      |
+      | W0628 | 1    | 5      |
+
+  Scenario: a if-statement with compound-statements in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          if (i == 0) { return 0; } /* OK */
+          return 1;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W1071 | 1    | 5      |
+      | W0628 | 1    | 5      |
+
+  Scenario: a if-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          if (i == 0) return 0; /* OK */
+          return 1;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W1071 | 1    | 5      |
+      | W0414 | 3    | 17     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a for-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          int j, k = 1; /* W0425 */
+          for (j = 0; j < i; j++) k *= 2; /* OK */
+          return k;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W0414 | 4    | 29     |
+      | W0425 | 3    | 12     |
+      | W0628 | 1    | 5      |
+
+  Scenario: a for-statement with a compound-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          int j, k = 1; /* W0425 */
+          for (j = 0; j < i; j++) { k *= 2; } /* OK */
+          return k;
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W0425 | 3    | 12     |
+      | W0628 | 1    | 5      |
+
+  Scenario: extra statement after if-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          if (i == 0) return 0; return 1; /* W0425 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W1071 | 1    | 5      |
+      | W0414 | 3    | 17     |
+      | W0425 | 3    | 27     |
+      | W0628 | 1    | 5      |
+
+  Scenario: extra statement after for-statement in a line
+    Given a target source named "fixture.c" with:
+      """
+      int foo(int i)
+      {
+          int j, k = 1; /* W0425 */
+          for (j = 0; j < i; j++) k *= 2; return k; /* W0425 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 1    | 5      |
+      | W0104 | 1    | 13     |
+      | W0414 | 4    | 29     |
+      | W0425 | 3    | 12     |
+      | W0425 | 4    | 37     |
+      | W0628 | 1    | 5      |
+
+  Scenario: two member-declarations in a line
+    Given a target source named "fixture.c" with:
+      """
+      struct foo { int i; int j; }; /* W0425 */
+      union bar { int i; int j; }; /* W0425 */
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0551 | 2    | 7      |
+      | W0425 | 1    | 25     |
+      | W0425 | 2    | 24     |
+
+  Scenario: two declarators in a member-declaration
+    Given a target source named "fixture.c" with:
+      """
+      struct foo { int *p, i; }; /* W0425 */
+      union bar { int *p, i; }; /* W0425 */
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0551 | 2    | 7      |
+      | W0425 | 1    | 22     |
+      | W0425 | 2    | 21     |
+
+  Scenario: two declarators in a member-declaration
+    Given a target source named "fixture.c" with:
+      """
+      extern struct { int i; } foo; /* OK */
+      extern union { int i; } bar; /* OK */
+      typedef struct { int i; } baz; /* OK */
+      typedef union { int i; } qux; /* OK */
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0118 | 1    | 26     |
+      | W0118 | 2    | 25     |
+      | W0551 | 2    | 8      |
+      | W0551 | 4    | 9      |
+
+  Scenario: two declarators in a member-declaration
+    Given a target source named "fixture.c" with:
+      """
+      extern struct { int *p, i; } foo; /* W0425 */
+      extern union { int *p, i; } bar; /* W0425 */
+      typedef struct { int *p, i; } baz; /* W0425 */
+      typedef union { int *p, i; } qux; /* W0425 */
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0118 | 1    | 30     |
+      | W0118 | 2    | 29     |
+      | W0551 | 2    | 8      |
+      | W0551 | 4    | 9      |
+      | W0425 | 1    | 25     |
+      | W0425 | 2    | 24     |
+      | W0425 | 3    | 26     |
+      | W0425 | 4    | 25     |
+
+# vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W0692.feature

@@ -2,7 +2,7 @@ Feature: W0692
 
   W0692 detects that no argument is given to a function-like macro.
 
-  Scenario: no argument to a function-like macro
+  Scenario: empty argument to a function-like macro
     Given a target source named "fixture.c" with:
       """
       #define MACRO(a) #a
@@ -29,4 +29,17 @@ Feature: W0692
       | W0442 | 1    | 1      |
       | W0117 | 3    | 13     |
 
+  Scenario: no argument to a function-like macro
+    Given a target source named "fixture.c" with:
+      """
+      #define MACRO() 0
+
+      const int i = MACRO(); /* W0692 */
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0442 | 1    | 1      |
+      | W0117 | 3    | 11     |
+
 # vim:ts=2:sw=2:sts=2:et:

data/features/code_check/W0834.feature

@@ -116,7 +116,9 @@ Feature: W0834
   Scenario: `long long' in sizeof-expression
     Given a target source named "fixture.c" with:
       """
-      static int foo(void)
+      #include <stddef.h>
+      
+      static size_t foo(void)
       {
           return sizeof(long long); /* W0834 */
       }
@@ -124,10 +126,10 @@ Feature: W0834
     When I successfully run `adlint fixture.c` on noarch
     Then the output should exactly match with:
       | mesg  | line | column |
-      | W1076 | 1    | 12     |
-      | W0629 | 1    | 12     |
-      | W0834 | 3    | 19     |
-      | W0628 | 1    | 12     |
+      | W1076 | 3    | 15     |
+      | W0629 | 3    | 15     |
+      | W0834 | 5    | 19     |
+      | W0628 | 3    | 15     |
 
   Scenario: multiple `long long' parameters in function declaration
     Given a target source named "fixture.c" with:

data/features/code_check/W1073.feature

@@ -78,7 +78,6 @@ Feature: W1073
       | mesg  | line | column |
       | W0118 | 1    | 12     |
       | W1076 | 2    | 13     |
-      | W0100 | 5    | 9      |
       | W1073 | 6    | 20     |
       | W0629 | 2    | 13     |
       | W0535 | 6    | 10     |

data/features/code_check/W1074.feature

@@ -23,6 +23,7 @@ Feature: W1074
       | mesg  | line | column |
       | W1076 | 1    | 12     |
       | W0612 | 5    | 21     |
+      | W0168 | 5    | 24     |
       | W0609 | 5    | 21     |
       | W0629 | 1    | 12     |
       | W1074 | 5    | 15     |
@@ -49,6 +50,8 @@ Feature: W1074
       | mesg  | line | column |
       | W1076 | 1    | 12     |
       | W0613 | 5    | 33     |
+      | W0168 | 5    | 16     |
+      | W0168 | 5    | 36     |
       | W0610 | 5    | 33     |
       | W0629 | 1    | 12     |
       | W1074 | 5    | 26     |
@@ -75,6 +78,7 @@ Feature: W1074
       | mesg  | line | column |
       | W1076 | 1    | 12     |
       | W0612 | 5    | 20     |
+      | W0168 | 5    | 23     |
       | W0609 | 5    | 20     |
       | W0629 | 1    | 12     |
       | W1074 | 5    | 17     |
@@ -102,6 +106,7 @@ Feature: W1074
       | W0118 | 1    | 12     |
       | W1076 | 3    | 12     |
       | W0612 | 5    | 23     |
+      | W0168 | 5    | 26     |
       | W0609 | 5    | 23     |
       | W1073 | 5    | 19     |
       | W0629 | 3    | 12     |
@@ -131,6 +136,7 @@ Feature: W1074
       | W1077 | 1    | 12     |
       | W1076 | 3    | 12     |
       | W0612 | 5    | 22     |
+      | W0168 | 5    | 25     |
       | W0609 | 5    | 22     |
       | W0629 | 3    | 12     |
       | W9001 | 9    | 9      |

data/features/code_check/W9003.feature

@@ -127,4 +127,58 @@ Feature: W9003
       | W0502 | 5    | 9      |
       | W0628 | 3    | 12     |
 
+  Scenario: no implicit conversion of size_t value
+    Given a target source named "fixture.c" with:
+      """
+      #include <stddef.h>
+
+      size_t foo(int a)
+      {
+          return sizeof(a); /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 3    | 8      |
+      | W0104 | 3    | 16     |
+      | W0628 | 3    | 8      |
+
+  Scenario: implicit conversion of size_t value
+    Given a target source named "fixture.c" with:
+      """
+      #include <stddef.h>
+
+      int foo(int a)
+      {
+          return sizeof(a); /* W9003 */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 3    | 5      |
+      | W0150 | 5    | 12     |
+      | W9003 | 5    | 12     |
+      | W0286 | 5    | 5      |
+      | W0104 | 3    | 13     |
+      | W0628 | 3    | 5      |
+
+  Scenario: explicit conversion of size_t value
+    Given a target source named "fixture.c" with:
+      """
+      #include <stddef.h>
+
+      int foo(int a)
+      {
+          return (int) sizeof(a); /* OK */
+      }
+      """
+    When I successfully run `adlint fixture.c` on noarch
+    Then the output should exactly match with:
+      | mesg  | line | column |
+      | W0117 | 3    | 5      |
+      | W0104 | 3    | 13     |
+      | W0628 | 3    | 5      |
+
 # vim:ts=2:sw=2:sts=2:et:

data/features/support/env.rb

@@ -1,11 +1,12 @@
 NOARCH_TRAITS = <<EOF
-version: "2.0.0"
+version: "2.4.0"
 
 exam_packages:
   - "c_builtin"
 
 project_traits:
   project_name: "features"
+  project_root: "."
   include_path:
   initial_header: "empty_pinit.h"
   coding_style:
@@ -71,7 +72,8 @@ linker_traits:
 message_traits:
   language: "ja_JP"
   message_with_class: false
-  warn_only_files_in:
+  warn_files_in:
+  warn_files_not_in:
   individual_selection: true
   exclusion:
   inclusion:
@@ -111,6 +113,15 @@ DUMMY_ASSERT_H = <<EOF
 #endif
 EOF
 
+DUMMY_STDDEF_H = <<EOF
+#if !defined(DUMMY_STDDEF_H)
+#define DUMMY_STDDEF_H
+
+typedef unsigned long size_t;
+
+#endif
+EOF
+
 require "pathname"
 require "stringio"
 
@@ -135,7 +146,7 @@ def run_adlint(cmd, *args)
   create_adlint_files
   cd_to_tmpdir do
     $all_output = exec(cmd, *args).each_line.map { |line|
-      if line =~ /_pinit\.h|_cinit\.h|stdio\.h|math\.h|assert\.h/
+      if line =~ /_pinit\.h|_cinit\.h|stdio\.h|math\.h|assert\.h|stddef\.h/
         nil
       else
         line.chomp
@@ -181,6 +192,7 @@ def create_adlint_files
     create_file("stdio.h", DUMMY_STDIO_H)
     create_file("math.h", DUMMY_MATH_H)
     create_file("assert.h", DUMMY_ASSERT_H)
+    create_file("stddef.h", DUMMY_STDDEF_H)
   end
 end
 

data/lib/adlint/c/expr.rb

@@ -1664,14 +1664,20 @@ module C #:nodoc:
     def visit_sizeof_expression(node)
       checkpoint(node.location)
 
+      if size_t_type = type_of(UserTypeId.new("size_t"))
+        result_type = size_t_type
+      else
+        result_type = unsigned_long_type
+      end
+
       object = node.operand.accept(self)
       if object.variable?
         variable = object
         result = temporary_variable(
-          int_type, ScalarValue.of(variable.type.aligned_byte_size))
+          result_type, ScalarValue.of(variable.type.aligned_byte_size))
         notify_sizeof_expr_evaled(node, variable, result)
       else
-        result = temporary_variable(int_type)
+        result = temporary_variable(result_type)
       end
 
       result
@@ -1682,8 +1688,14 @@ module C #:nodoc:
 
       resolve_unresolved_type(node.operand)
 
+      if size_t_type = type_of(UserTypeId.new("size_t"))
+        result_type = size_t_type
+      else
+        result_type = unsigned_long_type
+      end
+
       result = temporary_variable(
-        int_type, ScalarValue.of(node.operand.type.aligned_byte_size))
+        result_type, ScalarValue.of(node.operand.type.aligned_byte_size))
       notify_sizeof_type_expr_evaled(node, node.operand.type, result)
 
       result
@@ -1692,13 +1704,19 @@ module C #:nodoc:
     def visit_alignof_expression(node)
       checkpoint(node.location)
 
+      if size_t_type = type_of(UserTypeId.new("size_t"))
+        result_type = size_t_type
+      else
+        result_type = unsigned_long_type
+      end
+
       object = node.operand.accept(self)
       if object.variable?
         variable = object
-        temporary_variable(int_type,
+        temporary_variable(result_type,
                            ScalarValue.of(variable.type.byte_alignment))
       else
-        temporary_variable(int_type)
+        temporary_variable(result_type)
       end
     end
 
@@ -1707,7 +1725,13 @@ module C #:nodoc:
 
       resolve_unresolved_type(node.operand)
 
-      temporary_variable(int_type,
+      if size_t_type = type_of(UserTypeId.new("size_t"))
+        result_type = size_t_type
+      else
+        result_type = unsigned_long_type
+      end
+
+      temporary_variable(result_type,
                          ScalarValue.of(node.operand.type.aligned_byte_size))
     end
 

data/lib/adlint/c/interp.rb

@@ -924,6 +924,10 @@ module C #:nodoc:
     end
 
     def lookup_or_define_function(function_definition)
+      function_definition.type.declarations.each do |decl|
+        decl.mark_as_referred_by(function_definition.identifier)
+      end
+
       if function = function_named(function_definition.identifier.value)
         function.declarations_and_definitions.each do |decl_or_def|
           decl_or_def.mark_as_referred_by(function_definition.identifier)

data/lib/adlint/cpp/eval.rb

@@ -684,14 +684,19 @@ module Cpp #:nodoc:
       include_paths += Traits.instance.of_project.include_path
       include_paths += Traits.instance.of_compiler.include_path
 
-      result = []
-      include_paths.each do |dpath|
-        fpath = dpath.join(Pathname.new(basename))
-        fpath = Pathname.new(fpath.to_s.gsub(/\\\\|\\/, "/"))
-        result.push(fpath) if fpath.readable?
-        break if result.size == max_num
+      base_fpath = Pathname.new(basename)
+      if base_fpath.absolute? && base_fpath.readable?
+        return [base_fpath]
+      else
+        result = []
+        include_paths.each do |dpath|
+          fpath = dpath.join(base_fpath)
+          fpath = Pathname.new(fpath.to_s.gsub(/\\\\|\\/, "/"))
+          result.push(fpath) if fpath.readable?
+          break if result.size == max_num
+        end
+        result
       end
-      result
     end
 
     def resolve_first_system_header(basename)
@@ -706,14 +711,19 @@ module Cpp #:nodoc:
       include_paths = Traits.instance.of_project.include_path
       include_paths += Traits.instance.of_compiler.include_path
 
-      result = []
-      include_paths.each do |dpath|
-        fpath = dpath.join(Pathname.new(basename))
-        fpath = Pathname.new(fpath.to_s.gsub(/\\\\|\\/, "/"))
-        result.push(fpath) if fpath.readable?
-        break if result.size == max_num
+      base_fpath = Pathname.new(basename)
+      if base_fpath.absolute? && base_fpath.readable?
+        return [base_fpath]
+      else
+        result = []
+        include_paths.each do |dpath|
+          fpath = dpath.join(base_fpath)
+          fpath = Pathname.new(fpath.to_s.gsub(/\\\\|\\/, "/"))
+          result.push(fpath) if fpath.readable?
+          break if result.size == max_num
+        end
+        result
       end
-      result
     end
 
     def macro_defined?(context, identifier)