Skip to content

Commit

Permalink
chore: Parameter name cleanup - vector -> list
Browse files Browse the repository at this point in the history
  • Loading branch information
@macmade
macmade committed May 3, 2023
1 parent c582b2d commit 4e6b2c4
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
34 changes: 17 additions & 17 deletions ObjectiveCPP/include/ObjectiveCPP/List.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,32 @@ NS_ASSUME_NONNULL_BEGIN

namespace ObjectiveCPP
{
NSArray * ArrayFromList( const std::list< std::string > & vector );
NSArray * ArrayFromList( const std::list< bool > & vector );
NSArray * ArrayFromList( const std::list< signed char > & vector );
NSArray * ArrayFromList( const std::list< unsigned char > & vector );
NSArray * ArrayFromList( const std::list< signed short > & vector );
NSArray * ArrayFromList( const std::list< unsigned short > & vector );
NSArray * ArrayFromList( const std::list< signed int > & vector );
NSArray * ArrayFromList( const std::list< unsigned int > & vector );
NSArray * ArrayFromList( const std::list< signed long > & vector );
NSArray * ArrayFromList( const std::list< unsigned long > & vector );
NSArray * ArrayFromList( const std::list< signed long long > & vector );
NSArray * ArrayFromList( const std::list< unsigned long long > & vector );
NSArray * ArrayFromList( const std::list< float > & vector );
NSArray * ArrayFromList( const std::list< double > & vector );
NSArray * ArrayFromList( const std::list< std::string > & list );
NSArray * ArrayFromList( const std::list< bool > & list );
NSArray * ArrayFromList( const std::list< signed char > & list );
NSArray * ArrayFromList( const std::list< unsigned char > & list );
NSArray * ArrayFromList( const std::list< signed short > & list );
NSArray * ArrayFromList( const std::list< unsigned short > & list );
NSArray * ArrayFromList( const std::list< signed int > & list );
NSArray * ArrayFromList( const std::list< unsigned int > & list );
NSArray * ArrayFromList( const std::list< signed long > & list );
NSArray * ArrayFromList( const std::list< unsigned long > & list );
NSArray * ArrayFromList( const std::list< signed long long > & list );
NSArray * ArrayFromList( const std::list< unsigned long long > & list );
NSArray * ArrayFromList( const std::list< float > & list );
NSArray * ArrayFromList( const std::list< double > & list );

template < typename T, typename ObjCClass >
NSArray * ArrayFromList( const std::list< T > & vector, SEL initMethod )
NSArray * ArrayFromList( const std::list< T > & list, SEL initMethod )
{
NSMutableArray * a;
id ( * i )( id, SEL, T );

a = [ NSMutableArray arrayWithCapacity: vector.size() ];
a = [ NSMutableArray arrayWithCapacity: list.size() ];

if( [ ObjCClass instancesRespondToSelector: initMethod ] )
{
for( auto v: vector )
for( auto v: list )
{
{
NSObject * o;
Expand Down
56 changes: 28 additions & 28 deletions ObjectiveCPP/source/List.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,73 +31,73 @@

namespace ObjectiveCPP
{
NSArray * ArrayFromList( const std::list< std::string > & vector )
NSArray * ArrayFromList( const std::list< std::string > & list )
{
return ArrayFromList< std::string, NSString >( vector, @selector( initWithCPPString: ) );
return ArrayFromList< std::string, NSString >( list, @selector( initWithCPPString: ) );
}

NSArray * ArrayFromList( const std::list< bool > & vector )
NSArray * ArrayFromList( const std::list< bool > & list )
{
return ArrayFromList< bool, NSNumber >( vector, @selector( initWithBool: ) );
return ArrayFromList< bool, NSNumber >( list, @selector( initWithBool: ) );
}

NSArray * ArrayFromList( const std::list< signed char > & vector )
NSArray * ArrayFromList( const std::list< signed char > & list )
{
return ArrayFromList< signed char, NSNumber >( vector, @selector( initWithChar: ) );
return ArrayFromList< signed char, NSNumber >( list, @selector( initWithChar: ) );
}

NSArray * ArrayFromList( const std::list< unsigned char > & vector )
NSArray * ArrayFromList( const std::list< unsigned char > & list )
{
return ArrayFromList< unsigned char, NSNumber >( vector, @selector( initWithUnsignedChar: ) );
return ArrayFromList< unsigned char, NSNumber >( list, @selector( initWithUnsignedChar: ) );
}

NSArray * ArrayFromList( const std::list< signed short > & vector )
NSArray * ArrayFromList( const std::list< signed short > & list )
{
return ArrayFromList< signed short, NSNumber >( vector, @selector( initWithShort: ) );
return ArrayFromList< signed short, NSNumber >( list, @selector( initWithShort: ) );
}

NSArray * ArrayFromList( const std::list< unsigned short > & vector )
NSArray * ArrayFromList( const std::list< unsigned short > & list )
{
return ArrayFromList< unsigned short, NSNumber >( vector, @selector( initWithUnsignedShort: ) );
return ArrayFromList< unsigned short, NSNumber >( list, @selector( initWithUnsignedShort: ) );
}

NSArray * ArrayFromList( const std::list< signed int > & vector )
NSArray * ArrayFromList( const std::list< signed int > & list )
{
return ArrayFromList< signed int, NSNumber >( vector, @selector( initWithInt: ) );
return ArrayFromList< signed int, NSNumber >( list, @selector( initWithInt: ) );
}

NSArray * ArrayFromList( const std::list< unsigned int > & vector )
NSArray * ArrayFromList( const std::list< unsigned int > & list )
{
return ArrayFromList< unsigned int, NSNumber >( vector, @selector( initWithUnsignedInt: ) );
return ArrayFromList< unsigned int, NSNumber >( list, @selector( initWithUnsignedInt: ) );
}

NSArray * ArrayFromList( const std::list< signed long > & vector )
NSArray * ArrayFromList( const std::list< signed long > & list )
{
return ArrayFromList< signed long, NSNumber >( vector, @selector( initWithLong: ) );
return ArrayFromList< signed long, NSNumber >( list, @selector( initWithLong: ) );
}

NSArray * ArrayFromList( const std::list< unsigned long > & vector )
NSArray * ArrayFromList( const std::list< unsigned long > & list )
{
return ArrayFromList< unsigned long, NSNumber >( vector, @selector( initWithUnsignedLong: ) );
return ArrayFromList< unsigned long, NSNumber >( list, @selector( initWithUnsignedLong: ) );
}

NSArray * ArrayFromList( const std::list< signed long long > & vector )
NSArray * ArrayFromList( const std::list< signed long long > & list )
{
return ArrayFromList< signed long long, NSNumber >( vector, @selector( initWithLong: ) );
return ArrayFromList< signed long long, NSNumber >( list, @selector( initWithLong: ) );
}

NSArray * ArrayFromList( const std::list< unsigned long long > & vector )
NSArray * ArrayFromList( const std::list< unsigned long long > & list )
{
return ArrayFromList< unsigned long long, NSNumber >( vector, @selector( initWithUnsignedLongLong: ) );
return ArrayFromList< unsigned long long, NSNumber >( list, @selector( initWithUnsignedLongLong: ) );
}

NSArray * ArrayFromList( const std::list< float > & vector )
NSArray * ArrayFromList( const std::list< float > & list )
{
return ArrayFromList< float, NSNumber >( vector, @selector( initWithFloat: ) );
return ArrayFromList< float, NSNumber >( list, @selector( initWithFloat: ) );
}

NSArray * ArrayFromList( const std::list< double > & vector )
NSArray * ArrayFromList( const std::list< double > & list )
{
return ArrayFromList< double, NSNumber >( vector, @selector( initWithDouble: ) );
return ArrayFromList< double, NSNumber >( list, @selector( initWithDouble: ) );
}
}

0 comments on commit 4e6b2c4

Please sign in to comment.