Remove parsing of the @deprecated syntax used in headers. We will support

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.

svn path=/trunk/; revision=145

diff --git a/ChangeLog b/ChangeLog
index eeb6f46e52350093fd99bf493c8288ff0b99c612..7e01a747a02713cdc6dd1c53b1d2fd2549dda41e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2008-03-11  Johan Dahlin  <johan@gnome.org>
 
        * tools/compiler.c (main): Coding style fixes

diff --git a/tests/parser/Foo-expected.gidl b/tests/parser/Foo-expected.gidl
index c35120f827b748bb963e869443a8a9c168026eab..793132cd941eda5b5294d592d1dc87484f8dee88 100644 (file)
--- a/tests/parser/Foo-expected.gidl
+++ b/tests/parser/Foo-expected.gidl
@@ -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">

diff --git a/tests/parser/foo-object.h b/tests/parser/foo-object.h
index 96c8f456350007c93f76ef20009a985b92141768..849048c33f45c427d5177b6f0438990728d01542 100644 (file)
--- a/tests/parser/foo-object.h
+++ b/tests/parser/foo-object.h
@@ -39,9 +39,6 @@ struct _FooObjectClass
   GObjectClass parent_class;
 };
 
-/*
- * @deprecated
- */
 gint                  foo_init                     (void);
 
 GType                 foo_object_get_type          (void) G_GNUC_CONST;

diff --git a/tools/scanner.c b/tools/scanner.c
index 9e3cb1a4cb68806446e2d47127bfdf7809d26280..70a0735f5d63a746010469823f1e307c9375357b 100644 (file)
--- a/tools/scanner.c
+++ b/tools/scanner.c
@@ -718,16 +718,6 @@ g_igenerator_process_function_symbol (GIGenerator * igenerator, CSymbol * sym)
   * 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 @@ g_igenerator_add_symbol (GIGenerator * igenerator, CSymbol * symbol)
        }
     }
 
-  symbol->directives = g_slist_reverse (igenerator->directives);
-  igenerator->directives = NULL;
-
   if (found_filename || igenerator->macro_scan)
     {
       igenerator->symbol_list =

diff --git a/tools/scanner.h b/tools/scanner.h
index 277387ce6a4b51e7f77e9f7237bd0c0158ef3a05..b110d6ea3a195ca89d52270ca931a167ff7266d4 100644 (file)
--- a/tools/scanner.h
+++ b/tools/scanner.h
@@ -60,7 +60,6 @@ struct _GIGenerator
   
   /* scanner variables */
   gboolean macro_scan;
-  GSList *directives; /* list of CDirective for the current symbol */
 };
 
 typedef enum

diff --git a/tools/scannerlexer.l b/tools/scannerlexer.l
index f7dea4129ce094bad28e30915a5de67df0277637..182f6089f6631fdcb83c89de4f4cc4272cabfd01 100644 (file)
--- a/tools/scannerlexer.l
+++ b/tools/scannerlexer.l
@@ -244,20 +244,11 @@ static void parse_gtkdoc (GIGenerator *igenerator, gchar *symbol, int *c1, int *
  
   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);
   
 }

diff --git a/tools/scannerparser.y b/tools/scannerparser.y
index b4de11ac8e1f8013a2ef6369c9f6ea4eec78ae37..0134a6916c099b7ff682f4acdeca6aef898d9247 100644 (file)
--- a/tools/scannerparser.y
+++ b/tools/scannerparser.y
@@ -67,8 +67,6 @@ csymbol_free (CSymbol * symbol)
   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