Changeset 353:d80caa0f753d in finroc_core-java

Timestamp:

14.02.2022 07:07:32 (22 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Reduces preference for lossy casts when deciding how to represent unknown remote data types in Java tooling.

File:

• remote/RemoteType.java (modified) (7 diffs)

remote/RemoteType.java

@@ -48 +48 @@
         EXACT,     // Option 1: Local type is the exact counterpart to remote type
         ADAPTED,   // Option 2: Local type is adapted via a type adapter
-        CAST,      // Option 3: Local type is obtained via static cast from and to remote type
+        CAST,      // Option 3: Local type is obtained via static cast from and to remote type (conversion to and from local type is lossless)
         STRING,    // Option 4: Type's string representation is used
         XML,       // Option 5: Type's XML representation is used
-        EVENT,     // Option 6: Event type is used
+        LOSSY_CAST,// Option 6: Local type is obtained via static cast from and to remote type (conversion to and from local type is lossy)
+        EVENT,     // Option 7: Event type is used
         NONE       // Local type has not yet been resolved
     }
@@ -292 +293 @@
         }
 
-        // Option 3: Type has a static cast operation to and from known type (underlying type is preferred, next choices are types with best local type match - and smallest size difference)
+        // Option 3/6: Type has a static cast operation to and from known type (underlying type is preferred, next choices are types with best local type match - and smallest size difference)
         RemoteType castedTo = null;
+        boolean lossyCast = false;
         if ((typeTraits & DataTypeBase.HAS_UNDERLYING_TYPE) != 0) {
             castedTo = runtime.getTypes().get(underlyingType);
@@ -309 +311 @@
                 if (cast.getSourceType() == this && runtime.isStaticCastSupported(cast.getDestinationType(), this)) {
                     RemoteType candidate = cast.getDestinationType();
+                    boolean candidateCastLossy = candidate.size < this.size;
                     if (maxCasts == 2) {
                         candidate.resolveDefaultLocalType(runtime, 1);
                     }
-                    if (candidate.getCastCountForDefaultLocalType() <= 1 && (castedTo == null || (candidate.localTypeMatch.ordinal() < castedTo.localTypeMatch.ordinal()) || (candidate.localTypeMatch == castedTo.localTypeMatch && Math.abs(candidate.size - this.size) < Math.abs(castedTo.size - this.size)))) {
+                    if (candidate.getCastCountForDefaultLocalType() <= 1 && (castedTo == null || (candidate.localTypeMatch.ordinal() < castedTo.localTypeMatch.ordinal()) ||
+                            (candidate.localTypeMatch == castedTo.localTypeMatch && ((!candidateCastLossy) || lossyCast) && (((!candidateCastLossy) && lossyCast) || Math.abs(candidate.size - this.size) < Math.abs(castedTo.size - this.size))))) {
                         castedTo = candidate;
+                        lossyCast = candidateCastLossy;
+                        //System.out.println("Cast operation adapted type (this -> casted to): " + this.getName() + " " + this.getSize() + " -> " + castedTo.getName() + " " + castedTo.getSize()+ " " + lossyCast);
                     }
                 }
@@ -320 +326 @@
 
         localTypeCastsChecked |= (maxCasts >= 2);
-        if (castedTo != null) {
+        if (castedTo != null && ((!lossyCast) || localTypeMatch.ordinal() > LocalTypeMatch.LOSSY_CAST.ordinal())) {
             this.castedTo = castedTo;
             localDataType = castedTo.localDataType;
-            localTypeMatch = LocalTypeMatch.CAST;
+            localTypeMatch = lossyCast ? LocalTypeMatch.LOSSY_CAST : LocalTypeMatch.CAST;
             return;
         }
@@ -364 +370 @@
 
         // Options 4 and 5: Type has a string or XML representation
-        // Option 6: Use empty (event) type
+        // Option 7: Use empty (event) type
         RemoteTypeAdapter.Default defaultAdapter = RemoteTypeAdapter.Default.getInstance();
         defaultAdapter.handleType(this, info);
@@ -403 +409 @@
             break;
         case CAST:
+        case LOSSY_CAST:
             castedTo.deserializeData(stream, object);
             break;
@@ -429 +436 @@
             break;
         case CAST:
+        case LOSSY_CAST:
             castedTo.serializeData(stream, object);
             break;