svn commit: samba r26659 - in branches/SAMBA_4_0: .
source/pidl/lib/Parse/Pidl/Samba4
jelmer at samba.org
jelmer at samba.org
Thu Jan 3 21:57:45 GMT 2008
Author: jelmer
Date: 2008-01-03 21:57:44 +0000 (Thu, 03 Jan 2008)
New Revision: 26659
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26659
Log:
pidl/python: Support string constants and handle modules.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm 2008-01-03 21:45:18 UTC (rev 26658)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm 2008-01-03 21:57:44 UTC (rev 26659)
@@ -49,6 +49,38 @@
$self->{tabs} = substr($self->{tabs}, 0, -1);
}
+sub Import
+{
+ my $self = shift;
+ my @imports = @_;
+ foreach (@imports) {
+ s/\.idl\"$//;
+ s/^\"//;
+ $self->pidl_hdr("#include \"librpc/gen_ndr/py_$_\.h\"\n");
+ }
+}
+
+sub Const($$)
+{
+ my ($self, $const) = @_;
+ $self->{constants}->{$const->{NAME}} = [$const->{DATA}->{TYPE}, $const->{VALUE}];
+}
+
+sub Interface($$)
+{
+ my($self,$interface) = @_;
+
+ $self->pidl_hdr("#ifndef _HEADER_PYTHON_$interface->{NAME}\n");
+ $self->pidl_hdr("#define _HEADER_PYTHON_$interface->{NAME}\n\n");
+
+ $self->pidl_hdr("\n");
+
+ $self->Const($_) foreach (@{$interface->{CONSTS}});
+
+ $self->pidl_hdr("\n");
+ $self->pidl_hdr("#endif /* _HEADER_NDR_$interface->{NAME} */\n");
+}
+
sub Parse($$$$)
{
my($self,$basename,$ndr,$hdr) = @_;
@@ -66,6 +98,11 @@
#include \"$py_hdr\"
");
+
+ foreach my $x (@$ndr) {
+ ($x->{TYPE} eq "INTERFACE") && $self->Interface($x);
+ ($x->{TYPE} eq "IMPORT") && $self->Import(@{$x->{PATHS}});
+ }
$self->pidl("static PyMethodDef $basename\_methods[] = {");
$self->indent;
@@ -78,9 +115,13 @@
$self->pidl("void init$basename(void)");
$self->pidl("{");
$self->indent;
- $self->pidl("PyObject *m;");
+ $self->pidl("PyObject *m, *d;");
$self->pidl("m = Py_InitModule((char *)\"$basename\", $basename\_methods);");
- # FIXME
+ $self->pidl("d = PyModule_GetDict(m);");
+ foreach (keys %{$self->{constants}}) {
+ # FIXME: Handle non-string constants
+ $self->pidl("PyDict_SetItemString(d, \"$_\", PyString_FromString(" . $self->{constants}->{$_}->[1] . "));");
+ }
$self->deindent;
$self->pidl("}");
return ($self->{res_hdr}, $self->{res});
More information about the samba-cvs
mailing list