re GNATS libgcj/378 (Problem with scripts/classes.pl)

	* scripts/classes.pl (scan): Skip lines with leading `*'.
	Fix for PR libgcj/378.

From-SVN: r38198

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5af05af36ec4cf196d78ab1014992d7f23c92afb..7ca34d2abbf1828c66e67cde15c78eb5c1cb2f6c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-11  Tom Tromey  <tromey@redhat.com>
+
+       * scripts/classes.pl (scan): Skip lines with leading `*'.
+       Fix for PR libgcj/378.
+
 2000-12-11  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * configure.in: Remove check for -fuse-divide-subroutine.

diff --git a/libjava/scripts/classes.pl b/libjava/scripts/classes.pl
index 9523823a313d38fa55bf7f54bd21bfc5063f8520..cc5ef7866683cfbe85fdf93ef76145bbe3308a6f 100644 (file)
--- a/libjava/scripts/classes.pl
+++ b/libjava/scripts/classes.pl
@@ -68,8 +68,12 @@ sub scan
            local ($outer, $classname);
            while (<FILE>)
            {
-               # NOTE: we don't skip `/*' comments.
                s,//.*$,,;
+               # NOTE: we don't skip `/*' comments.  However, we do
+               # skip lines with a `*' with leading whitespace.  This
+               # catches the most important cases.
+               s,^\s*\*.*$,,;
+
                # For now assume that class names start with upper
                # case letter.
                next unless /\b(class|interface) ([A-Z][A-Za-z0-9]+)/;