Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
plcopen/yslt_noindent.yml2
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Wed, 01 Aug 2018 13:09:45 +0300
changeset 2258 c9915bc620cd
parent 1936 b85b13b1c2ec
permissions -rw-r--r--
Fix wrong code generation if EN/ENO are used in FBD/LD/SFC

This problem appears for example here

--------
------- | MOVE |
| MOVE1 |------|EN ENO|
------- | |
| |
------- | | -----------
| 23 |------|IN OUT|---| LocalVar0 |
------- -------- -----------


--------
------- | MOVE |
| MOVE2 |------|EN ENO|
------- | |
| |
------- | | -----------
| 15 |------|IN OUT|---| LocalVar0 |
------- -------- -----------

Before wrong code was generated for this case:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
LocalVar0 := MOVE6_OUT;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
LocalVar0 := MOVE4_OUT;

With this patch now following code is generated:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
IF MOVE6_ENO THEN
LocalVar0 := MOVE6_OUT;
END_IF;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
IF MOVE4_ENO THEN
LocalVar0 := MOVE4_OUT;
END_IF;


See discussion here:
https://sourceforge.net/p/beremiz/mailman/message/36378805/
1936
b85b13b1c2ec YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
diff changeset 
     1
 
include yslt.yml2
b85b13b1c2ec YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
diff changeset 
     2
 












b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     3


in xsl {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     4


    decl istylesheet (













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     5


        *output="xml",













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     6


        version="1.0",













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     7


        xmlns:xsl="http://www.w3.org/1999/XSL/Transform",













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     8


        xmlns:exsl='http://exslt.org/common',













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




     9


        extension-element-prefixes='exsl'













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    10


    ) alias stylesheet {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    11


        output *output;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    12


        content;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    13


    };













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    14














b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    15


    decl template(match) {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    16


        content;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    17


    };













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    18














b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    19


    decl function(name) alias template {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    20


        content;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    21


    };













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    22


   













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    23


    decl call(name) alias call-template {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    24


        content;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    25


    };













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    26














b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    27


    decl apply(select) alias apply-templates {













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    28


        content;













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    29


    };













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    30


}













b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    31














b85b13b1c2ec
YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files



Edouard Tisserant <edouard.tisserant@gmail.com>


parents: 

diff
changeset




    32














beremiz