Changeset 20:c8365294522d in rrlib_rtti_conversion

Timestamp:

03.02.2020 06:44:53 (22 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Children:

21:9e5fed94ff31, 22:fed7ec8deba0

Phase:

public

Message:

Makes static cast operation handle more (valid) cases including implicit casts in a single conversion operation

File:

• tStaticCastOperation.cpp (modified) (2 diffs)

tStaticCastOperation.cpp

@@ -158 +158 @@
   }
   tCommonUnderlyingTypeResult result = GetCommonUnderlyingType(source_type, destination_type);
-  if (result.common_underlying_type == destination_type || (result.common_underlying_type == source_type && result.cast_from_common_to_destination_type_valid))
+  if (result.common_underlying_type == destination_type || (result.cast_from_common_to_destination_type_valid && (result.common_underlying_type == source_type || result.cast_from_common_to_destination_type_implicit || result.cast_from_source_to_common_type_implicit)))
   {
     return tConversionOption(source_type, destination_type, 0);
@@ -168 +168 @@
     {
       return option->conversion_option;
+    }
+
+    if (option->implicit)
+    {
+      // Combining (non-implicit) underlying type casts with implicit casts can be done in a single operation
+      tType underlying_type_source = source_type;
+      while (underlying_type_source.GetUnderlyingType() != underlying_type_source)
+      {
+        underlying_type_source = underlying_type_source.GetUnderlyingType();
+        if (underlying_type_source == option->conversion_option.source_type && destination_type == option->conversion_option.destination_type)
+        {
+          return option->conversion_option;
+        }
+      }
     }
   }