--- a/plcopen/instances_path.xslt Wed Oct 09 22:01:21 2013 +0200
+++ b/plcopen/instances_path.xslt Wed Oct 09 23:06:47 2013 +0200
@@ -1,38 +1,55 @@
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:ppx="http://www.plcopen.org/xml/tc6_0201"
- xmlns:ns="instances_ns"
- extension-element-prefixes="ns"
- exclude-result-prefixes="ns">
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:func="http://exslt.org/functions" xmlns:dyn="http://exslt.org/dynamic" xmlns:str="http://exslt.org/strings" xmlns:math="http://exslt.org/math" xmlns:exsl="http://exslt.org/common" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:yml="http://fdik.org/yml" xmlns:set="http://exslt.org/sets" xmlns:ppx="http://www.plcopen.org/xml/tc6_0201" xmlns:ns="instances_ns" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" extension-element-prefixes="ns" version="1.0" exclude-result-prefixes="ns">
+ <xsl:output method="xml"/>
+ <xsl:variable name="space" select="' '"/>
+ <xsl:param name="autoindent" select="4"/>
<xsl:param name="instance_type"/>
+ <xsl:template match="text()">
+ <xsl:param name="_indent" select="0"/>
+ </xsl:template>
+ <xsl:variable name="project">
+ <xsl:copy-of select="document('project')/project/*"/>
+ </xsl:variable>
+ <xsl:variable name="stdlib">
+ <xsl:copy-of select="document('stdlib')/stdlib/*"/>
+ </xsl:variable>
+ <xsl:variable name="extensions">
+ <xsl:copy-of select="document('extensions')/extensions/*"/>
+ </xsl:variable>
<xsl:template match="ppx:project">
- <instances>
- <xsl:apply-templates select="ppx:instances/ppx:configurations/ppx:configuration"/>
- </instances>
+ <xsl:param name="_indent" select="0"/>
+ <instances>
+ <xsl:apply-templates select="ppx:instances/ppx:configurations/ppx:configuration">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ </xsl:apply-templates>
+ </instances>
</xsl:template>
<xsl:template match="ppx:configuration">
- <xsl:apply-templates select="ppx:globalVars/ppx:variable[ppx:type/ppx:derived]">
- <xsl:with-param name="parent_path" select="@name"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="ppx:resource">
- <xsl:with-param name="parent_path" select="@name"/>
+ <xsl:param name="_indent" select="0"/>
+ <xsl:apply-templates select="ppx:globalVars/ppx:variable[ppx:type/ppx:derived] | ppx:resource">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="parent_path">
+ <xsl:value-of select="@name"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:resource">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="parent_path"/>
<xsl:variable name="resource_path">
<xsl:value-of select="$parent_path"/>
<xsl:text>.</xsl:text>
<xsl:value-of select="@name"/>
</xsl:variable>
- <xsl:apply-templates select="ppx:globalVars/ppx:variable[ppx:type/ppx:derived]">
- <xsl:with-param name="parent_path" select="$resource_path"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="ppx:pouInstance | ppx:task/ppx:pouInstance">
- <xsl:with-param name="parent_path" select="$resource_path"/>
+ <xsl:apply-templates select="ppx:globalVars/ppx:variable[ppx:type/ppx:derived] | ppx:pouInstance | ppx:task/ppx:pouInstance">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="parent_path">
+ <xsl:value-of select="$resource_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:pouInstance">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="parent_path"/>
<xsl:variable name="pou_instance_path">
<xsl:value-of select="$parent_path"/>
@@ -41,37 +58,43 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="@typeName=$instance_type">
- <instance>
- <xsl:attribute name="path">
- <xsl:value-of select="$pou_instance_path"/>
- </xsl:attribute>
- </instance>
+ <xsl:value-of select="ns:AddInstance($pou_instance_path)"/>
</xsl:when>
<xsl:otherwise>
- <ns:instance_definition>
- <xsl:attribute name="name">
- <xsl:value-of select="@typeName"/>
- </xsl:attribute>
- <xsl:attribute name="path">
+ <xsl:variable name="type_name">
+ <xsl:value-of select="@typeName"/>
+ </xsl:variable>
+ <xsl:apply-templates select="exsl:node-set($project)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($project)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="instance_path">
<xsl:value-of select="$pou_instance_path"/>
- </xsl:attribute>
- </ns:instance_definition>
+ </xsl:with-param>
+ </xsl:apply-templates>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="ppx:pou">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="instance_path"/>
<xsl:apply-templates select="ppx:interface/*/ppx:variable[ppx:type/ppx:derived]">
- <xsl:with-param name="parent_path" select="$instance_path"/>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="parent_path">
+ <xsl:value-of select="$instance_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:dataType">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="instance_path"/>
<xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="parent_path" select="$instance_path"/>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="parent_path">
+ <xsl:value-of select="$instance_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:variable">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="parent_path"/>
<xsl:variable name="variable_path">
<xsl:value-of select="$parent_path"/>
@@ -79,32 +102,34 @@
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:apply-templates select="ppx:type/ppx:derived">
- <xsl:with-param name="variable_path" select="$variable_path"/>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="variable_path">
+ <xsl:value-of select="$variable_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="ppx:derived">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="variable_path"/>
<xsl:choose>
<xsl:when test="@name=$instance_type">
- <instance>
- <xsl:attribute name="path">
- <xsl:value-of select="$variable_path"/>
- </xsl:attribute>
- </instance>
+ <xsl:value-of select="ns:AddInstance($variable_path)"/>
</xsl:when>
<xsl:otherwise>
- <ns:instance_definition>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:attribute name="path">
+ <xsl:variable name="type_name">
+ <xsl:value-of select="@name"/>
+ </xsl:variable>
+ <xsl:apply-templates select="exsl:node-set($project)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($project)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($stdlib)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:pous/ppx:pou[@name=$type_name] | exsl:node-set($extensions)/ppx:project/ppx:types/ppx:dataTypes/ppx:dataType[@name=$type_name]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="instance_path">
<xsl:value-of select="$variable_path"/>
- </xsl:attribute>
- </ns:instance_definition>
+ </xsl:with-param>
+ </xsl:apply-templates>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
- <xsl:template name="ppx:struct">
+ <xsl:template match="ppx:struct">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="variable_path"/>
<xsl:for-each select="ppx:variable[ppx:type/ppx:derived or ppx:type/ppx:struct or ppx:type/ppx:array]">
<xsl:variable name="element_path">
@@ -112,26 +137,40 @@
<xsl:text>.</xsl:text>
<xsl:value-of select="@name"/>
</xsl:variable>
- <xsl:apply-templates select="ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="variable_path" select="$element_path"/>
- </xsl:apply-templates>
</xsl:for-each>
+ <xsl:apply-templates select="ppx:type/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="variable_path">
+ <xsl:value-of select="$element_path"/>
+ </xsl:with-param>
+ </xsl:apply-templates>
</xsl:template>
- <xsl:template name="ppx:array">
+ <xsl:template match="ppx:array">
+ <xsl:param name="_indent" select="0"/>
<xsl:param name="variable_path"/>
<xsl:apply-templates select="ppx:baseType/*[self::ppx:derived or self::ppx:struct or self::ppx:array]">
- <xsl:with-param name="variable_path" select="$variable_path"/>
- </xsl:apply-templates>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="variable_path">
+ <xsl:value-of select="$variable_path"/>
+ </xsl:with-param>
+ </xsl:apply-templates>
</xsl:template>
<xsl:template match="pou_instance">
+ <xsl:param name="_indent" select="0"/>
<xsl:apply-templates>
- <xsl:with-param name="instance_path" select="@pou_path"/>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="instance_path">
+ <xsl:value-of select="@pou_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="datatype_instance">
+ <xsl:param name="_indent" select="0"/>
<xsl:apply-templates>
- <xsl:with-param name="instance_path" select="@datatype_path"/>
+ <xsl:with-param name="_indent" select="$_indent + (1) * $autoindent"/>
+ <xsl:with-param name="instance_path">
+ <xsl:value-of select="@datatype_path"/>
+ </xsl:with-param>
</xsl:apply-templates>
</xsl:template>
- <xsl:template match="text()"/>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>