Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-24009] Properly generate properties and methods from protocols #121

Merged
merged 6 commits into from
Mar 3, 2017
Merged

[TIMOB-24009] Properly generate properties and methods from protocols #121

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d3fd13
[TIMOB-24009] Properly generate properties and methods from protocols
janvennemann Feb 7, 2017
74679e6
[TIMOB-24009] Fix typo and guard against undefined vars
janvennemann Feb 7, 2017
7bf21dd
[TIMOB-24009] Merge incorporated protocol methods and properties
janvennemann Feb 10, 2017
fd46d02
[TIMOB-24009] Fix indentation
janvennemann Feb 10, 2017
4d4cfd0
[TIMOB-24009] Reword method name and log messages
janvennemann Mar 3, 2017
b00d0cb
[TIMOB-24009] Remove superfluous commas
janvennemann Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 18 additions & 9 deletions metabase/ios/lib/generate/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,25 @@ function merge (src, dest) {
}
}

function superClassImplementsProxy (json, cls, proto) {
var prev;
while (cls && cls.superclass) {
prev = cls;
cls = cls.superclass;
if (cls) {
cls = json.classes[cls];
/**
* Checks if a parent class in the inheritance path already implemented
* the given protocol.
*
* @param {Object} json Native code metabase
* @param {Object} cls Class to traverse upwards from
* @param {String} proto The protocoll to look for in parent classes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo protocoll

* @return {bool} True if protocol already implemented in a parent class, false otherwise.
*/
function isProtocolImplementedBySuperClass (json, cls, proto) {
var currentClass = cls.superclass;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was checked against null before. Are there no cases where cls could be null?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because in the previous implementation cls was overwritten by cls.superclass and that could be undefined once NSObject was reached. Nevertheless i'll make an additional check just to be sure ;)

while (currentClass) {
if (currentClass.protocols && currentClass.protocols.indexOf(proto) !== -1) {
return true;
}
currentClass = json.classes[currentClass.superclass];
}
return (prev && prev.protocols && prev.protocols.indexOf(proto) !== -1);

return false;
}

function generateBuiltins (json, callback) {
Expand Down Expand Up @@ -155,7 +164,7 @@ function generateFromJSON (name, dir, json, state, callback, includes) {
// add protocols
if (cls.protocols && cls.protocols.length) {
cls.protocols.forEach(function (p) {
if (superClassImplementsProxy(json, cls, p)) {
if (isProtocolImplementedBySuperClass(json, cls, p)) {
return;
}
var protocol = json.protocols[p];
Expand Down