gobject-introspection r779 - in trunk: . giscanner tests/scanner

[walters svn gnome org]

Author: walters
Date: Tue Oct 21 21:35:35 2008
New Revision: 779
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=779&view=rev

Log:
Don't require trailing whitespace after uncommented parameters


Modified:
   trunk/ChangeLog
   trunk/giscanner/scannerlexer.l
   trunk/tests/scanner/annotation.c

Modified: trunk/giscanner/scannerlexer.l
==============================================================================
--- trunk/giscanner/scannerlexer.l	(original)
+++ trunk/giscanner/scannerlexer.l	Tue Oct 21 21:35:35 2008
@@ -228,9 +228,15 @@
   if (!isline)
     return;
 
+  /* Ignore lines that don't have a : - this is a hack but avoids
+   * trying to parse too many things as annotations
+   */
+  if (!strchr (line, ':'))
+    return;
+
   line[i] = '\0';
 
-  parts = g_strsplit (line, ": ", 3);
+  parts = g_strsplit (line, ":", 3);
   n_parts = g_strv_length (parts);
 
   if (g_ascii_strcasecmp (parts[0], "eprecated") == 0)
@@ -295,11 +301,10 @@
   directive = gi_source_directive_new (rname, value, options);
   directives = g_hash_table_lookup (scanner->directives_map, symbol);
   directives = g_slist_prepend (directives, directive);
-  g_hash_table_replace (scanner->directives_map, 
+  g_hash_table_replace (scanner->directives_map,
 			g_strdup (symbol), directives);
 
   g_strfreev (parts);
-  
 }
 
 

Modified: trunk/tests/scanner/annotation.c
==============================================================================
--- trunk/tests/scanner/annotation.c	(original)
+++ trunk/tests/scanner/annotation.c	Tue Oct 21 21:35:35 2008
@@ -244,7 +244,7 @@
 /**
  * annotation_object_allow_none: 
  * @object: a #GObject
- * @somearg: (allow-none): 
+ * @somearg: (allow-none):
  **/
 GObject*
 annotation_object_allow_none (AnnotationObject *object, gchar *somearg)