adlint 2.6.0 → 2.6.2

data/lib/adlint/c/const.rb

@@ -43,7 +43,7 @@ module C #:nodoc:
 
     private
     def eval_as_integer_constant(value)
-      # NOTE: The ISO C99 standard saids;
+      # NOTE: The ISO C99 standard says;
       #
       # 6.4.4.1 Integer constants
       #
@@ -150,15 +150,15 @@ module C #:nodoc:
       when /\A([0-9]*\.[0-9]*E[+-]?[0-9]+)\z/i,
            /\A([0-9]+\.?E[+-]?[0-9]+)\z/i,
            /\A([0-9]*\.[0-9]+|[0-9]+\.)\z/
-        return temporary_variable(double_type, ScalarValue.of($1.to_f))
+        return create_tempvar(double_type, ScalarValue.of($1.to_f))
       when /\A([0-9]*\.[0-9]*E[+-]?[0-9]+)F\z/i,
            /\A([0-9]+\.?E[+-]?[0-9]+)F\z/i,
            /\A([0-9]*\.[0-9]+|[0-9]+\.)F\z/i
-        return temporary_variable(float_type, ScalarValue.of($1.to_f))
+        return create_tempvar(float_type, ScalarValue.of($1.to_f))
       when /\A([0-9]*\.[0-9]*E[+-]?[0-9]+)L\z/i,
            /\A([0-9]+\.?E[+-]?[0-9]+)L\z/i,
            /\A([0-9]*\.[0-9]+|[0-9]+\.)L\z/i
-        return temporary_variable(long_double_type, ScalarValue.of($1.to_f))
+        return create_tempvar(long_double_type, ScalarValue.of($1.to_f))
       end
       nil
     end
@@ -175,9 +175,9 @@ module C #:nodoc:
         end
 
         if $1 == "L"
-          temporary_variable(wchar_type, ScalarValue.of(char_code))
+          create_tempvar(wchar_type, ScalarValue.of(char_code))
         else
-          temporary_variable(int_type, ScalarValue.of(char_code))
+          create_tempvar(int_type, ScalarValue.of(char_code))
         end
       else
         nil
@@ -187,13 +187,13 @@ module C #:nodoc:
     def eval_as_decimal_integer_constant_unsuffixed(value)
       case
       when int_value_range.include?(value)
-        temporary_variable(int_type, ScalarValue.of(value))
+        create_tempvar(int_type, ScalarValue.of(value))
       when long_int_value_range.include?(value)
-        temporary_variable(long_int_type, ScalarValue.of(value))
+        create_tempvar(long_int_type, ScalarValue.of(value))
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -202,20 +202,20 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_decimal_integer_constant_with_u(value)
       case
       when unsigned_int_value_range.include?(value)
-        temporary_variable(unsigned_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_int_type, ScalarValue.of(value))
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -224,18 +224,18 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_decimal_integer_constant_with_l(value)
       case
       when long_int_value_range.include?(value)
-        temporary_variable(long_int_type, ScalarValue.of(value))
+        create_tempvar(long_int_type, ScalarValue.of(value))
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -244,18 +244,18 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_decimal_integer_constant_with_ul(value)
       case
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -264,16 +264,16 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_decimal_integer_constant_with_ll(value)
       case
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -282,16 +282,16 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_decimal_integer_constant_with_ull(value)
       case
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -300,26 +300,26 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_unsuffixed(value)
       case
       when int_value_range.include?(value)
-        temporary_variable(int_type, ScalarValue.of(value))
+        create_tempvar(int_type, ScalarValue.of(value))
       when unsigned_int_value_range.include?(value)
-        temporary_variable(unsigned_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_int_type, ScalarValue.of(value))
       when long_int_value_range.include?(value)
-        temporary_variable(long_int_type, ScalarValue.of(value))
+        create_tempvar(long_int_type, ScalarValue.of(value))
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -328,20 +328,20 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_with_u(value)
       case
       when unsigned_int_value_range.include?(value)
-        temporary_variable(unsigned_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_int_type, ScalarValue.of(value))
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -350,22 +350,22 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_with_l(value)
       case
       when long_int_value_range.include?(value)
-        temporary_variable(long_int_type, ScalarValue.of(value))
+        create_tempvar(long_int_type, ScalarValue.of(value))
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -374,18 +374,18 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_with_ul(value)
       case
       when unsigned_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -394,18 +394,18 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_with_ll(value)
       case
       when long_long_int_value_range.include?(value)
-        temporary_variable(long_long_int_type, ScalarValue.of(value))
+        create_tempvar(long_long_int_type, ScalarValue.of(value))
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -414,16 +414,16 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 
     def eval_as_non_decimal_integer_constant_with_ull(value)
       case
       when unsigned_long_long_int_value_range.include?(value)
-        temporary_variable(unsigned_long_long_int_type, ScalarValue.of(value))
+        create_tempvar(unsigned_long_long_int_type, ScalarValue.of(value))
       else
-        # NOTE: The ISO C99 standard saids;
+        # NOTE: The ISO C99 standard says;
         #
         # 6.4.4.1 Integer constants
         #
@@ -432,7 +432,7 @@ module C #:nodoc:
         #   has no type.
         #
         # NOTE: Use ExtendedBigIntType for unrepresentable integer constants.
-        temporary_variable(extended_big_int_type, ScalarValue.of(value))
+        create_tempvar(extended_big_int_type, ScalarValue.of(value))
       end
     end
 

data/lib/adlint/c/conv.rb

@@ -37,8 +37,8 @@ module C #:nodoc:
     def do_conversion(original, to_type)
       if original.type.coercible?(to_type)
         # NOTE: Value will be coerced into the destination type in
-        #       VariableTableMediator#temporary_variable.
-        temporary_variable(to_type, wrap_around_value(original, to_type))
+        #       VariableTableMediator#create_tempvar.
+        create_tempvar(to_type, wrap_around_value(original, to_type))
       else
         nil
       end
@@ -142,7 +142,7 @@ module C #:nodoc:
   # Host class of this module must include StandardTypeCatalogAccessor.
   module UsualArithmeticTypeConversion
     def do_usual_arithmetic_type_conversion(lhs_type, rhs_type)
-      # NOTE: The ISO C99 standard saids;
+      # NOTE: The ISO C99 standard says;
       #
       # 6.3.1.8 Usual arithmetic conversions
       #