From 1684f6440811aa05725c7f1b77a220d06fb60b0e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 8 Oct 2002 22:02:13 +0000
Subject: [PATCH] For our purposes we want A and all derived classes, rather
 than all classes that extend A. Other perlformattengruven.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1790 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 bin/matchclasses | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/bin/matchclasses b/bin/matchclasses
index e1be6e715..82e7b2e22 100755
--- a/bin/matchclasses
+++ b/bin/matchclasses
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: matchclasses,v 1.1 2002/10/08 18:46:02 mdb Exp $
+# $Id: matchclasses,v 1.2 2002/10/08 22:02:13 mdb Exp $
 #
 # A script which inspects a hierarchy of classes and generates lists of
 # classes that match specified criterion. The criterion are that a class
@@ -182,11 +182,7 @@ foreach $class (@classes) {
 
 # print out the results
 foreach $class (sort keys %matches) {
-    if (defined $orig{$class}) {
-        print "$orig{$class}\n";
-    } else {
-        print "$class\n";
-    }
+    print defined $orig{$class} ?  "$orig{$class}\n" :  "$class\n";
 }
 # print join("\n", ) . "\n";
 
@@ -211,18 +207,14 @@ sub implements {
         if (defined $irecord) {
             my $iface;
             foreach $iface (@{$irecord}) {
-                if ($iface eq $target || extends($iface, $target)) {
-                    return 1;
-                }
+                return 1 if (extends($iface, $target));
             }
         }
 
         # check our parents
         my $pclass;
         foreach $pclass (@{$crecord}) {
-            if (implements($pclass, $target)) {
-                return 1;
-            }
+            return 1 if (implements($pclass, $target));
         }
     }
 
@@ -234,15 +226,16 @@ sub implements {
 sub extends {
     my ($class, $target) = @_;
 
+    # if we are the class, we're good
+    return 1 if ($class eq $target);
+
     # look to see if any of our parent classes extend the target class
     # (recursing as necessary up the hierarchy)
     my $crecord = $ptable{$class};
     if (defined $crecord) {
         my $pclass;
         foreach $pclass (@{$crecord}) {
-            if ($target eq $pclass || extends($pclass, $target)) {
-                return 1;
-            }
+            return 1 if (extends($pclass, $target));
         }
     }