Updated Stateflow driver to use non-deprecated API and pass tests

eclipse-epsilon · Nov 18, 2024 · a5a4357 · a5a4357
1 parent 717efff
commit a5a4357
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...silon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/model/element/StateflowBlock.java b/...silon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/model/element/StateflowBlock.java
@@ -30,7 +30,7 @@ public class StateflowBlock extends SimulinkModelElement {
 	/** CONSTANTS */
 
 	//public static final String STATEFLOW_LIB = "sflib/";
-	private static final String SIMPLE_TYPE = "?.classhandle.get('Name');";
+	private static final String SIMPLE_TYPE = "class(?);";
 	private static final String DELETE_SF = "?.delete;";
 
 	/** FIELDS */
@@ -333,7 +333,7 @@ public Double getHandle() {
 	public Boolean isCommented() throws EolRuntimeException{
 		try {
 			String handle = StateflowUtil.getBlockHandleFromId(((SimulinkModel)model), engine, id);
-			return (Boolean) engine.evalWithResult("isCommented(?);", handle);	
+			return (Boolean) engine.evalWithResult("?.isCommented;", handle);	
 		}catch (Exception e) {
 			throw new EolRuntimeException(e.getMessage());
 		}

diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/resources/example_scripts/parent.eol b/tests/org.eclipse.epsilon.emc.simulink.test/resources/example_scripts/parent.eol
@@ -46,7 +46,6 @@ foundSfChart.println("Found chart" );
 var sA = new `Stateflow.State`;
 sA.parent = `Stateflow.Chart`.all.first();
 sA.path.println;
-sA.struct.println;
 
 sA.println(">> CREATED: ");
 chart.parent = subsys;