pidl:Samba4/Python.pm: ignore "SUBCONTEXT" levels

[metze/samba/wip.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 3e9178b7e8da05fd73c6e6fb0c904c0ef84cd86b..8fdb66a541b444bd68caefc30ba4319768a555ca 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -979,12 +979,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
 {
        my ($self, $env, $mem_ctx, $py_var, $e, $l, $var_name, $fail) = @_;
        my $nl = GetNextLevel($e, $l);
+       if ($nl and $nl->{TYPE} eq "SUBCONTEXT") {
+               $nl = GetNextLevel($e, $nl);
+       }
+       my $pl = GetPrevLevel($e, $l);
+       if ($pl and $pl->{TYPE} eq "SUBCONTEXT") {
+               $pl = GetPrevLevel($e, $pl);
+       }
 
        if ($l->{TYPE} eq "POINTER") {
-               if ($nl->{TYPE} eq "DATA" and Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
-                       $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, $nl, $var_name, $fail);
-                       return;
-               }
                if ($l->{POINTER_TYPE} ne "ref") {
                        $self->pidl("if ($py_var == Py_None) {");
                        $self->indent;
@@ -1000,13 +1003,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                } else {
                        $self->pidl("$var_name = NULL;");
                }
-               $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, $nl, get_value_of($var_name), $fail);
+               unless ($nl->{TYPE} eq "DATA" and Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
+                       $var_name = get_value_of($var_name);
+               }
+               $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, $nl, $var_name, $fail);
                if ($l->{POINTER_TYPE} ne "ref") {
                        $self->deindent;
                        $self->pidl("}");
                }
        } elsif ($l->{TYPE} eq "ARRAY") {
-               my $pl = GetPrevLevel($e, $l);
                if ($pl && $pl->{TYPE} eq "POINTER") {
                        $var_name = get_pointer_to($var_name);
                }
@@ -1040,7 +1045,7 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                        }
                        $self->pidl("for ($counter = 0; $counter < PyList_GET_SIZE($py_var); $counter++) {");
                        $self->indent;
-                       $self->ConvertObjectFromPythonLevel($env, $var_name, "PyList_GET_ITEM($py_var, $counter)", $e, GetNextLevel($e, $l), $var_name."[$counter]", $fail);
+                       $self->ConvertObjectFromPythonLevel($env, $var_name, "PyList_GET_ITEM($py_var, $counter)", $e, $nl, $var_name."[$counter]", $fail);
                        $self->deindent;
                        $self->pidl("}");
                        $self->deindent;
@@ -1057,15 +1062,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                my $switch_ptr = "$e->{NAME}_switch_$l->{LEVEL_INDEX}";
                $self->pidl("{");
                $self->indent;
-               my $union_type = mapTypeName(GetNextLevel($e, $l)->{DATA_TYPE});
+               my $union_type = mapTypeName($nl->{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("$switch_ptr = py_export_" . $nl->{DATA_TYPE} . "($mem_ctx, $switch, $py_var);");
                $self->pidl("if ($switch_ptr == NULL) { $fail }");
                $self->assign($var_name, "$switch_ptr");
                $self->deindent;
                $self->pidl("}");
        } elsif ($l->{TYPE} eq "SUBCONTEXT") {
-               $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, GetNextLevel($e, $l), $var_name, $fail);
+               $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, $nl, $var_name, $fail);
        } else {
                fatal($e->{ORIGINAL}, "unknown level type $l->{TYPE}");
        }
@@ -1107,19 +1112,19 @@ sub ConvertScalarToPython($$$)
        }
 
        if (($ctypename eq "string" or $ctypename eq "nbt_string" or $ctypename eq "nbt_name" or $ctypename eq "wrepl_nbt_name")) {
-               return "PyString_FromString_check_null($cvar)";
+               return "PyString_FromStringOrNULL($cvar)";
        }
 
        if (($ctypename eq "dns_string" or $ctypename eq "dns_name")) {
-               return "PyString_FromString_check_null($cvar)";
+               return "PyString_FromStringOrNULL($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 "ipv4address") { return "PyString_FromStringOrNULL($cvar)"; }
+       if ($ctypename eq "ipv6address") { return "PyString_FromStringOrNULL($cvar)"; }
+       if ($ctypename eq "dnsp_name") { return "PyString_FromStringOrNULL($cvar)"; }
+       if ($ctypename eq "dnsp_string") { return "PyString_FromStringOrNULL($cvar)"; }
        if ($ctypename eq "pointer") {
                return "PyCObject_FromTallocPtr($cvar)";
        }
@@ -1174,12 +1179,15 @@ sub ConvertObjectToPythonLevel($$$$$$)
 {
        my ($self, $mem_ctx, $env, $e, $l, $var_name, $py_var, $fail) = @_;
        my $nl = GetNextLevel($e, $l);
+       if ($nl and $nl->{TYPE} eq "SUBCONTEXT") {
+               $nl = GetNextLevel($e, $nl);
+       }
+       my $pl = GetPrevLevel($e, $l);
+       if ($pl and $pl->{TYPE} eq "SUBCONTEXT") {
+               $pl = GetPrevLevel($e, $pl);
+       }
 
        if ($l->{TYPE} eq "POINTER") {
-               if ($nl->{TYPE} eq "DATA" and Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
-                       $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl, $var_name, $py_var, $fail);
-                       return;
-               }
                if ($l->{POINTER_TYPE} ne "ref") {
                        $self->pidl("if ($var_name == NULL) {");
                        $self->indent;
@@ -1189,13 +1197,16 @@ sub ConvertObjectToPythonLevel($$$$$$)
                        $self->pidl("} else {");
                        $self->indent;
                }
-               $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl, get_value_of($var_name), $py_var, $fail);
+               my $var_name2 = $var_name;
+               unless ($nl->{TYPE} eq "DATA" and Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
+                       $var_name2 = get_value_of($var_name);
+               }
+               $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl, $var_name2, $py_var, $fail);
                if ($l->{POINTER_TYPE} ne "ref") {
                        $self->deindent;
                        $self->pidl("}");
                }
        } elsif ($l->{TYPE} eq "ARRAY") {
-               my $pl = GetPrevLevel($e, $l);
                if ($pl && $pl->{TYPE} eq "POINTER") {
                        $var_name = get_pointer_to($var_name);
                }
@@ -1230,7 +1241,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
                        $self->indent;
                        my $member_var = "py_$e->{NAME}_$l->{LEVEL_INDEX}";
                        $self->pidl("PyObject *$member_var;");
-                       $self->ConvertObjectToPythonLevel($var_name, $env, $e, GetNextLevel($e, $l), $var_name."[$counter]", $member_var, $fail);
+                       $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl, $var_name."[$counter]", $member_var, $fail);
                        $self->pidl("PyList_SetItem($py_var, $counter, $member_var);");
                        $self->deindent;
                        $self->pidl("}");
@@ -1240,7 +1251,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
        } elsif ($l->{TYPE} eq "SWITCH") {
                $var_name = get_pointer_to($var_name);
                my $switch = ParseExpr($l->{SWITCH_IS}, $env, $e);
-               $self->pidl("$py_var = py_import_" . GetNextLevel($e, $l)->{DATA_TYPE} . "($mem_ctx, $switch, $var_name);");
+               $self->pidl("$py_var = py_import_" . $nl->{DATA_TYPE} . "($mem_ctx, $switch, $var_name);");
                $self->fail_on_null($py_var, $fail);
 
        } elsif ($l->{TYPE} eq "DATA") {
@@ -1250,7 +1261,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
                my $conv = $self->ConvertObjectToPythonData($mem_ctx, $l->{DATA_TYPE}, $var_name, $e->{ORIGINAL});
                $self->pidl("$py_var = $conv;");
        } elsif ($l->{TYPE} eq "SUBCONTEXT") {
-               $self->ConvertObjectToPythonLevel($mem_ctx, $env, $e, GetNextLevel($e, $l), $var_name, $py_var, $fail);
+               $self->ConvertObjectToPythonLevel($mem_ctx, $env, $e, $nl, $var_name, $py_var, $fail);
        } else {
                fatal($e->{ORIGINAL}, "Unknown level type $l->{TYPE} $var_name");
        }