Redo of IteratorProtocol with tests #768
Conversation
| { | ||
| private var _xamarinClassIsInitialized: Bool = false; | ||
|
|
||
| public init() |
There was a problem hiding this comment.
Nit: Is spacing here standard for swift? I see 2 and 4 intend?
There was a problem hiding this comment.
Is there a standard? It's likely because BTfS puts in spaces for indentation. Maybe I should change that to tabs. Maybe I'll open an issue and assign it to the next person who brings this up.
| @@ -728,5 +728,78 @@ associatedtype Element | |||
| var callingCode = CSCodeBlock.Create (printIt); | |||
| TestRunning.TestAndExecute (swiftCode, callingCode, "Got here\n"); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Nit: Bunch of unrelated space diffs in this fine, but they look fine.
SwiftReflector/NewClassCompiler.cs
Outdated
| if (namedTypeSpec == null) | ||
| throw new NotImplementedException ("You should never get an alias name that is not a NamedTypeSpec"); | ||
| var typeName = namedTypeSpec.NameWithoutModule; | ||
| if (typeName == assoc.Name || typeName == $"{proto.ToFullyQualifiedName ()}.{assoc.Name}") { |
There was a problem hiding this comment.
$"{proto.ToFullyQualifiedName ()}.{assoc.Name}" will be computed several time and involve memory allocations
proto.ToFullyQualifiedName () seems to be constant in the method and could be moved out of the loops
the concatenation with assoc.Name could be moved outside the inner (alias) loop
| @@ -205,6 +211,11 @@ public static TypeDeclaration TypeFromXElement (TypeAliasFolder folder, XElement | |||
| select SwiftReflector.SwiftXmlReflection.Inheritance.FromXElement (folder, inherit) as Inheritance; | |||
| decl.Inheritance.AddRange (inherits); | |||
| } | |||
| if (elem.Element ("typealiases") != null) { | |||
There was a problem hiding this comment.
move to var ta = elem.Element ("typealiases"); and reuse later
| return SwiftOptional<T>.None (); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
nit: missing new line!
swiftglue/IteratorHelpers.swift
Outdated
| -> SwiftIteratorProtocolProtocol<T0> | ||
| { | ||
| return SwiftIteratorProtocolProtocol(); | ||
| } |
The existing implementation was done by hand, I redid it using BTfS entirely. The old code was untested and almost assuredly would not have worked.
This code is halfway working to the extent that we can use an object that implements
IteratorProtocolfrom swift correctly. There is an issue with sending one into swift, but fixing that now will make this (more) ungainly.In testing this, I found that we weren't reflecting
typealiasdeclarations which are needed to understand how a class implementation a protocol with associated types binds the associated types.I also found that we weren't binding the generics in the interface implementation of the final type, so we do that too.