[macruby-changes] [4933] MacRuby/trunk/object.c

[source_changes at macosforge.org]

Revision: 4933
          http://trac.macosforge.org/projects/ruby/changeset/4933
Author:   lsansonetti at apple.com
Date:     2010-11-22 17:57:21 -0800 (Mon, 22 Nov 2010)
Log Message:
-----------
fix a bug in the previous commit (r4930) as well as indentation

Revision Links:
--------------
    http://trac.macosforge.org/projects/ruby/changeset/4930

Modified Paths:
--------------
    MacRuby/trunk/object.c

Modified: MacRuby/trunk/object.c
===================================================================
--- MacRuby/trunk/object.c	2010-11-23 01:51:04 UTC (rev 4932)
+++ MacRuby/trunk/object.c	2010-11-23 01:57:21 UTC (rev 4933)
@@ -2858,8 +2858,7 @@
 {
     unsigned int count = 0;
     struct objc_method_description *list =
-	protocol_copyMethodDescriptionList(p, true, instanceMethods,
-	    &count);
+	protocol_copyMethodDescriptionList(p, true, instanceMethods, &count);
     if (list != NULL) {
 	bool success = true;
 	for (unsigned int i = 0; i < count; i++) {
@@ -2878,17 +2877,18 @@
 	}
 	free(list);
 	if (success) {
-		return true;
+	    return true;
 	}
+	return false;
     }
-    return false;
+    return true;
 }
 
 static bool
 conformsToProtocol(Class klass, Protocol *p)
 {
     if (implementsProtocolMethods(p, klass, true)
-	&& implementsProtocolMethods(p, klass, false)) {
+	    && implementsProtocolMethods(p, klass, false)) {
 	unsigned int count = 0;
 	Protocol **list = protocol_copyProtocolList(p, &count);
 	bool success = true;
@@ -2906,7 +2906,7 @@
 
 static bool
 conformsToProtocolAndAncestors(void *self, SEL sel, Class klass,
-				void *protocol, IMP super)
+	void *protocol, IMP super)
 {
     if (protocol != NULL) {
 	Protocol *p = (Protocol *)protocol;
@@ -2926,7 +2926,7 @@
 robj_conformsToProtocol(void *self, SEL sel, void *protocol)
 {
     return conformsToProtocolAndAncestors(self, sel, object_getClass(self),
-	protocol, old_conformsToProtocol_imp);
+	    protocol, old_conformsToProtocol_imp);
 }
 
 static IMP old_conformsToProtocol_mimp = NULL;
@@ -2935,7 +2935,7 @@
 robj_conformsToProtocol_m(void *self, SEL sel, void *protocol)
 {
     return conformsToProtocolAndAncestors(self, sel, (Class)self, protocol,
-	old_conformsToProtocol_mimp);
+	    old_conformsToProtocol_mimp);
 }
 
 /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101122/f4411810/attachment.html>