svn commit: samba r6515 - in branches/tmp/pidl2/source/build/pidl: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-04-29 15:59:34 +0000 (Fri, 29 Apr 2005)
New Revision: 6515

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

Log:
Squash another bug. RPC-SAMR passes ok now.

Modified:
   branches/tmp/pidl2/source/build/pidl/ndr_parser.pm


Changeset:
Modified: branches/tmp/pidl2/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/tmp/pidl2/source/build/pidl/ndr_parser.pm	2005-04-28 22:28:11 UTC (rev 6514)
+++ branches/tmp/pidl2/source/build/pidl/ndr_parser.pm	2005-04-29 15:59:34 UTC (rev 6515)
@@ -128,7 +128,7 @@
 	}
 
 	if (defined($varlist->{$expr})) {
-		return $prefix.$varlist->{$expr};
+		return $prefix.$varlist->{$expr}.$postfix;
 	}
 
 	return $prefix.$expr.$postfix;
@@ -210,9 +210,12 @@
 	my %env;
 
 	foreach my $e (@{$fn->{ELEMENTS}}) {
-		foreach my $d (@{$e->{DIRECTION}}) {
-			$env{$e->{NAME}} = "r->$d.$e->{NAME}";
+		if (grep (/out/, @{$e->{DIRECTION}})) {
+			$env{$e->{NAME}} = "r->out.$e->{NAME}";
 		}
+		if (grep (/in/, @{$e->{DIRECTION}})) {
+			$env{$e->{NAME}} = "r->in.$e->{NAME}";
+		}
 	}
 
 	return \%env;
@@ -877,7 +880,10 @@
 {
 	my $e = shift;
 
-	foreach my $l (@{$e->{LEVELS}}) { return 1 if ($l->{IS_DEFERRED}); }
+	foreach my $l (@{$e->{LEVELS}}) { 
+		return 1 if ($l->{IS_DEFERRED}); 
+		return 1 if ($l->{CONTAINS_DEFERRED});
+	}
 	
 	return 0;
 }