r24815: Support cpp_quote().

(This used to be commit 30c1de30bb)

source4/pidl/idl.yp

@@ -21,6 +21,7 @@ idl:
 	| idl import { push(@{$_[1]}, $_[2]); $_[1] }
 	| idl include { push(@{$_[1]}, $_[2]); $_[1] }
 	| idl importlib { push(@{$_[1]}, $_[2]); $_[1] }
+	| idl cpp_quote { push(@{$_[1]}, $_[2]); $_[1] }
 ;
 
 import: 'import' commalist ';' {{
@@ -77,6 +78,15 @@ interface: property_list 'interface' identifier '{' definitions '}' optional_sem
           }}
 ;
 
+cpp_quote: 'cpp_quote' '(' text ')'
+	{{
+		 "TYPE" => "CPP_QUOTE",
+		 "FILE" => $_[0]->YYData->{FILE},
+		 "LINE" => $_[0]->YYData->{LINE},
+		 "DATA" => $_[3]
+	}}
+;
+
 definitions: 
       definition              { [ $_[1] ] }    
     | definitions definition  { push(@{$_[1]}, $_[2]); $_[1] }
@@ -466,7 +476,7 @@ again:
 		if (s/^([\w_]+)//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
 			if ($1 =~ 
-			    /^(coclass|interface|const|typedef|declare|union
+			    /^(coclass|interface|const|typedef|declare|union|cpp_quote
 			      |struct|enum|bitmap|void|unsigned|signed|import|include
 				  |importlib)$/x) {
 				return $1;

source4/pidl/lib/Parse/Pidl/NDR.pm

@@ -715,6 +715,7 @@ sub Parse($)
 	my @ndr = ();
 
 	foreach (@{$idl}) {
+		($_->{TYPE} eq "CPP_QUOTE") && push(@ndr, $_);
 		($_->{TYPE} eq "INTERFACE") && push(@ndr, ParseInterface($_));
 		($_->{TYPE} eq "IMPORT") && push(@ndr, $_);
 	}

source4/pidl/lib/Parse/Pidl/Samba4/Header.pm

@@ -371,6 +371,13 @@ sub HeaderInterface($)
 	pidl "#endif /* _HEADER_$interface->{NAME} */\n";
 }
 
+sub HeaderQuote($)
+{
+	my($quote) = shift;
+
+	pidl $quote->{DATA};
+}
+
 #####################################################################
 # parse a parsed IDL into a C header
 sub Parse($)
@@ -388,6 +395,7 @@ sub Parse($)
 	pidl "\n";
 
 	foreach (@{$ndr}) {
+		($_->{TYPE} eq "CPP_QUOTE") && HeaderQuote($_);
 		($_->{TYPE} eq "INTERFACE") && HeaderInterface($_);
 		($_->{TYPE} eq "IMPORT") && HeaderImport(@{$_->{PATHS}});
 		($_->{TYPE} eq "INCLUDE") && HeaderInclude(@{$_->{PATHS}});

source4/pidl/pidl

@@ -273,7 +273,7 @@ Datagram support (ncadg_*)
 in, out, ref, length_is, switch_is, size_is, uuid, case, default, string, 
 unique, ptr, pointer_default, v1_enum, object, helpstring, range, local, 
 call_as, endpoint, switch_type, progid, coclass, iid_is, represent_as, 
-transmit_as, import, include.
+transmit_as, import, include, cpp_quote.
 
 =head2 PIDL Specific properties
 
@@ -347,7 +347,7 @@ to the host format. Commonly used values are UCS2, DOS and UTF8.
 
 =head2 Unsupported MIDL properties or statements
 
-aggregatable, appobject, async_uuid, bindable, control, cpp_quote, 
+aggregatable, appobject, async_uuid, bindable, control, 
 defaultbind, defaultcollelem, defaultvalue, defaultvtable, dispinterface, 
 displaybind, dual, entry, first_is, helpcontext, helpfile, helpstringcontext, 
 helpstringdll, hidden, idl_module, idl_quote, id, immediatebind, importlib, 

source4/pidl/tests/header.pl

@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 15;
+use Test::More tests => 16;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;
@@ -53,3 +53,6 @@ like(parse_idl("interface p { struct x; };"),
 
 like(parse_idl("interface p { typedef struct x { int p; } x; };"),
      qr/struct x.*{.*int32_t p;.*};/sm, "double struct declaration");
+
+like(parse_idl("cpp_quote(\"some-foo\")"),
+	qr/some-foo/sm, "cpp quote");

source4/pidl/tests/parse_idl.pl

@@ -4,7 +4,7 @@
 # Published under the GNU General Public License
 use strict;
 
-use Test::More tests => 64 * 2 + 2;
+use Test::More tests => 65 * 2 + 3;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util qw(test_errors);
@@ -109,6 +109,7 @@ testok "import-multiple", "import \"foo.idl\", \"bar.idl\";";
 testok "include-multiple", "include \"foo.idl\", \"bar.idl\";";
 testok "empty-struct", "interface test { struct foo { }; }";
 testok "typedef-double", "interface test { typedef struct foo { } foo; }";
+testok "cpp-quote", "cpp_quote(\"bla\")";
 
 my $x = Parse::Pidl::IDL::parse_string("interface foo { struct x {}; }", "<foo>");
 
@@ -122,3 +123,10 @@ is_deeply($x,
 	 [ { 'FILE' => '<foo>', 'NAME' => 'foo', 'DATA' => [ 
 		 { 'NAME' => 'x', 'TYPE' => 'STRUCT' } ], 
 		 'TYPE' => 'INTERFACE', 'LINE' => 0 } ]); 
+
+$x = Parse::Pidl::IDL::parse_string("cpp_quote(\"foobar\")", "<quote>");
+is_deeply($x, 
+	 [ { 'FILE' => '<quote>', 'DATA' => '"foobar"',
+		 'TYPE' => 'CPP_QUOTE', 'LINE' => 0 } ]); 
+
+