r19585: Add support for some more standard IDL instructions:

 - `include' (replaces helper())
 - `import' (replaces depends())

Add support for parsing importlib() - importlib() is now ignored (with a
warning), but no longer causes syntax errors.

helper() and depends() are now marked deprecated and will cause warnings.
(This used to be commit 1ccab71cb8a9e3db9448b6679d01ad00e1c1e9a3)

1 files changed, 21 insertions, 4 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 6fb3ee2eec..94346efe4b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -307,6 +307,24 @@ sub HeaderFunction($)
     pidl "};\n\n";
 }
 
+sub HeaderImport
+{
+	my @imports = @_;
+	foreach (@imports) {
+		s/\.idl\"$//;
+		s/^\"//;
+		pidl "#include \"librpc/gen_ndr/$_\.h\"\n";
+	}
+}
+
+sub HeaderInclude
+{
+	my @includes = @_;
+	foreach (@includes) {
+		pidl "#include \"$_\"\n";
+	}
+}
+
 #####################################################################
 # parse the interface definitions
 sub HeaderInterface($)
@@ -317,10 +335,7 @@ sub HeaderInterface($)
 	pidl "#define _HEADER_$interface->{NAME}\n\n";
 
 	if (defined $interface->{PROPERTIES}->{depends}) {
-		my @d = split / /, $interface->{PROPERTIES}->{depends};
-		foreach my $i (@d) {
-			pidl "#include \"librpc/gen_ndr/$i\.h\"\n";
-		}
+		HeaderImport(split / /, $interface->{PROPERTIES}->{depends});
 	}
 
 	foreach my $d (@{$interface->{DATA}}) {
@@ -358,6 +373,8 @@ sub Parse($)
 	
     foreach (@{$idl}) {
 	    ($_->{TYPE} eq "INTERFACE") && HeaderInterface($_);
+	    ($_->{TYPE} eq "IMPORT") && HeaderImport(@{$_->{PATHS}});
+	    ($_->{TYPE} eq "INCLUDE") && HeaderInclude(@{$_->{PATHS}});
     }
     return $res;
 }