luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-mkenums: fix handling of forward enum declarations

Browse Source 
Given

    typedef enum MyFoo MyFoo;

glib-mkenums would get confused, not notice the ";", and then keep
skipping lines until it found one that started with a "{", possibly
even going into the next file.

Fix it to just ignore those lines instead (and also, to error out if
it hits eof while parsing an enum).

https://bugzilla.gnome.org/show_bug.cgi?id=669595
This commit is contained in:
Dan Winship 2012-02-07 10:54:22 -05:00
parent 808346c6ab
commit f049262a61
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/glib-mkenums.in
View File

@ -290,6 +290,9 @@ while (<>) {
([^*]+|\*(?!/))*
\*/@@gx;
# ignore forward declarations
next if /^\s*typedef\s+enum.*;/;
if (m@^\s*typedef\s+enum\s*
({)?\s*
(?:/\*<
@ -321,6 +324,9 @@ while (<>) {
# Didn't have trailing '{' look on next lines
if (!defined $1 && !defined $4) {
while (<>) {
if (eof) {
die "Hit end of file while parsing enum in $ARGV";
}
if (s/^\s*\{//) {
last;
}