gobject-introspection r145 - in trunk: . tests/parser tools

[johan svn gnome org]

Author: johan
Date: Tue Mar 11 12:47:30 2008
New Revision: 145
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=145&view=rev

Log:
2008-03-11  Johan Dahlin  <johan gnome org>

        * tests/parser/Foo-expected.gidl:
        * tests/parser/foo-object.h:
        * tools/scanner.c:
        * tools/scanner.h:
        * tools/scannerlexer.l:
        * tools/scannerparser.y:
        Remove parsing of the @deprecated syntax used in headers.
        We will support gtk-doc deprecation in the future instead.



Modified:
   trunk/ChangeLog
   trunk/tests/parser/Foo-expected.gidl
   trunk/tests/parser/foo-object.h
   trunk/tools/scanner.c
   trunk/tools/scanner.h
   trunk/tools/scannerlexer.l
   trunk/tools/scannerparser.y

Modified: trunk/tests/parser/Foo-expected.gidl
==============================================================================
--- trunk/tests/parser/Foo-expected.gidl	(original)
+++ trunk/tests/parser/Foo-expected.gidl	Tue Mar 11 12:47:30 2008
@@ -7,7 +7,7 @@
 				<parameter name="foo_enum" type="FooEnumType"/>
 			</parameters>
 		</function>
-		<function name="init" symbol="foo_init" deprecated="1">
+		<function name="init" symbol="foo_init">
 			<return-type type="gint"/>
 		</function>
 		<boxed name="FooBoxed" type-name="FooBoxed" get-type="foo_boxed_get_type">

Modified: trunk/tests/parser/foo-object.h
==============================================================================
--- trunk/tests/parser/foo-object.h	(original)
+++ trunk/tests/parser/foo-object.h	Tue Mar 11 12:47:30 2008
@@ -39,9 +39,6 @@
   GObjectClass parent_class;
 };
 
-/*
- * @deprecated
- */
 gint                  foo_init                     (void);
 
 GType                 foo_object_get_type          (void) G_GNUC_CONST;

Modified: trunk/tools/scanner.c
==============================================================================
--- trunk/tools/scanner.c	(original)
+++ trunk/tools/scanner.c	Tue Mar 11 12:47:30 2008
@@ -718,16 +718,6 @@
   * the cleanup for sym */
   g_hash_table_remove (igenerator->directives_map, func->symbol);
 
-  for (j = sym->directives; j; j = j->next)
-    {
-      CDirective *directive = (CDirective*)j->data;
-
-      if (!strcmp (directive->name, "deprecated"))
-	func->deprecated = TRUE;
-      else
-	g_printerr ("Unknown function directive: %s\n",
-		    directive->name);
-    }
 }
 
 static void
@@ -1230,9 +1220,6 @@
 	}
     }
 
-  symbol->directives = g_slist_reverse (igenerator->directives);
-  igenerator->directives = NULL;
-
   if (found_filename || igenerator->macro_scan)
     {
       igenerator->symbol_list =

Modified: trunk/tools/scanner.h
==============================================================================
--- trunk/tools/scanner.h	(original)
+++ trunk/tools/scanner.h	Tue Mar 11 12:47:30 2008
@@ -60,7 +60,6 @@
   
   /* scanner variables */
   gboolean macro_scan;
-  GSList *directives; /* list of CDirective for the current symbol */
 };
 
 typedef enum

Modified: trunk/tools/scannerlexer.l
==============================================================================
--- trunk/tools/scannerlexer.l	(original)
+++ trunk/tools/scannerlexer.l	Tue Mar 11 12:47:30 2008
@@ -244,20 +244,11 @@
  
   directive = cdirective_new (name, value, options);
  
-  if (symbol == NULL)
-    {
-      igenerator->directives = g_slist_prepend (igenerator->directives,
-						directive);
-    }
-  else
-    {
-      directives = g_hash_table_lookup (igenerator->directives_map, symbol);
-      directives = g_slist_prepend (directives, directive);
+  directives = g_hash_table_lookup (igenerator->directives_map, symbol);
+  directives = g_slist_prepend (directives, directive);
 
-      g_hash_table_replace (igenerator->directives_map, 
-			    g_strdup (symbol), directives);
-    }
-  
+  g_hash_table_replace (igenerator->directives_map, 
+			g_strdup (symbol), directives);
   g_strfreev (parts);
   
 }

Modified: trunk/tools/scannerparser.y
==============================================================================
--- trunk/tools/scannerparser.y	(original)
+++ trunk/tools/scannerparser.y	Tue Mar 11 12:47:30 2008
@@ -67,8 +67,6 @@
   ctype_free (symbol->base_type);
   g_free (symbol->const_string);
   g_free (symbol);
-  g_slist_foreach (symbol->directives, (GFunc)cdirective_free, NULL);
-  g_slist_free (symbol->directives);
 }
  
 gboolean