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

[tridge at samba.org]

Author: tridge
Date: 2005-01-05 00:31:28 +0000 (Wed, 05 Jan 2005)
New Revision: 4523

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

Log:
the PROPERTIES change for typedef was not quite as simple as I thought. This puts in a workaround
that fixes things for now





Modified:
   branches/SAMBA_4_0/source/build/pidl/idl.pm
   branches/SAMBA_4_0/source/build/pidl/parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/idl.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/idl.pm	2005-01-05 00:14:29 UTC (rev 4522)
+++ branches/SAMBA_4_0/source/build/pidl/idl.pm	2005-01-05 00:31:28 UTC (rev 4523)
@@ -1666,9 +1666,9 @@
 #line 24 "build/pidl/idl.yp"
 {$_[3] => {
                "TYPE" => "COCLASS", 
-			   "PROPERTIES" => $_[1],
-		       "NAME" => $_[3],
-		       "DATA" => $_[5],
+	       "PROPERTIES" => $_[1],
+	       "NAME" => $_[3],
+	       "DATA" => $_[5],
           }}
 	],
 	[#Rule 5
@@ -1686,10 +1686,10 @@
 #line 38 "build/pidl/idl.yp"
 {$_[3] => {
                "TYPE" => "INTERFACE", 
-			   "PROPERTIES" => $_[1],
-		       "NAME" => $_[3],
-			   "BASE" => $_[4],
-		       "DATA" => $_[6],
+	       "PROPERTIES" => $_[1],
+	       "NAME" => $_[3],
+	       "BASE" => $_[4],
+	       "DATA" => $_[6],
           }}
 	],
 	[#Rule 8

Modified: branches/SAMBA_4_0/source/build/pidl/parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/parser.pm	2005-01-05 00:14:29 UTC (rev 4522)
+++ branches/SAMBA_4_0/source/build/pidl/parser.pm	2005-01-05 00:31:28 UTC (rev 4523)
@@ -1259,6 +1259,10 @@
 		return;
 	}
 
+	if (defined($e->{PROPERTIES}) && !defined($e->{DATA}->{PROPERTIES})) {
+		$e->{DATA}->{PROPERTIES} = $e->{PROPERTIES};
+	}
+
 	if ($e->{DATA}->{TYPE} eq "STRUCT") {
 		pidl $static . "NTSTATUS ndr_push_$e->{NAME}(struct ndr_push *ndr, int ndr_flags, struct $e->{NAME} *r)";
 		pidl "\n{\n";
@@ -1292,6 +1296,10 @@
 	my($e) = shift;
 	my $static = fn_prefix($e);
 
+	if (defined($e->{PROPERTIES}) && !defined($e->{DATA}->{PROPERTIES})) {
+		$e->{DATA}->{PROPERTIES} = $e->{PROPERTIES};
+	}
+
 	if (! needed::is_needed("pull_$e->{NAME}")) {
 #		print "pull_$e->{NAME} not needed\n";
 		return;
@@ -1329,6 +1337,10 @@
 {
 	my($e) = shift;
 
+	if (defined($e->{PROPERTIES}) && !defined($e->{DATA}->{PROPERTIES})) {
+		$e->{DATA}->{PROPERTIES} = $e->{PROPERTIES};
+	}
+
 	if ($e->{DATA}->{TYPE} eq "STRUCT") {
 		pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, struct $e->{NAME} *r)";
 		pidl "\n{\n";