# HG changeset patch
# User lbessard
# Date 1199465278 -3600
# Node ID 015a34da60ebc53a410a5cba3ea829a53fd6a5aa
# Parent  f5f43f009709c25968f6779c61ad1c1909be371a
Bug on FunctionBlock type variables management fixed

diff -r f5f43f009709 -r 015a34da60eb plcopen/plcopen.py
--- a/plcopen/plcopen.py	Fri Jan 04 17:47:00 2008 +0100
+++ b/plcopen/plcopen.py	Fri Jan 04 17:47:58 2008 +0100
@@ -453,7 +453,7 @@
         var_type = PLCOpenClasses["dataType"]()
         derived_type = PLCOpenClasses["derived"]()
         derived_type.setName(type)
-        var_type.setValue(derived_type)
+        var_type.setContent("derived", derived_type)
         var.setType(var_type)
         content[-1]["value"].appendVariable(var)
     setattr(cls, "addPouVar", addPouVar)
@@ -477,8 +477,8 @@
             variables = varlist["value"].getVariable()
             for var in variables:
                 if var.getName() == name:
-                    var_type = var.getType().getValue()
-                    if isinstance(var_type, PLCOpenClasses["derived"]) and var_type.getName() == type:
+                    vartype_content = var.getType().getContent()
+                    if vartype_content["name"] == "derived" and vartype_content["value"].getName() == type:
                         variables.remove(var)
                         break
             if len(varlist["value"].getVariable()) == 0: