diff --git a/ChangeLog b/ChangeLog index f99861561..e3e14c4b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-12 Mike Kestner + + * parser/gapi_pp.pl : fix multi-line extern parsing. + 2004-11-12 Mike Kestner * parser/gapi_pp.pl : fix a struct parsing bug. diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl index 985a444a4..1fac125c7 100755 --- a/parser/gapi_pp.pl +++ b/parser/gapi_pp.pl @@ -8,7 +8,7 @@ # # Copyright (c) 2001 Mike Kestner # Copyright (c) 2003 Martin Willemoes Hansen -# Copyright (c) 2003 Novell, Inc. +# Copyright (c) 2003-2004 Novell, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -26,7 +26,7 @@ $private_regex = "^#if.*(ENABLE_BACKEND|ENABLE_ENGINE)"; $eatit_regex = "^#if.*(__cplusplus|DEBUG|DISABLE_COMPAT|ENABLE_BROKEN)"; -$ignoreit_regex = '^\s+\*|#ident|#\s*include|#\s*else|#\s*undef|G_(BEGIN|END)_DECLS|extern|GDKVAR|GTKVAR|GTKMAIN_C_VAR|GTKTYPEUTILS_VAR|VARIABLE|GTKTYPEBUILTIN'; +$ignoreit_regex = '^\s+\*|#ident|#\s*include|#\s*else|#\s*undef|G_(BEGIN|END)_DECLS|GDKVAR|GTKVAR|GTKMAIN_C_VAR|GTKTYPEUTILS_VAR|VARIABLE|GTKTYPEBUILTIN'; foreach $arg (@ARGV) { if (-d $arg && -e $arg) { @@ -79,6 +79,8 @@ foreach $fname (@hdrs) { } } elsif ($line =~ /^\s*\/\*/) { while ($line !~ /\*\//) {$line = ;} + } elsif ($line =~ /^extern/) { + while ($line !~ /;/) {$line = ;} } elsif ($line =~ /$private_regex/) { $nested = 0; while ($line = ) {