adlint 1.2.0 → 1.4.0

data/lib/adlint/c/type.rb

@@ -312,6 +312,10 @@ module C #:nodoc:
       subclass_responsibility
     end
 
+    def enumerators
+      subclass_responsibility
+    end
+
     def length
       subclass_responsibility
     end
@@ -763,6 +767,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      []
+    end
+
     def length
       0
     end
@@ -1279,6 +1287,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      []
+    end
+
     def length
       0
     end
@@ -1793,6 +1805,10 @@ module C #:nodoc:
       @base_type.parameter_types
     end
 
+    def enumerators
+      @base_type.enumerators
+    end
+
     def length
       @base_type.length
     end
@@ -2098,6 +2114,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      []
+    end
+
     def length
       0
     end
@@ -2615,6 +2635,10 @@ module C #:nodoc:
       @have_va_list
     end
 
+    def enumerators
+      []
+    end
+
     def length
       0
     end
@@ -3159,6 +3183,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      subclass_responsibility
+    end
+
     def length
       0
     end
@@ -3484,6 +3512,10 @@ module C #:nodoc:
       @explicitly_signed
     end
 
+    def enumerators
+      subclass_responsibility
+    end
+
     def min_value
       if @signed
         -2**(@bit_size - 1)
@@ -3590,6 +3622,10 @@ module C #:nodoc:
       false
     end
 
+    def enumerators
+      []
+    end
+
     def integer_conversion_rank
       subclass_responsibility
     end
@@ -4854,6 +4890,10 @@ module C #:nodoc:
       false
     end
 
+    def enum?
+      false
+    end
+
     def bitfield?
       false
     end
@@ -4866,6 +4906,10 @@ module C #:nodoc:
       true
     end
 
+    def enumerators
+      []
+    end
+
     def min_value
       (-2**fraction_bit_size * 10**(exponent_bit_size - 1)).to_f
     end
@@ -5084,6 +5128,10 @@ module C #:nodoc:
       @base_type.unresolved?
     end
 
+    def enumerators
+      []
+    end
+
     def integer_conversion_rank
       -1
     end
@@ -5186,6 +5234,10 @@ module C #:nodoc:
       "enum #{name}"
     end
 
+    def enumerators
+      declarations.map { |decl| decl.enumerators }.compact.flatten.uniq
+    end
+
     def integer_conversion_rank
       # NOTE: The ISO C99 standard saids;
       #
@@ -5304,6 +5356,10 @@ module C #:nodoc:
       false
     end
 
+    def enumerators
+      []
+    end
+
     def integer_conversion_rank
       # NOTE: Pointer variables must not be converted implicitly.
       100
@@ -5562,6 +5618,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      []
+    end
+
     def members
       []
     end
@@ -6118,6 +6178,10 @@ module C #:nodoc:
       []
     end
 
+    def enumerators
+      []
+    end
+
     def length
       0
     end
@@ -6651,6 +6715,7 @@ module C #:nodoc:
     def_delegator :@base_type, :have_va_list?
     def_delegator :@base_type, :return_type
     def_delegator :@base_type, :parameter_types
+    def_delegator :@base_type, :enumerators
     def_delegator :@base_type, :length
     def_delegator :@base_type, :impl_length
     def_delegator :@base_type, :members
@@ -6792,6 +6857,7 @@ module C #:nodoc:
     def_delegator :@type, :have_va_list?
     def_delegator :@type, :return_type
     def_delegator :@type, :parameter_types
+    def_delegator :@type, :enumerators
     def_delegator :@type, :length
     def_delegator :@type, :impl_length
     def_delegator :@type, :members
@@ -6882,6 +6948,10 @@ module C #:nodoc:
       false
     end
 
+    def enumerators
+      []
+    end
+
     def integer_conversion_rank
       # NOTE: The ISO C99 standard saids;
       #

data/lib/adlint/cpp/eval.rb

@@ -61,6 +61,7 @@ module Cpp #:nodoc:
     def_plugin :on_object_like_macro_defined
     def_plugin :on_function_like_macro_defined
     def_plugin :on_va_function_like_macro_defined
+    def_plugin :on_macro_undefined
     def_plugin :on_asm_section_evaled
     def_plugin :on_unknown_pragma_evaled
     def_plugin :on_pp_token_extracted
@@ -492,8 +493,14 @@ module Cpp #:nodoc:
       unless new_line = context.next_token and new_line.type == :NEW_LINE
         return nil
       end
+
+      undef_line = UndefLine.new(keyword, identifier)
+      macro = context.macro_table.lookup(identifier.value)
+      # NOTE: Undefining macro may be nil if not defined.
+      notify_macro_undefined(undef_line, macro)
+
       context.macro_table.undef(identifier.value)
-      UndefLine.new(keyword, identifier)
+      undef_line
     end
 
     def line_line(context)
@@ -803,6 +810,10 @@ module Cpp #:nodoc:
       on_va_function_like_macro_defined.invoke(define_line, macro)
     end
 
+    def notify_macro_undefined(undef_line, macro)
+      on_macro_undefined.invoke(undef_line, macro)
+    end
+
     def notify_asm_section_evaled(asm_section)
       on_asm_section_evaled.invoke(asm_section)
     end

data/lib/adlint/cpp/message_shima.rb

@@ -35,6 +35,25 @@ require "adlint/message"
 module AdLint #:nodoc:
 module Cpp #:nodoc:
 
+  class W0687 < PassiveMessageDetection
+    # NOTE: W0687 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0687
+
+    def initialize(context)
+      super
+      interp = context[:cpp_interpreter]
+      interp.on_macro_undefined += method(:check)
+    end
+
+    private
+    def check(undef_line, macro)
+      if undef_line.identifier.value == "defined"
+        W(:W0687, undef_line.identifier.location)
+      end
+    end
+  end
+
   class W0688 < PassiveMessageDetection
     # NOTE: W0688 may be duplicative when the same header which causes this
     #       warning is included twice or more.
@@ -96,5 +115,37 @@ module Cpp #:nodoc:
     end
   end
 
+  class W0695 < W0687
+    # NOTE: W0695 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0695
+
+    private
+    def check(undef_line, macro)
+      if undef_line.identifier.value == "assert"
+        W(:W0695, undef_line.identifier.location)
+      end
+    end
+  end
+
+  class W0806 < PassiveMessageDetection
+    # NOTE: W0806 may be duplicative when the same header which causes this
+    #       warning is included twice or more.
+    ensure_uniqueness_of :W0806
+
+    def initialize(context)
+      super
+      interp = context[:cpp_interpreter]
+      interp.on_object_like_macro_defined += method(:check)
+    end
+
+    private
+    def check(define_line, macro)
+      if define_line.identifier.value == "defined"
+        W(:W0806, define_line.identifier.location)
+      end
+    end
+  end
+
 end
 end

data/lib/adlint/cpp/phase.rb

@@ -100,11 +100,14 @@ module Cpp #:nodoc:
         W0575.new(context),
         W0576.new(context),
         W0577.new(context),
+        W0687.new(context),
         W0688.new(context),
         W0689.new(context),
         W0690.new(context),
+        W0695.new(context),
         W0696.new(context),
         W0804.new(context),
+        W0806.new(context),
         W0831.new(context),
         W9002.new(context)
       ]

data/lib/adlint/version.rb

@@ -32,9 +32,9 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 1
-  MINOR_VERSION = 2
+  MINOR_VERSION = 4
   PATCH_VERSION = 0
-  RELEASE_DATE  = "2012-03-21"
+  RELEASE_DATE  = "2012-03-29"
 
   TRAITS_SCHEMA_VERSION = "1.0.0"
 

data/share/demo/Makefile

@@ -8,10 +8,12 @@ bad_charset \
 bad_comment \
 bad_const \
 bad_conv \
+bad_enum \
 bad_indent \
 bad_init \
 bad_line \
 bad_macro \
+bad_return \
 bitwise_expr \
 call_by_value \
 cross_ref \
@@ -71,6 +73,7 @@ uninit_vars \
 union_type \
 unmatch_decl \
 unmatch_paren_macro \
+unnamed_member \
 unreachable \
 useless_exp_funs \
 useless_exp_vars \

data/share/demo/bad_enum/bad_enum.c

@@ -0,0 +1,27 @@
+enum Foo { FOO_A, FOO_B, FOO_C };
+enum Bar { BAR_A = 1, BAR_B, BAR_C };
+enum Baz { BAZ_A = 2, BAZ_B = 4, BAZ_C = 8 };
+
+extern void func1(enum Foo f);
+
+enum Foo func2(const enum Foo param)
+{
+    enum Foo foo = BAR_A;
+    foo = FOO_A;
+
+    switch (param) {
+    case FOO_A:
+        foo = BAR_A;
+        func1(BAR_A);
+        return BAR_B;
+    case BAR_B:
+    case 5:
+        foo = BAZ_C;
+        func1(BAZ_C);
+        return BAZ_C;
+    case 6:
+        return 10;
+    }
+
+    return FOO_C;
+}

data/share/demo/bad_macro/bad_macro.c

@@ -95,3 +95,7 @@ static void bar(int i)
 #define RETURN return
 #define BREAK break
 #define CONTINUE continue
+
+#undef assert
+#define defined !defined
+#undef defined

data/share/demo/bad_return/bad_return.c

@@ -0,0 +1,83 @@
+int ansi_int_func_1(const int i)
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+int kandr_int_func_1(i)
+    const int i;
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+static void ansi_void_func(const int i)
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+static void kandr_void_func(i)
+    const int i;
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+ansi_int_func_2(const i)
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+kandr_int_func2(i)
+    const i;
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+const void ansi_qualified_void_func_1(const int i)
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}
+
+volatile void kandr_qualified_void_func_1(i)
+    const int i;
+{
+    if (i == 0) {
+        return;
+    }
+    else {
+        return i * 2;
+    }
+}