From c326168e83ee3cbb3be4b0576293464905fa5b29 Mon Sep 17 00:00:00 2001 From: Martin Carlberg Date: Thu, 22 Aug 2013 12:35:16 +0200 Subject: [PATCH] Fixed: Protocol definition in compiler was not created correct from protocol definition in the runtime --- Objective-J/ObjJAcornCompiler.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Objective-J/ObjJAcornCompiler.js b/Objective-J/ObjJAcornCompiler.js index a801cdc6a..6957889e4 100644 --- a/Objective-J/ObjJAcornCompiler.js +++ b/Objective-J/ObjJAcornCompiler.js @@ -552,22 +552,22 @@ ObjJAcornCompiler.prototype.getProtocolDef = function(/* String */ aProtocolName var aProtocol = objj_getProtocol(aProtocolName); if (aProtocol) { - var protocol = protocols[i], - protocolName = protocol_getName(protocol), - requiredInstanceMethods = protocol_copyMethodDescriptionList(protocol, true, true), + var protocolName = protocol_getName(aProtocol), + requiredInstanceMethods = protocol_copyMethodDescriptionList(aProtocol, true, true), requiredInstanceMethodDefs = ObjJAcornCompiler.methodDefsFromMethodList(requiredInstanceMethods), - requiredClassMethods = protocol_copyMethodDescriptionList(protocol, true, false), + requiredClassMethods = protocol_copyMethodDescriptionList(aProtocol, true, false), requiredClassMethodDefs = ObjJAcornCompiler.methodDefsFromMethodList(requiredClassMethods), - protocols = protocol.protocols, + protocols = aProtocol.protocols, inheritFromProtocols = []; - for (var i = 0, size = protocols.length; i < size; i++) - inheritFromProtocols.push(compiler.getProtocolDef(protocols[i].name)); + if (protocols) + for (var i = 0, size = protocols.length; i < size; i++) + inheritFromProtocols.push(compiler.getProtocolDef(protocols[i].name)); - p = new ProtocolDef(protocolName, inheritFromProtocols, requiredInstanceMethodDefs, requiredClassMethodDefs); + p = new ProtocolDef(protocolName, inheritFromProtocols, requiredInstanceMethodDefs, requiredClassMethodDefs); this.protocolDefs[aProtocolName] = p; - return c; + return p; } }