jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow std::set<> C# typemaps to work for non-nullable types too

Browse source 
Notably make them work for primitive types, such as "int".

Doing this requires using "object" instead of the actual C# type of the
variable to store the current value in the iterator, as we don't
currently have a "csnullabletype" typemap that would expand to "T" for
nullable types and "T?" for the other ones. This is a bit ugly, but it
shouldn't matter much for the generated code and is already done in
std::vector<> typemaps.

Also add a simple unit test verifying the basic functionality for such
vectors.

Closes #1568.
This commit is contained in:
Vadim Zeitlin 2019-07-11 12:58:10 +02:00
commit 28c6140c56
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/test-suite/csharp/li_std_set_runme.cs
View file

@ -92,5 +92,14 @@ public class runme
checkThat(fooISet.Count == 0, "is initially empty");
checkThat(fooISet.Add(new Foo(17)), "added successfully");
checkThat(fooISet.Count == 1, "is not empty any more");
// And a set of primitive type.
IntSet intSet = new IntSet();
checkThat(intSet.Count == 0, "is initially empty");
checkThat(intSet.Add(17), "17 added successfully");
checkThat(!intSet.Add(17), "17 not added again");
checkThat(intSet.Count == 1, "not empty any more");
checkThat(intSet.Add(289), "289 added successfully");
checkThat(intSet.Count == 2, "even less empty now");
}
}

4
Examples/test-suite/li_std_set.i
View file

@ -40,6 +40,10 @@
};
%}
// This one doesn't work in Java correctly yet.
#ifdef SWIGCSHARP
%template(IntSet) std::set<int>;
#endif
%template(StringSet) std::set<std::string>;
%template(FooSet) std::set<Foo>;
#endif

4
Lib/csharp/std_set.i
View file

@ -192,7 +192,7 @@ class set {
private $csclassname collectionRef;
private global::System.Collections.Generic.IList<$typemap(cstype, T)> ItemsCollection;
private int currentIndex;
private $typemap(cstype, T) currentObject;
private object currentObject;
private int currentSize;
public $csclassnameEnumerator($csclassname collection) {
@ -212,7 +212,7 @@ class set {
throw new global::System.InvalidOperationException("Enumeration finished.");
if (currentObject == null)
throw new global::System.InvalidOperationException("Collection modified.");
return currentObject;
return ($typemap(cstype, T))currentObject;
}
}