allow the enums name to not be on the same line as the trailing '}'.

2001-11-16  Mark McLoughlin  <mark@skynet.ie>

        * glib-mkenums.in: allow the enums name to not be on the same
        line as the trailing '}'. (#64714)

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 049e0de..deda0c7 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-16  Mark McLoughlin  <mark@skynet.ie>
+
+       * glib-mkenums.in: allow the enums name to not be on the same
+       line as the trailing '}'. (#64714)
+
 2001-11-18  Hans Breuer  <hans@breuer.org>
 
        * makefile.msc.in : remove g_log_domain_gruntime usage

diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index e58f907..c0e31ca 100755 (executable)
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -27,6 +27,7 @@ sub parse_trigraph {
 sub parse_entries {
     my $file = shift;
     my $file_name = shift;
+    my $looking_for_name = 0;
     
     while (<$file>) {
        
@@ -46,6 +47,13 @@ sub parse_entries {
        next if m@^\s*$@;
        
 #      print STDERR "xxx $_\n";
+
+       if ($looking_for_name) {
+           if (/^\s*(\w+)/) {
+               $enumname = $1;
+               return 1;
+           }
+       }
        
        # Handle include files
        if (/^\#include\s*<([^>]*)>/ ) {
@@ -74,6 +82,12 @@ sub parse_entries {
            return 1;
        }
        
+       if (/^\s*\}/) {
+           $enumindex++;
+           $looking_for_name = 1;
+           next;
+       }
+
         if (m@^\s*
               (\w+)\s*                   # name
               (?:=(                      # value