plcopen/instances_path.ysl2
changeset 1949 c266fbaae0f6
parent 1946 95fa4e05e30f
child 2626 39d78c530cbb
--- a/plcopen/instances_path.ysl2	Mon Feb 19 15:14:30 2018 +0100
+++ b/plcopen/instances_path.ysl2	Mon Feb 19 15:15:36 2018 +0100
@@ -15,8 +15,7 @@
 
     variable "extensions", "ns:GetExtensions()";
 
-    variable "all", "$project | $stdlib | $extensions";
-    
+    variable "all_types", "($project | $stdlib | $extensions)/ppx:types";
 
     template "ppx:project" {
         apply "ppx:instances/ppx:configurations/ppx:configuration";
@@ -45,8 +44,8 @@
             }
             otherwise {
                 variable "type_name" > «@typeName»
-                apply """$all/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | \
-                         $all/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]""" {
+                apply """$all_types/ppx:pous/ppx:pou[@name=$type_name] | \
+                         $all_types/ppx:dataTypes/ppx:dataType[@name=$type_name]""" {
                     with "instance_path" > «$pou_instance_path»
                 }
             }
@@ -83,8 +82,8 @@
             }
             otherwise {
                 variable "type_name" > «@name»
-                apply """$all/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | \
-                         $all/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]""" {
+                apply """$all_types/ppx:pous/ppx:pou[@name=$type_name] | \
+                         $all_types/ppx:dataTypes/ppx:dataType[@name=$type_name]""" {
                     with "instance_path" > «$variable_path»
                 }
             }