adlint 2.0.6 → 2.0.10

data/ChangeLog

@@ -1,3 +1,38 @@
+Thu Sep  6 15:54:41 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.ga : 2.0.10
+	  - Revise value domain management in order not to over-thin value
+	    domains of the controlling variables in complexly compounded
+	    controlling expression.
+	  - Support environment variable substitution in the traits file.
+
+Thu Sep  6 11:52:08 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 2.0.9
+	  - Support environment variable substitution in the traits file.
+
+Thu Sep  6 11:36:26 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/prelude.rb : Support environment variable substitution in
+	  the traits file.
+
+Wed Sep  5 16:40:17 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* release.rc : 2.0.7
+	  - Revise value domain management in order not to over-thin value
+	    domains of the controlling variables in complexly compounded
+	    controlling expression.
+
+Wed Sep  5 16:11:42 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
+
+	* lib/adlint/c/branch.rb : Revise value domain management in order not
+	  to over-thin value domains of the controlling variables in complexly
+	  compounded controlling expression.
+
+	* lib/adlint/c/ctrlexpr.rb : Add #complexly_compounded? predicate
+	  method.
+	* lib/adlint/c/syntax.rb : Ditto.
+
 Thu Aug 30 09:56:15 2012  Yutaka Yanoh  <yanoh@users.sourceforge.net>
 
 	* release.ga : 2.0.6

data/NEWS

@@ -21,6 +21,18 @@
 
 ++
 
+=== \AdLint 2.0.10 is released (2012-09-06)
+
+==== Changes since the 2.0.6 release
+
+* Revise value domain management in order not to over-thin value domains of the
+  controlling variables in complexly compounded controlling expression
+* Support environment variable substitution in the traits file
+
+See the file
+{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
+for more details.
+
 === \AdLint 2.0.6 is released (2012-08-30)
 
 ==== Changes since the 2.0.2 release
@@ -30,10 +42,6 @@
 * Revise variable cross-reference extraction in order to output only about the
   outmost-variable when its element or member is accessed
 
-See the file
-{ChangeLog}[http://adlint.sourceforge.net/pmwiki/upload.d/Main/ChangeLog]
-for more details.
-
 === \AdLint 2.0.2 is released (2012-08-28)
 
 ==== Changes since the 2.0.0 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: "2.0.6"
+version: "2.0.10"
 
 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: "2.0.6"
+version: "2.0.10"
 
 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: "2.0.6"
+version: "2.0.10"
 
 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: "2.0.6"
+version: "2.0.10"
 
 message_definition:
   X0001:

data/lib/adlint/c/branch.rb

@@ -82,13 +82,24 @@ module C #:nodoc:
       environment.enter_versioning_group if first?
       environment.begin_versioning
 
-      @controlling_expression = ControllingExpression.new(interpreter, self)
-      if ensure_condition(@controlling_expression, expression)
+      @controlling_expression =
+        ControllingExpression.new(interpreter, self, expression)
+      if ensure_condition(@controlling_expression)
         @break_event = BreakEvent.catch { yield(self) }
       end
 
     ensure
-      environment.end_versioning(break_with_return?)
+      if @controlling_expression.complexly_compounded?
+        # NOTE: Give up value domain thinning of the controlling variables,
+        #       because the controlling expression is too complex to manage
+        #       value domains correctly.
+        # TODO: Study about introducing inter-value-constraints to correctly
+        #       manage value domains of controlling variables related with each
+        #       other.
+        environment.end_versioning(false)
+      else
+        environment.end_versioning(break_with_return?)
+      end
       environment.leave_versioning_group(!@group.complete?) if final?
 
       if final? && @group.complete?
@@ -119,12 +130,12 @@ module C #:nodoc:
     end
 
     private
-    def ensure_condition(controlling_expression, expression)
+    def ensure_condition(controlling_expression)
       case
       when narrowing?
-        controlling_expression.ensure_true_by_narrowing(expression).commit!
+        controlling_expression.ensure_true_by_narrowing.commit!
       when widening?
-        controlling_expression.ensure_true_by_widening(expression).commit!
+        controlling_expression.ensure_true_by_widening.commit!
       end
       @group.all_controlling_variables_value_exist?
     end

data/lib/adlint/c/ctrlexpr.rb

@@ -55,15 +55,20 @@ module C #:nodoc:
   #            <-- StrictObjectDerivation
   #            <-- DelayedObjectDerivation
   class ControllingExpression
-    def initialize(interpreter, branch)
+    include SyntaxNodeCollector
+
+    def initialize(interpreter, branch, expression = nil)
       @interpreter = interpreter
       @branch = branch
+      @expression = expression
       @manipulators = []
     end
 
-    def ensure_true_by_narrowing(expression = nil)
-      if expression
-        new_manip = ValueDomainNarrower.new(@interpreter, expression)
+    def ensure_true_by_narrowing(other_expr = nil)
+      target_expr = other_expr ? other_expr : @expression
+
+      if target_expr
+        new_manip = ValueDomainNarrower.new(@interpreter, target_expr)
         begin
           if @branch.implicit_condition?
             @interpreter._quiet = true
@@ -83,9 +88,11 @@ module C #:nodoc:
       new_manip
     end
 
-    def ensure_true_by_widening(expression = nil)
-      if expression
-        new_manip = ValueDomainWidener.new(@interpreter, expression)
+    def ensure_true_by_widening(other_expr = nil)
+      target_expr = other_expr ? other_expr : @expression
+
+      if target_expr
+        new_manip = ValueDomainWidener.new(@interpreter, target_expr)
         begin
           if @branch.implicit_condition?
             @interpreter._quiet = true
@@ -120,6 +127,12 @@ module C #:nodoc:
     def restore_affected_variables
       @manipulators.each { |manip| manip.restore! }
     end
+
+    def complexly_compounded?
+      # NOTE: This method determines whether the controlling expression is too
+      #       complex to thinning value domains of controlling variables.
+      @expression && !collect_logical_and_expressions(@expression).empty?
+    end
   end
 
   class ValueDomainManipulator < SyntaxTreeVisitor

data/lib/adlint/c/syntax.rb

@@ -324,6 +324,17 @@ module C #:nodoc:
     end
     module_function :collect_additive_expressions
 
+    def collect_logical_and_expressions(node)
+      if node
+        LogicalAndExpressionCollector.new.tap { |collector|
+          node.accept(collector)
+        }.logical_and_expressions
+      else
+        []
+      end
+    end
+    module_function :collect_logical_and_expressions
+
     def collect_generic_labeled_statements(node)
       if node
         GenericLabeledStatementCollector.new.tap { |collector|
@@ -5065,6 +5076,19 @@ module C #:nodoc:
     end
   end
 
+  class LogicalAndExpressionCollector < SyntaxTreeVisitor
+    def initialize
+      @logical_and_expressions = []
+    end
+
+    attr_reader :logical_and_expressions
+
+    def visit_logical_and_expression(node)
+      super
+      @logical_and_expressions.push(node)
+    end
+  end
+
   class GenericLabeledStatementCollector < SyntaxTreeVisitor
     def initialize
       @generic_labeled_statements = []

data/lib/adlint/exam.rb

@@ -118,7 +118,7 @@ module AdLint #:nodoc:
 
     private
     def module_name
-      @name.sub(/\A./) { |str| str.upcase }.gsub(/_(.)/) { |*| $1.upcase }
+      @name.sub(/\A./) { |str| str.upcase }.gsub(/_(.)/) { $1.upcase }
     end
   end
 

data/lib/adlint/prelude.rb

@@ -299,6 +299,37 @@ class SuffixArray < Array
   end
 end
 
+# NOTE: To support environment variable substitution in YAML file.
+#
+#       Syntax of embedding environment variable is below;
+#         env_var_specifier : '$' env_var_name
+#                           | '$' '{' env_var_name '}'
+#         env_var_name      : [A-Za-z_][0-9A-Za-z_]*
+#
+#       Examples of environment variable as any scalar value;
+#         string_item_1: $VAR
+#         boolean_item: $VAR
+#         decimal_item: $VAR
+#
+#       Examples of embedding environment variable in string;
+#         string_item_1: "foo${VAR}baz"
+#
+class Psych::TreeBuilder < Psych::Handler
+  alias :_orig_scalar :scalar
+  def scalar(value, anchor, tag, plain, quoted, style)
+    _orig_scalar(substitute_environment_variables(value),
+                 anchor, tag, plain, quoted, style)
+  end
+
+  private
+  def substitute_environment_variables(string)
+    string.gsub(/(?<!\\)\${?([a-z_][0-9a-z_]*)}?/i) do
+      (value = ENV[$1]) ? value : ""
+    end
+  end
+end
+
+
 if $0 == __FILE__
   h1 = Hash.lazy_new(1)
   p h1[0]

data/lib/adlint/util.rb

@@ -568,9 +568,7 @@ module AdLint #:nodoc:
   module PackageResolver
     def package_name_of(class_or_module)
       if class_or_module.name =~ /\AAdLint::Exam::(.*?)::/
-        $1.sub(/\A./) { |str| str.downcase }.gsub(/[A-Z]/) { |str|
-          "_#{str.downcase}"
-        }
+        $1.sub(/\A./) { |s| s.downcase }.gsub(/[A-Z]/) { |s| "_#{s.downcase}" }
       else
         "core"
       end

data/lib/adlint/version.rb

@@ -33,8 +33,8 @@ module AdLint #:nodoc:
 
   MAJOR_VERSION = 2
   MINOR_VERSION = 0
-  PATCH_VERSION = 6
-  RELEASE_DATE  = "2012-08-30"
+  PATCH_VERSION = 10
+  RELEASE_DATE  = "2012-09-06"
 
   TRAITS_SCHEMA_VERSION = "2.0.0"
 

data/share/doc/developers_guide_ja.html

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

data/share/doc/users_guide_en.html

@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>AdLint 2.0.6 User's Guide</title>
+<title>AdLint 2.0.10 User's Guide</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.0.6 User's Guide">
+<meta name="description" content="AdLint 2.0.10 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 2.0.6 User's Guide</h1>
+<h1 class="settitle">AdLint 2.0.10 User's Guide</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -999,6 +999,20 @@ generate the template of traits file for the project, <samp><span class="file">G
 % ls adlint
 GNUmakefile     adlint_all.sh   adlint_files.txt  adlint_traits.yml
 adlint_all.bat  adlint_cinit.h  adlint_pinit.h
+</pre>
+
+   <p>You can specify environment variable as items in the traits file to be
+described.
+
+   <p>For example, specify the environment variable <code>ENV_VAR</code> as the item
+<code>item</code> like below;
+
+<pre class="verbatim">  item: $ENV_VAR
+</pre>
+
+   <p>And embed environment variables in a string value like below;
+
+<pre class="verbatim">  item: "prefix${ENV_VAR}suffix"
 </pre>
 
 <div class="node">

data/share/doc/users_guide_en.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_en.info
 @documentlanguage en
 @documentencoding utf-8
-@settitle AdLint 2.0.6 User's Guide
+@settitle AdLint 2.0.10 User's Guide
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
@@ -867,6 +867,22 @@ GNUmakefile     adlint_all.sh   adlint_files.txt  adlint_traits.yml
 adlint_all.bat  adlint_cinit.h  adlint_pinit.h
 @end verbatim
 
+You can specify environment variable as items in the traits file to be
+described.
+
+For example, specify the environment variable @code{ENV_VAR} as the item
+@code{item} like below;
+
+@verbatim
+  item: $ENV_VAR
+@end verbatim
+
+And embed environment variables in a string value like below;
+
+@verbatim
+  item: "prefix${ENV_VAR}suffix"
+@end verbatim
+
 
 @node Global Traits
 @subsection Global Traits

data/share/doc/users_guide_ja.html

@@ -1,8 +1,8 @@
 <html lang="ja">
 <head>
-<title>AdLint 2.0.6 利用者ガイド</title>
+<title>AdLint 2.0.10 利用者ガイド</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="AdLint 2.0.6 利用者ガイド">
+<meta name="description" content="AdLint 2.0.10 利用者ガイド">
 <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 2.0.6 利用者ガイド</h1>
+<h1 class="settitle">AdLint 2.0.10 利用者ガイド</h1>
 <div class="node">
 <a name="Top"></a>
 <p><hr>
@@ -1044,15 +1044,29 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Input">Input</a>
 <a href="http://yaml.org/">YAML 形式</a>の設定ファイル(<a href="#Traits-Sample">サンプル</a>)
 に記述します。
 
-   <p>下記のように解析対象プロジェクトのルートディレクトリで <a href="#AdLintize-Command"><samp><span class="command">adlintize</span></samp></a> コマンドを実行すると、そのプロジェクト用の特性ファイルの雛
-形、および、解析手順を自動化する <samp><span class="file">GNUmakefile</span></samp> やシェルスクリプトなどを生
-成することができます。
+   <p>下記のように解析対象プロジェクトのルートディレクトリで <a href="#AdLintize-Command"><samp><span class="command">adlintize</span></samp></a> コマンドを実行すると、そのプロジェクト用の特性ファイル
+<samp><span class="file">adlint_traits.yml</span></samp> の雛形、および、解析手順を自動化する
+<samp><span class="file">GNUmakefile</span></samp> やシェルスクリプトなどを生成することができます。
 
 <pre class="verbatim">% cd project
 % adlintize -o adlint
 % ls adlint
 GNUmakefile     adlint_all.sh   adlint_files.txt  adlint_traits.yml
 adlint_all.bat  adlint_cinit.h  adlint_pinit.h
+</pre>
+
+   <p>後述の特性ファイルの各設定項目には、環境変数を指定することもできます。
+
+   <p>例えば、設定項目 <code>item</code> に、環境変数 <code>ENV_VAR</code> の値を指定する場合は下
+記のように記述します。
+
+<pre class="verbatim">  item: $ENV_VAR
+</pre>
+
+   <p>また、文字列形式の設定項目に、環境変数の値を埋め込んだ文字列を指定する場合は下
+記のように記述します。
+
+<pre class="verbatim">  item: "prefix${ENV_VAR}suffix"
 </pre>
 
 <div class="node">

data/share/doc/users_guide_ja.texi

@@ -2,7 +2,7 @@
 @setfilename users_guide_ja.info
 @documentlanguage ja
 @documentencoding utf-8
-@settitle AdLint 2.0.6 利用者ガイド
+@settitle AdLint 2.0.10 利用者ガイド
 
 @copying
 Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
@@ -904,9 +904,9 @@ Command, @command{adlint_sma}}、@ref{AdLint CMA Command, @command{adlint_cma}}
 に記述します。
 
 下記のように解析対象プロジェクトのルートディレクトリで @ref{AdLintize Command,
-@command{adlintize}} コマンドを実行すると、そのプロジェクト用の特性ファイルの雛
-形、および、解析手順を自動化する @file{GNUmakefile} やシェルスクリプトなどを生
-成することができます。
+@command{adlintize}} コマンドを実行すると、そのプロジェクト用の特性ファイル
+@file{adlint_traits.yml} の雛形、および、解析手順を自動化する
+@file{GNUmakefile} やシェルスクリプトなどを生成することができます。
 
 @verbatim
 % cd project
@@ -916,6 +916,22 @@ GNUmakefile     adlint_all.sh   adlint_files.txt  adlint_traits.yml
 adlint_all.bat  adlint_cinit.h  adlint_pinit.h
 @end verbatim
 
+後述の特性ファイルの各設定項目には、環境変数を指定することもできます。
+
+例えば、設定項目 @code{item} に、環境変数 @code{ENV_VAR} の値を指定する場合は下
+記のように記述します。
+
+@verbatim
+  item: $ENV_VAR
+@end verbatim
+
+また、文字列形式の設定項目に、環境変数の値を埋め込んだ文字列を指定する場合は下
+記のように記述します。
+
+@verbatim
+  item: "prefix${ENV_VAR}suffix"
+@end verbatim
+
 
 @node Global Traits
 @subsection グローバル特性

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adlint
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'AdLint is a source code static analyzer.