luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-19 23:28:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-codegen: Strip @since parameters before comparison

Browse Source 
People might put more extraneous whitespace in a @since line in a
documentation comment, which should not affect the ordering of
methods/signals/etc. in the generated output.

https://bugzilla.gnome.org/show_bug.cgi?id=770372
This commit is contained in:
Philip Withnall
2016-08-25 10:25:49 +01:00
parent 61ea2946ed
commit 097f70828f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gdbus-2.0/codegen/parser.py
View File

@@ -156,7 +156,8 @@ class DBusXMLParser:
short_description = self.doc_comment_params['short_description'] short_description = self.doc_comment_params['short_description']
self._cur_object.doc_string_brief = short_description self._cur_object.doc_string_brief = short_description
if 'since' in self.doc_comment_params: if 'since' in self.doc_comment_params:
self._cur_object.since = self.doc_comment_params['since'] self._cur_object.since = \
self.doc_comment_params['since'].strip()
elif self.state == DBusXMLParser.STATE_INTERFACE: elif self.state == DBusXMLParser.STATE_INTERFACE:
if name == DBusXMLParser.STATE_METHOD: if name == DBusXMLParser.STATE_METHOD:
@@ -186,7 +187,8 @@ class DBusXMLParser:
if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']: if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
self._cur_object.doc_string = self.doc_comment_body self._cur_object.doc_string = self.doc_comment_body
if 'since' in self.doc_comment_params: if 'since' in self.doc_comment_params:
self._cur_object.since = self.doc_comment_params['since'] self._cur_object.since = \
self.doc_comment_params['since'].strip()
elif self.state == DBusXMLParser.STATE_METHOD: elif self.state == DBusXMLParser.STATE_METHOD:
if name == DBusXMLParser.STATE_ARG: if name == DBusXMLParser.STATE_ARG:
@@ -218,7 +220,8 @@ class DBusXMLParser:
if doc_string != None: if doc_string != None:
self._cur_object.doc_string = doc_string self._cur_object.doc_string = doc_string
if 'since' in self.doc_comment_params: if 'since' in self.doc_comment_params:
self._cur_object.since = self.doc_comment_params['since'] self._cur_object.since = \
self.doc_comment_params['since'].strip()
elif self.state == DBusXMLParser.STATE_SIGNAL: elif self.state == DBusXMLParser.STATE_SIGNAL:
if name == DBusXMLParser.STATE_ARG: if name == DBusXMLParser.STATE_ARG:
@@ -244,7 +247,8 @@ class DBusXMLParser:
if doc_string != None: if doc_string != None:
self._cur_object.doc_string = doc_string self._cur_object.doc_string = doc_string
if 'since' in self.doc_comment_params: if 'since' in self.doc_comment_params:
self._cur_object.since = self.doc_comment_params['since'] self._cur_object.since = \
self.doc_comment_params['since'].strip()
elif self.state == DBusXMLParser.STATE_PROPERTY: elif self.state == DBusXMLParser.STATE_PROPERTY:
if name == DBusXMLParser.STATE_ANNOTATION: if name == DBusXMLParser.STATE_ANNOTATION: