adlint 1.6.0 → 1.8.0

data/lib/adlint/cpp/phase.rb

@@ -41,7 +41,7 @@ require "adlint/cpp/util"
 module AdLint #:nodoc:
 module Cpp #:nodoc:
 
-  class PreparePhase < Phase
+  class Prepare1Phase < Phase
     private
     def do_execute(context)
       monitored_region("pr1") do
@@ -50,7 +50,14 @@ module Cpp #:nodoc:
         context[:cpp_macro_table] = MacroTable.new
         context[:cpp_interpreter] = Preprocessor.new
         context[:cpp_visitor] = SyntaxTreeMulticastVisitor.new
+      end
+    end
+  end
 
+  class Prepare2Phase < Phase
+    private
+    def do_execute(context)
+      monitored_region("pr2") do
         context[:cpp_commands] =
           setup_code_extractions(context) + setup_message_detections(context)
       end
@@ -101,6 +108,9 @@ module Cpp #:nodoc:
         W0575.new(context),
         W0576.new(context),
         W0577.new(context),
+        W0632.new(context),
+        W0633.new(context),
+        W0634.new(context),
         W0687.new(context),
         W0688.new(context),
         W0689.new(context),
@@ -112,6 +122,7 @@ module Cpp #:nodoc:
         W0807.new(context),
         W0808.new(context),
         W0831.new(context),
+        W0832.new(context),
         W9002.new(context)
       ]
     end

data/lib/adlint/cpp/source.rb

@@ -94,8 +94,8 @@ module Cpp #:nodoc:
     private
     def create_extension_substitution(pattern, replacement)
       CodeSubstitution.new(pattern, replacement).tap do |subst|
-        subst.on_substitution += lambda { |location, matched|
-          on_language_extension.invoke(location, matched)
+        subst.on_substitution += lambda { |matched_tokens|
+          on_language_extension.invoke(matched_tokens)
         }
       end
     end

data/lib/adlint/cpp/subst.rb

@@ -68,10 +68,8 @@ module Cpp #:nodoc:
 
     private
     def notify_substitution(tokens, index, length)
-      matched = tokens[index, length].map { |token|
-        token.type == :NEW_LINE ? nil : token.value
-      }.compact.join(" ")
-      on_substitution.invoke(tokens[index].location, matched)
+      matched_tokens = tokens[index, length]
+      on_substitution.invoke(matched_tokens) unless matched_tokens.empty?
     end
   end
 

data/lib/adlint/lang.rb

@@ -68,12 +68,14 @@ module AdLint #:nodoc:
       class << self
         def single_module_phases
           [
-            AdLint::Cpp::PreparePhase,
+            AdLint::Cpp::Prepare1Phase,
+            AdLint::C::Prepare1Phase,
+            AdLint::Cpp::Prepare2Phase,
             AdLint::Cpp::EvalPhase,
             AdLint::Cpp::SubstPhase,
             AdLint::C::ParsePhase,
             AdLint::C::ResolvePhase,
-            AdLint::C::PreparePhase,
+            AdLint::C::Prepare2Phase,
             AdLint::C::InterpPhase,
             AdLint::Cpp::ReviewPhase,
             AdLint::C::ReviewPhase,
@@ -84,7 +86,7 @@ module AdLint #:nodoc:
 
         def check_phases
           [
-            AdLint::Cpp::PreparePhase,
+            AdLint::Cpp::Prepare1Phase,
             AdLint::Cpp::EvalPhase,
             AdLint::Cpp::SubstPhase,
             AdLint::C::ParsePhase

data/lib/adlint/ld/metric.rb

@@ -48,7 +48,7 @@ module Ld #:nodoc:
 
     def measure(function)
       call_graph = @context[:ld_function_call_graph]
-      FN_CALL(FunctionIdentifier.new(function.name, function.signature.to_s),
+      FN_CALL(FunctionIdentifier.new(function.name, function.signature),
               function.location, call_graph.all_callers_of(function).size)
     end
   end

data/lib/adlint/version.rb

@@ -32,9 +32,9 @@
 module AdLint #:nodoc:
 
   MAJOR_VERSION = 1
-  MINOR_VERSION = 6
+  MINOR_VERSION = 8
   PATCH_VERSION = 0
-  RELEASE_DATE  = "2012-04-06"
+  RELEASE_DATE  = "2012-04-27"
 
   TRAITS_SCHEMA_VERSION = "1.0.0"
 

data/share/demo/Makefile

@@ -9,6 +9,7 @@ bad_comment \
 bad_const \
 bad_conv \
 bad_enum \
+bad_include \
 bad_indent \
 bad_init \
 bad_label \
@@ -31,6 +32,7 @@ id_hiding \
 ill_defined \
 implicit_conv \
 implicit_int \
+incomplete_ifelse \
 incomplete_type \
 indirect_recur \
 inline_asm \
@@ -39,6 +41,7 @@ invalid_call \
 kandr_fundef \
 line_comment \
 local_decl \
+logical_expr \
 logical_trick \
 long_sym \
 loop_var \
@@ -63,6 +66,7 @@ output_by_param \
 overflow \
 press_release \
 redundant_select \
+register_vars \
 reserved_ident \
 retn_lvar_addr \
 sequence_point \
@@ -71,6 +75,7 @@ should_be_typedef \
 static_paths \
 static_vars \
 tag_hiding \
+typedef_each_src \
 tricky_incdec \
 undefined_macro \
 uninit_vars \

data/share/demo/bad_include/bad_include.c

@@ -0,0 +1,13 @@
+#include <test'1'.h>
+/*#include <test"1".h>*/
+
+#include "test'2'.h"
+#include ".\test'2'.h"
+#include ".\\test'2'.h"
+
+#include_next <test'1'.h>
+/*#include_next <test"1".h>*/
+
+#include_next "test'2'.h"
+#include_next ".\test'2'.h"
+#include_next ".\\test'2'.h"

data/share/demo/incomplete_ifelse/incomplete_ifelse.c

@@ -0,0 +1,29 @@
+int foo(const int i)
+{
+    int j;
+
+    if (i == 0) {
+        j = 0;
+    }
+
+    if (i == 1) {
+        j = 1;
+    }
+    else if (i == 2) {
+        j = 2;
+    }
+
+    if (i > 2) {
+        if (i == 5) {
+            j = 5;
+        }
+        else if (i == 6) {
+            j = 6;
+        }
+    }
+    else if (i < 0) {
+        j = -1;
+    }
+
+    return j;
+}

data/share/demo/inline_asm/inline_asm.c

@@ -1,6 +1,7 @@
 void foo(int arg1, int *arg2, int arg3)
 {
     asm("movl %ecx, %eax");
+
     __asm__("movl %ecx, (%eax)");
 
     asm {
@@ -16,3 +17,27 @@ void foo(int arg1, int *arg2, int arg3)
             : "a" (128)
             : "memory", "cc");
 }
+
+#define ASM1 asm("movl %ecx, %eax");
+
+#define ASM2 __asm__("movl %ecx, (%eax)");
+
+#define ASM3 asm { xorl eax, eax }
+
+#define ASM4(arg1, arg2, arg3)   \
+    __asm__ volatile (           \
+	"int $0x80"              \
+            : "=a" (r)           \
+              "+b" (arg1),       \
+              "+c" (arg2),       \
+              "+d" (arg3)        \
+            : "a" (128)          \
+            : "memory", "cc");
+
+void bar(int arg1, int *arg2, int arg3)
+{
+    ASM1;
+    ASM2;
+    ASM3;
+    ASM4(arg1, arg2, arg3);
+}

data/share/demo/invalid_call/invalid_call.c

@@ -1,5 +1,6 @@
-int baz(i)
+int baz(i, a)
     const int i;
+    const char a[];
 {
     return i;
 }
@@ -8,6 +9,7 @@ int main(void)
 {
     const short s = 0;
     const int i = 0;
+    const char a[3];
 
     foo(s);
     foo(i);
@@ -17,9 +19,11 @@ int main(void)
     bar(i);
     bar(s, i);
 
-    baz(s);
-    baz(i);
-    baz(s, i);
+    baz(s, a);
+    baz(i, a);
+    baz(s, a, i);
+
+    qux();
 
     return 0;
 }
@@ -35,3 +39,7 @@ static int bar(const int i)
 
     return i;
 }
+
+static int qux(void)
+{
+}

data/share/demo/logical_expr/logical_expr.c

@@ -0,0 +1,73 @@
+int foo(const int i1, const int i2, const int i3, const int i4)
+{
+    int r;
+
+    r = (i1 + i2) < (i3 == i4);
+    r = i1 - i2 > (i3 != i4);
+    r = (i1 * i2) <= (i3 < i4);
+    r = i1 / i2 >= (i3 > i4);
+    r = (i1 % i2) < (i3 <= i4);
+    r = i1 & i2 > (i3 >= i4);
+    r = (i1 | i2) <= !i3;
+    r = i1 ^ i2 >= !(i3 + i4);
+    r = (i1 << i2) > (!i3 < (i4 + i1));
+
+    r = (i3 == i4) < (i1 + i2);
+    r = (i3 != i4) > i1 - i2;
+    r = (i3 < i4) <= (i1 * i2);
+    r = (i3 > i4) >= i1 / i2;
+    r = (i3 <= i4) < (i1 % i2);
+    r = (i3 >= i4) > i1 & i2;
+    r = !i3 <= (i1 | i2);
+    r = !(i3 + i4) >= i1 ^ i2;
+    r = (!i3 < (i4 + i1)) > (i1 << i2);
+
+    r = (!i3 < (i4 + i1)) < (i3 == i4);
+    r = !(i3 + i4) > (i3 != i4);
+    r = !i3 <= (i3 < i4);
+    r = (i3 >= i4) >= (i3 > i4);
+    r = (i3 <= i4) < (i3 <= i4);
+    r = (i3 > i4) > (i3 >= i4);
+    r = (i3 < i4) <= !i3;
+    r = (i3 != i4) >= !(i3 + i4);
+    r = (i3 == i4) > (!i3 < (i4 + i1));
+
+    return r;
+}
+
+int bar(const int i1, const int i2, const int i3, const int i4)
+{
+    int r;
+
+    r = (i1 + i2) & (i3 == i4);
+    r = i1 - i2 | (i3 != i4);
+    r = (i1 * i2) & (i3 < i4);
+    r = i1 / i2 | (i3 > i4);
+    r = (i1 % i2) & (i3 <= i4);
+    r = i1 & i2 | (i3 >= i4);
+    r = (i1 | i2) & !i3;
+    r = i1 ^ i2 | !(i3 + i4);
+    r = (i1 << i2) & (!i3 < (i4 + i1));
+
+    r = (i3 == i4) | (i1 + i2);
+    r = (i3 != i4) & i1 - i2;
+    r = (i3 < i4) | (i1 * i2);
+    r = (i3 > i4) & i1 / i2;
+    r = (i3 <= i4) | (i1 % i2);
+    r = (i3 >= i4) & i1 & i2;
+    r = !i3 | (i1 | i2);
+    r = !(i3 + i4) & i1 ^ i2;
+    r = (!i3 < (i4 + i1)) | (i1 << i2);
+
+    r = (!i3 < (i4 + i1)) & (i3 == i4);
+    r = !(i3 + i4) | (i3 != i4);
+    r = !i3 & (i3 < i4);
+    r = (i3 >= i4) | (i3 > i4);
+    r = (i3 <= i4) & (i3 <= i4);
+    r = (i3 > i4) | (i3 >= i4);
+    r = (i3 < i4) & !i3;
+    r = (i3 != i4) | !(i3 + i4);
+    r = (i3 == i4) & (!i3 < (i4 + i1));
+
+    return r;
+}

data/share/demo/register_vars/register_vars.c

@@ -0,0 +1,12 @@
+extern int puts(const char *);
+
+void foo(void)
+{
+    register char a[3];
+    char *p = a;
+
+    p = &a[0];
+    p = &a[1];
+
+    puts(a);
+}

data/share/demo/typedef_each_src/typedef_each_src.c

@@ -0,0 +1,9 @@
+typedef int integer;
+
+integer ei1 = 0;
+static integer si = 0;
+
+void foo(void)
+{
+    extern integer ei2;
+}

data/share/demo/wrap_around/wrap_around.c

@@ -110,3 +110,20 @@ static void qux(const unsigned int ui)
         ui3 = ui * 2U;
     }
 }
+
+static void quux(const int i)
+{
+    unsigned int ui;
+
+    if (i < 10) {
+	ui1 = (unsigned int) (i - 5);
+	ui1 = (unsigned int) (i - 9);
+	ui1 = (unsigned int) (i - 10);
+    }
+
+    if (i >= 0 && i < 10) {
+	ui1 = (unsigned int) (i - 5);
+	ui1 = (unsigned int) (i - 9);
+	ui1 = (unsigned int) (i - 10);
+    }
+}

data/share/doc/developers_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 1.6.0 開発者ガイド</title>
+<title>AdLint 1.8.0 開発者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 1.6.0 開発者ガイド">
+<meta name="description" content="AdLint 1.8.0 開発者ガイド">
 <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 1.6.0 開発者ガイド</h1>
+<h1 class="settitle">AdLint 1.8.0 開発者ガイド</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 1.6.0 開発者ガイド
+@settitle AdLint 1.8.0 開発者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.