adlint 3.0.10 → 3.2.0

data/features/code_check/W0754.feature

@@ -32,6 +32,8 @@ Feature: W0754
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 15     |
+      | C1000 |      |        |
+      | C1006 | 1    | 15     |
       | W0100 | 3    | 11     |
       | W0104 | 1    | 15     |
       | W0628 | 1    | 6      |
@@ -68,6 +70,8 @@ Feature: W0754
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 4    | 9      |
+      | C1000 |      |        |
+      | C1006 | 1    | 15     |
       | W0100 | 3    | 11     |
       | W0104 | 1    | 15     |
       | W0628 | 1    | 6      |
@@ -107,6 +111,8 @@ Feature: W0754
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
       | W1049 | 5    | 9      |
+      | C1000 |      |        |
+      | C1006 | 3    | 15     |
       | W0104 | 3    | 15     |
       | W0628 | 3    | 6      |
 
@@ -140,5 +146,7 @@ Feature: W0754
       | mesg  | line | column |
       | W0117 | 1    | 7      |
       | W1049 | 3    | 12     |
+      | C1000 |      |        |
+      | C1006 | 1    | 16     |
       | W0104 | 1    | 16     |
       | W0628 | 1    | 7      |

data/features/code_check/W0759.feature

@@ -33,6 +33,8 @@ Feature: W0759
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 21     |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 17     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -71,6 +73,8 @@ Feature: W0759
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 4    | 9      |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 17     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -112,6 +116,8 @@ Feature: W0759
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
       | W1049 | 5    | 9      |
+      | C1000 |      |        |
+      | C1006 | 3    | 20     |
       | W0104 | 3    | 20     |
       | W0834 | 3    | 10     |
       | W0628 | 3    | 6      |
@@ -147,6 +153,8 @@ Feature: W0759
       | mesg  | line | column |
       | W0117 | 1    | 13     |
       | W1049 | 3    | 12     |
+      | C1000 |      |        |
+      | C1006 | 1    | 27     |
       | W0104 | 1    | 27     |
       | W0834 | 1    | 17     |
       | W0628 | 1    | 13     |

data/features/code_check/W0760.feature

@@ -33,6 +33,8 @@ Feature: W0760
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 15     |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 11     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -71,6 +73,8 @@ Feature: W0760
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 4    | 9      |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 11     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -112,6 +116,8 @@ Feature: W0760
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
       | W1049 | 5    | 9      |
+      | C1000 |      |        |
+      | C1006 | 3    | 20     |
       | W0104 | 3    | 20     |
       | W0834 | 3    | 10     |
       | W0628 | 3    | 6      |
@@ -147,6 +153,8 @@ Feature: W0760
       | mesg  | line | column |
       | W0117 | 1    | 7      |
       | W1049 | 3    | 12     |
+      | C1000 |      |        |
+      | C1006 | 1    | 21     |
       | W0104 | 1    | 21     |
       | W0834 | 1    | 11     |
       | W0628 | 1    | 7      |

data/features/code_check/W0761.feature

@@ -33,6 +33,8 @@ Feature: W0761
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 13     |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 9      |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -71,6 +73,8 @@ Feature: W0761
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 4    | 9      |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 9      |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -112,6 +116,8 @@ Feature: W0761
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
       | W1049 | 5    | 9      |
+      | C1000 |      |        |
+      | C1006 | 3    | 20     |
       | W0104 | 3    | 20     |
       | W0834 | 3    | 10     |
       | W0628 | 3    | 6      |
@@ -147,6 +153,8 @@ Feature: W0761
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W1049 | 3    | 12     |
+      | C1000 |      |        |
+      | C1006 | 1    | 19     |
       | W0104 | 1    | 19     |
       | W0834 | 1    | 9      |
       | W0628 | 1    | 5      |

data/features/code_check/W0762.feature

@@ -33,6 +33,8 @@ Feature: W0762
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 14     |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 10     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -71,6 +73,8 @@ Feature: W0762
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 4    | 9      |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0100 | 3    | 10     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
@@ -112,6 +116,8 @@ Feature: W0762
       | W0118 | 1    | 13     |
       | W0117 | 3    | 6      |
       | W1049 | 5    | 9      |
+      | C1000 |      |        |
+      | C1006 | 3    | 20     |
       | W0104 | 3    | 20     |
       | W0834 | 3    | 10     |
       | W0628 | 3    | 6      |
@@ -147,6 +153,8 @@ Feature: W0762
       | mesg  | line | column |
       | W0117 | 1    | 6      |
       | W1049 | 3    | 12     |
+      | C1000 |      |        |
+      | C1006 | 1    | 20     |
       | W0104 | 1    | 20     |
       | W0834 | 1    | 10     |
       | W0628 | 1    | 6      |

data/features/code_check/W0794.feature

@@ -15,6 +15,8 @@ Feature: W0794
       | mesg  | line | column |
       | W0117 | 1    | 5      |
       | W0570 | 3    | 14     |
+      | C1000 |      |        |
+      | C1006 | 1    | 14     |
       | W0572 | 3    | 14     |
       | W0794 | 3    | 14     |
       | W0104 | 1    | 14     |
@@ -50,6 +52,8 @@ Feature: W0794
       | mesg  | line | column |
       | W0117 | 1    | 14     |
       | W0116 | 3    | 15     |
+      | C1000 |      |        |
+      | C1006 | 1    | 32     |
       | W0104 | 1    | 32     |
       | W0628 | 1    | 14     |
 
@@ -83,5 +87,7 @@ Feature: W0794
       | W0117 | 1    | 5      |
       | W0246 | 3    | 12     |
       | W0116 | 3    | 15     |
+      | C1000 |      |        |
+      | C1006 | 1    | 24     |
       | W0104 | 1    | 24     |
       | W0628 | 1    | 5      |

data/features/code_check/W1050.feature

@@ -32,9 +32,17 @@ Feature: W1050
       | mesg  | line | column |
       | W1076 | 1    | 13     |
       | W1050 | 4    | 31     |
+      | C1000 |      |        |
+      | C1006 | 1    | 27     |
       | W1050 | 7    | 31     |
+      | C1000 |      |        |
+      | C1006 | 1    | 27     |
       | W1049 | 11   | 31     |
+      | C1000 |      |        |
+      | C1006 | 1    | 27     |
       | W1049 | 14   | 31     |
+      | C1000 |      |        |
+      | C1006 | 1    | 27     |
       | W0629 | 1    | 13     |
       | W0489 | 17   | 9      |
       | W0490 | 17   | 9      |

data/features/code_check/W1066.feature

@@ -27,6 +27,8 @@ Feature: W1066
       | W0723 | 6    | 21     |
       | W1066 | 6    | 21     |
       | W0093 | 7    | 21     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W1066 | 7    | 21     |
       | W0104 | 1    | 24     |
       | W0104 | 1    | 33     |
@@ -51,7 +53,11 @@ Feature: W1066
       | mesg  | line | column |
       | W1076 | 1    | 13     |
       | W0093 | 4    | 21     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W0570 | 6    | 21     |
+      | C1000 |      |        |
+      | C1006 | 1    | 24     |
       | W0572 | 6    | 21     |
       | W0794 | 6    | 21     |
       | W0572 | 7    | 21     |
@@ -83,6 +89,8 @@ Feature: W1066
       | W0723 | 6    | 11     |
       | W0777 | 6    | 11     |
       | W0093 | 7    | 11     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W0777 | 7    | 11     |
       | W0104 | 1    | 24     |
       | W0104 | 1    | 33     |

data/features/code_check/W1067.feature

@@ -27,6 +27,8 @@ Feature: W1067
       | W0723 | 6    | 26     |
       | W1067 | 6    | 26     |
       | W0093 | 7    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W1067 | 7    | 26     |
       | W0104 | 1    | 24     |
       | W0104 | 1    | 33     |
@@ -51,7 +53,11 @@ Feature: W1067
       | mesg  | line | column |
       | W1076 | 1    | 13     |
       | W0093 | 4    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W0570 | 6    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 24     |
       | W0572 | 6    | 26     |
       | W0794 | 6    | 26     |
       | W0572 | 7    | 26     |
@@ -83,6 +89,8 @@ Feature: W1067
       | W0723 | 6    | 11     |
       | W0778 | 6    | 11     |
       | W0093 | 7    | 11     |
+      | C1000 |      |        |
+      | C1006 | 1    | 33     |
       | W0778 | 7    | 11     |
       | W0104 | 1    | 24     |
       | W0104 | 1    | 33     |

data/features/code_check/W1068.feature

@@ -27,6 +27,8 @@ Feature: W1068
       | W0723 | 6    | 26     |
       | W1068 | 6    | 26     |
       | W0093 | 7    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 35     |
       | W1068 | 7    | 26     |
       | W0104 | 1    | 25     |
       | W0104 | 1    | 35     |
@@ -51,7 +53,11 @@ Feature: W1068
       | mesg  | line | column |
       | W1076 | 1    | 13     |
       | W0093 | 4    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 35     |
       | W0570 | 6    | 26     |
+      | C1000 |      |        |
+      | C1006 | 1    | 25     |
       | W0572 | 6    | 26     |
       | W0794 | 6    | 26     |
       | W0572 | 7    | 26     |
@@ -83,6 +89,8 @@ Feature: W1068
       | W0723 | 6    | 11     |
       | W0779 | 6    | 11     |
       | W0093 | 7    | 11     |
+      | C1000 |      |        |
+      | C1006 | 1    | 35     |
       | W0779 | 7    | 11     |
       | W0104 | 1    | 25     |
       | W0104 | 1    | 35     |

data/features/code_check/W1071.feature

@@ -101,7 +101,11 @@ Feature: W1071
       | mesg  | line | column |
       | W1076 | 6    | 13     |
       | W0422 | 9    | 22     |
+      | C1000 |      |        |
+      | C1005 | 6    | 29     |
       | W0422 | 10   | 14     |
+      | C1000 |      |        |
+      | C1005 | 6    | 29     |
       | W0104 | 6    | 29     |
       | W0105 | 6    | 29     |
       | W1071 | 6    | 13     |

data/features/code_check/W9003.feature

@@ -285,6 +285,8 @@ Feature: W9003
       | mesg  | line | column |
       | W1076 | 1    | 13     |
       | W0459 | 5    | 9      |
+      | C1000 |      |        |
+      | C1003 | 3    | 19     |
       | W0642 | 5    | 9      |
       | W0100 | 3    | 19     |
       | W0100 | 4    | 11     |

data/lib/adlint/cc1.rb

@@ -52,6 +52,7 @@ require "adlint/cc1/scanner"
 require "adlint/cc1/scope"
 require "adlint/cc1/seqp"
 require "adlint/cc1/syntax"
+require "adlint/cc1/trace"
 require "adlint/cc1/type"
 require "adlint/cc1/util"
 require "adlint/cc1/value"

data/lib/adlint/cc1/branch.rb

@@ -42,12 +42,16 @@ module Cc1 #:nodoc:
       @group = branch_group
       @options = opts
       @break_event = nil
-      @controlling_expression = nil
+      @ctrlexpr = nil
     end
 
     attr_reader :group
     attr_reader :break_event
-    attr_reader :controlling_expression
+    attr_reader :ctrlexpr
+
+    def trunk
+      @group.trunk
+    end
 
     def add_options(*new_opts)
       @options = (@options + new_opts).uniq
@@ -86,8 +90,8 @@ module Cc1 #:nodoc:
       env.enter_versioning_group if first?
       env.begin_versioning
 
-      @controlling_expression = ControllingExpression.new(interp, self, expr)
-      if ensure_condition(@controlling_expression)
+      @ctrlexpr = ControllingExpression.new(interp, self, expr)
+      if ensure_condition(@ctrlexpr)
         @break_event = BreakEvent.catch { yield(self) }
       else
         unless final? && @group.branches.size == 1
@@ -96,7 +100,7 @@ module Cc1 #:nodoc:
       end
 
     ensure
-      if @controlling_expression.complexly_compounded? && !complemental?
+      if @ctrlexpr.complexly_compounded? && !complemental?
         # NOTE: Give up value domain thinning of the controlling variables,
         #       because the controlling expression is too complex to manage
         #       value domains correctly.
@@ -125,13 +129,13 @@ module Cc1 #:nodoc:
     end
 
     def restart_versioning(&block)
-      @controlling_expression.save_affected_variables
+      @ctrlexpr.save_affected_variables
       env.end_versioning(false)
       env.leave_versioning_group(true)
       env.enter_versioning_group
       env.begin_versioning
       yield
-      @controlling_expression.restore_affected_variables
+      @ctrlexpr.restore_affected_variables
     end
 
     def break_with_break?
@@ -175,17 +179,30 @@ module Cc1 #:nodoc:
     include BranchOptions
     include BranchGroupOptions
 
-    def initialize(env, parent, *opts)
+    def initialize(env, trunk, *opts)
       @environment = env
-      @parent_group = parent
+      @trunk = trunk
       @options = opts
       @branches = []
     end
 
     attr_reader :environment
-    attr_reader :parent_group
+    attr_reader :trunk
     attr_reader :branches
 
+    def trunk_group
+      @trunk ? @trunk.group : nil
+    end
+
+    def branches_to_trunk(acc = [])
+      if @trunk
+        acc.push(@trunk)
+        @trunk.group.branches_to_trunk(acc)
+      else
+        acc
+      end
+    end
+
     def add_options(*new_opts)
       @options = (@options + new_opts).uniq
     end
@@ -199,10 +216,10 @@ module Cc1 #:nodoc:
     end
 
     def in_iteration?
-      branch_group = @parent_group
+      branch_group = trunk_group
       while branch_group
         return true if branch_group.iteration?
-        branch_group = branch_group.parent_group
+        branch_group = branch_group.trunk_group
       end
       false
     end
@@ -219,7 +236,7 @@ module Cc1 #:nodoc:
 
     def all_controlling_variables
       @branches.map { |br|
-        ctrlexpr = br.controlling_expression and ctrlexpr.affected_variables
+        ctrlexpr = br.ctrlexpr and ctrlexpr.affected_variables
       }.compact.flatten.uniq
     end
 
@@ -238,6 +255,10 @@ module Cc1 #:nodoc:
     def all_branches_break_with_return?
       @branches.all? { |br| br.break_with_return? }
     end
+
+    def current_branch
+      @branches.last
+    end
   end
 
   class BreakEvent