adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 08:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Perl: fix several methods to return perl stuff instead of pointers.

Browse Source
This commit is contained in:
Alexey Sokolov
2012-01-23 04:09:24 +07:00
parent 29564f1c7e
commit 00e26c8dbc
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modperl/modperl.i
+47
View File
@@ -76,6 +76,22 @@ namespace std {
argvi++;
}
%template(VIRCNetworks) std::vector<CIRCNetwork*>;
%template(VChannels) std::vector<CChan*>;
/*%template(MNicks) std::map<CString, CNick>;*/
%typemap(out) std::map<CString, CNick> {
HV* myhv = newHV();
for (std::map<CString, CNick>::const_iterator i = $1.begin(); i != $1.end(); ++i) {
SV* val = SWIG_NewInstanceObj(const_cast<CNick*>(&i->second), SWIG_TypeQuery("CNick*"), SWIG_SHADOW);
SvREFCNT_inc(val);// it was created mortal
hv_store(myhv, i->first.c_str(), i->first.length(), val, 0);
}
$result = newRV_noinc((SV*)myhv);
sv_2mortal($result);
argvi++;
}
#define u_short unsigned short
#define u_int unsigned int
#include "../include/znc/ZNCString.h"
@@ -162,6 +178,24 @@ namespace std {
}
}
%extend CUser {
std::vector<CIRCNetwork*> GetNetworks_() {
return $self->GetNetworks();
}
}
%extend CIRCNetwork {
std::vector<CChan*> GetChans_() {
return $self->GetChans();
}
}
%extend CChan {
std::map<CString, CNick> GetNicks_() {
return $self->GetNicks();
}
}
/* Web */
%template(StrPair) pair<CString, CString>;
@@ -215,6 +249,19 @@ typedef vector<pair<CString, CString> > VPair;
*HALTMODS = *ZNC::CModule::HALTMODS;
*HALTCORE = *ZNC::CModule::HALTCORE;
*UNLOAD = *ZNC::CModule::UNLOAD;
package ZNC::CIRCNetwork;
*GetChans = *GetChans_;
package ZNC::CUser;
*GetNetworks = *GetNetworks_;
package ZNC::CChan;
sub _GetNicks_ {
my $result = GetNicks_(@_);
return %$result;
}
*GetNicks = *_GetNicks_;
%}
/* vim: set filetype=cpp noexpandtab: */