#259 Updated output of TwinCAT tests.

e15e12c4 · Ferdie Reijnen · dbdd82be · e15e12c4 · e15e12c4 · e15e12c4
Commit e15e12c4 authored 2 years ago by Ferdie Reijnen
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/STATE.TcDUT
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/STATE.TcDUT
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <DUT Name="STATE">
-    <Declaration>
+    <Declaration><![CDATA[TYPE STATE:
-      <![CDATA[TYPE STATE:
    STRUCT
        curTime: LREAL;
        dvar_M_p_b AT %Q*: BOOL;
@@ -20,8 +19,7 @@
        cvar_M_p_t3 AT %Q*: LREAL;
        dvar_M_p AT %Q*: enum_E;
    END_STRUCT
-END_TYPE]]>
+END_TYPE]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </DUT>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_1.TcDUT
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_1.TcDUT
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <DUT Name="TupleStruct_1">
-    <Declaration>
+    <Declaration><![CDATA[TYPE TupleStruct_1:
-      <![CDATA[TYPE TupleStruct_1:
    STRUCT
        field0: LREAL;
        field1: LREAL;
    END_STRUCT
-END_TYPE]]>
+END_TYPE]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </DUT>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_2.TcDUT
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_2.TcDUT
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <DUT Name="TupleStruct_2">
-    <Declaration>
+    <Declaration><![CDATA[TYPE TupleStruct_2:
-      <![CDATA[TYPE TupleStruct_2:
    STRUCT
        field0: TupleStruct_1;
        field1: LREAL;
    END_STRUCT
-END_TYPE]]>
+END_TYPE]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </DUT>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_3.TcDUT
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/TupleStruct_3.TcDUT
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <DUT Name="TupleStruct_3">
-    <Declaration>
+    <Declaration><![CDATA[TYPE TupleStruct_3:
-      <![CDATA[TYPE TupleStruct_3:
    STRUCT
        field0: DINT;
        field1: DINT;
    END_STRUCT
-END_TYPE]]>
+END_TYPE]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </DUT>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/enum_E.TcDUT
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/DUTs/enum_E.TcDUT
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <DUT Name="enum_E">
-    <Declaration>
+    <Declaration><![CDATA[TYPE enum_E:
-      <![CDATA[TYPE enum_E:
    (elit_l1, elit_l10, elit_l11, elit_l12, elit_l13, elit_l14, elit_l15, elit_l16, elit_l2, elit_l3, elit_l4, elit_l5, elit_l6, elit_l7, elit_l8, elit_l9, elit_LIT1, elit_LIT2);
-END_TYPE]]>
+END_TYPE]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </DUT>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/GVLs/INPUTS.TcGVL
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/GVLs/INPUTS.TcGVL
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <GVL Name="INPUTS">
-    <Declaration>
+    <Declaration><![CDATA[VAR_GLOBAL // INPUTS
-      <![CDATA[VAR_GLOBAL // INPUTS
    ivar_g_inp AT %I*: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </GVL>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/GVLs/TIMERS.TcGVL
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/GVLs/TIMERS.TcGVL
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <GVL Name="TIMERS">
-    <Declaration>
+    <Declaration><![CDATA[VAR_GLOBAL // TIMERS
-      <![CDATA[VAR_GLOBAL // TIMERS
    timer0: TON;
    timer1: TON;
    curTimer: INT := 0;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <ObjectProperties/>
  </GVL>
 </TcPlcObject>
--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/MAIN.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/MAIN.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="MAIN">
-    <Declaration>
+    <Declaration><![CDATA[PROGRAM MAIN
-      <![CDATA[PROGRAM MAIN
 VAR_OUTPUT
    timerValue0: TIME;
    timerValue1: TIME;
@@ -22,11 +21,9 @@ VAR_TEMP
    state1: STATE;
    progress: BOOL;
    loopCount: INT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[
-        <![CDATA[
 // Handle 'time' and cycle time.
 cnt := cnt + 1;
@@ -299,8 +296,7 @@ WHILE TRUE DO
        loopsKilled := loopsKilled + 1;
        EXIT;
    END_IF;
-END_WHILE;]]>
+END_WHILE;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/alg_g_algeb1.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/alg_g_algeb1.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="alg_g_algeb1">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION alg_g_algeb1: LREAL
-      <![CDATA[FUNCTION alg_g_algeb1: LREAL
 VAR_INPUT
    state: STATE;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[alg_g_algeb1 := (state.curTime) + (1.0);]]></ST>
-        <![CDATA[alg_g_algeb1 := (state.curTime) + (1.0);]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/alg_g_algeb2.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/alg_g_algeb2.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="alg_g_algeb2">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION alg_g_algeb2: TupleStruct_1
-      <![CDATA[FUNCTION alg_g_algeb2: TupleStruct_1
 VAR_INPUT
    state: STATE;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[alg_g_algeb2 := makeTupleStruct_1(state.curTime, (state.curTime) + (1.0));]]></ST>
-        <![CDATA[alg_g_algeb2 := makeTupleStruct_1(state.curTime, (state.curTime) + (1.0));]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="derivcvar_M_p_t">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION derivcvar_M_p_t: LREAL
-      <![CDATA[FUNCTION derivcvar_M_p_t: LREAL
 VAR_INPUT
    state: STATE;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[derivcvar_M_p_t := 1.0;]]></ST>
-        <![CDATA[derivcvar_M_p_t := 1.0;]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t2.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t2.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="derivcvar_M_p_t2">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION derivcvar_M_p_t2: LREAL
-      <![CDATA[FUNCTION derivcvar_M_p_t2: LREAL
 VAR_INPUT
    state: STATE;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[derivcvar_M_p_t2 := 2.0;]]></ST>
-        <![CDATA[derivcvar_M_p_t2 := 2.0;]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t3.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/derivcvar_M_p_t3.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="derivcvar_M_p_t3">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION derivcvar_M_p_t3: LREAL
-      <![CDATA[FUNCTION derivcvar_M_p_t3: LREAL
 VAR_INPUT
    state: STATE;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[derivcvar_M_p_t3 := state.cvar_M_p_t3;]]></ST>
-        <![CDATA[derivcvar_M_p_t3 := state.cvar_M_p_t3;]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_f1.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_f1.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="func_f1">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION func_f1: DINT
-      <![CDATA[FUNCTION func_f1: DINT
 VAR_INPUT
    farg_f1_x: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[func_f1 := (farg_f1_x) + (1);
-        <![CDATA[func_f1 := (farg_f1_x) + (1);
+RETURN;]]></ST>
-RETURN;]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_f2.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_f2.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="func_f2">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION func_f2: LREAL
-      <![CDATA[FUNCTION func_f2: LREAL
 VAR_INPUT
    farg_f2_y: LREAL;
 END_VAR
 VAR
    fvar_f2_z: LREAL;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[// Initialize local variables.
-        <![CDATA[// Initialize local variables.
 fvar_f2_z := farg_f2_y;
 // Actual function body.
@@ -22,8 +19,7 @@ IF ((farg_f2_y) > (0)) THEN
 ELSE
    func_f2 := (fvar_f2_z) + (1.0);
    RETURN;
-END_IF;]]>
+END_IF;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="func_fac">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION func_fac: DINT
-      <![CDATA[FUNCTION func_fac: DINT
 VAR_INPUT
    farg_fac_a: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[func_fac := ifExprFunc1(farg_fac_a);
-        <![CDATA[func_fac := ifExprFunc1(farg_fac_a);
+RETURN;]]></ST>
-RETURN;]]>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac2.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac2.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="func_fac2">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION func_fac2: DINT
-      <![CDATA[FUNCTION func_fac2: DINT
 VAR_INPUT
    farg2_fac2_a: DINT;
 END_VAR
 VAR
    farg_fac2_a: DINT;
    fvar_fac2_rslt: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[farg_fac2_a := farg2_fac2_a;
-        <![CDATA[farg_fac2_a := farg2_fac2_a;
 // Initialize local variables.
 fvar_fac2_rslt := 1;
@@ -23,8 +20,7 @@ WHILE ((farg_fac2_a) > (0)) DO
    farg_fac2_a := (farg_fac2_a) - (1);
 END_WHILE;
 func_fac2 := fvar_fac2_rslt;
-RETURN;]]>
+RETURN;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac3.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/func_fac3.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="func_fac3">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION func_fac3: DINT
-      <![CDATA[FUNCTION func_fac3: DINT
 VAR_INPUT
    farg2_fac3_a: DINT;
 END_VAR
 VAR
    farg_fac3_a: DINT;
    fvar_fac3_rslt: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[farg_fac3_a := farg2_fac3_a;
-        <![CDATA[farg_fac3_a := farg2_fac3_a;
 // Initialize local variables.
 fvar_fac3_rslt := 1;
@@ -26,8 +23,7 @@ WHILE (TRUE) DO
    farg_fac3_a := (farg_fac3_a) - (1);
 END_WHILE;
 func_fac3 := fvar_fac3_rslt;
-RETURN;]]>
+RETURN;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/ifExprFunc1.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/ifExprFunc1.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="ifExprFunc1">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION ifExprFunc1: DINT
-      <![CDATA[FUNCTION ifExprFunc1: DINT
 VAR_INPUT
    farg_fac_a: DINT;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[IF ((farg_fac_a) = (0)) THEN
-        <![CDATA[IF ((farg_fac_a) = (0)) THEN
    ifExprFunc1 := 1;
 ELSE
    ifExprFunc1 := (func_fac((farg_fac_a) - (1))) * (farg_fac_a);
-END_IF;]]>
+END_IF;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>

--- a/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/makeTupleStruct_1.TcPOU
+++ b/cif/org.eclipse.escet.cif.tests/tests/cif2plc/all1_twincat/all1_twincat_real/Untitled1/POUs/makeTupleStruct_1.TcPOU
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TcPlcObject ProductVersion="3.1.0.18" Version="1.1.0.1">
  <POU Name="makeTupleStruct_1">
-    <Declaration>
+    <Declaration><![CDATA[FUNCTION makeTupleStruct_1: TupleStruct_1
-      <![CDATA[FUNCTION makeTupleStruct_1: TupleStruct_1
 VAR_INPUT
    field0: LREAL;
    field1: LREAL;
 END_VAR
 VAR
    rslt: TupleStruct_1;
-END_VAR]]>
+END_VAR]]></Declaration>
-    </Declaration>
    <Implementation>
-      <ST>
+      <ST><![CDATA[rslt.field0 := field0;
-        <![CDATA[rslt.field0 := field0;
 rslt.field1 := field1;
-makeTupleStruct_1 := rslt;]]>
+makeTupleStruct_1 := rslt;]]></ST>
-      </ST>
    </Implementation>
    <ObjectProperties/>
  </POU>