diff -r a070a9681961 -r e9807c28a788 plcopen/pou_variables.ysl2 --- a/plcopen/pou_variables.ysl2 Mon Oct 16 23:35:47 2023 +0200 +++ b/plcopen/pou_variables.ysl2 Mon Oct 16 23:50:58 2023 +0200 @@ -170,6 +170,11 @@ } } + template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_class" { + param "default_class"; + value "$default_class"; + } + template "*[self::ppx:type or self::ppx:baseType]/ppx:derived", mode="var_class" { param "default_class"; variable "type_name", "@name"; @@ -188,11 +193,10 @@ value "@pouType"; } - template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_class", priority="-1.0" { - param "default_class"; - value "$default_class"; - } - + template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_type" { + > «local-name()» + } + template "*[self::ppx:type or self::ppx:baseType]/ppx:derived", mode="var_type" { > «@name» } @@ -214,8 +218,8 @@ > WSTRING } - template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_type", priority="-1.0" { - > «local-name()» + template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_edit" { + > false } template "*[self::ppx:type or self::ppx:baseType]/ppx:derived", mode="var_edit" { @@ -231,8 +235,8 @@ apply "ppx:baseType", mode="var_edit"; } - template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_edit", priority="-1.0" { - > false + template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_debug" { + > true } template "*[self::ppx:type or self::ppx:baseType]/ppx:derived", mode="var_debug" { @@ -261,8 +265,4 @@ > false } - template "*[self::ppx:type or self::ppx:baseType]/*", mode="var_debug", priority="-1.0" { - > true - } - }