svn commit: samba r8932 - in branches/SAMBA_4_0/source/build/pidl: .

tpot at samba.org tpot at samba.org
Tue Aug 2 18:29:51 GMT 2005


Author: tpot
Date: 2005-08-02 18:29:51 +0000 (Tue, 02 Aug 2005)
New Revision: 8932

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

Log:
Handle non-anonymous unions and structures better.

Modified:
   branches/SAMBA_4_0/source/build/pidl/smb_interfaces.yp


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/smb_interfaces.yp
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/smb_interfaces.yp	2005-08-02 18:25:19 UTC (rev 8931)
+++ branches/SAMBA_4_0/source/build/pidl/smb_interfaces.yp	2005-08-02 18:29:51 UTC (rev 8932)
@@ -24,9 +24,9 @@
 
 struct: STRUCT optional_identifier '{' elements '}' pointers optional_identifiers ';'
 	{
-		my $name = defined($_[2]) ? $_[2] : $_[7];
 		{
-			"NAME" => $name,
+			"NAME" => $_[7],
+			"STRUCT_NAME" => $_[2],
 			"TYPE" => "struct",
 			"DATA" => $_[4],
 		}
@@ -36,9 +36,9 @@
 union:
 	UNION optional_identifier '{' elements '}' pointers optional_identifier ';'
 	{
-		my $name = defined($_[2]) ? $_[2] : $_[7];
 		{
-			"NAME" => $name,
+			"NAME" => $_[7],
+			"UNION_NAME" => $_[2],
 			"TYPE" => "union",
 			"DATA" => $_[4],
 		}



More information about the samba-cvs mailing list