Fix unnecessary conversion warning from integer to real

m-meingast · Jul 30, 2024 · ee9458f · ee9458f
1 parent 5099db0
commit ee9458f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...edtextcore/src/org/eclipse/fordiac/ide/structuredtextcore/validation/STCoreValidator.java b/...edtextcore/src/org/eclipse/fordiac/ide/structuredtextcore/validation/STCoreValidator.java
@@ -50,6 +50,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.fordiac.ide.model.data.AnyBitType;
 import org.eclipse.fordiac.ide.model.data.AnyIntType;
+import org.eclipse.fordiac.ide.model.data.AnyRealType;
 import org.eclipse.fordiac.ide.model.data.AnySignedType;
 import org.eclipse.fordiac.ide.model.data.AnyStringType;
 import org.eclipse.fordiac.ide.model.data.AnyUnsignedType;
@@ -475,8 +476,10 @@ && isBetterCastPossible(argumentDataType, expectedReturnDataType)) {
 	private static boolean isCastSemanticallyRelevant(final DataType argumentDataType, final DataType returnDataType) {
 		// semantically relevant casts:
 		// - signed to unsigned
+		// - integer to real
 		// - involves bit types
 		return (argumentDataType instanceof AnySignedType && returnDataType instanceof AnyUnsignedType)
+				|| (argumentDataType instanceof AnyIntType && returnDataType instanceof AnyRealType)
 				|| argumentDataType instanceof AnyBitType || returnDataType instanceof AnyBitType;
 	}
 

diff --git a/.../org/eclipse/fordiac/ide/structuredtextfunctioneditor/tests/STFunctionValidatorTest.xtend b/.../org/eclipse/fordiac/ide/structuredtextfunctioneditor/tests/STFunctionValidatorTest.xtend
@@ -1607,6 +1607,16 @@ class STFunctionValidatorTest {
 			END_FUNCTION
 		'''.parse.assertWarning(STCorePackage.eINSTANCE.STFeatureExpression,
 			STCoreValidator.UNNECESSARY_LITERAL_CONVERSION, "Unnecessary conversion of literal to USINT")
+		'''
+			FUNCTION test
+			VAR_TEMP
+				INT_VAR: INT;
+				INT_VAR2: INT;
+				REAL_VAR: REAL;
+			END_VAR
+			REAL_VAR := INT_TO_REAL(INT_VAR) / INT_VAR2;
+			END_FUNCTION
+		'''.parse.assertNoIssues
 	}
 
 	@Test