diff options
| author | Josh Triplett <josh@freedesktop.org> | 2005-04-23 22:39:18 +0000 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2005-04-23 22:39:18 +0000 |
| commit | 78d7b77c10873eff87e52f6d052d3b00f954f5e2 (patch) | |
| tree | 5b45145be1df1d23a44f6b86c904c7cc6ad38f88 /xcb | |
| parent | 70bcda0b8bffc21e71e083f3dbee74ef0f04a730 (diff) | |
Allow protocol descriptions to explicitly qualify types with a namespace,
which should be the value of the header attribute from the protocol
description containing the desired type.
Diffstat (limited to 'xcb')
| -rw-r--r-- | xcb/ChangeLog | 7 | ||||
| -rw-r--r-- | xcb/src/c-client.xsl | 39 |
2 files changed, 40 insertions, 6 deletions
diff --git a/xcb/ChangeLog b/xcb/ChangeLog index 6e9cc4a..4d47067 100644 --- a/xcb/ChangeLog +++ b/xcb/ChangeLog @@ -1,3 +1,10 @@ +2005-04-23 Josh Triplett <josh@freedesktop.org> + + * src/c-client.xsl: + Allow protocol descriptions to explicitly qualify types with a + namespace, which should be the value of the header attribute from + the protocol description containing the desired type. + 2005-04-10 Jamey Sharp <jamey@minilop.net> * src/xcb.h, src/xcb_in.c: diff --git a/xcb/src/c-client.xsl b/xcb/src/c-client.xsl index 875de00..fe809c0 100644 --- a/xcb/src/c-client.xsl +++ b/xcb/src/c-client.xsl @@ -144,24 +144,40 @@ authorization from the authors. <xsl:template name="canonical-type-name"> <xsl:param name="type" select="string(@type)" /> + <xsl:variable name="is-unqualified" select="not(contains($type, ':'))"/> + <xsl:variable name="namespace" select="substring-before($type, ':')" /> + <xsl:variable name="unqualified-type"> + <xsl:choose> + <xsl:when test="$is-unqualified"> + <xsl:value-of select="$type" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="substring-after($type, ':')" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:choose> - <xsl:when test="$core-types/type[@name=$type]"> + <xsl:when test="$is-unqualified and $core-types/type[@name=$type]"> <xsl:value-of select="$type" /> </xsl:when> <xsl:otherwise> <xsl:variable name="type-definitions" select="(/xcb|document($search-path)/xcb - )/*[((self::struct or self::union + )[$is-unqualified or @header=$namespace] + /*[((self::struct or self::union or self::xidtype or self::enum or self::event or self::eventcopy or self::error or self::errorcopy) - and @name=$type) - or (self::typedef and @newname=$type)]" /> + and @name=$unqualified-type) + or (self::typedef + and @newname=$unqualified-type)]" /> <xsl:choose> <xsl:when test="count($type-definitions) = 1"> <xsl:for-each select="$type-definitions"> <xsl:text>XCB</xsl:text> - <xsl:value-of select="concat(/xcb/@extension-name, $type)" /> + <xsl:value-of select="concat(/xcb/@extension-name, + $unqualified-type)" /> </xsl:for-each> </xsl:when> <xsl:when test="count($type-definitions) > 1"> @@ -169,13 +185,24 @@ authorization from the authors. <xsl:text>Multiple definitions of type "</xsl:text> <xsl:value-of select="$type" /> <xsl:text>" found.</xsl:text> + <xsl:if test="$is-unqualified"> + <xsl:for-each select="$type-definitions"> + <xsl:text> + </xsl:text> + <xsl:value-of select="concat(/xcb/@header, ':', $type)" /> + </xsl:for-each> + </xsl:if> </xsl:message> </xsl:when> <xsl:otherwise> <xsl:message terminate="yes"> <xsl:text>No definitions of type "</xsl:text> <xsl:value-of select="$type" /> - <xsl:text>" found, and it is not a known core type.</xsl:text> + <xsl:text>" found</xsl:text> + <xsl:if test="$is-unqualified"> + <xsl:text>, and it is not a known core type</xsl:text> + </xsl:if> + <xsl:text>.</xsl:text> </xsl:message> </xsl:otherwise> </xsl:choose> |