colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-13 20:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Protocol definition in compiler was not created correct from protocol definition in the runtime

Browse Source
This commit is contained in:
Martin Carlberg committed 2013-08-22 12:35:16 +02:00
1 parent b8b96a17d7
commit c326168e83
1 file changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files
Objective-J/ObjJAcornCompiler.js
+9 -9
View File
@@ -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;
}
}