adlint 3.0.4 → 3.0.8

data/lib/adlint/cc1/parser.y

@@ -547,7 +547,7 @@ declaration
     : declaration_specifiers ";"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
+        @lexer.enable_identifier_translation
         result = Declaration.new(val[0], [], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[1]
@@ -555,6 +555,7 @@ declaration
     | declaration_specifiers init_declarator_list ";"
       {
         checkpoint(val[0].location)
+        @lexer.enable_identifier_translation
         result = Declaration.new(val[0], val[1], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
@@ -598,7 +599,6 @@ declaration_specifiers
     | type_specifier
       {
         checkpoint(val[0].location)
-        @lexer.stop_identifier_translation
         result = DeclarationSpecifiers.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -607,7 +607,6 @@ declaration_specifiers
     | declaration_specifiers type_specifier
       {
         checkpoint(val[0].location)
-        @lexer.stop_identifier_translation
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -684,86 +683,110 @@ type_specifier
     : VOID
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | CHAR
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | SHORT
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | INT
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | LONG
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | FLOAT
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | DOUBLE
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | SIGNED
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | UNSIGNED
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | BOOL
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | COMPLEX
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | IMAGINARY
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = StandardTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | TYPEDEF_NAME
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = TypedefTypeSpecifier.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
     | struct_or_union_specifier
+      {
+        checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
+        result = val[0]
+      }
     | enum_specifier
+      {
+        checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
+        result = val[0]
+      }
     | TYPEOF "(" constant_expression ")"
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         val[2].full = true
         result = TypeofTypeSpecifier.new(val[2], nil)
         result.head_token = val[0]
@@ -772,6 +795,7 @@ type_specifier
     | TYPEOF "(" type_name ")"
       {
         checkpoint(val[0].location)
+        @lexer.disable_identifier_translation
         result = TypeofTypeSpecifier.new(nil, val[2])
         result.head_token = val[0]
         result.tail_token = val[3]
@@ -855,11 +879,13 @@ struct_declaration_list
     : struct_declaration
       {
         checkpoint(val[0].location)
+        @lexer.enable_identifier_translation
         result = val
       }
     | struct_declaration_list struct_declaration
       {
         checkpoint(val[0].first.location)
+        @lexer.enable_identifier_translation
         result = val[0].push(val[1])
       }
     ;
@@ -868,18 +894,16 @@ struct_declaration
     : specifier_qualifier_list ";"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = StructDeclaration.new(val[0], [])
         result.head_token = val[0].head_token
         result.tail_token = val[1]
       }
-    | specifier_qualifier_list { @lexer.stop_identifier_translation }
-      struct_declarator_list ";"
+    | specifier_qualifier_list struct_declarator_list ";"
       {
         checkpoint(val[0].location)
-        result = StructDeclaration.new(val[0], val[2])
+        result = StructDeclaration.new(val[0], val[1])
         result.head_token = val[0].head_token
-        result.tail_token = val[3]
+        result.tail_token = val[2]
       }
     ;
 
@@ -887,7 +911,6 @@ specifier_qualifier_list
     : specifier_qualifier_list type_specifier
       {
         checkpoint(val[0].location)
-        @lexer.stop_identifier_translation
         result = val[0]
         result.type_specifiers.push(val[1])
         result.tail_token = val[1].tail_token
@@ -895,7 +918,6 @@ specifier_qualifier_list
     | type_specifier
       {
         checkpoint(val[0].location)
-        @lexer.stop_identifier_translation
         result = SpecifierQualifierList.new
         result.type_specifiers.push(val[0])
         result.head_token = val[0].head_token
@@ -1058,7 +1080,7 @@ direct_declarator
     : IDENTIFIER
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
+        @lexer.enable_identifier_translation
         result = IdentifierDeclarator.new(val[0])
         result.head_token = result.tail_token = val[0]
       }
@@ -1131,12 +1153,13 @@ direct_declarator
         result.head_token = val[0].head_token
         result.tail_token = val[2]
       }
-    | direct_declarator "(" parameter_type_list ")"
+    | direct_declarator "(" { @lexer.enable_identifier_translation }
+      parameter_type_list ")"
       {
         checkpoint(val[0].location)
-        result = AnsiFunctionDeclarator.new(val[0], val[2])
+        result = AnsiFunctionDeclarator.new(val[0], val[3])
         result.head_token = val[0].head_token
-        result.tail_token = val[3]
+        result.tail_token = val[4]
       }
     | direct_declarator "(" identifier_list ")"
       {
@@ -1224,6 +1247,7 @@ parameter_declaration
     : declaration_specifiers declarator
       {
         checkpoint(val[0].location)
+        @lexer.enable_identifier_translation
         result = ParameterDeclaration.new(val[0], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
@@ -1231,6 +1255,7 @@ parameter_declaration
     | declaration_specifiers abstract_declarator
       {
         checkpoint(val[0].location)
+        @lexer.enable_identifier_translation
         result = ParameterDeclaration.new(val[0], val[1])
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
@@ -1238,7 +1263,7 @@ parameter_declaration
     | declaration_specifiers
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
+        @lexer.enable_identifier_translation
         result = ParameterDeclaration.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -1262,7 +1287,7 @@ type_name
     : specifier_qualifier_list
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
+        @lexer.enable_identifier_translation
         result = TypeName.new(val[0], nil, @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[0].tail_token
@@ -1270,6 +1295,7 @@ type_name
     | specifier_qualifier_list abstract_declarator
       {
         checkpoint(val[0].location)
+        @lexer.enable_identifier_translation
         result = TypeName.new(val[0], val[1], @sym_tbl)
         result.head_token = val[0].head_token
         result.tail_token = val[1].tail_token
@@ -1280,7 +1306,7 @@ abstract_declarator
     : pointer
       {
         checkpoint(val[0].first.location)
-        @lexer.start_identifier_translation
+        @lexer.enable_identifier_translation
         result = PointerAbstractDeclarator.new(nil, val[0])
         result.head_token = val[0].first
         result.tail_token = val[0].last
@@ -1289,6 +1315,7 @@ abstract_declarator
     | pointer direct_abstract_declarator
       {
         checkpoint(val[0].first.location)
+        @lexer.enable_identifier_translation
         result = PointerAbstractDeclarator.new(val[1], val[0])
         result.head_token = val[0].first
         result.tail_token = val[1].tail_token
@@ -1306,7 +1333,6 @@ direct_abstract_declarator
     : "(" abstract_declarator ")"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = GroupedAbstractDeclarator.new(val[1])
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1314,7 +1340,6 @@ direct_abstract_declarator
     | "[" "]"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
@@ -1322,7 +1347,6 @@ direct_abstract_declarator
     | "[" assignment_expression "]"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         val[1].full = true
         result = ArrayAbstractDeclarator.new(nil, val[1])
         result.head_token = val[0]
@@ -1346,7 +1370,6 @@ direct_abstract_declarator
     | "[" "*" "]"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = ArrayAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[2]
@@ -1361,12 +1384,11 @@ direct_abstract_declarator
     | "(" ")"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = FunctionAbstractDeclarator.new(nil, nil)
         result.head_token = val[0]
         result.tail_token = val[1]
       }
-    | "(" { @lexer.start_identifier_translation } parameter_type_list ")"
+    | "(" { @lexer.enable_identifier_translation } parameter_type_list ")"
       {
         checkpoint(val[0].location)
         result = FunctionAbstractDeclarator.new(nil, val[2])
@@ -1376,17 +1398,17 @@ direct_abstract_declarator
     | direct_abstract_declarator "(" ")"
       {
         checkpoint(val[0].location)
-        @lexer.start_identifier_translation
         result = FunctionAbstractDeclarator.new(val[0], nil)
         result.head_token = val[0].head_token
         result.tail_token = val[2]
       }
-    | direct_abstract_declarator "(" parameter_type_list ")"
+    | direct_abstract_declarator "(" { @lexer.enable_identifier_translation }
+      parameter_type_list ")"
       {
         checkpoint(val[0].location)
-        result = FunctionAbstractDeclarator.new(val[0], val[2])
+        result = FunctionAbstractDeclarator.new(val[0], val[3])
         result.head_token = val[0].head_token
-        result.tail_token = val[3]
+        result.tail_token = val[4]
       }
     ;
 
@@ -1472,7 +1494,7 @@ statement
     ;
 
 labeled_statement
-    : IDENTIFIER ":" statement
+    : label_name ":" statement
       {
         checkpoint(val[0].location)
         result = GenericLabeledStatement.new(val[0], val[2])
@@ -1496,6 +1518,14 @@ labeled_statement
       }
     ;
 
+label_name
+    : IDENTIFIER
+    | TYPEDEF_NAME
+      {
+        result = val[0].class.new(:IDENTIFIER, val[0].value, val[0].location)
+      }
+    ;
+
 compound_statement
     : "{" "}"
       {
@@ -1627,7 +1657,7 @@ iteration_statement
     ;
 
 jump_statement
-    : GOTO IDENTIFIER ";"
+    : GOTO label_name ";"
       {
         checkpoint(val[0].location)
         result = GotoStatement.new(val[1])

data/lib/adlint/cc1/phase.rb

@@ -53,7 +53,7 @@ module Cc1 #:nodoc:
 
     private
     def do_execute(phase_ctxt, *)
-      phase_ctxt[:cc1_visitor] = SyntaxTreeMulticastVisitor.new
+      phase_ctxt[:cc1_ast_traversal] = SyntaxTreeMulticastVisitor.new
       phase_ctxt[:cc1_parser]  = Parser.new(phase_ctxt)
     end
   end
@@ -65,9 +65,9 @@ module Cc1 #:nodoc:
 
     private
     def do_execute(phase_ctxt, *)
-      phase_ctxt[:cc1_syntax_tree] = phase_ctxt[:cc1_parser].execute
+      phase_ctxt[:cc1_ast] = phase_ctxt[:cc1_parser].execute
     ensure
-      phase_ctxt[:cc1_token_array] = phase_ctxt[:cc1_parser].token_array
+      phase_ctxt[:cc1_tokens] = phase_ctxt[:cc1_parser].token_array
       DebugUtil.dump_token_array(phase_ctxt)
     end
   end
@@ -80,8 +80,7 @@ module Cc1 #:nodoc:
     private
     def do_execute(phase_ctxt, *)
       resolver = StaticTypeResolver.new(TypeTable.new(traits, monitor, logger))
-      phase_ctxt[:cc1_type_table] =
-        resolver.resolve(phase_ctxt[:cc1_syntax_tree])
+      phase_ctxt[:cc1_type_table] = resolver.resolve(phase_ctxt[:cc1_ast])
     end
   end
 
@@ -104,8 +103,7 @@ module Cc1 #:nodoc:
 
     private
     def do_execute(phase_ctxt, *)
-      Program.new(phase_ctxt[:cc1_interpreter],
-                  phase_ctxt[:cc1_syntax_tree]).execute
+      Program.new(phase_ctxt[:cc1_interpreter], phase_ctxt[:cc1_ast]).execute
       ValueDomain.clear_memos
     ensure
       DebugUtil.dump_syntax_tree(phase_ctxt)
@@ -119,7 +117,7 @@ module Cc1 #:nodoc:
 
     private
     def do_execute(phase_ctxt, *)
-      phase_ctxt[:cc1_syntax_tree].accept(phase_ctxt[:cc1_visitor])
+      phase_ctxt[:cc1_ast].accept(phase_ctxt[:cc1_ast_traversal])
     end
   end
 

data/lib/adlint/cc1/syntax.rb

@@ -439,6 +439,19 @@ module Cc1 #:nodoc:
     module_function :collect_constant_specifiers
   end
 
+  module InterpSyntaxBridge
+    # NOTE: InterpreterMediator includes this module to bridge constant
+    #       designator collector to this layer.
+
+    def _interp_syntax_bridge_
+      {
+        enumerator_designators: method(:enumerator_designators),
+        function_designators:   method(:function_designators),
+        variable_designators:   method(:variable_designators)
+      }
+    end
+  end
+
   class Expression < SyntaxNode
     def initialize
       super
@@ -470,8 +483,8 @@ module Cc1 #:nodoc:
       subclass_responsibility
     end
 
-    def constant?(enum_tbl)
-      object_specifiers.all? { |os| enum_tbl.lookup(os.identifier.value) }
+    def constant?(interp_bridge)
+      ExpressionConstancy.new(interp_bridge).check(self)
     end
 
     def logical?
@@ -2321,9 +2334,9 @@ module Cc1 #:nodoc:
       type_dcls = []
 
       dcl_specs.type_specifiers.each do |type_spec|
-        visitor = TypeDeclarationBuilder.new(sym_tbl)
-        type_spec.accept(visitor)
-        type_dcls.concat(visitor.type_declarations)
+        builder = TypeDeclarationBuilder.new(sym_tbl)
+        type_spec.accept(builder)
+        type_dcls.concat(builder.type_declarations)
       end
 
       if sc = dcl_specs.storage_class_specifier and sc.type == :TYPEDEF
@@ -3991,10 +4004,10 @@ module Cc1 #:nodoc:
     def build_type_declaration(dcl_specs, sym_tbl)
       return nil unless dcl_specs
       dcl_specs.type_specifiers.each do |type_spec|
-        visitor = TypeDeclarationBuilder.new(sym_tbl)
-        type_spec.accept(visitor)
-        unless visitor.type_declarations.empty?
-          return visitor.type_declarations.first
+        builder = TypeDeclarationBuilder.new(sym_tbl)
+        type_spec.accept(builder)
+        unless builder.type_declarations.empty?
+          return builder.type_declarations.first
         end
       end
       nil
@@ -4191,10 +4204,10 @@ module Cc1 #:nodoc:
     private
     def build_type_declaration(spec_qual_list, sym_tbl)
       spec_qual_list.type_specifiers.each do |type_spec|
-        visitor = TypeDeclarationBuilder.new(sym_tbl)
-        type_spec.accept(visitor)
-        unless visitor.type_declarations.empty?
-          return visitor.type_declarations.first
+        builder = TypeDeclarationBuilder.new(sym_tbl)
+        type_spec.accept(builder)
+        unless builder.type_declarations.empty?
+          return builder.type_declarations.first
         end
       end
       nil
@@ -5470,10 +5483,16 @@ module Cc1 #:nodoc:
 
     attr_reader :expressions
 
-    def push_expression(expression)
-      @expressions.push(expression)
+    def push_expression(expr)
+      @expressions.push(expr)
     end
+    private :push_expression
 
+    alias :visit_error_expression :push_expression
+    alias :visit_object_specifier :push_expression
+    alias :visit_constant_specifier :push_expression
+    alias :visit_string_literal_specifier :push_expression
+    alias :visit_null_constant_specifier :push_expression
     alias :visit_grouped_expression :push_expression
     alias :visit_array_subscript_expression :push_expression
     alias :visit_function_call_expression :push_expression
@@ -5490,7 +5509,9 @@ module Cc1 #:nodoc:
     alias :visit_indirection_expression :push_expression
     alias :visit_unary_arithmetic_expression :push_expression
     alias :visit_sizeof_expression :push_expression
+    alias :visit_sizeof_type_expression :push_expression
     alias :visit_alignof_expression :push_expression
+    alias :visit_alignof_type_expression :push_expression
     alias :visit_cast_expression :push_expression
     alias :visit_multiplicative_expression :push_expression
     alias :visit_additive_expression :push_expression
@@ -5505,8 +5526,6 @@ module Cc1 #:nodoc:
     alias :visit_conditional_expression :push_expression
     alias :visit_simple_assignment_expression :push_expression
     alias :visit_compound_assignment_expression :push_expression
-
-    private :push_expression
   end
 
   class ConditionalExpressionExtractor < SyntaxTreeVisitor
@@ -5521,5 +5540,39 @@ module Cc1 #:nodoc:
     end
   end
 
+  class ExpressionConstancy < SyntaxTreeVisitor
+    def initialize(interp_bridge)
+      @interp_bridge = interp_bridge
+    end
+
+    def check(expr)
+      catch(:constancy) { expr.accept(self); true }
+    end
+
+    def visit_object_specifier(node)
+      var_designators = @interp_bridge[:variable_designators][]
+      if var_designators.include?(node.identifier.value)
+        break_as_inconstant
+      end
+    end
+
+    def visit_address_expression(node)
+      # NOTE: To treat address of variables as an address-constant.
+    end
+
+    def break_as_inconstant(*)
+      throw(:constancy, false)
+    end
+    private :break_as_inconstant
+
+    alias :visit_function_call_expression :break_as_inconstant
+    alias :visit_postfix_increment_expression :break_as_inconstant
+    alias :visit_postfix_decrement_expression :break_as_inconstant
+    alias :visit_prefix_increment_expression :break_as_inconstant
+    alias :visit_prefix_decrement_expression :break_as_inconstant
+    alias :visit_simple_assignment_expression :break_as_inconstant
+    alias :visit_compound_assignment_expression :break_as_inconstant
+  end
+
 end
 end

data/lib/adlint/cc1/util.rb

@@ -72,8 +72,8 @@ module Cc1 #:nodoc:
         ast_fpath = ast_fname.expand_path(phase_ctxt.msg_fpath.dirname)
 
         File.open(ast_fpath, "w") do |io|
-          if phase_ctxt[:cc1_syntax_tree]
-            PP.pp(phase_ctxt[:cc1_syntax_tree], io)
+          if phase_ctxt[:cc1_ast]
+            PP.pp(phase_ctxt[:cc1_ast], io)
           end
         end
       end
@@ -86,8 +86,8 @@ module Cc1 #:nodoc:
         tok_fpath = tok_fname.expand_path(phase_ctxt.msg_fpath.dirname)
 
         File.open(tok_fpath, "w") do |io|
-          if phase_ctxt[:cc1_token_array]
-            phase_ctxt[:cc1_token_array].each { |tok| io.puts(tok.inspect) }
+          if phase_ctxt[:cc1_tokens]
+            phase_ctxt[:cc1_tokens].each { |tok| io.puts(tok.inspect) }
           end
         end
       end

data/lib/adlint/code.rb

@@ -123,7 +123,7 @@ module AdLint #:nodoc:
 
   # == DESCRIPTION
   # Function declaration information.
-  class FuncDcl < CodeStructure
+  class FunDcl < CodeStructure
     # === DESCRIPTION
     # Constructs the function declaration information.
     #
@@ -188,7 +188,7 @@ module AdLint #:nodoc:
 
   # == DESCRIPTION
   # Function definition information.
-  class FuncDef < CodeStructure
+  class FunDef < CodeStructure
     # === DESCRIPTION
     # Constructs the function definition information.
     #
@@ -350,7 +350,7 @@ module AdLint #:nodoc:
 
   # == DESCRIPTION
   # Function call information.
-  class Call < CodeStructure
+  class Funcall < CodeStructure
     # === DESCRIPTION
     # Constructs the function call informatin.
     #
@@ -404,7 +404,7 @@ module AdLint #:nodoc:
     end
   end
 
-  class XRefFunc < CodeStructure
+  class XRefFun < CodeStructure
     # === DESCRIPTION
     # Constructs the cross reference information.
     #
@@ -460,13 +460,23 @@ module AdLint #:nodoc:
   end
 
   class FunctionId
-    def initialize(name, sig)
-      @name, @signature = name, sig
+    def self.of_ctors_section
+      # NOTE: To represent an object referrer of non-function in case of global
+      #       function table initialization.
+      self.new(nil, nil)
+    end
+
+    def initialize(name, sig_str)
+      @name, @signature = name, sig_str
     end
 
     attr_reader :name
     attr_reader :signature
 
+    def named?
+      !@name.nil?
+    end
+
     def to_a
       [@name, @signature]
     end