diff options
author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-07-17 08:16:26 +0200 |
---|---|---|
committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-10-08 20:54:30 +0200 |
commit | d8998d68d3dd03e7e8bfc87ec4464512ed705ac2 (patch) | |
tree | b35e9c1b7ce90123badcea6fcd6f0b4f8ffea6fc /tests | |
parent | 680ec99d696db06a02aab24e07c4457a1d031250 (diff) | |
download | gobject-introspection-d8998d68d3dd03e7e8bfc87ec4464512ed705ac2.tar.gz |
giscanner: rename "colon" to "delimiter"
It serves as a GTK-Doc "field" separator, so delimiter seems
like a better name. This also makes the distinction between the
colon used in property/signal names (which is not a "field"
separator) and the GTK-Doc "field" separator a bit more clear.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/scanner/annotationparser/test_patterns.py | 208 |
1 files changed, 104 insertions, 104 deletions
diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py index 97e66872..063b1916 100644 --- a/tests/scanner/annotationparser/test_patterns.py +++ b/tests/scanner/annotationparser/test_patterns.py @@ -47,223 +47,223 @@ identifier_section_tests = [ (SECTION_RE, 'section:test', None), (SECTION_RE, 'SECTION', - {'colon': '', + {'delimiter': '', 'section_name': None}), (SECTION_RE, 'SECTION \t ', - {'colon': '', + {'delimiter': '', 'section_name': None}), (SECTION_RE, ' \t SECTION \t ', - {'colon': '', + {'delimiter': '', 'section_name': None}), (SECTION_RE, 'SECTION: \t ', - {'colon': ':', + {'delimiter': ':', 'section_name': None}), (SECTION_RE, 'SECTION : ', - {'colon': ':', + {'delimiter': ':', 'section_name': None}), (SECTION_RE, ' SECTION : ', - {'colon': ':', + {'delimiter': ':', 'section_name': None}), (SECTION_RE, 'SECTION:gtkwidget', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, 'SECTION:gtkwidget ', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, ' SECTION:gtkwidget', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, ' SECTION:gtkwidget\t ', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, 'SECTION: gtkwidget ', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, 'SECTION : gtkwidget', - {'colon': ':', + {'delimiter': ':', 'section_name': 'gtkwidget'}), (SECTION_RE, 'SECTION gtkwidget \f ', - {'colon': '', + {'delimiter': '', 'section_name': 'gtkwidget'})] identifier_symbol_tests = [ (SYMBOL_RE, 'GBaseFinalizeFunc:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'GBaseFinalizeFunc', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show ', - {'colon': '', + {'delimiter': '', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show', - {'colon': '', + {'delimiter': '', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show ', - {'colon': '', + {'delimiter': '', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show :', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show: ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show : ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show :', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show: ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, ' gtk_widget_show : ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': ''}), (SYMBOL_RE, 'gtk_widget_show (skip)', - {'colon': '', + {'delimiter': '', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, 'gtk_widget_show: (skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, 'gtk_widget_show : (skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, 'gtk_widget_show: (skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, 'gtk_widget_show : (skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, ' gtk_widget_show:(skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, ' gtk_widget_show :(skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, ' gtk_widget_show: (skip)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)'}), (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) \t '}), (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) \t '}), (SYMBOL_RE, 'gtk_widget_show:(skip)(test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)(test1)'}), (SYMBOL_RE, 'gtk_widget_show (skip)(test1)', - {'colon': '', + {'delimiter': '', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip)(test1)'}), (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, ' gtk_widget_show:(skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, ' gtk_widget_show :(skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, ' gtk_widget_show: (skip) (test1)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1)'}), (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) '}), (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, ' gtk_widget_show:(skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, ' gtk_widget_show :(skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, ' gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2)'}), (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2) '}), (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'gtk_widget_show', 'annotations': '(skip) (test1) (test-2) '}), # constants (SYMBOL_RE, 'MY_CONSTANT:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'MY_CONSTANT', 'annotations': ''}), # structs (SYMBOL_RE, 'FooWidget:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'FooWidget', 'annotations': ''}), # enums (SYMBOL_RE, 'Something:', - {'colon': ':', + {'delimiter': ':', 'symbol_name': 'Something', 'annotations': ''})] @@ -272,57 +272,57 @@ identifier_property_tests = [ (PROPERTY_RE, 'GtkWidget:name (skip)', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': '', + 'delimiter': '', 'annotations': '(skip)'}), (PROPERTY_RE, 'GtkWidget:name', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget :name', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget: name ', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget : name ', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget:name:', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget:name: ', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget:name:', {'class_name': 'GtkWidget', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Something:name:', {'class_name': 'Something', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Something:name: ', {'class_name': 'Something', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, ' Something:name:', {'class_name': 'Something', 'property_name': 'name', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Weird-thing:name:', None), @@ -331,63 +331,63 @@ identifier_property_tests = [ (PROPERTY_RE, 'GWin32InputStream:handle:', {'class_name': 'GWin32InputStream', 'property_name': 'handle', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), # property name that contains a dash (PROPERTY_RE, 'GtkWidget:double-buffered (skip)', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': '', + 'delimiter': '', 'annotations': '(skip)'}), (PROPERTY_RE, 'GtkWidget:double-buffered', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget :double-buffered', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget: double-buffered ', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget : double-buffered ', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': '', + 'delimiter': '', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget:double-buffered:', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'GtkWidget:double-buffered: ', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, ' GtkWidget:double-buffered:', {'class_name': 'GtkWidget', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Something:double-buffered:', {'class_name': 'Something', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Something:double-buffered: ', {'class_name': 'Something', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, ' Something:double-buffered:', {'class_name': 'Something', 'property_name': 'double-buffered', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (PROPERTY_RE, 'Weird-thing:double-buffered:', None), @@ -396,7 +396,7 @@ identifier_property_tests = [ (PROPERTY_RE, ' GMemoryOutputStream:realloc-function: (skip)', {'class_name': 'GMemoryOutputStream', 'property_name': 'realloc-function', - 'colon': ':', + 'delimiter': ':', 'annotations': '(skip)'})] identifier_signal_tests = [ @@ -404,17 +404,17 @@ identifier_signal_tests = [ (SIGNAL_RE, 'GtkWidget::changed: (skip)', {'class_name': 'GtkWidget', 'signal_name': 'changed', - 'colon': ':', + 'delimiter': ':', 'annotations': '(skip)'}), (SIGNAL_RE, 'GtkWidget::changed:', {'class_name': 'GtkWidget', 'signal_name': 'changed', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (SIGNAL_RE, 'Something::changed:', {'class_name': 'Something', 'signal_name': 'changed', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (SIGNAL_RE, 'Weird-thing::changed:', None), @@ -424,17 +424,17 @@ identifier_signal_tests = [ (SIGNAL_RE, 'GtkWidget::hierarchy-changed: (skip)', {'class_name': 'GtkWidget', 'signal_name': 'hierarchy-changed', - 'colon': ':', + 'delimiter': ':', 'annotations': '(skip)'}), (SIGNAL_RE, 'GtkWidget::hierarchy-changed:', {'class_name': 'GtkWidget', 'signal_name': 'hierarchy-changed', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (SIGNAL_RE, 'Something::hierarchy-changed:', {'class_name': 'Something', 'signal_name': 'hierarchy-changed', - 'colon': ':', + 'delimiter': ':', 'annotations': ''}), (SIGNAL_RE, 'Weird-thing::hierarchy-changed:', None), @@ -445,47 +445,47 @@ parameter_tests = [ (PARAMETER_RE, '@Short_description: Base class for all widgets ', {'parameter_name': 'Short_description', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'Base class for all widgets'}), (PARAMETER_RE, '@...: the value of the first property, followed optionally by more', {'parameter_name': '...', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'the value of the first property, followed optionally by more'}), (PARAMETER_RE, '@widget: a #GtkWidget', {'parameter_name': 'widget', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'a #GtkWidget'}), (PARAMETER_RE, '@widget_pointer: (inout) (transfer none): ' 'address of a variable that contains @widget', {'parameter_name': 'widget_pointer', 'annotations': '(inout) (transfer none)', - 'colon': ':', + 'delimiter': ':', 'description': 'address of a variable that contains @widget'}), (PARAMETER_RE, '@weird_thing: (inout) (transfer none) (allow-none) (attribute) (destroy) ' '(foreign) (inout) (out) (transfer) (skip) (method): some weird @thing', {'parameter_name': 'weird_thing', 'annotations': '(inout) (transfer none) (allow-none) (attribute) (destroy) ' '(foreign) (inout) (out) (transfer) (skip) (method)', - 'colon': ':', + 'delimiter': ':', 'description': 'some weird @thing'}), (PARAMETER_RE, '@data: a pointer to the element data. The data may be moved as elements ' 'are added to the #GByteArray.', {'parameter_name': 'data', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'a pointer to the element data. The data may be moved as elements ' 'are added to the #GByteArray.'}), (PARAMETER_RE, '@a: a #GSequenceIter', {'parameter_name': 'a', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'a #GSequenceIter'}), (PARAMETER_RE, '@keys: (array length=n_keys) (element-type GQuark) (allow-none):', {'parameter_name': 'keys', 'annotations': '(array length=n_keys) (element-type GQuark) (allow-none)', - 'colon': ':', + 'delimiter': ':', 'description': ''})] tag_tests = [ @@ -494,17 +494,17 @@ tag_tests = [ (TAG_RE, 'Since: 3.0', {'tag_name': 'Since', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': '3.0'}), (TAG_RE, 'Attributes: (inout) (transfer none): some note about attributes', {'tag_name': 'Attributes', 'annotations': '(inout) (transfer none)', - 'colon': ':', + 'delimiter': ':', 'description': 'some note about attributes'}), (TAG_RE, 'Rename to: something_else', {'tag_name': 'Rename to', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'something_else'}), (TAG_RE, '@Deprecated: Since 2.8, reference counting is done atomically', None), @@ -513,36 +513,36 @@ tag_tests = [ (TAG_RE, 'Returns: a #GtkWidget', {'tag_name': 'Returns', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'a #GtkWidget'}), (TAG_RE, 'Return value: (transfer none): The binary data that @text responds. ' 'This pointer', {'tag_name': 'Return value', 'annotations': '(transfer none)', - 'colon': ':', + 'delimiter': ':', 'description': 'The binary data that @text responds. This pointer'}), (TAG_RE, 'Return value: (transfer full) (array length=out_len) (element-type guint8):', {'tag_name': 'Return value', 'annotations': '(transfer full) (array length=out_len) (element-type guint8)', - 'colon': ':', + 'delimiter': ':', 'description': ''}), (TAG_RE, 'Returns: A boolean value, but let me tell you a bit about this boolean. It', {'tag_name': 'Returns', 'annotations': '', - 'colon': '', + 'delimiter': '', 'description': 'A boolean value, but let me tell you a bit about this boolean. ' 'It'}), (TAG_RE, 'Returns: (transfer container) (element-type GObject.ParamSpec): a', {'tag_name': 'Returns', 'annotations': '(transfer container) (element-type GObject.ParamSpec)', - 'colon': ':', + 'delimiter': ':', 'description': 'a'}), (TAG_RE, 'Return value: (type GLib.HashTable<utf8,GLib.HashTable<utf8,utf8>>) ' '(transfer full):', {'tag_name': 'Return value', 'annotations': '(type GLib.HashTable<utf8,GLib.HashTable<utf8,utf8>>) ' '(transfer full)', - 'colon': ':', + 'delimiter': ':', 'description': ''})] comment_end_tests = [ |