beremiz

Improve fix wrong code generation if EN/ENO are used in FBD/LD/SFC

2018-08-09, Andrey Skvortsov
1bb8afa02409
Improve fix wrong code generation if EN/ENO are used in FBD/LD/SFC

Commit c9915bc6 "Fix wrong code generation if EN/ENO are used in
FBD/LD/SFC" caused following backtrace in some cases:

File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 476, in GenerateProgram
self.GeneratePouProgram(pou_name)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 258, in GeneratePouProgram
program = pou_program.GenerateProgram(pou)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 1713, in GenerateProgram
self.ComputeProgram(pou)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 997, in ComputeProgram
eno_var = self.GetUsedEno(body, connections)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 929, in GetUsedEno
for invar in blk.inputVariables.getvariable():
File "/home/developer/WorkData/PLC/beremiz/beremiz/xmlclass/xmlclass.py", line 1363, in getattrMethod
return DefaultElementClass.__getattribute__(self, name)
: 'inOutVariable' object has no attribute 'inputVariables'
# the platform name (PyV8, smjs, Mozilla, IE6, Opera, Safari etc.)
platform = '' # to be updated by app, on compile
# a dictionary of module override names (platform-specific)
overrides = {} # to be updated by app, on compile
# the remote path for loading modules
loadpath = None
stacktrace = None
appname = None
def setloadpath(lp):
global loadpath
loadpath = lp
def setappname(an):
global appname
appname = an
def getloadpath():
return loadpath
def addoverride(module_name, path):
overrides[module_name] = path
def addstack(linedebug):
JS("""
if (pyjslib.bool((sys.stacktrace === null))) {
sys.stacktrace = new pyjslib.List([]);
}
sys.stacktrace.append(linedebug);
""")
def popstack():
JS("""
sys.stacktrace.pop()
""")
def printstack():
JS("""
var res = '';
var __l = sys.stacktrace.__iter__();
try {
while (true) {
var l = __l.next();
res += ( l + '\\n' ) ;
}
} catch (e) {
if (e != pyjslib.StopIteration) {
throw e;
}
}
return res;
""")