pidl: Base new objects off of talloc object.

[samba.git] / pidl / lib / Parse / Pidl / Samba4 / Python.pm

diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 000f543fa431c8869d91c431f6483004bfbaec85..b0b8e53f44f68a22fad9cce4effc9ac208b1eb71 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -321,22 +321,22 @@ sub PythonStruct($$$$$$)
        $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_getset = $getsetters,");
-       $self->pidl(".tp_repr = py_talloc_default_repr,");
-       $self->pidl(".tp_compare = py_talloc_default_cmp,");
        if ($docstring) {
                $self->pidl(".tp_doc = $docstring,");
        }
        $self->pidl(".tp_methods = $py_methods,");
        $self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,");
+       $self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
        $self->pidl(".tp_new = py_$name\_new,");
        $self->deindent;
        $self->pidl("};");
 
        $self->pidl("");
 
+       my $talloc_typename = $self->import_type_variable("talloc", "Object");
+       $self->register_module_prereadycode(["$name\_Type.tp_base = $talloc_typename;", ""]);
+
        return "&$typeobject";
 }
 
@@ -506,7 +506,7 @@ sub PythonFunctionPackIn($$$)
                if ($metadata_args->{in}->{$e->{NAME}}) {
                        my $py_var = "py_".$metadata_args->{in}->{$e->{NAME}};
                        $self->pidl("PY_CHECK_TYPE(&PyList_Type, $py_var, $fail);");
-                       my $val = "PyList_Size($py_var)";
+                       my $val = "PyList_GET_SIZE($py_var)";
                        if ($e->{LEVELS}[0]->{TYPE} eq "POINTER") {
                                $self->pidl("r->in.$e->{NAME} = talloc_ptrtype(r, r->in.$e->{NAME});");
                                $self->pidl("*r->in.$e->{NAME} = $val;");
@@ -824,7 +824,8 @@ sub assign($$$)
        if ($dest =~ /^\&/ and $src eq "NULL") {
                $self->pidl("memset($dest, 0, sizeof(" . get_value_of($dest) . "));");
        } elsif ($dest =~ /^\&/) {
-               $self->pidl("memmove($dest, $src, sizeof(" . get_value_of($dest) . "));");
+               my $destvar = get_value_of($dest);
+               $self->pidl("$destvar = *$src;");
        } else {
                $self->pidl("$dest = $src;");
        }
@@ -844,8 +845,21 @@ sub ConvertObjectFromPythonData($$$$$$;$)
        }
 
        if ($actual_ctype->{TYPE} eq "ENUM" or $actual_ctype->{TYPE} eq "BITMAP") {
-               $self->pidl("PY_CHECK_TYPE(&PyInt_Type, $cvar, $fail);");
+               $self->pidl("if (PyLong_Check($cvar)) {");
+               $self->indent;
+               $self->pidl("$target = PyLong_AsLongLong($cvar);");
+               $self->deindent;
+               $self->pidl("} else if (PyInt_Check($cvar)) {");
+               $self->indent;
                $self->pidl("$target = PyInt_AsLong($cvar);");
+               $self->deindent;
+               $self->pidl("} else {");
+               $self->indent;
+               $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type %s or %s\",\\");
+               $self->pidl("  PyInt_Type.tp_name, PyLong_Type.tp_name);");
+               $self->pidl($fail);
+               $self->deindent;
+               $self->pidl("}");
                return;
        }
        if ($actual_ctype->{TYPE} eq "SCALAR" ) {
@@ -865,8 +879,6 @@ sub ConvertObjectFromPythonData($$$$$$;$)
                        $self->pidl($fail);
                        $self->deindent;
                        $self->pidl("}");
-                       $self->deindent;
-                       $self->pidl("}");
                        return;
                }
                if (expandAlias($actual_ctype->{NAME}) =~ /^(char|u?int[0-9]*|time_t)$/) {
@@ -895,26 +907,40 @@ sub ConvertObjectFromPythonData($$$$$$;$)
        }
 
        if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "DATA_BLOB") {
-               $self->pidl("$target = data_blob_talloc($mem_ctx, PyString_AsString($cvar), PyString_Size($cvar));");
+               $self->pidl("$target = data_blob_talloc($mem_ctx, PyString_AS_STRING($cvar), PyString_GET_SIZE($cvar));");
                return;
        }
 
        if ($actual_ctype->{TYPE} eq "SCALAR" and 
                ($actual_ctype->{NAME} eq "string" or $actual_ctype->{NAME} eq "nbt_string" or $actual_ctype->{NAME} eq "nbt_name" or $actual_ctype->{NAME} eq "wrepl_nbt_name")) {
-               $self->pidl("$target = talloc_strdup($mem_ctx, PyString_AsString($cvar));");
+               $self->pidl("$target = talloc_strdup($mem_ctx, PyString_AS_STRING($cvar));");
+               return;
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and ($actual_ctype->{NAME} eq "dns_string" or $actual_ctype->{NAME} eq "dns_name")) {
+               $self->pidl("$target = talloc_strdup($mem_ctx, PyString_AS_STRING($cvar));");
                return;
        }
 
        if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "ipv4address") {
+               $self->pidl("$target = PyString_AS_STRING($cvar);");
+               return;
+       }
+
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "ipv6address") {
                $self->pidl("$target = PyString_AsString($cvar);");
                return;
        }
 
        if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "dnsp_name") {
-               $self->pidl("$target = PyString_AsString($cvar);");
+               $self->pidl("$target = PyString_AS_STRING($cvar);");
                return;
        }
 
+       if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "dnsp_string") {
+               $self->pidl("$target = PyString_AS_STRING($cvar);");
+               return;
+       }
 
        if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "NTSTATUS") {
                $self->pidl("$target = NT_STATUS(PyInt_AsLong($cvar));");
@@ -980,11 +1006,11 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                        $self->pidl("if (PyUnicode_Check($py_var)) {");
                        $self->indent;
                        # FIXME: Use Unix charset setting rather than utf-8
-                       $self->pidl($var_name . " = PyString_AsString(PyUnicode_AsEncodedString($py_var, \"utf-8\", \"ignore\"));");
+                       $self->pidl($var_name . " = PyString_AS_STRING(PyUnicode_AsEncodedString($py_var, \"utf-8\", \"ignore\"));");
                        $self->deindent;
                        $self->pidl("} else if (PyString_Check($py_var)) {");
                        $self->indent;
-                       $self->pidl($var_name . " = PyString_AsString($py_var);");
+                       $self->pidl($var_name . " = PyString_AS_STRING($py_var);");
                        $self->deindent;
                        $self->pidl("} else {");
                        $self->indent;
@@ -999,13 +1025,13 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                        $self->indent;
                        $self->pidl("int $counter;");
                        if (ArrayDynamicallyAllocated($e, $l)) {
-                               $self->pidl("$var_name = talloc_array_ptrtype($mem_ctx, $var_name, PyList_Size($py_var));");
+                               $self->pidl("$var_name = talloc_array_ptrtype($mem_ctx, $var_name, PyList_GET_SIZE($py_var));");
                                $self->pidl("if (!$var_name) { $fail; }");
                                $self->pidl("talloc_set_name_const($var_name, \"ARRAY: $var_name\");");
                        }
-                       $self->pidl("for ($counter = 0; $counter < PyList_Size($py_var); $counter++) {");
+                       $self->pidl("for ($counter = 0; $counter < PyList_GET_SIZE($py_var); $counter++) {");
                        $self->indent;
-                       $self->ConvertObjectFromPythonLevel($env, $var_name, "PyList_GetItem($py_var, $counter)", $e, GetNextLevel($e, $l), $var_name."[$counter]", $fail);
+                       $self->ConvertObjectFromPythonLevel($env, $var_name, "PyList_GET_ITEM($py_var, $counter)", $e, GetNextLevel($e, $l), $var_name."[$counter]", $fail);
                        $self->deindent;
                        $self->pidl("}");
                        $self->deindent;
@@ -1022,7 +1048,8 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                my $switch_ptr = "$e->{NAME}_switch_$l->{LEVEL_INDEX}";
                $self->pidl("{");
                $self->indent;
-               $self->pidl("void *$switch_ptr;");
+               my $union_type = mapTypeName(GetNextLevel($e, $l)->{DATA_TYPE});
+               $self->pidl("$union_type *$switch_ptr;");
                $self->pidl("$switch_ptr = py_export_" . GetNextLevel($e, $l)->{DATA_TYPE} . "($mem_ctx, $switch, $py_var);");
                $self->pidl("if ($switch_ptr == NULL) { $fail }");
                $self->assign($var_name, "$switch_ptr");
@@ -1074,10 +1101,16 @@ sub ConvertScalarToPython($$$)
                return "PyString_FromString_check_null($cvar)";
        }
 
+       if (($ctypename eq "dns_string" or $ctypename eq "dns_name")) {
+               return "PyString_FromString_check_null($cvar)";
+       }
+
        # Not yet supported
        if ($ctypename eq "string_array") { return "PyCObject_FromTallocPtr($cvar)"; }
        if ($ctypename eq "ipv4address") { return "PyString_FromString_check_null($cvar)"; }
+       if ($ctypename eq "ipv6address") { return "PyString_FromString_check_null($cvar)"; }
        if ($ctypename eq "dnsp_name") { return "PyString_FromString_check_null($cvar)"; }
+       if ($ctypename eq "dnsp_string") { return "PyString_FromString_check_null($cvar)"; }
        if ($ctypename eq "pointer") {
                return "PyCObject_FromTallocPtr($cvar)";
        }