# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1733654491 -3600
# Node ID 6668dcbca9151bc0734fe7c8c3884e464117047e
# Parent  1994928ce3d249128429da749fd405dddc0c32a1
IDE: Fix wrong red wire coloring in FBD, this time for good.

diff -r 1994928ce3d2 -r 6668dcbca915 PLCControler.py
--- a/PLCControler.py	Fri Dec 06 12:16:07 2024 +0100
+++ b/PLCControler.py	Sun Dec 08 11:41:31 2024 +0100
@@ -1357,12 +1357,7 @@
         return [x for x, _y in TypeHierarchy_list if not x.startswith("ANY")]
 
     def IsOfType(self, typename, reference, debug=False):
-        if typename is None or reference is None:
-            return True
-        
-        typename = typename.upper()
-        reference = reference.upper()
-        if typename == reference:
+        if reference is None or typename == reference:
             return True
 
         basetype = TypeHierarchy.get(typename)
diff -r 1994928ce3d2 -r 6668dcbca915 plcopen/pou_block_instances.xslt
--- a/plcopen/pou_block_instances.xslt	Fri Dec 06 12:16:07 2024 +0100
+++ b/plcopen/pou_block_instances.xslt	Sun Dec 08 11:41:31 2024 +0100
@@ -112,6 +112,9 @@
       </xsl:apply-templates>
     </xsl:for-each>
   </xsl:template>
+  <xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/*">
+    <xsl:value-of select="local-name()"/>
+  </xsl:template>
   <xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:derived">
     <xsl:value-of select="@name"/>
   </xsl:template>
@@ -121,9 +124,6 @@
   <xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:wstring">
     <xsl:text>WSTRING</xsl:text>
   </xsl:template>
-  <xsl:template match="*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/*">
-    <xsl:value-of select="local-name()"/>
-  </xsl:template>
   <xsl:template name="VariableBlockInfos">
     <xsl:param name="type"/>
     <xsl:variable name="expression">
diff -r 1994928ce3d2 -r 6668dcbca915 plcopen/pou_block_instances.ysl2
--- a/plcopen/pou_block_instances.ysl2	Fri Dec 06 12:16:07 2024 +0100
+++ b/plcopen/pou_block_instances.ysl2	Sun Dec 08 11:41:31 2024 +0100
@@ -102,6 +102,10 @@
         }
     }
     
+    template "*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/*" {
+        > «local-name()»
+    }
+    
     template "*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/ppx:derived" {
         > «@name»
     }
@@ -114,10 +118,6 @@
         > WSTRING
     }
     
-    template "*[self::ppx:type or self::ppx:baseType or self::ppx:returnType]/*" {
-        > «local-name()»
-    }
-    
     function "VariableBlockInfos" {
         param "type";
         variable "expression" > «ppx:expression/text()»