mirror of
https://github.com/samba-team/samba.git
synced 2025-01-14 19:24:43 +03:00
Register types rather than constructors, display structs as classes.
(This used to be commit aad07f482544107dbeb4c3c468ce7dd78c151849)
This commit is contained in:
Jelmer Vernooij
parent
a3bfabefd7
commit
6f02fdea23
@ -21,7 +21,7 @@ $VERSION = '0.01';
|
||||
sub new($) {
|
||||
my ($class) = @_;
|
||||
my $self = { res => "", res_hdr => "", tabs => "", constants => {},
|
||||
module_methods => []};
|
||||
module_methods => [], module_objects => [], module_types => []};
|
||||
bless($self, $class);
|
||||
}
|
||||
|
||||
@ -163,9 +163,9 @@ sub FromPythonToUnionFunction($$$$$)
|
||||
$self->pidl("return ret;");
|
||||
}
|
||||
|
||||
sub PythonStruct($$$$)
|
||||
sub PythonStruct($$$$$$)
|
||||
{
|
||||
my ($self, $name, $cname, $d) = @_;
|
||||
my ($self, $modulename, $prettyname, $name, $cname, $d) = @_;
|
||||
|
||||
my $env = GenerateStructEnv($d, "object");
|
||||
|
||||
@ -222,38 +222,40 @@ sub PythonStruct($$$$)
|
||||
$self->pidl("}");
|
||||
$self->pidl("");
|
||||
|
||||
$self->pidl_hdr("PyAPI_DATA(PyTypeObject) $name\_Type;\n");
|
||||
$self->pidl_hdr("#define $name\_Check(op) PyObject_TypeCheck(op, &$name\_Type)\n");
|
||||
$self->pidl_hdr("#define $name\_CheckExact(op) ((op)->ob_type == &$name\_Type)\n");
|
||||
$self->pidl_hdr("\n");
|
||||
my $docstring = $self->DocString($d, $name);
|
||||
$self->pidl("PyTypeObject $name\_Type = {");
|
||||
$self->indent;
|
||||
$self->pidl("PyObject_HEAD_INIT(NULL) 0,");
|
||||
$self->pidl(".tp_name = \"$name\",");
|
||||
$self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
|
||||
$self->pidl(".tp_dealloc = py_talloc_dealloc,");
|
||||
$self->pidl(".tp_getattr = py_$name\_getattr,");
|
||||
$self->pidl(".tp_setattr = py_$name\_setattr,");
|
||||
$self->pidl(".tp_repr = py_talloc_default_repr,");
|
||||
$self->pidl(".tp_doc = $docstring,");
|
||||
$self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT,");
|
||||
$self->deindent;
|
||||
$self->pidl("};");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
my $py_fnname = "py_$name";
|
||||
$self->pidl("static PyObject *$py_fnname(PyObject *self, PyObject *args)");
|
||||
$self->pidl("static PyObject *py_$name\_new(PyTypeObject *self, PyObject *args, PyObject *kwargs)");
|
||||
$self->pidl("{");
|
||||
$self->indent;
|
||||
$self->pidl("$cname *ret = talloc_zero(NULL, $cname);");
|
||||
$self->pidl("return py_talloc_import(&$name\_Type, ret);");
|
||||
$self->deindent;
|
||||
$self->pidl("}");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
return ($py_fnname, "NULL");
|
||||
$self->pidl_hdr("PyAPI_DATA(PyTypeObject) $name\_Type;\n");
|
||||
$self->pidl_hdr("#define $name\_Check(op) PyObject_TypeCheck(op, &$name\_Type)\n");
|
||||
$self->pidl_hdr("#define $name\_CheckExact(op) ((op)->ob_type == &$name\_Type)\n");
|
||||
$self->pidl_hdr("\n");
|
||||
my $docstring = $self->DocString($d, $name);
|
||||
my $typeobject = "$name\_Type";
|
||||
$self->pidl("PyTypeObject $typeobject = {");
|
||||
$self->indent;
|
||||
$self->pidl("PyObject_HEAD_INIT(NULL) 0,");
|
||||
$self->pidl(".tp_name = \"$modulename.$prettyname\",");
|
||||
$self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
|
||||
$self->pidl(".tp_dealloc = py_talloc_dealloc,");
|
||||
$self->pidl(".tp_getattr = py_$name\_getattr,");
|
||||
$self->pidl(".tp_setattr = py_$name\_setattr,");
|
||||
$self->pidl(".tp_repr = py_talloc_default_repr,");
|
||||
$self->pidl(".tp_doc = $docstring,");
|
||||
$self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,");
|
||||
$self->pidl(".tp_new = py_$name\_new,");
|
||||
$self->deindent;
|
||||
$self->pidl("};");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
return "&$typeobject";
|
||||
}
|
||||
|
||||
sub PythonFunction($$$)
|
||||
@ -386,9 +388,9 @@ sub handle_ntstatus($$$$)
|
||||
$self->pidl("");
|
||||
}
|
||||
|
||||
sub PythonType($$$)
|
||||
sub PythonType($$$$)
|
||||
{
|
||||
my ($self, $d, $interface, $basename) = @_;
|
||||
my ($self, $modulename, $d, $interface, $basename) = @_;
|
||||
|
||||
my $actual_ctype = $d;
|
||||
if ($actual_ctype->{TYPE} eq "TYPEDEF") {
|
||||
@ -396,19 +398,20 @@ sub PythonType($$$)
|
||||
}
|
||||
|
||||
if ($actual_ctype->{TYPE} eq "STRUCT") {
|
||||
my ($py_fnname, $py_fndocstring);
|
||||
if ($d->{TYPE} eq "STRUCT") {
|
||||
($py_fnname, $py_fndocstring) = $self->PythonStruct($d->{NAME}, mapTypeName($d), $d);
|
||||
} else {
|
||||
($py_fnname, $py_fndocstring) = $self->PythonStruct($d->{NAME}, mapTypeName($d), $d->{DATA});
|
||||
}
|
||||
|
||||
my $typeobject;
|
||||
my $fn_name = $d->{NAME};
|
||||
|
||||
$fn_name =~ s/^$interface->{NAME}_//;
|
||||
$fn_name =~ s/^$basename\_//;
|
||||
|
||||
$self->register_module_method($fn_name, $py_fnname, "METH_NOARGS", $py_fndocstring);
|
||||
|
||||
if ($d->{TYPE} eq "STRUCT") {
|
||||
$typeobject = $self->PythonStruct($modulename, $fn_name, $d->{NAME}, mapTypeName($d), $d);
|
||||
} else {
|
||||
$typeobject = $self->PythonStruct($modulename, $fn_name, $d->{NAME}, mapTypeName($d), $d->{DATA});
|
||||
}
|
||||
|
||||
$self->register_module_typeobject($fn_name, $typeobject);
|
||||
}
|
||||
|
||||
if ($d->{TYPE} eq "ENUM" or $d->{TYPE} eq "BITMAP") {
|
||||
@ -464,7 +467,7 @@ sub Interface($$$)
|
||||
foreach my $d (@{$interface->{TYPES}}) {
|
||||
next if has_property($d, "nopython");
|
||||
|
||||
$self->PythonType($d, $interface, $basename);
|
||||
$self->PythonType($basename, $d, $interface, $basename);
|
||||
}
|
||||
|
||||
if (defined $interface->{PROPERTIES}->{uuid}) {
|
||||
@ -486,19 +489,19 @@ sub Interface($$$)
|
||||
|
||||
my ($fnname, $fndocstring) = $self->PythonFunction($d, $interface->{NAME});
|
||||
|
||||
push (@fns, [$fnname, $fndocstring]);
|
||||
my $prettyname = $d->{NAME};
|
||||
|
||||
$prettyname =~ s/^$interface->{NAME}_//;
|
||||
$prettyname =~ s/^$basename\_//;
|
||||
|
||||
push (@fns, [$fnname, $prettyname, $fndocstring]);
|
||||
}
|
||||
|
||||
$self->pidl("static PyMethodDef interface_$interface->{NAME}\_methods[] = {");
|
||||
$self->indent;
|
||||
foreach my $d (@fns) {
|
||||
my ($c_fn, $docstring) = @$d;
|
||||
my $fn_name = $c_fn;
|
||||
|
||||
$fn_name =~ s/^$interface->{NAME}_//;
|
||||
$fn_name =~ s/^$basename\_//;
|
||||
|
||||
$self->pidl("{ \"$fn_name\", (PyCFunction)$c_fn, METH_VARARGS|METH_KEYWORDS, $docstring },");
|
||||
my ($c_fn, $prettyname, $docstring) = @$d;
|
||||
$self->pidl("{ \"$prettyname\", (PyCFunction)$c_fn, METH_VARARGS|METH_KEYWORDS, $docstring },");
|
||||
}
|
||||
$self->pidl("{ NULL, NULL, 0, NULL }");
|
||||
$self->deindent;
|
||||
@ -515,32 +518,7 @@ sub Interface($$$)
|
||||
$self->pidl("}");
|
||||
$self->pidl("");
|
||||
|
||||
$self->pidl("static PyObject *interface_$interface->{NAME}_getattr(PyObject *obj, char *name)");
|
||||
$self->pidl("{");
|
||||
$self->indent;
|
||||
$self->pidl("return Py_FindMethod(interface_$interface->{NAME}\_methods, obj, name);");
|
||||
$self->deindent;
|
||||
$self->pidl("}");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
my $docstring = $self->DocString($interface, $interface->{NAME});
|
||||
$self->pidl("PyTypeObject $interface->{NAME}_InterfaceType = {");
|
||||
$self->indent;
|
||||
$self->pidl("PyObject_HEAD_INIT(NULL) 0,");
|
||||
$self->pidl(".tp_name = \"$interface->{NAME}\",");
|
||||
$self->pidl(".tp_basicsize = sizeof($interface->{NAME}_InterfaceObject),");
|
||||
$self->pidl(".tp_dealloc = interface_$interface->{NAME}_dealloc,");
|
||||
$self->pidl(".tp_getattr = interface_$interface->{NAME}_getattr,");
|
||||
$self->pidl(".tp_doc = $docstring,");
|
||||
$self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT,");
|
||||
$self->deindent;
|
||||
$self->pidl("};");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
$self->register_module_method($interface->{NAME}, "interface_$interface->{NAME}", "METH_VARARGS|METH_KEYWORDS", "\"$interface->{NAME}(binding, lp_ctx, credentials)\\nConnect to the $interface->{NAME} interface\"");
|
||||
$self->pidl("static PyObject *interface_$interface->{NAME}(PyObject *self, PyObject *args, PyObject *kwargs)");
|
||||
$self->pidl("static PyObject *interface_$interface->{NAME}_new(PyTypeObject *self, PyObject *args, PyObject *kwargs)");
|
||||
$self->pidl("{");
|
||||
$self->indent;
|
||||
$self->pidl("$interface->{NAME}_InterfaceObject *ret;");
|
||||
@ -600,6 +578,25 @@ sub Interface($$$)
|
||||
$self->pidl("}");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
|
||||
my $docstring = $self->DocString($interface, $interface->{NAME});
|
||||
$self->pidl("PyTypeObject $interface->{NAME}_InterfaceType = {");
|
||||
$self->indent;
|
||||
$self->pidl("PyObject_HEAD_INIT(NULL) 0,");
|
||||
$self->pidl(".tp_name = \"$basename.$interface->{NAME}\",");
|
||||
$self->pidl(".tp_basicsize = sizeof($interface->{NAME}_InterfaceObject),");
|
||||
$self->pidl(".tp_dealloc = interface_$interface->{NAME}_dealloc,");
|
||||
$self->pidl(".tp_methods = interface_$interface->{NAME}_methods,");
|
||||
$self->pidl(".tp_doc = $docstring,");
|
||||
$self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,");
|
||||
$self->pidl(".tp_new = interface_$interface->{NAME}_new,");
|
||||
$self->deindent;
|
||||
$self->pidl("};");
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
$self->register_module_typeobject($interface->{NAME}, "&$interface->{NAME}_InterfaceType");
|
||||
}
|
||||
|
||||
$self->pidl_hdr("\n");
|
||||
@ -613,6 +610,22 @@ sub register_module_method($$$$$)
|
||||
push (@{$self->{module_methods}}, [$fn_name, $pyfn_name, $flags, $doc])
|
||||
}
|
||||
|
||||
sub register_module_typeobject($$$)
|
||||
{
|
||||
my ($self, $name, $py_name) = @_;
|
||||
|
||||
$self->register_module_object($name, "(PyObject *)$py_name");
|
||||
|
||||
push (@{$self->{module_types}}, [$name, $py_name])
|
||||
}
|
||||
|
||||
sub register_module_object($$$)
|
||||
{
|
||||
my ($self, $name, $py_name) = @_;
|
||||
|
||||
push (@{$self->{module_objects}}, [$name, $py_name])
|
||||
}
|
||||
|
||||
sub assign($$$)
|
||||
{
|
||||
my ($self, $dest, $src) = @_;
|
||||
@ -955,7 +968,20 @@ sub Parse($$$$$)
|
||||
$self->pidl("{");
|
||||
$self->indent;
|
||||
$self->pidl("PyObject *m;");
|
||||
$self->pidl("m = Py_InitModule3(\"$basename\", $basename\_methods, \"$basename DCE/RPC interface\");");
|
||||
$self->pidl("");
|
||||
|
||||
foreach (@{$self->{module_types}}) {
|
||||
my ($object_name, $c_name) = @$_;
|
||||
$self->pidl("if (PyType_Ready($c_name) < 0)");
|
||||
$self->pidl("\treturn;");
|
||||
}
|
||||
|
||||
$self->pidl("");
|
||||
|
||||
$self->pidl("m = Py_InitModule3(\"$basename\", $basename\_methods, \"$basename DCE/RPC\");");
|
||||
$self->pidl("if (m == NULL)");
|
||||
$self->pidl("\treturn;");
|
||||
$self->pidl("");
|
||||
foreach my $name (keys %{$self->{constants}}) {
|
||||
my $py_obj;
|
||||
my ($ctype, $cvar) = @{$self->{constants}->{$name}};
|
||||
@ -969,6 +995,13 @@ sub Parse($$$$$)
|
||||
|
||||
$self->pidl("PyModule_AddObject(m, \"$name\", $py_obj);");
|
||||
}
|
||||
|
||||
foreach (@{$self->{module_objects}}) {
|
||||
my ($object_name, $c_name) = @$_;
|
||||
$self->pidl("Py_INCREF($c_name);");
|
||||
$self->pidl("PyModule_AddObject(m, \"$object_name\", $c_name);");
|
||||
}
|
||||
|
||||
$self->deindent;
|
||||
$self->pidl("}");
|
||||
return ($self->{res_hdr}, $self->{res});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user