Clean up white space in the generated header file.
Also, include the interface name in the method and signal names, to avoid name collisions. I have corresponding changes in the flimflam modemmgr plugin to accomodate the new names. For a sample of the output, see ~ers/mm-modem.h Review URL: http://codereview.chromium.org/2852010 (cherry picked from commit f9dbea25b8ba4414c77d6dfc94545bf7b5c26e68)
This commit is contained in:
Eric Shienbrood
committed by
Elly Jones
Elly Jones
parent
48169926f4
commit
6c75810320
+63
-33
@@ -16,7 +16,6 @@ You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
-->
|
||||
|
||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
|
||||
exclude-result-prefixes="tp">
|
||||
@@ -24,41 +23,35 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
don't work ideally in the presence of two things that want to use the
|
||||
absence of a prefix, sadly. -->
|
||||
|
||||
<xsl:strip-space elements="node interface property tp:errors tp:mapping
|
||||
tp:member"/>
|
||||
<xsl:template match="*" mode="identity">
|
||||
<xsl:copy>
|
||||
<xsl:apply-templates mode="identity"/>
|
||||
</xsl:copy>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:docstring">
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:realdocstring">
|
||||
/* <xsl:apply-templates select="node()" mode="identity"/> */
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:errors">
|
||||
<xsl:apply-templates/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:generic-types">
|
||||
<xsl:call-template name="do-types"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="do-types">
|
||||
<xsl:if test="tp:simple-type">
|
||||
<xsl:apply-templates select="tp:simple-type"/>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="tp:enum">
|
||||
<xsl:apply-templates select="tp:enum"/>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="tp:flags">
|
||||
<xsl:apply-templates select="tp:flags"/>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:error">
|
||||
<xsl:apply-templates select="tp:docstring"/>
|
||||
<xsl:variable name="nameprefix">
|
||||
@@ -71,12 +64,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ__')"/>
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_ERROR_', $nameprefix, '_', $name, ' ')"/> "<xsl:value-of select="translate(@name, ' ', '')"/>"
|
||||
</xsl:template>
|
||||
#define <xsl:value-of select="concat('MM_ERROR_', $nameprefix, '_', $name)"/> "<xsl:value-of select="translate(@name, ' ', '')"/>"</xsl:template>
|
||||
|
||||
<xsl:template match="tp:flags">
|
||||
/* <xsl:value-of select="@name"/> */
|
||||
<xsl:apply-templates select="tp:docstring" />
|
||||
/* <xsl:value-of select="@name"/> flag values */
|
||||
<xsl:apply-templates select="tp:docstring" />
|
||||
<xsl:variable name="value-prefix">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@value-prefix">
|
||||
@@ -90,16 +82,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
<xsl:for-each select="tp:flag">
|
||||
<xsl:choose>
|
||||
<xsl:when test="tp:docstring">
|
||||
<xsl:apply-templates select="tp:docstring" />
|
||||
<xsl:apply-templates select="tp:docstring"/>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
#define <xsl:value-of select="concat($value-prefix, '_', @suffix, ' ') "/><xsl:value-of select="@value"/>
|
||||
|
||||
</xsl:for-each>
|
||||
#define <xsl:value-of select="concat($value-prefix, '_', @suffix)"/><xsl:text> </xsl:text><xsl:value-of select="@value"/>
|
||||
</xsl:for-each><xsl:text>
|
||||
</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:enum">
|
||||
/* <xsl:value-of select="@name"/> */
|
||||
/* <xsl:value-of select="@name"/> enum values */
|
||||
<xsl:apply-templates select="tp:docstring" />
|
||||
<xsl:variable name="value-prefix">
|
||||
<xsl:choose>
|
||||
@@ -118,7 +110,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
#define <xsl:value-of select="concat($value-prefix, '_', @suffix, ' ')"/><xsl:value-of select="@value"/>
|
||||
</xsl:for-each>
|
||||
</xsl:for-each><xsl:text>
|
||||
</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="tp:possible-errors/tp:error">
|
||||
@@ -142,18 +135,39 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"
|
||||
|
||||
</xsl:template>
|
||||
<xsl:variable name="intname">
|
||||
<xsl:choose>
|
||||
<xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
|
||||
<xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:text>MANAGER</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
|
||||
|
||||
<xsl:template match="method">
|
||||
<xsl:variable name="varname">
|
||||
<xsl:value-of select="translate(@name,
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"
|
||||
</xsl:template>
|
||||
<xsl:variable name="intname">
|
||||
<xsl:choose>
|
||||
<xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
|
||||
<xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:text>MANAGER</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_', $intname, '_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
|
||||
|
||||
<xsl:template match="tp:copyright">
|
||||
</xsl:template>
|
||||
@@ -164,13 +178,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
<xsl:template match="/tp:spec">
|
||||
/* Generated Header file do not edit */
|
||||
/* <xsl:value-of select="tp:title"/> */
|
||||
|
||||
<xsl:if test="tp:version">
|
||||
/*
|
||||
* <xsl:text> version </xsl:text> <xsl:value-of select="tp:version"/>
|
||||
*/
|
||||
</xsl:if>
|
||||
|
||||
#define MM_MODEMMANAGER_PATH "/org/freedesktop/ModemManager"
|
||||
#define MM_MODEMMANAGER_SERVICE "org.freedesktop.ModemManager"
|
||||
|
||||
@@ -181,7 +193,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
<xsl:apply-templates select="tp:docstring"/>
|
||||
<xsl:variable name="varname">
|
||||
<xsl:choose>
|
||||
<xsl:when test="contains(@name, 'org.freedesktop.ModemManager.')">
|
||||
<xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager.')">
|
||||
<xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager.'),
|
||||
'abcdefghijklmnopqrstuvwxyz. ',
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
|
||||
@@ -195,16 +207,34 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
</xsl:variable>
|
||||
#define <xsl:value-of select="concat('MM_', $varname, '_INTERFACE ')"/> "<xsl:value-of select="@name"/>"</xsl:for-each>
|
||||
|
||||
/***************
|
||||
* Enums/Flags *
|
||||
***************/
|
||||
<xsl:apply-templates select="node"/>
|
||||
|
||||
/***********************
|
||||
* Methods/Enums/Flags *
|
||||
***********************/
|
||||
<xsl:for-each select="node/interface">
|
||||
/*
|
||||
* Interface <xsl:value-of select="@name"/>
|
||||
*/
|
||||
<xsl:apply-templates select="method"/>
|
||||
<xsl:if test="count(method[*])!=0">
|
||||
<xsl:text>
|
||||
</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:apply-templates select="signal"/>
|
||||
<xsl:if test="count(signal[*])!=0">
|
||||
<xsl:text>
|
||||
</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:apply-templates select="tp:enum"/>
|
||||
<xsl:apply-templates select="tp:flags"/>
|
||||
</xsl:for-each>
|
||||
/**********
|
||||
* Errors *
|
||||
**********/
|
||||
<xsl:apply-templates select="tp:errors"/>
|
||||
|
||||
<!-- Ensure that the file ends with a newline -->
|
||||
<xsl:text>
|
||||
</xsl:text>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user