Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
py_ext/__init__.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Wed, 01 Aug 2018 13:09:45 +0300
changeset 2258 c9915bc620cd
parent 1858 4c5156dee87a
child 3750 f62625418bff
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/
1511
91538d0c242c add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 728
diff changeset 
     1
 
#!/usr/bin/env python
91538d0c242c add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 728
diff changeset 
     2
 
# -*- coding: utf-8 -*-
91538d0c242c add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 728
diff changeset 
     3
 












91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     4


# This file is part of Beremiz, a Integrated Development Environment for













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     5


# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     6


#













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     7


# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     8


#













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




     9


# See COPYING file for copyrights details.













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    10


#













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    11


# This program is free software; you can redistribute it and/or













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    12


# modify it under the terms of the GNU General Public License













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    13


# as published by the Free Software Foundation; either version 2













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    14


# of the License, or (at your option) any later version.













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    15


#













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    16


# This program is distributed in the hope that it will be useful,













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    17


# but WITHOUT ANY WARRANTY; without even the implied warranty of













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    18


# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    19


# GNU General Public License for more details.













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    20


#













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    21


# You should have received a copy of the GNU General Public License













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    22


# along with this program; if not, write to the Free Software













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    23


# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.













91538d0c242c
add copyright notices to python files where there were missing, that



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
728

diff
changeset




    24









1853






47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1511

diff
changeset




    25


from __future__ import absolute_import








1858






4c5156dee87a
fix pylint warning '(import-self) Module import itself'



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1853

diff
changeset




    26


from .py_ext import *













4c5156dee87a
fix pylint warning '(import-self) Module import itself'



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1853

diff
changeset




    27


from .PythonEditor import PythonEditor













4c5156dee87a
fix pylint warning '(import-self) Module import itself'



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1853

diff
changeset




    28


from .PythonFileCTNMixin import PythonFileCTNMixin













beremiz