svn commit: samba r14688 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl/Samba4/NDR tests

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-24 11:42:03 +0000 (Fri, 24 Mar 2006)
New Revision: 14688

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14688

Log:
More work on represent_as(): output the right function calls, fix test.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-24 01:03:02 UTC (rev 14687)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-24 11:42:03 UTC (rev 14688)
@@ -676,8 +676,12 @@
 
 	# Representation type is different from transmit_as
 	if ($e->{REPRESENTATION_TYPE}) {
-		pidl "/* FIXME: Convert from $e->{REPRESENTATION_TYPE} to $e->{TYPE} */";
-		pidl "NDR_CHECK(ndr_$e->{REPRESENTATION_TYPE}_to_$e->{TYPE}(FIXME, FIXME));";
+		pidl "{";
+		indent;
+		my $transmit_name = "_transmit_$e->{NAME}";
+		pidl mapType($e->{TYPE}) ." $transmit_name;";
+		pidl "NDR_CHECK(ndr_$e->{REPRESENTATION_TYPE}_to_$e->{TYPE}($var_name, $transmit_name));";
+		$var_name = $transmit_name;
 	}
 
 	start_flags($e);
@@ -690,6 +694,10 @@
 
 	end_flags($e);
 
+	if ($e->{REPRESENTATION_TYPE}) {
+		deindent;
+		pidl "}";
+	}
 }
 
 #####################################################################
@@ -1064,11 +1072,20 @@
 	my($e,$ndr,$var_prefix,$env,$primitives,$deferred) = @_;
 
 	my $var_name = $var_prefix.$e->{NAME};
+	my $represent_name;
 
+	return unless $primitives or ($deferred and ContainsDeferred($e, $e->{LEVELS}[0]));
+
+	if ($e->{REPRESENTATION_TYPE}) {
+		pidl "{";
+		indent;
+		$represent_name = $var_name;
+		$var_name = "_transmit_$e->{NAME}";
+		pidl mapType($e->{TYPE})." $var_name;";
+	}
+
 	$var_name = append_prefix($e, $var_name);
 
-	return unless $primitives or ($deferred and ContainsDeferred($e, $e->{LEVELS}[0]));
-
 	start_flags($e);
 
 	ParseElementPullLevel($e,$e->{LEVELS}[0],$ndr,$var_name,$env,$primitives,$deferred);
@@ -1077,8 +1094,9 @@
 
 	# Representation type is different from transmit_as
 	if ($e->{REPRESENTATION_TYPE}) {
-		pidl "/* FIXME: Convert from $e->{TYPE} to $e->{REPRESENTATION_TYPE} */";
-		pidl "NDR_CHECK(ndr_$e->{TYPE}_to_$e->{REPRESENTATION_TYPE}(FIXME, FIXME));";
+		pidl "NDR_CHECK(ndr_$e->{TYPE}_to_$e->{REPRESENTATION_TYPE}($var_name, $represent_name));";
+		deindent;
+		pidl "}";
 	}
 }
 

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm	2006-03-24 01:03:02 UTC (rev 14687)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm	2006-03-24 11:42:03 UTC (rev 14688)
@@ -57,8 +57,8 @@
 	print CC "#include <stdarg.h>\n";
 	print CC $header;
 	print CC $ndrheader;
+	print CC $extra if ($extra);
 	print CC $ndrparser;
-	print CC $extra if ($extra);
 	print CC "int main(int argc, const char **argv)
 {
 	TALLOC_CTX *mem_ctx = talloc_init(NULL);

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
===================================================================
--- branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl	2006-03-24 01:03:02 UTC (rev 14687)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl	2006-03-24 11:42:03 UTC (rev 14688)
@@ -29,11 +29,20 @@
 		return 2;
 ',
 '
-NTSTATUS ndr_uint8_to_foo(uint8 from, foo *to)
+#include <core/nterr.h>
+typedef int foo;
+
+NTSTATUS ndr_uint8_to_foo(uint8_t from, foo *to)
 {
 	*to = from;
 	return NT_STATUS_OK;
 }
+
+NTSTATUS ndr_foo_to_uint8(foo from, uint8_t *to)
+{
+	*to = from;
+	return NT_STATUS_OK;
+}
 '
 );