Merge 3.5.4 in upstream branch

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@3574 fc4039ab-9d04-0410-8cac-899223bdd6b0

13 files changed, 1589 insertions, 1167 deletions

diff --git a/pidl/lib/Parse/Pidl/Expr.pm b/pidl/lib/Parse/Pidl/Expr.pm
index 5524374fae..1230a71a2b 100644
--- a/pidl/lib/Parse/Pidl/Expr.pm
+++ b/pidl/lib/Parse/Pidl/Expr.pm
@@ -1127,7 +1127,7 @@ sub new {
 	[#Rule 2
 		 'exp', 1,
 sub
-#line 22 "./pidl/expr.yp"
+#line 24 "./../pidl/expr.yp"
 { "\"$_[1]\"" }
 	],
 	[#Rule 3
@@ -1139,199 +1139,199 @@ sub
 	[#Rule 5
 		 'exp', 2,
 sub
-#line 25 "./pidl/expr.yp"
+#line 30 "./../pidl/expr.yp"
 { "~$_[2]" }
 	],
 	[#Rule 6
 		 'exp', 3,
 sub
-#line 26 "./pidl/expr.yp"
+#line 32 "./../pidl/expr.yp"
 { "$_[1] + $_[3]" }
 	],
 	[#Rule 7
 		 'exp', 3,
 sub
-#line 27 "./pidl/expr.yp"
+#line 34 "./../pidl/expr.yp"
 { "$_[1] - $_[3]" }
 	],
 	[#Rule 8
 		 'exp', 3,
 sub
-#line 28 "./pidl/expr.yp"
+#line 36 "./../pidl/expr.yp"
 { "$_[1] * $_[3]" }
 	],
 	[#Rule 9
 		 'exp', 3,
 sub
-#line 29 "./pidl/expr.yp"
+#line 38 "./../pidl/expr.yp"
 { "$_[1] % $_[3]" }
 	],
 	[#Rule 10
 		 'exp', 3,
 sub
-#line 30 "./pidl/expr.yp"
+#line 40 "./../pidl/expr.yp"
 { "$_[1] < $_[3]" }
 	],
 	[#Rule 11
 		 'exp', 3,
 sub
-#line 31 "./pidl/expr.yp"
+#line 42 "./../pidl/expr.yp"
 { "$_[1] > $_[3]" }
 	],
 	[#Rule 12
 		 'exp', 3,
 sub
-#line 32 "./pidl/expr.yp"
+#line 44 "./../pidl/expr.yp"
 { "$_[1] | $_[3]" }
 	],
 	[#Rule 13
 		 'exp', 3,
 sub
-#line 33 "./pidl/expr.yp"
+#line 46 "./../pidl/expr.yp"
 { "$_[1] == $_[3]" }
 	],
 	[#Rule 14
 		 'exp', 3,
 sub
-#line 34 "./pidl/expr.yp"
+#line 48 "./../pidl/expr.yp"
 { "$_[1] <= $_[3]" }
 	],
 	[#Rule 15
 		 'exp', 3,
 sub
-#line 35 "./pidl/expr.yp"
+#line 50 "./../pidl/expr.yp"
 { "$_[1] => $_[3]" }
 	],
 	[#Rule 16
 		 'exp', 3,
 sub
-#line 36 "./pidl/expr.yp"
+#line 52 "./../pidl/expr.yp"
 { "$_[1] << $_[3]" }
 	],
 	[#Rule 17
 		 'exp', 3,
 sub
-#line 37 "./pidl/expr.yp"
+#line 54 "./../pidl/expr.yp"
 { "$_[1] >> $_[3]" }
 	],
 	[#Rule 18
 		 'exp', 3,
 sub
-#line 38 "./pidl/expr.yp"
+#line 56 "./../pidl/expr.yp"
 { "$_[1] != $_[3]" }
 	],
 	[#Rule 19
 		 'exp', 3,
 sub
-#line 39 "./pidl/expr.yp"
+#line 58 "./../pidl/expr.yp"
 { "$_[1] || $_[3]" }
 	],
 	[#Rule 20
 		 'exp', 3,
 sub
-#line 40 "./pidl/expr.yp"
+#line 60 "./../pidl/expr.yp"
 { "$_[1] && $_[3]" }
 	],
 	[#Rule 21
 		 'exp', 3,
 sub
-#line 41 "./pidl/expr.yp"
+#line 62 "./../pidl/expr.yp"
 { "$_[1] & $_[3]" }
 	],
 	[#Rule 22
 		 'exp', 5,
 sub
-#line 42 "./pidl/expr.yp"
+#line 64 "./../pidl/expr.yp"
 { "$_[1]?$_[3]:$_[5]" }
 	],
 	[#Rule 23
 		 'exp', 2,
 sub
-#line 43 "./pidl/expr.yp"
+#line 66 "./../pidl/expr.yp"
 { "~$_[1]" }
 	],
 	[#Rule 24
 		 'exp', 2,
 sub
-#line 44 "./pidl/expr.yp"
+#line 68 "./../pidl/expr.yp"
 { "not $_[1]" }
 	],
 	[#Rule 25
 		 'exp', 3,
 sub
-#line 45 "./pidl/expr.yp"
+#line 70 "./../pidl/expr.yp"
 { "$_[1] / $_[3]" }
 	],
 	[#Rule 26
 		 'exp', 2,
 sub
-#line 46 "./pidl/expr.yp"
+#line 72 "./../pidl/expr.yp"
 { "-$_[2]" }
 	],
 	[#Rule 27
 		 'exp', 2,
 sub
-#line 47 "./pidl/expr.yp"
+#line 74 "./../pidl/expr.yp"
 { "&$_[2]" }
 	],
 	[#Rule 28
 		 'exp', 3,
 sub
-#line 48 "./pidl/expr.yp"
+#line 76 "./../pidl/expr.yp"
 { "$_[1]^$_[3]" }
 	],
 	[#Rule 29
 		 'exp', 3,
 sub
-#line 49 "./pidl/expr.yp"
+#line 78 "./../pidl/expr.yp"
 { "($_[2])" }
 	],
 	[#Rule 30
 		 'possible_pointer', 1,
 sub
-#line 53 "./pidl/expr.yp"
+#line 82 "./../pidl/expr.yp"
 { $_[0]->_Lookup($_[1]) }
 	],
 	[#Rule 31
 		 'possible_pointer', 2,
 sub
-#line 54 "./pidl/expr.yp"
+#line 84 "./../pidl/expr.yp"
 { $_[0]->_Dereference($_[2]); "*$_[2]" }
 	],
 	[#Rule 32
 		 'var', 1,
 sub
-#line 57 "./pidl/expr.yp"
+#line 88 "./../pidl/expr.yp"
 { $_[0]->_Use($_[1]) }
 	],
 	[#Rule 33
 		 'var', 3,
 sub
-#line 58 "./pidl/expr.yp"
+#line 90 "./../pidl/expr.yp"
 { $_[0]->_Use("$_[1].$_[3]") }
 	],
 	[#Rule 34
 		 'var', 3,
 sub
-#line 59 "./pidl/expr.yp"
+#line 92 "./../pidl/expr.yp"
 { "($_[2])" }
 	],
 	[#Rule 35
 		 'var', 3,
 sub
-#line 60 "./pidl/expr.yp"
+#line 94 "./../pidl/expr.yp"
 { $_[0]->_Use("*$_[1]"); $_[1]."->".$_[3] }
 	],
 	[#Rule 36
 		 'func', 4,
 sub
-#line 64 "./pidl/expr.yp"
+#line 99 "./../pidl/expr.yp"
 { "$_[1]($_[3])" }
 	],
 	[#Rule 37
 		 'opt_args', 0,
 sub
-#line 65 "./pidl/expr.yp"
+#line 104 "./../pidl/expr.yp"
 { "" }
 	],
 	[#Rule 38
@@ -1349,7 +1349,7 @@ sub
 	[#Rule 42
 		 'args', 3,
 sub
-#line 68 "./pidl/expr.yp"
+#line 118 "./../pidl/expr.yp"
 { "$_[1], $_[3]" }
 	]
 ],
@@ -1357,28 +1357,28 @@ sub
     bless($self,$class);
 }
 
-#line 71 "./pidl/expr.yp"
+#line 121 "./../pidl/expr.yp"
 
 
 package Parse::Pidl::Expr;
 
 sub _Lexer {
-    my($parser)=shift;
+	my($parser)=shift;
 
-    $parser->YYData->{INPUT}=~s/^[ \t]//;
+	$parser->YYData->{INPUT}=~s/^[ \t]//;
 
-    for ($parser->YYData->{INPUT}) {
-        if (s/^(0x[0-9A-Fa-f]+)//) {
+	for ($parser->YYData->{INPUT}) {
+		if (s/^(0x[0-9A-Fa-f]+)//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-            return('NUM',$1);
+			return('NUM',$1);
 		}
-        if (s/^([0-9]+(?:\.[0-9]+)?)//) {
+		if (s/^([0-9]+(?:\.[0-9]+)?)//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-            return('NUM',$1);
+			return('NUM',$1);
 		}
-        if (s/^([A-Za-z_][A-Za-z0-9_]*)//) {
+		if (s/^([A-Za-z_][A-Za-z0-9_]*)//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-        	return('VAR',$1);
+			return('VAR',$1);
 		}
 		if (s/^\"(.*?)\"//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
@@ -1386,13 +1386,13 @@ sub _Lexer {
 		}
 		if (s/^(==|!=|<=|>=|->|\|\||<<|>>|&&)//s) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-            return($1,$1);
+			return($1,$1);
 		}
-        if (s/^(.)//s) {
+		if (s/^(.)//s) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-            return($1,$1);
+			return($1,$1);
 		}
-    }
+	}
 }
 
 sub _Use($$)
@@ -1429,14 +1429,16 @@ sub _Error($)
 }
 
 sub Run {
-    my($self, $data, $error, $lookup, $deref, $use) = @_;
-    $self->YYData->{FULL_INPUT} = $data;
-    $self->YYData->{INPUT} = $data;
-    $self->YYData->{LOOKUP} = $lookup;
-    $self->YYData->{DEREFERENCE} = $deref;
-    $self->YYData->{ERROR} = $error;
-    $self->YYData->{USE} = $use;
-    return $self->YYParse( yylex => \&_Lexer, yyerror => \&_Error);
+	my($self, $data, $error, $lookup, $deref, $use) = @_;
+
+	$self->YYData->{FULL_INPUT} = $data;
+	$self->YYData->{INPUT} = $data;
+	$self->YYData->{LOOKUP} = $lookup;
+	$self->YYData->{DEREFERENCE} = $deref;
+	$self->YYData->{ERROR} = $error;
+	$self->YYData->{USE} = $use;
+
+	return $self->YYParse( yylex => \&_Lexer, yyerror => \&_Error);
 }
 
 1;
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index 06d54fb4b5..1a3c59d35c 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -38,7 +38,7 @@ sub new {
 			"import" => 7,
 			"include" => 13
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
 			'cpp_quote' => 11,
 			'importlib' => 10,
@@ -124,7 +124,7 @@ sub new {
 		}
 	},
 	{#State 16
-		DEFAULT => -116
+		DEFAULT => -120
 	},
 	{#State 17
 		DEFAULT => -11
@@ -184,7 +184,7 @@ sub new {
 		}
 	},
 	{#State 26
-		DEFAULT => -112
+		DEFAULT => -116
 	},
 	{#State 27
 		ACTIONS => {
@@ -210,10 +210,10 @@ sub new {
 		ACTIONS => {
 			"(" => 41
 		},
-		DEFAULT => -89
+		DEFAULT => -93
 	},
 	{#State 31
-		DEFAULT => -87
+		DEFAULT => -91
 	},
 	{#State 32
 		DEFAULT => -8
@@ -256,7 +256,7 @@ sub new {
 		}
 	},
 	{#State 40
-		DEFAULT => -86
+		DEFAULT => -90
 	},
 	{#State 41
 		ACTIONS => {
@@ -264,7 +264,7 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
 			'text' => 51,
@@ -284,72 +284,73 @@ sub new {
 	},
 	{#State 44
 		ACTIONS => {
-			"const" => 63
+			"const" => 64
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
 			'typedecl' => 54,
 			'function' => 55,
-			'definitions' => 57,
-			'bitmap' => 56,
-			'definition' => 60,
-			'property_list' => 59,
-			'usertype' => 58,
-			'const' => 62,
-			'struct' => 61,
-			'typedef' => 65,
-			'enum' => 64,
-			'union' => 66
+			'pipe' => 56,
+			'definitions' => 58,
+			'bitmap' => 57,
+			'definition' => 61,
+			'property_list' => 60,
+			'usertype' => 59,
+			'const' => 63,
+			'struct' => 62,
+			'typedef' => 66,
+			'enum' => 65,
+			'union' => 67
 		}
 	},
 	{#State 45
-		DEFAULT => -88
+		DEFAULT => -92
 	},
 	{#State 46
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -91
+		DEFAULT => -95
 	},
 	{#State 47
-		DEFAULT => -95
+		DEFAULT => -99
 	},
 	{#State 48
-		DEFAULT => -115
+		DEFAULT => -119
 	},
 	{#State 49
 		ACTIONS => {
-			"," => 82,
-			")" => 83
+			"," => 83,
+			")" => 84
 		}
 	},
 	{#State 50
-		DEFAULT => -94
+		DEFAULT => -98
 	},
 	{#State 51
-		DEFAULT => -96
+		DEFAULT => -100
 	},
 	{#State 52
 		ACTIONS => {
-			";" => 85
+			";" => 86
 		},
-		DEFAULT => -117,
+		DEFAULT => -121,
 		GOTOS => {
-			'optional_semicolon' => 84
+			'optional_semicolon' => 85
 		}
 	},
 	{#State 53
@@ -357,7 +358,7 @@ sub new {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 86
+			'identifier' => 87
 		}
 	},
 	{#State 54
@@ -367,98 +368,90 @@ sub new {
 		DEFAULT => -22
 	},
 	{#State 56
-		DEFAULT => -33
+		DEFAULT => -34
 	},
 	{#State 57
+		DEFAULT => -33
+	},
+	{#State 58
 		ACTIONS => {
-			"}" => 87,
-			"const" => 63
+			"}" => 88,
+			"const" => 64
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
 			'typedecl' => 54,
 			'function' => 55,
-			'bitmap' => 56,
-			'definition' => 88,
-			'property_list' => 59,
-			'usertype' => 58,
-			'struct' => 61,
-			'const' => 62,
-			'typedef' => 65,
-			'enum' => 64,
-			'union' => 66
+			'pipe' => 56,
+			'bitmap' => 57,
+			'definition' => 89,
+			'property_list' => 60,
+			'usertype' => 59,
+			'const' => 63,
+			'struct' => 62,
+			'typedef' => 66,
+			'enum' => 65,
+			'union' => 67
 		}
 	},
-	{#State 58
+	{#State 59
 		ACTIONS => {
-			";" => 89
+			";" => 90
 		}
 	},
-	{#State 59
+	{#State 60
 		ACTIONS => {
-			"typedef" => 90,
+			"typedef" => 91,
 			'IDENTIFIER' => 26,
-			"signed" => 98,
-			"union" => 91,
-			"enum" => 100,
-			"bitmap" => 101,
-			'void' => 92,
-			"unsigned" => 102,
+			"signed" => 100,
+			"union" => 92,
+			"enum" => 101,
+			"bitmap" => 102,
+			'void' => 93,
+			"pipe" => 103,
+			"unsigned" => 104,
 			"[" => 20,
-			"struct" => 97
+			"struct" => 98
 		},
 		GOTOS => {
 			'existingtype' => 99,
-			'bitmap' => 56,
-			'usertype' => 94,
-			'property_list' => 93,
-			'identifier' => 95,
-			'struct' => 61,
-			'enum' => 64,
-			'type' => 103,
-			'union' => 66,
-			'sign' => 96
+			'pipe' => 56,
+			'bitmap' => 57,
+			'usertype' => 95,
+			'property_list' => 94,
+			'identifier' => 96,
+			'struct' => 62,
+			'enum' => 65,
+			'type' => 105,
+			'union' => 67,
+			'sign' => 97
 		}
 	},
-	{#State 60
+	{#State 61
 		DEFAULT => -20
 	},
-	{#State 61
+	{#State 62
 		DEFAULT => -30
 	},
-	{#State 62
+	{#State 63
 		DEFAULT => -23
 	},
-	{#State 63
+	{#State 64
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 104
+			'identifier' => 106
 		}
 	},
-	{#State 64
-		DEFAULT => -32
-	},
 	{#State 65
-		DEFAULT => -24
+		DEFAULT => -32
 	},
 	{#State 66
-		DEFAULT => -31
+		DEFAULT => -24
 	},
 	{#State 67
-		ACTIONS => {
-			'CONSTANT' => 48,
-			'TEXT' => 16,
-			'IDENTIFIER' => 26
-		},
-		DEFAULT => -93,
-		GOTOS => {
-			'identifier' => 50,
-			'anytext' => 105,
-			'text' => 51,
-			'constant' => 47
-		}
+		DEFAULT => -31
 	},
 	{#State 68
 		ACTIONS => {
@@ -466,10 +459,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 106,
+			'anytext' => 107,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -480,10 +473,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 107,
+			'anytext' => 108,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -494,10 +487,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 108,
+			'anytext' => 109,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -508,10 +501,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 109,
+			'anytext' => 110,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -522,10 +515,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 110,
+			'anytext' => 111,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -536,13 +529,12 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 46,
+			'anytext' => 112,
 			'text' => 51,
-			'constant' => 47,
-			'commalisttext' => 111
+			'constant' => 47
 		}
 	},
 	{#State 74
@@ -551,12 +543,13 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 112,
+			'anytext' => 46,
 			'text' => 51,
-			'constant' => 47
+			'constant' => 47,
+			'commalisttext' => 113
 		}
 	},
 	{#State 75
@@ -565,10 +558,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 113,
+			'anytext' => 114,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -579,10 +572,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 114,
+			'anytext' => 115,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -593,13 +586,12 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 46,
+			'anytext' => 116,
 			'text' => 51,
-			'constant' => 47,
-			'commalisttext' => 115
+			'constant' => 47
 		}
 	},
 	{#State 78
@@ -608,12 +600,13 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 116,
+			'anytext' => 46,
 			'text' => 51,
-			'constant' => 47
+			'constant' => 47,
+			'commalisttext' => 117
 		}
 	},
 	{#State 79
@@ -622,10 +615,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 117,
+			'anytext' => 118,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -636,10 +629,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 118,
+			'anytext' => 119,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -650,10 +643,10 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 119,
+			'anytext' => 120,
 			'text' => 51,
 			'constant' => 47
 		}
@@ -664,1039 +657,1101 @@ sub new {
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 120,
+			'anytext' => 121,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
 	{#State 83
-		DEFAULT => -90
+		ACTIONS => {
+			'CONSTANT' => 48,
+			'TEXT' => 16,
+			'IDENTIFIER' => 26
+		},
+		DEFAULT => -97,
+		GOTOS => {
+			'identifier' => 50,
+			'anytext' => 122,
+			'text' => 51,
+			'constant' => 47
+		}
 	},
 	{#State 84
-		DEFAULT => -13
+		DEFAULT => -94
 	},
 	{#State 85
-		DEFAULT => -118
+		DEFAULT => -13
 	},
 	{#State 86
+		DEFAULT => -122
+	},
+	{#State 87
 		ACTIONS => {
-			";" => 121
+			";" => 123
 		}
 	},
-	{#State 87
+	{#State 88
 		ACTIONS => {
-			";" => 85
+			";" => 86
 		},
-		DEFAULT => -117,
+		DEFAULT => -121,
 		GOTOS => {
-			'optional_semicolon' => 122
+			'optional_semicolon' => 124
 		}
 	},
-	{#State 88
-		DEFAULT => -21
-	},
 	{#State 89
-		DEFAULT => -34
+		DEFAULT => -21
 	},
 	{#State 90
+		DEFAULT => -35
+	},
+	{#State 91
 		ACTIONS => {
 			'IDENTIFIER' => 26,
-			"signed" => 98,
-			'void' => 92,
-			"unsigned" => 102
+			"signed" => 100,
+			'void' => 93,
+			"unsigned" => 104
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
 			'existingtype' => 99,
-			'bitmap' => 56,
-			'usertype' => 94,
-			'property_list' => 93,
-			'identifier' => 95,
-			'struct' => 61,
-			'enum' => 64,
-			'type' => 123,
-			'union' => 66,
-			'sign' => 96
+			'pipe' => 56,
+			'bitmap' => 57,
+			'usertype' => 95,
+			'property_list' => 94,
+			'identifier' => 96,
+			'struct' => 62,
+			'enum' => 65,
+			'type' => 125,
+			'union' => 67,
+			'sign' => 97
 		}
 	},
-	{#State 91
+	{#State 92
 		ACTIONS => {
-			'IDENTIFIER' => 124
+			'IDENTIFIER' => 126
 		},
-		DEFAULT => -114,
+		DEFAULT => -117,
 		GOTOS => {
-			'optional_identifier' => 125
+			'optional_identifier' => 127
 		}
 	},
-	{#State 92
-		DEFAULT => -41
-	},
 	{#State 93
+		DEFAULT => -42
+	},
+	{#State 94
 		ACTIONS => {
-			"union" => 91,
-			"enum" => 100,
-			"bitmap" => 101,
+			"pipe" => 103,
+			"union" => 92,
+			"enum" => 101,
+			"bitmap" => 102,
 			"[" => 20,
-			"struct" => 97
+			"struct" => 98
 		}
 	},
-	{#State 94
-		DEFAULT => -39
-	},
 	{#State 95
-		DEFAULT => -38
+		DEFAULT => -40
 	},
 	{#State 96
+		DEFAULT => -39
+	},
+	{#State 97
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 126
+			'identifier' => 128
 		}
 	},
-	{#State 97
+	{#State 98
 		ACTIONS => {
-			'IDENTIFIER' => 124
+			'IDENTIFIER' => 126
 		},
-		DEFAULT => -114,
+		DEFAULT => -117,
 		GOTOS => {
-			'optional_identifier' => 127
+			'optional_identifier' => 129
 		}
 	},
-	{#State 98
-		DEFAULT => -35
-	},
 	{#State 99
-		DEFAULT => -40
+		DEFAULT => -41
 	},
 	{#State 100
+		DEFAULT => -36
+	},
+	{#State 101
 		ACTIONS => {
-			'IDENTIFIER' => 124
+			'IDENTIFIER' => 126
 		},
-		DEFAULT => -114,
+		DEFAULT => -117,
 		GOTOS => {
-			'optional_identifier' => 128
+			'optional_identifier' => 130
 		}
 	},
-	{#State 101
+	{#State 102
 		ACTIONS => {
-			'IDENTIFIER' => 124
+			'IDENTIFIER' => 126
 		},
-		DEFAULT => -114,
+		DEFAULT => -117,
 		GOTOS => {
-			'optional_identifier' => 129
+			'optional_identifier' => 131
 		}
 	},
-	{#State 102
-		DEFAULT => -36
-	},
 	{#State 103
 		ACTIONS => {
-			'IDENTIFIER' => 26
+			'IDENTIFIER' => 26,
+			"signed" => 100,
+			'void' => 93,
+			"unsigned" => 104
 		},
+		DEFAULT => -89,
 		GOTOS => {
-			'identifier' => 130
+			'existingtype' => 99,
+			'pipe' => 56,
+			'bitmap' => 57,
+			'usertype' => 95,
+			'property_list' => 94,
+			'identifier' => 96,
+			'struct' => 62,
+			'enum' => 65,
+			'type' => 132,
+			'union' => 67,
+			'sign' => 97
 		}
 	},
 	{#State 104
-		DEFAULT => -74,
-		GOTOS => {
-			'pointers' => 131
-		}
+		DEFAULT => -37
 	},
 	{#State 105
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			'IDENTIFIER' => 26
 		},
-		DEFAULT => -106
+		GOTOS => {
+			'identifier' => 133
+		}
 	},
 	{#State 106
-		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
-		},
-		DEFAULT => -97
+		DEFAULT => -75,
+		GOTOS => {
+			'pointers' => 134
+		}
 	},
 	{#State 107
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -105
+		DEFAULT => -110
 	},
 	{#State 108
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
 		DEFAULT => -101
 	},
 	{#State 109
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
 		DEFAULT => -109
 	},
 	{#State 110
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -108
+		DEFAULT => -105
 	},
 	{#State 111
 		ACTIONS => {
-			"}" => 132,
-			"," => 82
-		}
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
+		},
+		DEFAULT => -113
 	},
 	{#State 112
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
-		DEFAULT => -103
+		DEFAULT => -112
 	},
 	{#State 113
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
-		},
-		DEFAULT => -104
+			"}" => 135,
+			"," => 83
+		}
 	},
 	{#State 114
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
 		DEFAULT => -107
 	},
 	{#State 115
 		ACTIONS => {
-			"," => 82,
-			")" => 133
-		}
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
+		},
+		DEFAULT => -108
 	},
 	{#State 116
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -102
+		DEFAULT => -111
 	},
 	{#State 117
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
-		},
-		DEFAULT => -99
+			"," => 83,
+			")" => 136
+		}
 	},
 	{#State 118
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
-		DEFAULT => -98
+		DEFAULT => -106
 	},
 	{#State 119
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
-		DEFAULT => -100
+		DEFAULT => -103
 	},
 	{#State 120
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
-		DEFAULT => -92
+		DEFAULT => -102
 	},
 	{#State 121
-		DEFAULT => -15
+		ACTIONS => {
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
+		},
+		DEFAULT => -104
 	},
 	{#State 122
-		DEFAULT => -16
-	},
-	{#State 123
 		ACTIONS => {
-			'IDENTIFIER' => 26
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		GOTOS => {
-			'identifier' => 134
-		}
+		DEFAULT => -96
+	},
+	{#State 123
+		DEFAULT => -15
 	},
 	{#State 124
-		DEFAULT => -113
+		DEFAULT => -16
 	},
 	{#State 125
 		ACTIONS => {
-			"{" => 136
+			'IDENTIFIER' => 26
 		},
-		DEFAULT => -70,
 		GOTOS => {
-			'union_body' => 137,
-			'opt_union_body' => 135
+			'identifier' => 137
 		}
 	},
 	{#State 126
-		DEFAULT => -37
+		DEFAULT => -118
 	},
 	{#State 127
 		ACTIONS => {
 			"{" => 139
 		},
-		DEFAULT => -60,
+		DEFAULT => -71,
 		GOTOS => {
-			'struct_body' => 138,
-			'opt_struct_body' => 140
+			'union_body' => 140,
+			'opt_union_body' => 138
 		}
 	},
 	{#State 128
+		DEFAULT => -38
+	},
+	{#State 129
 		ACTIONS => {
-			"{" => 141
+			"{" => 142
 		},
-		DEFAULT => -43,
+		DEFAULT => -61,
 		GOTOS => {
-			'opt_enum_body' => 143,
-			'enum_body' => 142
+			'struct_body' => 141,
+			'opt_struct_body' => 143
 		}
 	},
-	{#State 129
+	{#State 130
 		ACTIONS => {
-			"{" => 145
+			"{" => 144
 		},
-		DEFAULT => -51,
+		DEFAULT => -44,
 		GOTOS => {
-			'bitmap_body' => 146,
-			'opt_bitmap_body' => 144
+			'opt_enum_body' => 146,
+			'enum_body' => 145
 		}
 	},
-	{#State 130
+	{#State 131
 		ACTIONS => {
-			"(" => 147
+			"{" => 148
+		},
+		DEFAULT => -52,
+		GOTOS => {
+			'bitmap_body' => 149,
+			'opt_bitmap_body' => 147
 		}
 	},
-	{#State 131
+	{#State 132
+		DEFAULT => -77
+	},
+	{#State 133
+		ACTIONS => {
+			"(" => 150
+		}
+	},
+	{#State 134
 		ACTIONS => {
 			'IDENTIFIER' => 26,
-			"*" => 149
+			"*" => 152
 		},
 		GOTOS => {
-			'identifier' => 148
+			'identifier' => 151
 		}
 	},
-	{#State 132
+	{#State 135
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 150,
+			'anytext' => 153,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 133
+	{#State 136
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 151,
+			'anytext' => 154,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 134
+	{#State 137
 		ACTIONS => {
-			"[" => 152
+			"[" => 155
 		},
-		DEFAULT => -82,
+		DEFAULT => -86,
 		GOTOS => {
-			'array_len' => 153
+			'array_len' => 156
 		}
 	},
-	{#State 135
-		DEFAULT => -72
+	{#State 138
+		DEFAULT => -73
 	},
-	{#State 136
-		DEFAULT => -67,
+	{#State 139
+		DEFAULT => -68,
 		GOTOS => {
-			'union_elements' => 154
+			'union_elements' => 157
 		}
 	},
-	{#State 137
-		DEFAULT => -71
+	{#State 140
+		DEFAULT => -72
 	},
-	{#State 138
-		DEFAULT => -61
+	{#State 141
+		DEFAULT => -62
 	},
-	{#State 139
-		DEFAULT => -76,
+	{#State 142
+		DEFAULT => -78,
 		GOTOS => {
-			'element_list1' => 155
+			'element_list1' => 158
 		}
 	},
-	{#State 140
-		DEFAULT => -62
+	{#State 143
+		DEFAULT => -63
 	},
-	{#State 141
+	{#State 144
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 156,
-			'enum_element' => 157,
-			'enum_elements' => 158
+			'identifier' => 159,
+			'enum_element' => 160,
+			'enum_elements' => 161
 		}
 	},
-	{#State 142
-		DEFAULT => -44
-	},
-	{#State 143
+	{#State 145
 		DEFAULT => -45
 	},
-	{#State 144
-		DEFAULT => -53
+	{#State 146
+		DEFAULT => -46
 	},
-	{#State 145
+	{#State 147
+		DEFAULT => -54
+	},
+	{#State 148
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -56,
+		DEFAULT => -57,
 		GOTOS => {
-			'identifier' => 161,
-			'bitmap_element' => 160,
-			'bitmap_elements' => 159,
-			'opt_bitmap_elements' => 162
+			'identifier' => 164,
+			'bitmap_element' => 163,
+			'bitmap_elements' => 162,
+			'opt_bitmap_elements' => 165
 		}
 	},
-	{#State 146
-		DEFAULT => -52
+	{#State 149
+		DEFAULT => -53
 	},
-	{#State 147
+	{#State 150
 		ACTIONS => {
-			"," => -78,
-			"void" => 166,
-			")" => -78
+			"," => -82,
+			"void" => 169,
+			"const" => 167,
+			")" => -82
 		},
-		DEFAULT => -85,
+		DEFAULT => -80,
 		GOTOS => {
-			'base_element' => 163,
-			'element_list2' => 165,
-			'property_list' => 164
+			'optional_const' => 166,
+			'element_list2' => 168
 		}
 	},
-	{#State 148
+	{#State 151
 		ACTIONS => {
-			"[" => 152,
-			"=" => 168
+			"[" => 155,
+			"=" => 171
 		},
 		GOTOS => {
-			'array_len' => 167
+			'array_len' => 170
 		}
 	},
-	{#State 149
-		DEFAULT => -75
+	{#State 152
+		DEFAULT => -76
 	},
-	{#State 150
+	{#State 153
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -111
+		DEFAULT => -115
 	},
-	{#State 151
+	{#State 154
 		ACTIONS => {
-			":" => 67,
-			"<" => 70,
-			"~" => 71,
-			"?" => 69,
-			"{" => 73,
-			"=" => 76
+			":" => 68,
+			"<" => 71,
+			"~" => 72,
+			"?" => 70,
+			"{" => 74,
+			"=" => 77
 		},
-		DEFAULT => -110
+		DEFAULT => -114
 	},
-	{#State 152
+	{#State 155
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
-			"]" => 169,
+			"]" => 172,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 170,
+			'anytext' => 173,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 153
-		ACTIONS => {
-			";" => 171
-		}
-	},
-	{#State 154
+	{#State 156
 		ACTIONS => {
-			"}" => 172
-		},
-		DEFAULT => -85,
-		GOTOS => {
-			'optional_base_element' => 174,
-			'property_list' => 173
+			";" => 174
 		}
 	},
-	{#State 155
+	{#State 157
 		ACTIONS => {
 			"}" => 175
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
-			'base_element' => 176,
-			'property_list' => 164
+			'optional_base_element' => 177,
+			'property_list' => 176
 		}
 	},
-	{#State 156
-		ACTIONS => {
-			"=" => 177
-		},
-		DEFAULT => -48
-	},
-	{#State 157
-		DEFAULT => -46
-	},
 	{#State 158
 		ACTIONS => {
-			"}" => 178,
-			"," => 179
+			"}" => 178
+		},
+		DEFAULT => -89,
+		GOTOS => {
+			'base_element' => 179,
+			'property_list' => 180
 		}
 	},
 	{#State 159
 		ACTIONS => {
-			"," => 180
+			"=" => 181
 		},
-		DEFAULT => -57
+		DEFAULT => -49
 	},
 	{#State 160
-		DEFAULT => -54
+		DEFAULT => -47
 	},
 	{#State 161
 		ACTIONS => {
-			"=" => 181
+			"}" => 182,
+			"," => 183
 		}
 	},
 	{#State 162
 		ACTIONS => {
-			"}" => 182
-		}
+			"," => 184
+		},
+		DEFAULT => -58
 	},
 	{#State 163
-		DEFAULT => -80
+		DEFAULT => -55
 	},
 	{#State 164
 		ACTIONS => {
-			'IDENTIFIER' => 26,
-			"signed" => 98,
-			'void' => 92,
-			"unsigned" => 102,
-			"[" => 20
-		},
-		DEFAULT => -85,
-		GOTOS => {
-			'existingtype' => 99,
-			'bitmap' => 56,
-			'usertype' => 94,
-			'property_list' => 93,
-			'identifier' => 95,
-			'struct' => 61,
-			'enum' => 64,
-			'type' => 183,
-			'union' => 66,
-			'sign' => 96
+			"=" => 185
 		}
 	},
 	{#State 165
 		ACTIONS => {
-			"," => 184,
-			")" => 185
+			"}" => 186
 		}
 	},
 	{#State 166
-		DEFAULT => -79
+		DEFAULT => -89,
+		GOTOS => {
+			'base_element' => 187,
+			'property_list' => 180
+		}
 	},
 	{#State 167
+		DEFAULT => -81
+	},
+	{#State 168
 		ACTIONS => {
-			"=" => 186
+			"," => 188,
+			")" => 189
 		}
 	},
-	{#State 168
+	{#State 169
+		DEFAULT => -83
+	},
+	{#State 170
+		ACTIONS => {
+			"=" => 190
+		}
+	},
+	{#State 171
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 187,
+			'anytext' => 191,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 169
+	{#State 172
 		ACTIONS => {
-			"[" => 152
+			"[" => 155
 		},
-		DEFAULT => -82,
+		DEFAULT => -86,
 		GOTOS => {
-			'array_len' => 188
+			'array_len' => 192
 		}
 	},
-	{#State 170
+	{#State 173
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"?" => 69,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"&" => 74,
-			"{" => 73,
-			"/" => 75,
-			"=" => 76,
-			"|" => 78,
-			"(" => 77,
-			"*" => 79,
-			"." => 80,
-			"]" => 189,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"?" => 70,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"&" => 75,
+			"{" => 74,
+			"/" => 76,
+			"=" => 77,
+			"|" => 79,
+			"(" => 78,
+			"*" => 80,
+			"." => 81,
+			"]" => 193,
+			">" => 82
 		}
 	},
-	{#State 171
+	{#State 174
 		DEFAULT => -29
 	},
-	{#State 172
-		DEFAULT => -69
+	{#State 175
+		DEFAULT => -70
 	},
-	{#State 173
+	{#State 176
 		ACTIONS => {
 			"[" => 20
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
-			'base_or_empty' => 190,
-			'base_element' => 191,
-			'empty_element' => 192,
-			'property_list' => 193
+			'base_or_empty' => 194,
+			'base_element' => 195,
+			'empty_element' => 196,
+			'property_list' => 197
 		}
 	},
-	{#State 174
-		DEFAULT => -68
+	{#State 177
+		DEFAULT => -69
 	},
-	{#State 175
-		DEFAULT => -59
+	{#State 178
+		DEFAULT => -60
 	},
-	{#State 176
+	{#State 179
 		ACTIONS => {
-			";" => 194
+			";" => 198
 		}
 	},
-	{#State 177
+	{#State 180
+		ACTIONS => {
+			'IDENTIFIER' => 26,
+			"signed" => 100,
+			'void' => 93,
+			"unsigned" => 104,
+			"[" => 20
+		},
+		DEFAULT => -89,
+		GOTOS => {
+			'existingtype' => 99,
+			'pipe' => 56,
+			'bitmap' => 57,
+			'usertype' => 95,
+			'property_list' => 94,
+			'identifier' => 96,
+			'struct' => 62,
+			'enum' => 65,
+			'type' => 199,
+			'union' => 67,
+			'sign' => 97
+		}
+	},
+	{#State 181
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 195,
+			'anytext' => 200,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 178
-		DEFAULT => -42
+	{#State 182
+		DEFAULT => -43
 	},
-	{#State 179
+	{#State 183
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 156,
-			'enum_element' => 196
+			'identifier' => 159,
+			'enum_element' => 201
 		}
 	},
-	{#State 180
+	{#State 184
 		ACTIONS => {
 			'IDENTIFIER' => 26
 		},
 		GOTOS => {
-			'identifier' => 161,
-			'bitmap_element' => 197
+			'identifier' => 164,
+			'bitmap_element' => 202
 		}
 	},
-	{#State 181
+	{#State 185
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 198,
+			'anytext' => 203,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 182
-		DEFAULT => -50
+	{#State 186
+		DEFAULT => -51
 	},
-	{#State 183
-		DEFAULT => -74,
-		GOTOS => {
-			'pointers' => 199
-		}
+	{#State 187
+		DEFAULT => -84
 	},
-	{#State 184
-		DEFAULT => -85,
+	{#State 188
+		ACTIONS => {
+			"const" => 167
+		},
+		DEFAULT => -80,
 		GOTOS => {
-			'base_element' => 200,
-			'property_list' => 164
+			'optional_const' => 204
 		}
 	},
-	{#State 185
+	{#State 189
 		ACTIONS => {
-			";" => 201
+			";" => 205
 		}
 	},
-	{#State 186
+	{#State 190
 		ACTIONS => {
 			'CONSTANT' => 48,
 			'TEXT' => 16,
 			'IDENTIFIER' => 26
 		},
-		DEFAULT => -93,
+		DEFAULT => -97,
 		GOTOS => {
 			'identifier' => 50,
-			'anytext' => 202,
+			'anytext' => 206,
 			'text' => 51,
 			'constant' => 47
 		}
 	},
-	{#State 187
+	{#State 191
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"?" => 69,
-			"<" => 70,
-			";" => 203,
-			"+" => 72,
-			"~" => 71,
-			"&" => 74,
-			"{" => 73,
-			"/" => 75,
-			"=" => 76,
-			"|" => 78,
-			"(" => 77,
-			"*" => 79,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"?" => 70,
+			"<" => 71,
+			";" => 207,
+			"+" => 73,
+			"~" => 72,
+			"&" => 75,
+			"{" => 74,
+			"/" => 76,
+			"=" => 77,
+			"|" => 79,
+			"(" => 78,
+			"*" => 80,
+			"." => 81,
+			">" => 82
 		}
 	},
-	{#State 188
-		DEFAULT => -83
+	{#State 192
+		DEFAULT => -87
 	},
-	{#State 189
+	{#State 193
 		ACTIONS => {
-			"[" => 152
+			"[" => 155
 		},
-		DEFAULT => -82,
+		DEFAULT => -86,
 		GOTOS => {
-			'array_len' => 204
+			'array_len' => 208
 		}
 	},
-	{#State 190
-		DEFAULT => -66
+	{#State 194
+		DEFAULT => -67
 	},
-	{#State 191
+	{#State 195
 		ACTIONS => {
-			";" => 205
+			";" => 209
 		}
 	},
-	{#State 192
-		DEFAULT => -65
+	{#State 196
+		DEFAULT => -66
 	},
-	{#State 193
+	{#State 197
 		ACTIONS => {
 			'IDENTIFIER' => 26,
-			"signed" => 98,
-			";" => 206,
-			'void' => 92,
-			"unsigned" => 102,
+			"signed" => 100,
+			";" => 210,
+			'void' => 93,
+			"unsigned" => 104,
 			"[" => 20
 		},
-		DEFAULT => -85,
+		DEFAULT => -89,
 		GOTOS => {
 			'existingtype' => 99,
-			'bitmap' => 56,
-			'usertype' => 94,
-			'property_list' => 93,
-			'identifier' => 95,
-			'struct' => 61,
-			'enum' => 64,
-			'type' => 183,
-			'union' => 66,
-			'sign' => 96
+			'pipe' => 56,
+			'bitmap' => 57,
+			'usertype' => 95,
+			'property_list' => 94,
+			'identifier' => 96,
+			'struct' => 62,
+			'enum' => 65,
+			'type' => 199,
+			'union' => 67,
+			'sign' => 97
 		}
 	},
-	{#State 194
-		DEFAULT => -77
+	{#State 198
+		DEFAULT => -79
 	},
-	{#State 195
+	{#State 199
+		DEFAULT => -75,
+		GOTOS => {
+			'pointers' => 211
+		}
+	},
+	{#State 200
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -49
+		DEFAULT => -50
 	},
-	{#State 196
-		DEFAULT => -47
+	{#State 201
+		DEFAULT => -48
 	},
-	{#State 197
-		DEFAULT => -55
+	{#State 202
+		DEFAULT => -56
 	},
-	{#State 198
+	{#State 203
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"<" => 70,
-			"+" => 72,
-			"~" => 71,
-			"*" => 79,
-			"?" => 69,
-			"{" => 73,
-			"&" => 74,
-			"/" => 75,
-			"=" => 76,
-			"(" => 77,
-			"|" => 78,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"<" => 71,
+			"+" => 73,
+			"~" => 72,
+			"*" => 80,
+			"?" => 70,
+			"{" => 74,
+			"&" => 75,
+			"/" => 76,
+			"=" => 77,
+			"(" => 78,
+			"|" => 79,
+			"." => 81,
+			">" => 82
 		},
-		DEFAULT => -58
+		DEFAULT => -59
 	},
-	{#State 199
-		ACTIONS => {
-			'IDENTIFIER' => 26,
-			"*" => 149
-		},
+	{#State 204
+		DEFAULT => -89,
 		GOTOS => {
-			'identifier' => 207
+			'base_element' => 212,
+			'property_list' => 180
 		}
 	},
-	{#State 200
-		DEFAULT => -81
-	},
-	{#State 201
+	{#State 205
 		DEFAULT => -28
 	},
-	{#State 202
+	{#State 206
 		ACTIONS => {
-			"-" => 68,
-			":" => 67,
-			"?" => 69,
-			"<" => 70,
-			";" => 208,
-			"+" => 72,
-			"~" => 71,
-			"&" => 74,
-			"{" => 73,
-			"/" => 75,
-			"=" => 76,
-			"|" => 78,
-			"(" => 77,
-			"*" => 79,
-			"." => 80,
-			">" => 81
+			"-" => 69,
+			":" => 68,
+			"?" => 70,
+			"<" => 71,
+			";" => 213,
+			"+" => 73,
+			"~" => 72,
+			"&" => 75,
+			"{" => 74,
+			"/" => 76,
+			"=" => 77,
+			"|" => 79,
+			"(" => 78,
+			"*" => 80,
+			"." => 81,
+			">" => 82
 		}
 	},
-	{#State 203
+	{#State 207
 		DEFAULT => -26
 	},
-	{#State 204
-		DEFAULT => -84
+	{#State 208
+		DEFAULT => -88
 	},
-	{#State 205
-		DEFAULT => -64
+	{#State 209
+		DEFAULT => -65
 	},
-	{#State 206
-		DEFAULT => -63
+	{#State 210
+		DEFAULT => -64
 	},
-	{#State 207
+	{#State 211
 		ACTIONS => {
-			"[" => 152
+			'IDENTIFIER' => 26,
+			"*" => 152
 		},
-		DEFAULT => -82,
 		GOTOS => {
-			'array_len' => 209
+			'identifier' => 214
 		}
 	},
-	{#State 208
+	{#State 212
+		DEFAULT => -85
+	},
+	{#State 213
 		DEFAULT => -27
 	},
-	{#State 209
-		DEFAULT => -73
+	{#State 214
+		ACTIONS => {
+			"[" => 155
+		},
+		DEFAULT => -86,
+		GOTOS => {
+			'array_len' => 215
+		}
+	},
+	{#State 215
+		DEFAULT => -74
 	}
 ],
                                   yyrules  =>
@@ -1710,96 +1765,96 @@ sub new {
 	[#Rule 2
 		 'idl', 2,
 sub
-#line 19 "pidl/idl.yp"
+#line 20 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 3
 		 'idl', 2,
 sub
-#line 20 "pidl/idl.yp"
+#line 22 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 4
 		 'idl', 2,
 sub
-#line 21 "pidl/idl.yp"
+#line 24 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 5
 		 'idl', 2,
 sub
-#line 22 "pidl/idl.yp"
+#line 26 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 6
 		 'idl', 2,
 sub
-#line 23 "pidl/idl.yp"
+#line 28 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 7
 		 'idl', 2,
 sub
-#line 24 "pidl/idl.yp"
+#line 30 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 8
 		 'import', 3,
 sub
-#line 27 "pidl/idl.yp"
+#line 35 "./../pidl/idl.yp"
 {{
-			"TYPE" => "IMPORT", 
-			"PATHS" => $_[2],
-		   "FILE" => $_[0]->YYData->{FILE},
-		   "LINE" => $_[0]->YYData->{LINE}
-		}}
+		"TYPE" => "IMPORT",
+		"PATHS" => $_[2],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 9
 		 'include', 3,
 sub
-#line 34 "pidl/idl.yp"
-{{ 
-			"TYPE" => "INCLUDE", 
-			"PATHS" => $_[2],
-		   "FILE" => $_[0]->YYData->{FILE},
-		   "LINE" => $_[0]->YYData->{LINE}
-		}}
+#line 45 "./../pidl/idl.yp"
+{{
+		"TYPE" => "INCLUDE",
+		"PATHS" => $_[2],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 10
 		 'importlib', 3,
 sub
-#line 41 "pidl/idl.yp"
-{{ 
-			"TYPE" => "IMPORTLIB", 
-			"PATHS" => $_[2],
-		   "FILE" => $_[0]->YYData->{FILE},
-		   "LINE" => $_[0]->YYData->{LINE}
-		}}
+#line 55 "./../pidl/idl.yp"
+{{
+		"TYPE" => "IMPORTLIB",
+		"PATHS" => $_[2],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 11
 		 'commalist', 1,
 sub
-#line 50 "pidl/idl.yp"
+#line 64 "./../pidl/idl.yp"
 { [ $_[1] ] }
 	],
 	[#Rule 12
 		 'commalist', 3,
 sub
-#line 51 "pidl/idl.yp"
+#line 66 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[3]); $_[1] }
 	],
 	[#Rule 13
 		 'coclass', 7,
 sub
-#line 55 "pidl/idl.yp"
+#line 71 "./../pidl/idl.yp"
 {{
-               "TYPE" => "COCLASS", 
-	       "PROPERTIES" => $_[1],
-	       "NAME" => $_[3],
-	       "DATA" => $_[5],
-		   "FILE" => $_[0]->YYData->{FILE},
-		   "LINE" => $_[0]->YYData->{LINE},
-          }}
+		"TYPE" => "COCLASS",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"DATA" => $_[5],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 14
 		 'interface_names', 0, undef
@@ -1807,22 +1862,22 @@ sub
 	[#Rule 15
 		 'interface_names', 4,
 sub
-#line 67 "pidl/idl.yp"
+#line 84 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 16
 		 'interface', 8,
 sub
-#line 71 "pidl/idl.yp"
+#line 89 "./../pidl/idl.yp"
 {{
-               "TYPE" => "INTERFACE", 
-	       "PROPERTIES" => $_[1],
-	       "NAME" => $_[3],
-		   "BASE" => $_[4],
-	       "DATA" => $_[6],
-		   "FILE" => $_[0]->YYData->{FILE},
-		   "LINE" => $_[0]->YYData->{LINE},
-          }}
+		"TYPE" => "INTERFACE",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"BASE" => $_[4],
+		"DATA" => $_[6],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 17
 		 'base_interface', 0, undef
@@ -1830,30 +1885,30 @@ sub
 	[#Rule 18
 		 'base_interface', 2,
 sub
-#line 84 "pidl/idl.yp"
+#line 103 "./../pidl/idl.yp"
 { $_[2] }
 	],
 	[#Rule 19
 		 'cpp_quote', 4,
 sub
-#line 89 "pidl/idl.yp"
+#line 109 "./../pidl/idl.yp"
 {{
 		 "TYPE" => "CPP_QUOTE",
+		 "DATA" => $_[3],
 		 "FILE" => $_[0]->YYData->{FILE},
 		 "LINE" => $_[0]->YYData->{LINE},
-		 "DATA" => $_[3]
 	}}
 	],
 	[#Rule 20
 		 'definitions', 1,
 sub
-#line 98 "pidl/idl.yp"
+#line 118 "./../pidl/idl.yp"
 { [ $_[1] ] }
 	],
 	[#Rule 21
 		 'definitions', 2,
 sub
-#line 99 "pidl/idl.yp"
+#line 120 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
 	[#Rule 22
@@ -1871,36 +1926,36 @@ sub
 	[#Rule 26
 		 'const', 7,
 sub
-#line 107 "pidl/idl.yp"
+#line 135 "./../pidl/idl.yp"
 {{
-                     "TYPE"  => "CONST", 
-		     "DTYPE"  => $_[2],
-			 "POINTERS" => $_[3],
-		     "NAME"  => $_[4],
-		     "VALUE" => $_[6],
-		     "FILE" => $_[0]->YYData->{FILE},
-		     "LINE" => $_[0]->YYData->{LINE},
-        }}
+		"TYPE"  => "CONST",
+		"DTYPE"  => $_[2],
+		"POINTERS" => $_[3],
+		"NAME"  => $_[4],
+		"VALUE" => $_[6],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 27
 		 'const', 8,
 sub
-#line 117 "pidl/idl.yp"
+#line 146 "./../pidl/idl.yp"
 {{
-                     "TYPE"  => "CONST", 
-		     "DTYPE"  => $_[2],
-			 "POINTERS" => $_[3],
-		     "NAME"  => $_[4],
-		     "ARRAY_LEN" => $_[5],
-		     "VALUE" => $_[7],
-		     "FILE" => $_[0]->YYData->{FILE},
-		     "LINE" => $_[0]->YYData->{LINE},
-        }}
+		"TYPE"  => "CONST",
+		"DTYPE"  => $_[2],
+		"POINTERS" => $_[3],
+		"NAME"  => $_[4],
+		"ARRAY_LEN" => $_[5],
+		"VALUE" => $_[7],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
 	[#Rule 28
 		 'function', 7,
 sub
-#line 131 "pidl/idl.yp"
+#line 160 "./../pidl/idl.yp"
 {{
 		"TYPE" => "FUNCTION",
 		"NAME" => $_[3],
@@ -1909,20 +1964,20 @@ sub
 		"ELEMENTS" => $_[5],
 		"FILE" => $_[0]->YYData->{FILE},
 		"LINE" => $_[0]->YYData->{LINE},
-	  }}
+	}}
 	],
 	[#Rule 29
 		 'typedef', 6,
 sub
-#line 143 "pidl/idl.yp"
+#line 173 "./../pidl/idl.yp"
 {{
-	             "TYPE" => "TYPEDEF", 
-                     "PROPERTIES" => $_[1],
-		     "NAME" => $_[4],
-		     "DATA" => $_[3],
-		     "ARRAY_LEN" => $_[5],
-		     "FILE" => $_[0]->YYData->{FILE},
-		     "LINE" => $_[0]->YYData->{LINE},
+		"TYPE" => "TYPEDEF",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[4],
+		"DATA" => $_[3],
+		"ARRAY_LEN" => $_[5],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
         }}
 	],
 	[#Rule 30
@@ -1938,450 +1993,480 @@ sub
 		 'usertype', 1, undef
 	],
 	[#Rule 34
+		 'usertype', 1, undef
+	],
+	[#Rule 35
 		 'typedecl', 2,
 sub
-#line 156 "pidl/idl.yp"
+#line 197 "./../pidl/idl.yp"
 { $_[1] }
 	],
-	[#Rule 35
-		 'sign', 1, undef
-	],
 	[#Rule 36
 		 'sign', 1, undef
 	],
 	[#Rule 37
+		 'sign', 1, undef
+	],
+	[#Rule 38
 		 'existingtype', 2,
 sub
-#line 161 "pidl/idl.yp"
+#line 207 "./../pidl/idl.yp"
 { ($_[1]?$_[1]:"signed") ." $_[2]" }
 	],
-	[#Rule 38
-		 'existingtype', 1, undef
-	],
 	[#Rule 39
-		 'type', 1, undef
+		 'existingtype', 1, undef
 	],
 	[#Rule 40
 		 'type', 1, undef
 	],
 	[#Rule 41
+		 'type', 1, undef
+	],
+	[#Rule 42
 		 'type', 1,
 sub
-#line 165 "pidl/idl.yp"
+#line 217 "./../pidl/idl.yp"
 { "void" }
 	],
-	[#Rule 42
+	[#Rule 43
 		 'enum_body', 3,
 sub
-#line 167 "pidl/idl.yp"
+#line 221 "./../pidl/idl.yp"
 { $_[2] }
 	],
-	[#Rule 43
+	[#Rule 44
 		 'opt_enum_body', 0, undef
 	],
-	[#Rule 44
+	[#Rule 45
 		 'opt_enum_body', 1, undef
 	],
-	[#Rule 45
+	[#Rule 46
 		 'enum', 4,
 sub
-#line 170 "pidl/idl.yp"
+#line 232 "./../pidl/idl.yp"
 {{
-             "TYPE" => "ENUM", 
-			 "PROPERTIES" => $_[1],
-			 "NAME" => $_[3],
-		     "ELEMENTS" => $_[4]
-        }}
+		"TYPE" => "ENUM",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"ELEMENTS" => $_[4],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 46
+	[#Rule 47
 		 'enum_elements', 1,
 sub
-#line 179 "pidl/idl.yp"
+#line 243 "./../pidl/idl.yp"
 { [ $_[1] ] }
 	],
-	[#Rule 47
+	[#Rule 48
 		 'enum_elements', 3,
 sub
-#line 180 "pidl/idl.yp"
+#line 245 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[3]); $_[1] }
 	],
-	[#Rule 48
+	[#Rule 49
 		 'enum_element', 1, undef
 	],
-	[#Rule 49
+	[#Rule 50
 		 'enum_element', 3,
 sub
-#line 184 "pidl/idl.yp"
+#line 251 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 50
+	[#Rule 51
 		 'bitmap_body', 3,
 sub
-#line 187 "pidl/idl.yp"
+#line 255 "./../pidl/idl.yp"
 { $_[2] }
 	],
-	[#Rule 51
+	[#Rule 52
 		 'opt_bitmap_body', 0, undef
 	],
-	[#Rule 52
+	[#Rule 53
 		 'opt_bitmap_body', 1, undef
 	],
-	[#Rule 53
+	[#Rule 54
 		 'bitmap', 4,
 sub
-#line 190 "pidl/idl.yp"
+#line 266 "./../pidl/idl.yp"
 {{
-             "TYPE" => "BITMAP", 
-		     "PROPERTIES" => $_[1],
-			 "NAME" => $_[3],
-		     "ELEMENTS" => $_[4]
-        }}
+		"TYPE" => "BITMAP",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"ELEMENTS" => $_[4],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 54
+	[#Rule 55
 		 'bitmap_elements', 1,
 sub
-#line 199 "pidl/idl.yp"
+#line 277 "./../pidl/idl.yp"
 { [ $_[1] ] }
 	],
-	[#Rule 55
+	[#Rule 56
 		 'bitmap_elements', 3,
 sub
-#line 200 "pidl/idl.yp"
+#line 279 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[3]); $_[1] }
 	],
-	[#Rule 56
+	[#Rule 57
 		 'opt_bitmap_elements', 0, undef
 	],
-	[#Rule 57
+	[#Rule 58
 		 'opt_bitmap_elements', 1, undef
 	],
-	[#Rule 58
+	[#Rule 59
 		 'bitmap_element', 3,
 sub
-#line 205 "pidl/idl.yp"
+#line 289 "./../pidl/idl.yp"
 { "$_[1] ( $_[3] )" }
 	],
-	[#Rule 59
+	[#Rule 60
 		 'struct_body', 3,
 sub
-#line 208 "pidl/idl.yp"
+#line 293 "./../pidl/idl.yp"
 { $_[2] }
 	],
-	[#Rule 60
+	[#Rule 61
 		 'opt_struct_body', 0, undef
 	],
-	[#Rule 61
+	[#Rule 62
 		 'opt_struct_body', 1, undef
 	],
-	[#Rule 62
+	[#Rule 63
 		 'struct', 4,
 sub
-#line 212 "pidl/idl.yp"
+#line 304 "./../pidl/idl.yp"
 {{
-             "TYPE" => "STRUCT", 
-			 "PROPERTIES" => $_[1],
-			 "NAME" => $_[3],
-		     "ELEMENTS" => $_[4]
-        }}
+		"TYPE" => "STRUCT",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"ELEMENTS" => $_[4],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 63
+	[#Rule 64
 		 'empty_element', 2,
 sub
-#line 221 "pidl/idl.yp"
+#line 316 "./../pidl/idl.yp"
 {{
-		 "NAME" => "",
-		 "TYPE" => "EMPTY",
-		 "PROPERTIES" => $_[1],
-		 "POINTERS" => 0,
-		 "ARRAY_LEN" => [],
-		 "FILE" => $_[0]->YYData->{FILE},
-		 "LINE" => $_[0]->YYData->{LINE},
-	 }}
+		"NAME" => "",
+		"TYPE" => "EMPTY",
+		"PROPERTIES" => $_[1],
+		"POINTERS" => 0,
+		"ARRAY_LEN" => [],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 64
+	[#Rule 65
 		 'base_or_empty', 2, undef
 	],
-	[#Rule 65
+	[#Rule 66
 		 'base_or_empty', 1, undef
 	],
-	[#Rule 66
+	[#Rule 67
 		 'optional_base_element', 2,
 sub
-#line 235 "pidl/idl.yp"
+#line 333 "./../pidl/idl.yp"
 { $_[2]->{PROPERTIES} = FlattenHash([$_[1],$_[2]->{PROPERTIES}]); $_[2] }
 	],
-	[#Rule 67
+	[#Rule 68
 		 'union_elements', 0, undef
 	],
-	[#Rule 68
+	[#Rule 69
 		 'union_elements', 2,
 sub
-#line 240 "pidl/idl.yp"
+#line 339 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
-	[#Rule 69
+	[#Rule 70
 		 'union_body', 3,
 sub
-#line 243 "pidl/idl.yp"
+#line 343 "./../pidl/idl.yp"
 { $_[2] }
 	],
-	[#Rule 70
+	[#Rule 71
 		 'opt_union_body', 0, undef
 	],
-	[#Rule 71
+	[#Rule 72
 		 'opt_union_body', 1, undef
 	],
-	[#Rule 72
+	[#Rule 73
 		 'union', 4,
 sub
-#line 247 "pidl/idl.yp"
+#line 354 "./../pidl/idl.yp"
 {{
-             "TYPE" => "UNION", 
-			 "PROPERTIES" => $_[1],
-		     "NAME" => $_[3],
-		     "ELEMENTS" => $_[4]
-        }}
+		"TYPE" => "UNION",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[3],
+		"ELEMENTS" => $_[4],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 73
+	[#Rule 74
 		 'base_element', 5,
 sub
-#line 256 "pidl/idl.yp"
+#line 366 "./../pidl/idl.yp"
 {{
-			   "NAME" => $_[4],
-			   "TYPE" => $_[2],
-			   "PROPERTIES" => $_[1],
-			   "POINTERS" => $_[3],
-			   "ARRAY_LEN" => $_[5],
-		       "FILE" => $_[0]->YYData->{FILE},
-		       "LINE" => $_[0]->YYData->{LINE},
-              }}
+		"NAME" => $_[4],
+		"TYPE" => $_[2],
+		"PROPERTIES" => $_[1],
+		"POINTERS" => $_[3],
+		"ARRAY_LEN" => $_[5],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
 	],
-	[#Rule 74
+	[#Rule 75
 		 'pointers', 0,
 sub
-#line 270 "pidl/idl.yp"
+#line 379 "./../pidl/idl.yp"
 { 0 }
 	],
-	[#Rule 75
+	[#Rule 76
 		 'pointers', 2,
 sub
-#line 271 "pidl/idl.yp"
+#line 381 "./../pidl/idl.yp"
 { $_[1]+1 }
 	],
-	[#Rule 76
+	[#Rule 77
+		 'pipe', 3,
+sub
+#line 386 "./../pidl/idl.yp"
+{{
+		"TYPE" => "PIPE",
+		"PROPERTIES" => $_[1],
+		"NAME" => $_[4],
+		"DATA" => $_[3],
+		"FILE" => $_[0]->YYData->{FILE},
+		"LINE" => $_[0]->YYData->{LINE},
+	}}
+	],
+	[#Rule 78
 		 'element_list1', 0,
 sub
-#line 275 "pidl/idl.yp"
+#line 398 "./../pidl/idl.yp"
 { [] }
 	],
-	[#Rule 77
+	[#Rule 79
 		 'element_list1', 3,
 sub
-#line 276 "pidl/idl.yp"
+#line 400 "./../pidl/idl.yp"
 { push(@{$_[1]}, $_[2]); $_[1] }
 	],
-	[#Rule 78
+	[#Rule 80
+		 'optional_const', 0, undef
+	],
+	[#Rule 81
+		 'optional_const', 1, undef
+	],
+	[#Rule 82
 		 'element_list2', 0, undef
 	],
-	[#Rule 79
+	[#Rule 83
 		 'element_list2', 1, undef
 	],
-	[#Rule 80
-		 'element_list2', 1,
+	[#Rule 84
+		 'element_list2', 2,
 sub
-#line 282 "pidl/idl.yp"
-{ [ $_[1] ] }
+#line 414 "./../pidl/idl.yp"
+{ [ $_[2] ] }
 	],
-	[#Rule 81
-		 'element_list2', 3,
+	[#Rule 85
+		 'element_list2', 4,
 sub
-#line 283 "pidl/idl.yp"
-{ push(@{$_[1]}, $_[3]); $_[1] }
+#line 416 "./../pidl/idl.yp"
+{ push(@{$_[1]}, $_[4]); $_[1] }
 	],
-	[#Rule 82
+	[#Rule 86
 		 'array_len', 0, undef
 	],
-	[#Rule 83
+	[#Rule 87
 		 'array_len', 3,
 sub
-#line 288 "pidl/idl.yp"
+#line 422 "./../pidl/idl.yp"
 { push(@{$_[3]}, "*"); $_[3] }
 	],
-	[#Rule 84
+	[#Rule 88
 		 'array_len', 4,
 sub
-#line 289 "pidl/idl.yp"
+#line 424 "./../pidl/idl.yp"
 { push(@{$_[4]}, "$_[2]"); $_[4] }
 	],
-	[#Rule 85
+	[#Rule 89
 		 'property_list', 0, undef
 	],
-	[#Rule 86
+	[#Rule 90
 		 'property_list', 4,
 sub
-#line 295 "pidl/idl.yp"
+#line 430 "./../pidl/idl.yp"
 { FlattenHash([$_[1],$_[3]]); }
 	],
-	[#Rule 87
+	[#Rule 91
 		 'properties', 1,
 sub
-#line 298 "pidl/idl.yp"
+#line 434 "./../pidl/idl.yp"
 { $_[1] }
 	],
-	[#Rule 88
+	[#Rule 92
 		 'properties', 3,
 sub
-#line 299 "pidl/idl.yp"
+#line 436 "./../pidl/idl.yp"
 { FlattenHash([$_[1], $_[3]]); }
 	],
-	[#Rule 89
+	[#Rule 93
 		 'property', 1,
 sub
-#line 302 "pidl/idl.yp"
+#line 440 "./../pidl/idl.yp"
 {{ "$_[1]" => "1"     }}
 	],
-	[#Rule 90
+	[#Rule 94
 		 'property', 4,
 sub
-#line 303 "pidl/idl.yp"
+#line 442 "./../pidl/idl.yp"
 {{ "$_[1]" => "$_[3]" }}
 	],
-	[#Rule 91
+	[#Rule 95
 		 'commalisttext', 1, undef
 	],
-	[#Rule 92
+	[#Rule 96
 		 'commalisttext', 3,
 sub
-#line 308 "pidl/idl.yp"
+#line 448 "./../pidl/idl.yp"
 { "$_[1],$_[3]" }
 	],
-	[#Rule 93
+	[#Rule 97
 		 'anytext', 0,
 sub
-#line 312 "pidl/idl.yp"
+#line 453 "./../pidl/idl.yp"
 { "" }
 	],
-	[#Rule 94
+	[#Rule 98
 		 'anytext', 1, undef
 	],
-	[#Rule 95
+	[#Rule 99
 		 'anytext', 1, undef
 	],
-	[#Rule 96
+	[#Rule 100
 		 'anytext', 1, undef
 	],
-	[#Rule 97
+	[#Rule 101
 		 'anytext', 3,
 sub
-#line 314 "pidl/idl.yp"
+#line 461 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 98
+	[#Rule 102
 		 'anytext', 3,
 sub
-#line 315 "pidl/idl.yp"
+#line 463 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 99
+	[#Rule 103
 		 'anytext', 3,
 sub
-#line 316 "pidl/idl.yp"
+#line 465 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 100
+	[#Rule 104
 		 'anytext', 3,
 sub
-#line 317 "pidl/idl.yp"
+#line 467 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 101
+	[#Rule 105
 		 'anytext', 3,
 sub
-#line 318 "pidl/idl.yp"
+#line 469 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 102
+	[#Rule 106
 		 'anytext', 3,
 sub
-#line 319 "pidl/idl.yp"
+#line 471 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 103
+	[#Rule 107
 		 'anytext', 3,
 sub
-#line 320 "pidl/idl.yp"
+#line 473 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 104
+	[#Rule 108
 		 'anytext', 3,
 sub
-#line 321 "pidl/idl.yp"
+#line 475 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 105
+	[#Rule 109
 		 'anytext', 3,
 sub
-#line 322 "pidl/idl.yp"
+#line 477 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 106
+	[#Rule 110
 		 'anytext', 3,
 sub
-#line 323 "pidl/idl.yp"
+#line 479 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 107
+	[#Rule 111
 		 'anytext', 3,
 sub
-#line 324 "pidl/idl.yp"
+#line 481 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 108
+	[#Rule 112
 		 'anytext', 3,
 sub
-#line 325 "pidl/idl.yp"
+#line 483 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 109
+	[#Rule 113
 		 'anytext', 3,
 sub
-#line 326 "pidl/idl.yp"
+#line 485 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]" }
 	],
-	[#Rule 110
+	[#Rule 114
 		 'anytext', 5,
 sub
-#line 327 "pidl/idl.yp"
+#line 487 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]$_[4]$_[5]" }
 	],
-	[#Rule 111
+	[#Rule 115
 		 'anytext', 5,
 sub
-#line 328 "pidl/idl.yp"
+#line 489 "./../pidl/idl.yp"
 { "$_[1]$_[2]$_[3]$_[4]$_[5]" }
 	],
-	[#Rule 112
+	[#Rule 116
 		 'identifier', 1, undef
 	],
-	[#Rule 113
-		 'optional_identifier', 1, undef
-	],
-	[#Rule 114
+	[#Rule 117
 		 'optional_identifier', 0, undef
 	],
-	[#Rule 115
+	[#Rule 118
+		 'optional_identifier', 1, undef
+	],
+	[#Rule 119
 		 'constant', 1, undef
 	],
-	[#Rule 116
+	[#Rule 120
 		 'text', 1,
 sub
-#line 342 "pidl/idl.yp"
+#line 507 "./../pidl/idl.yp"
 { "\"$_[1]\"" }
 	],
-	[#Rule 117
+	[#Rule 121
 		 'optional_semicolon', 0, undef
 	],
-	[#Rule 118
+	[#Rule 122
 		 'optional_semicolon', 1, undef
 	]
 ],
@@ -2389,58 +2474,63 @@ sub
     bless($self,$class);
 }
 
-#line 353 "pidl/idl.yp"
+#line 519 "./../pidl/idl.yp"
 
 
 use Parse::Pidl qw(error);
 
 #####################################################################
 # flatten an array of hashes into a single hash
-sub FlattenHash($) 
-{ 
-    my $a = shift;
-    my %b;
-    for my $d (@{$a}) {
-	for my $k (keys %{$d}) {
-	    $b{$k} = $d->{$k};
+sub FlattenHash($)
+{
+	my $a = shift;
+	my %b;
+	for my $d (@{$a}) {
+		for my $k (keys %{$d}) {
+		$b{$k} = $d->{$k};
+		}
 	}
-    }
-    return \%b;
+	return \%b;
 }
 
-
-
 #####################################################################
 # traverse a perl data structure removing any empty arrays or
 # hashes and any hash elements that map to undef
 sub CleanData($)
 {
-    sub CleanData($);
-    my($v) = shift;
+	sub CleanData($);
+	my($v) = shift;
+
 	return undef if (not defined($v));
-    if (ref($v) eq "ARRAY") {
-	foreach my $i (0 .. $#{$v}) {
-	    CleanData($v->[$i]);
-	}
-	# this removes any undefined elements from the array
-	@{$v} = grep { defined $_ } @{$v};
-    } elsif (ref($v) eq "HASH") {
-	foreach my $x (keys %{$v}) {
-	    CleanData($v->{$x});
-	    if (!defined $v->{$x}) { delete($v->{$x}); next; }
+
+	if (ref($v) eq "ARRAY") {
+		foreach my $i (0 .. $#{$v}) {
+			CleanData($v->[$i]);
+		}
+		# this removes any undefined elements from the array
+		@{$v} = grep { defined $_ } @{$v};
+	} elsif (ref($v) eq "HASH") {
+		foreach my $x (keys %{$v}) {
+			CleanData($v->{$x});
+			if (!defined $v->{$x}) {
+				delete($v->{$x});
+				next;
+			}
+		}
 	}
-    }
+
 	return $v;
 }
 
 sub _Error {
-    if (exists $_[0]->YYData->{ERRMSG}) {
+	if (exists $_[0]->YYData->{ERRMSG}) {
 		error($_[0]->YYData, $_[0]->YYData->{ERRMSG});
 		delete $_[0]->YYData->{ERRMSG};
 		return;
 	}
+
 	my $last_token = $_[0]->YYData->{LAST_TOKEN};
-	
+
 	error($_[0]->YYData, "Syntax error near '$last_token'");
 }
 
@@ -2448,7 +2538,7 @@ sub _Lexer($)
 {
 	my($parser)=shift;
 
-    $parser->YYData->{INPUT} or return('',undef);
+	$parser->YYData->{INPUT} or return('',undef);
 
 again:
 	$parser->YYData->{INPUT} =~ s/^[ \t]*//;
@@ -2475,18 +2565,19 @@ again:
 		}
 		if (s/^\"(.*?)\"//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-			return('TEXT',$1); 
+			return('TEXT',$1);
 		}
 		if (s/^(\d+)(\W|$)/$2/) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-			return('CONSTANT',$1); 
+			return('CONSTANT',$1);
 		}
 		if (s/^([\w_]+)//) {
 			$parser->YYData->{LAST_TOKEN} = $1;
-			if ($1 =~ 
-			    /^(coclass|interface|const|typedef|union|cpp_quote
-			      |struct|enum|bitmap|void|unsigned|signed|import|include
-				  |importlib)$/x) {
+			if ($1 =~
+			    /^(coclass|interface|import|importlib
+			      |include|cpp_quote|typedef
+			      |union|struct|enum|bitmap|pipe
+			      |void|const|unsigned|signed)$/x) {
 				return $1;
 			}
 			return('IDENTIFIER',$1);
@@ -2504,10 +2595,10 @@ sub parse_string
 
 	my $self = new Parse::Pidl::IDL;
 
-    $self->YYData->{FILE} = $filename;
-    $self->YYData->{INPUT} = $data;
-    $self->YYData->{LINE} = 0;
-    $self->YYData->{LAST_TOKEN} = "NONE";
+	$self->YYData->{FILE} = $filename;
+	$self->YYData->{INPUT} = $data;
+	$self->YYData->{LINE} = 0;
+	$self->YYData->{LAST_TOKEN} = "NONE";
 
 	my $idl = $self->YYParse( yylex => \&_Lexer, yyerror => \&_Error );
 
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 5ee26d16b6..fbd54693bc 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -50,9 +50,12 @@ my $scalar_alignment = {
 	'uint8' => 1,
 	'int16' => 2,
 	'uint16' => 2,
+	'int1632' => 3,
+	'uint1632' => 3,
 	'int32' => 4,
 	'uint32' => 4,
 	'hyper' => 8,
+	'double' => 8,
 	'pointer' => 8,
 	'dlong' => 4,
 	'udlong' => 4,
@@ -141,6 +144,13 @@ sub GetElementLevelTable($$)
 		$is_fixed = 1 if (not $is_conformant and Parse::Pidl::Util::is_constant($size));
 		$is_inline = 1 if (not $is_conformant and not Parse::Pidl::Util::is_constant($size));
 
+		if ($i == 0 and $is_fixed and has_property($e, "string")) {
+			$is_fixed = 0;
+			$is_varying = 1;
+			$is_string = 1;
+			delete($e->{PROPERTIES}->{string});
+		}
+
 		push (@$order, {
 			TYPE => "ARRAY",
 			SIZE_IS => $size,
@@ -355,7 +365,10 @@ sub find_largest_alignment($)
 		my $a = 1;
 
 		if ($e->{POINTERS}) {
-			$a = 4; 
+			# this is a hack for NDR64
+			# the NDR layer translates this into
+			# an alignment of 4 for NDR and 8 for NDR64
+			$a = 5;
 		} elsif (has_property($e, "subcontext")) { 
 			$a = 1;
 		} elsif (has_property($e, "transmit_as")) {
@@ -498,7 +511,8 @@ sub ParseUnion($$)
 		ELEMENTS => undef,
 		PROPERTIES => $e->{PROPERTIES},
 		HAS_DEFAULT => $hasdefault,
-		ORIGINAL => $e
+		ORIGINAL => $e,
+		ALIGN => undef
 	} unless defined($e->{ELEMENTS});
 
 	CheckPointerTypes($e, $pointer_default);
@@ -522,6 +536,11 @@ sub ParseUnion($$)
 		push @elements, $t;
 	}
 
+	my $align = undef;
+	if ($e->{NAME}) {
+		$align = align_type($e->{NAME});
+	}
+
 	return {
 		TYPE => "UNION",
 		NAME => $e->{NAME},
@@ -529,7 +548,8 @@ sub ParseUnion($$)
 		ELEMENTS => \@elements,
 		PROPERTIES => $e->{PROPERTIES},
 		HAS_DEFAULT => $hasdefault,
-		ORIGINAL => $e
+		ORIGINAL => $e,
+		ALIGN => $align
 	};
 }
 
@@ -920,7 +940,7 @@ my %property_list = (
 	"bitmap64bit"		=> ["BITMAP"],
 
 	# array
-	"range"			=> ["ELEMENT"],
+	"range"			=> ["ELEMENT", "PIPE"],
 	"size_is"		=> ["ELEMENT"],
 	"string"		=> ["ELEMENT"],
 	"noheader"		=> ["ELEMENT"],
@@ -1112,6 +1132,18 @@ sub ValidUnion($)
 }
 
 #####################################################################
+# validate a pipe
+sub ValidPipe($)
+{
+	my ($pipe) = @_;
+	my $data = $pipe->{DATA};
+
+	ValidProperties($pipe, "PIPE");
+
+	fatal($pipe, $pipe->{NAME} . ": 'pipe' is not yet supported by pidl");
+}
+
+#####################################################################
 # parse a typedef
 sub ValidTypedef($)
 {
@@ -1156,7 +1188,8 @@ sub ValidType($)
 		STRUCT => \&ValidStruct,
 		UNION => \&ValidUnion,
 		ENUM => \&ValidEnum,
-		BITMAP => \&ValidBitmap
+		BITMAP => \&ValidBitmap,
+		PIPE => \&ValidPipe
 	}->{$t->{TYPE}}->($t);
 }
 
@@ -1198,7 +1231,8 @@ sub ValidInterface($)
 		 $d->{TYPE} eq "STRUCT" or
 	 	 $d->{TYPE} eq "UNION" or 
 	 	 $d->{TYPE} eq "ENUM" or
-		 $d->{TYPE} eq "BITMAP") && ValidType($d);
+		 $d->{TYPE} eq "BITMAP" or
+		 $d->{TYPE} eq "PIPE") && ValidType($d);
 	}
 
 }
diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index a45abdbc35..68579d2c9a 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -71,10 +71,12 @@ sub HeaderProperties($$)
 	}
 }
 
-sub ParseOutputArgument($$$)
+sub ParseOutputArgument($$$;$$)
 {
-	my ($self, $fn, $e) = @_;
+	my ($self, $fn, $e, $r, $o) = @_;
 	my $level = 0;
+	$r = "r." unless defined($r);
+	$o = "" unless defined($o);
 
 	if ($e->{LEVELS}[0]->{TYPE} ne "POINTER" and $e->{LEVELS}[0]->{TYPE} ne "ARRAY") {
 		$self->pidl("return NT_STATUS_NOT_SUPPORTED;");
@@ -85,7 +87,7 @@ sub ParseOutputArgument($$$)
 	if ($e->{LEVELS}[0]->{TYPE} eq "POINTER") {
 		$level = 1;
 		if ($e->{LEVELS}[0]->{POINTER_TYPE} ne "ref") {
-			$self->pidl("if ($e->{NAME} && r.out.$e->{NAME}) {");
+			$self->pidl("if ($o$e->{NAME} && ${r}out.$e->{NAME}) {");
 			$self->indent;
 		}
 	}
@@ -95,15 +97,21 @@ sub ParseOutputArgument($$$)
 		# Since the data is being copied into a user-provided data 
 		# structure, the user should be able to know the size beforehand 
 		# to allocate a structure of the right size.
-		my $env = GenerateFunctionInEnv($fn, "r.");
-		my $size_is = ParseExpr($e->{LEVELS}[$level]->{SIZE_IS}, $env, $e->{ORIGINAL});
-		if (has_property($e, "charset")) {
-		    $self->pidl("memcpy(discard_const_p(uint8_t *, $e->{NAME}), r.out.$e->{NAME}, ($size_is) * sizeof(*$e->{NAME}));");
+		my $env = GenerateFunctionInEnv($fn, $r);
+		my $l = $e->{LEVELS}[$level];
+		unless (defined($l->{SIZE_IS})) {
+			error($e->{ORIGINAL}, "no size known for [out] array `$e->{NAME}'");
+			$self->pidl('#error No size known for [out] array `$e->{NAME}');
 		} else {
-		    $self->pidl("memcpy($e->{NAME}, r.out.$e->{NAME}, ($size_is) * sizeof(*$e->{NAME}));");
+			my $size_is = ParseExpr($l->{SIZE_IS}, $env, $e->{ORIGINAL});
+			if (has_property($e, "charset")) {
+				$self->pidl("memcpy(discard_const_p(uint8_t *, $o$e->{NAME}), ${r}out.$e->{NAME}, ($size_is) * sizeof(*$o$e->{NAME}));");
+			} else {
+				$self->pidl("memcpy($o$e->{NAME}, ${r}out.$e->{NAME}, ($size_is) * sizeof(*$o$e->{NAME}));");
+			}
 		}
 	} else {
-		$self->pidl("*$e->{NAME} = *r.out.$e->{NAME};");
+		$self->pidl("*$o$e->{NAME} = *${r}out.$e->{NAME};");
 	}
 
 	if ($e->{LEVELS}[0]->{TYPE} eq "POINTER") {
@@ -114,7 +122,233 @@ sub ParseOutputArgument($$$)
 	}
 }
 
-sub ParseFunction($$$)
+sub ParseFunctionAsyncState($$$)
+{
+	my ($self, $if, $fn) = @_;
+
+	my $state_str = "struct rpccli_$fn->{NAME}_state";
+	my $done_fn = "rpccli_$fn->{NAME}_done";
+
+	$self->pidl("$state_str {");
+	$self->indent;
+	$self->pidl("struct $fn->{NAME} orig;");
+	$self->pidl("struct $fn->{NAME} tmp;");
+	$self->pidl("TALLOC_CTX *out_mem_ctx;");
+	$self->pidl("NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx);");
+	$self->deindent;
+	$self->pidl("};");
+	$self->pidl("");
+	$self->pidl("static void $done_fn(struct tevent_req *subreq);");
+	$self->pidl("");
+}
+
+sub ParseFunctionAsyncSend($$$)
+{
+	my ($self, $if, $fn) = @_;
+
+	my $fn_args = "";
+	my $uif = uc($if);
+	my $ufn = "NDR_".uc($fn->{NAME});
+	my $state_str = "struct rpccli_$fn->{NAME}_state";
+	my $done_fn = "rpccli_$fn->{NAME}_done";
+	my $out_mem_ctx = "rpccli_$fn->{NAME}_out_memory";
+	my $fn_str = "struct tevent_req *rpccli_$fn->{NAME}_send";
+	my $pad = genpad($fn_str);
+
+	$fn_args .= "TALLOC_CTX *mem_ctx";
+	$fn_args .= ",\n" . $pad . "struct tevent_context *ev";
+	$fn_args .= ",\n" . $pad . "struct rpc_pipe_client *cli";
+
+	foreach (@{$fn->{ELEMENTS}}) {
+		my $dir = ElementDirection($_);
+		my $prop = HeaderProperties($_->{PROPERTIES}, ["in", "out"]);
+		$fn_args .= ",\n" . $pad . DeclLong($_, "_") . " /* $dir $prop */";
+	}
+
+	$self->fn_declare("$fn_str($fn_args)");
+	$self->pidl("{");
+	$self->indent;
+	$self->pidl("struct tevent_req *req;");
+	$self->pidl("$state_str *state;");
+	$self->pidl("struct tevent_req *subreq;");
+	$self->pidl("");
+	$self->pidl("req = tevent_req_create(mem_ctx, &state,");
+	$self->pidl("\t\t\t$state_str);");
+	$self->pidl("if (req == NULL) {");
+	$self->indent;
+	$self->pidl("return NULL;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("state->out_mem_ctx = NULL;");
+	$self->pidl("state->dispatch_recv = cli->dispatch_recv;");
+	$self->pidl("");
+
+	$self->pidl("/* In parameters */");
+	foreach (@{$fn->{ELEMENTS}}) {
+		if (grep(/in/, @{$_->{DIRECTION}})) {
+			$self->pidl("state->orig.in.$_->{NAME} = _$_->{NAME};");
+		}
+	}
+	$self->pidl("");
+
+	my $out_params = 0;
+	$self->pidl("/* Out parameters */");
+	foreach (@{$fn->{ELEMENTS}}) {
+		if (grep(/out/, @{$_->{DIRECTION}})) {
+			$self->pidl("state->orig.out.$_->{NAME} = _$_->{NAME};");
+			$out_params++;
+		}
+	}
+	$self->pidl("");
+
+	if (defined($fn->{RETURN_TYPE})) {
+		$self->pidl("/* Result */");
+		$self->pidl("ZERO_STRUCT(state->orig.out.result);");
+		$self->pidl("");
+	}
+
+	if ($out_params > 0) {
+		$self->pidl("state->out_mem_ctx = talloc_named_const(state, 0,");
+		$self->pidl("\t\t     \"$out_mem_ctx\");");
+		$self->pidl("if (tevent_req_nomem(state->out_mem_ctx, req)) {");
+		$self->indent;
+		$self->pidl("return tevent_req_post(req, ev);");
+		$self->deindent;
+		$self->pidl("}");
+		$self->pidl("");
+	}
+
+	$self->pidl("/* make a temporary copy, that we pass to the dispatch function */");
+	$self->pidl("state->tmp = state->orig;");
+	$self->pidl("");
+
+	$self->pidl("subreq = cli->dispatch_send(state, ev, cli,");
+	$self->pidl("\t\t\t    &ndr_table_$if,");
+	$self->pidl("\t\t\t    $ufn,");
+	$self->pidl("\t\t\t    &state->tmp);");
+	$self->pidl("if (tevent_req_nomem(subreq, req)) {");
+	$self->indent;
+	$self->pidl("return tevent_req_post(req, ev);");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("tevent_req_set_callback(subreq, $done_fn, req);");
+	$self->pidl("return req;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+}
+
+sub ParseFunctionAsyncDone($$$)
+{
+	my ($self, $if, $fn) = @_;
+
+	my $state_str = "struct rpccli_$fn->{NAME}_state";
+	my $done_fn = "rpccli_$fn->{NAME}_done";
+
+	$self->pidl("static void $done_fn(struct tevent_req *subreq)");
+	$self->pidl("{");
+	$self->indent;
+	$self->pidl("struct tevent_req *req = tevent_req_callback_data(");
+	$self->pidl("\tsubreq, struct tevent_req);");
+	$self->pidl("$state_str *state = tevent_req_data(");
+	$self->pidl("\treq, $state_str);");
+	$self->pidl("NTSTATUS status;");
+	$self->pidl("TALLOC_CTX *mem_ctx;");
+	$self->pidl("");
+
+	$self->pidl("if (state->out_mem_ctx) {");
+	$self->indent;
+	$self->pidl("mem_ctx = state->out_mem_ctx;");
+	$self->deindent;
+	$self->pidl("} else {");
+	$self->indent;
+	$self->pidl("mem_ctx = state;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+
+	$self->pidl("status = state->dispatch_recv(subreq, mem_ctx);");
+	$self->pidl("TALLOC_FREE(subreq);");
+	$self->pidl("if (!NT_STATUS_IS_OK(status)) {");
+	$self->indent;
+	$self->pidl("tevent_req_nterror(req, status);");
+	$self->pidl("return;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+
+	$self->pidl("/* Copy out parameters */");
+	foreach my $e (@{$fn->{ELEMENTS}}) {
+		next unless (grep(/out/, @{$e->{DIRECTION}}));
+
+		$self->ParseOutputArgument($fn, $e, "state->tmp.", "state->orig.out.");
+	}
+	$self->pidl("");
+
+	if (defined($fn->{RETURN_TYPE})) {
+		$self->pidl("/* Copy result */");
+		$self->pidl("state->orig.out.result = state->tmp.out.result;");
+		$self->pidl("");
+	}
+
+	$self->pidl("/* Reset temporary structure */");
+	$self->pidl("ZERO_STRUCT(state->tmp);");
+	$self->pidl("");
+
+	$self->pidl("tevent_req_done(req);");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+}
+
+sub ParseFunctionAsyncRecv($$$)
+{
+	my ($self, $if, $fn) = @_;
+
+	my $fn_args = "";
+	my $state_str = "struct rpccli_$fn->{NAME}_state";
+	my $fn_str = "NTSTATUS rpccli_$fn->{NAME}_recv";
+	my $pad = genpad($fn_str);
+
+	$fn_args .= "struct tevent_req *req,\n" . $pad . "TALLOC_CTX *mem_ctx";
+
+	if (defined($fn->{RETURN_TYPE})) {
+		$fn_args .= ",\n" . $pad . "$fn->{RETURN_TYPE} *result";
+	}
+
+	$self->fn_declare("$fn_str($fn_args)");
+	$self->pidl("{");
+	$self->indent;
+	$self->pidl("$state_str *state = tevent_req_data(");
+	$self->pidl("\treq, $state_str);");
+	$self->pidl("NTSTATUS status;");
+	$self->pidl("");
+	$self->pidl("if (tevent_req_is_nterror(req, &status)) {");
+	$self->indent;
+	$self->pidl("tevent_req_received(req);");
+	$self->pidl("return status;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+
+	$self->pidl("/* Steal possbile out parameters to the callers context */");
+	$self->pidl("talloc_steal(mem_ctx, state->out_mem_ctx);");
+	$self->pidl("");
+
+	if (defined($fn->{RETURN_TYPE})) {
+		$self->pidl("/* Return result */");
+		$self->pidl("*result = state->orig.out.result;");
+		$self->pidl("");
+	}
+
+	$self->pidl("tevent_req_received(req);");
+	$self->pidl("return NT_STATUS_OK;");
+	$self->deindent;
+	$self->pidl("}");
+	$self->pidl("");
+}
+
+sub ParseFunctionSync($$$)
 {
 	my ($self, $if, $fn) = @_;
 
@@ -151,12 +385,6 @@ sub ParseFunction($$$)
 	}
 
 	$self->pidl("");
-	$self->pidl("if (DEBUGLEVEL >= 10) {");
-	$self->indent;
-	$self->pidl("NDR_PRINT_IN_DEBUG($fn->{NAME}, &r);");
-	$self->deindent;
-	$self->pidl("}");
-	$self->pidl("");
 	$self->pidl("status = cli->dispatch(cli,");
 	$self->pidl("\t\t\tmem_ctx,");
 	$self->pidl("\t\t\t&ndr_table_$if,");
@@ -171,12 +399,6 @@ sub ParseFunction($$$)
 	$self->pidl("}");
 
 	$self->pidl("");
-	$self->pidl("if (DEBUGLEVEL >= 10) {");
-	$self->indent;
-	$self->pidl("NDR_PRINT_OUT_DEBUG($fn->{NAME}, &r);");
-	$self->deindent;
-	$self->pidl("}");
-	$self->pidl("");
 	$self->pidl("if (NT_STATUS_IS_ERR(status)) {");
 	$self->indent;
 	$self->pidl("return status;");
@@ -215,6 +437,18 @@ sub ParseFunction($$$)
 	$self->pidl("");
 }
 
+sub ParseFunction($$$)
+{
+	my ($self, $if, $fn) = @_;
+
+	$self->ParseFunctionAsyncState($if, $fn);
+	$self->ParseFunctionAsyncSend($if, $fn);
+	$self->ParseFunctionAsyncDone($if, $fn);
+	$self->ParseFunctionAsyncRecv($if, $fn);
+
+	$self->ParseFunctionSync($if, $fn);
+}
+
 sub ParseInterface($$)
 {
 	my ($self, $if) = @_;
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index c9a8eea59f..5599de9d79 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -11,7 +11,7 @@ use Exporter;
 @EXPORT_OK = qw(DeclLevel);
 
 use strict;
-use Parse::Pidl qw(warning fatal);
+use Parse::Pidl qw(warning error fatal);
 use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference);
 use Parse::Pidl::Util qw(ParseExpr has_property is_constant);
 use Parse::Pidl::NDR qw(GetNextLevel);
@@ -72,8 +72,13 @@ sub AllocOutVar($$$$$)
 	}
 
 	if ($l->{TYPE} eq "ARRAY") {
-		my $size = ParseExpr($l->{SIZE_IS}, $env, $e);
-		pidl "$name = talloc_zero_array($mem_ctx, " . DeclLevel($e, 1) . ", $size);";
+		unless(defined($l->{SIZE_IS})) {
+			error($e->{ORIGINAL}, "No size known for array `$e->{NAME}'");
+			pidl "#error No size known for array `$e->{NAME}'";
+		} else {
+			my $size = ParseExpr($l->{SIZE_IS}, $env, $e);
+			pidl "$name = talloc_zero_array($mem_ctx, " . DeclLevel($e, 1) . ", $size);";
+		}
 	} else {
 		pidl "$name = talloc_zero($mem_ctx, " . DeclLevel($e, 1) . ");";
 	}
diff --git a/pidl/lib/Parse/Pidl/Samba4.pm b/pidl/lib/Parse/Pidl/Samba4.pm
index 20c518dceb..1deb708689 100644
--- a/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/pidl/lib/Parse/Pidl/Samba4.pm
@@ -102,10 +102,11 @@ sub ArrayBrackets($)
 	return $res;
 }
 
-sub DeclLong($)
+sub DeclLong($;$)
 {
-	my ($e) = shift;
+	my ($e, $p) = @_;
 	my $res = "";
+	$p = "" unless defined($p);
 
 	if (has_property($e, "represent_as")) {
 		$res .= mapTypeName($e->{PROPERTIES}->{represent_as})." ";
@@ -118,7 +119,7 @@ sub DeclLong($)
 
 		$res .= ElementStars($e);
 	}
-	$res .= $e->{NAME};
+	$res .= $p.$e->{NAME};
 	$res .= ArrayBrackets($e);
 
 	return $res;
diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 5315957946..be1df4b118 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -120,10 +120,20 @@ sub HeaderEnum($$;$)
 		pidl " {\n";
 		$tab_depth++;
 		foreach my $e (@{$enum->{ELEMENTS}}) {
+			my @enum_els = ();
 			unless ($first) { pidl ",\n"; }
 			$first = 0;
 			pidl tabs();
-			pidl $e;
+			@enum_els = split(/=/, $e);
+			if (@enum_els == 2) {
+				pidl $enum_els[0];
+				pidl "=(int)";
+				pidl "(";
+				pidl $enum_els[1];
+				pidl ")";
+			} else {
+				pidl $e;
+			}
 		}
 		pidl "\n";
 		$tab_depth--;
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index f2a96a3037..9d3ccaf8c8 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -34,8 +34,9 @@ sub ParseFunctionSend($$$)
 	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
 		NDR_PRINT_IN_DEBUG($name, r);
 	}
-	
-	return dcerpc_ndr_request_send(p, NULL, &ndr_table_$interface->{NAME}, NDR_$uname, mem_ctx, r);
+
+	return dcerpc_ndr_request_send(p, NULL, &ndr_table_$interface->{NAME},
+				       NDR_$uname, true, mem_ctx, r);
 ";
 	}
 
@@ -45,6 +46,7 @@ sub ParseFunctionSend($$$)
 sub ParseFunctionSync($$$)
 {
 	my ($interface, $fn, $name) = @_;
+	my $uname = uc $name;
 
 	my $proto = "NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)";
 
@@ -55,13 +57,14 @@ sub ParseFunctionSync($$$)
 		$res .= "\treturn NT_STATUS_NOT_IMPLEMENTED;\n";
 	} else {
 		$res .= "
-	struct rpc_request *req;
 	NTSTATUS status;
-	
-	req = dcerpc_$name\_send(p, mem_ctx, r);
-	if (req == NULL) return NT_STATUS_NO_MEMORY;
 
-	status = dcerpc_ndr_request_recv(req);
+	if (p->conn->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG($name, r);
+	}
+
+	status = dcerpc_ndr_request(p, NULL, &ndr_table_$interface->{NAME},
+				    NDR_$uname, mem_ctx, r);
 
 	if (NT_STATUS_IS_OK(status) && (p->conn->flags & DCERPC_DEBUG_PRINT_OUT)) {
 		NDR_PRINT_OUT_DEBUG($name, r);		
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index c822d6746e..da536beef4 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -204,12 +204,12 @@ sub ParseArrayPushHeader($$$$$$)
 	}
 
 	if ((!$l->{IS_SURROUNDING}) and $l->{IS_CONFORMANT}) {
-		$self->pidl("NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, $size));");
+		$self->pidl("NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS, $size));");
 	}
 	
 	if ($l->{IS_VARYING}) {
-		$self->pidl("NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, 0));");  # array offset
-		$self->pidl("NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, $length));");
+		$self->pidl("NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS, 0));");  # array offset
+		$self->pidl("NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS, $length));");
 	} 
 
 	return $length;
@@ -326,7 +326,7 @@ sub ParseArrayPullHeader($$$$$$)
 
 	if ($l->{IS_CONFORMANT}) {
 		$length = $size = "ndr_get_array_size($ndr, " . get_pointer_to($var_name) . ")";
-	} elsif ($l->{IS_ZERO_TERMINATED}) { # Noheader arrays
+	} elsif ($l->{IS_ZERO_TERMINATED} and $l->{SIZE_IS} == 0 and $l->{LENGTH_IS} == 0) { # Noheader arrays
 		$length = $size = "ndr_get_string_size($ndr, sizeof(*$var_name))";
 	} else {
 		$length = $size = ParseExprExt($l->{SIZE_IS}, $env, $e->{ORIGINAL},
@@ -1069,6 +1069,10 @@ sub ParseElementPullLevel
 		my $counter = "cntr_$e->{NAME}_$l->{LEVEL_INDEX}";
 		my $array_name = $var_name;
 
+		if ($l->{IS_VARYING}) {
+			$length = "ndr_get_array_length($ndr, " . get_pointer_to($var_name) .")";
+		}
+
 		$var_name = get_array_element($var_name, $counter);
 
 		$self->ParseMemCtxPullStart($e, $l, $ndr, $array_name);
@@ -1220,9 +1224,9 @@ sub ParseStructPushPrimitives($$$$$)
 				$size = ParseExpr($e->{LEVELS}[0]->{SIZE_IS}, $env, $e->{ORIGINAL});
 			}
 
-			$self->pidl("NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, $size));");
+			$self->pidl("NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS, $size));");
 		} else {
-			$self->pidl("NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, ndr_string_array_size($ndr, $varname->$e->{NAME})));");
+			$self->pidl("NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS, ndr_string_array_size($ndr, $varname->$e->{NAME})));");
 		}
 	}
 
@@ -1235,6 +1239,8 @@ sub ParseStructPushPrimitives($$$$$)
 	}
 
 	$self->ParseElementPush($_, $ndr, $env, 1, 0) foreach (@{$struct->{ELEMENTS}});
+
+	$self->pidl("NDR_CHECK(ndr_push_trailer_align($ndr, $struct->{ALIGN}));");
 }
 
 sub ParseStructPushDeferred($$$$)
@@ -1287,7 +1293,7 @@ sub ParseEnumPush($$$$)
 	my($type_fn) = $enum->{BASE_TYPE};
 
 	$self->start_flags($enum, $ndr);
-	$self->pidl("NDR_CHECK(ndr_push_$type_fn($ndr, NDR_SCALARS, $varname));");
+	$self->pidl("NDR_CHECK(ndr_push_enum_$type_fn($ndr, NDR_SCALARS, $varname));");
 	$self->end_flags($enum, $ndr);
 }
 
@@ -1301,7 +1307,7 @@ sub ParseEnumPull($$$$)
 
 	$self->pidl("$type_v_decl v;");
 	$self->start_flags($enum, $ndr);
-	$self->pidl("NDR_CHECK(ndr_pull_$type_fn($ndr, NDR_SCALARS, &v));");
+	$self->pidl("NDR_CHECK(ndr_pull_enum_$type_fn($ndr, NDR_SCALARS, &v));");
 	$self->pidl("*$varname = v;");
 
 	$self->end_flags($enum, $ndr);
@@ -1533,6 +1539,8 @@ sub ParseStructPullPrimitives($$$$$)
 	$self->ParseElementPull($_, $ndr, $env, 1, 0) foreach (@{$struct->{ELEMENTS}});
 
 	$self->add_deferred();
+
+	$self->pidl("NDR_CHECK(ndr_pull_trailer_align($ndr, $struct->{ALIGN}));");
 }
 
 sub ParseStructPullDeferred($$$$$)
@@ -1644,6 +1652,10 @@ sub ParseUnionPushPrimitives($$$$)
 		$self->pidl("NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}($ndr, NDR_SCALARS, level));");
 	}
 
+	if (defined($e->{ALIGN})) {
+		$self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));");
+	}
+
 	$self->pidl("switch (level) {");
 	$self->indent;
 	foreach my $el (@{$e->{ELEMENTS}}) {
@@ -1669,7 +1681,7 @@ sub ParseUnionPushPrimitives($$$$)
 	}
 	if (! $have_default) {
 		$self->pidl("default:");
-		$self->pidl("\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u\", level);");
+		$self->pidl("\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u at \%s\", level, __location__);");
 	}
 	$self->deindent;
 	$self->pidl("}");
@@ -1705,7 +1717,7 @@ sub ParseUnionPushDeferred($$$$)
 	}
 	if (! $have_default) {
 		$self->pidl("default:");
-		$self->pidl("\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u\", level);");
+		$self->pidl("\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u at \%s\", level, __location__);");
 	}
 	$self->deindent;
 	$self->pidl("}");
@@ -1784,10 +1796,14 @@ sub ParseUnionPullPrimitives($$$$$)
 	if (defined($switch_type)) {
 		$self->pidl("NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS, &_level));");
 		$self->pidl("if (_level != level) {"); 
-		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value %u for $varname\", _level);");
+		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value %u for $varname at \%s\", _level, __location__);");
 		$self->pidl("}");
 	}
 
+	if (defined($e->{ALIGN})) {
+		$self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));");
+	}
+
 	$self->pidl("switch (level) {");
 	$self->indent;
 	foreach my $el (@{$e->{ELEMENTS}}) {
@@ -1814,7 +1830,7 @@ sub ParseUnionPullPrimitives($$$$$)
 	}
 	if (! $have_default) {
 		$self->pidl("default:");
-		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u\", level);");
+		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u at \%s\", level, __location__);");
 	}
 	$self->deindent;
 	$self->pidl("}");
@@ -1848,7 +1864,7 @@ sub ParseUnionPullDeferred($$$$)
 	}
 	if (! $have_default) {
 		$self->pidl("default:");
-		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u\", level);");
+		$self->pidl("\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value \%u at \%s\", level, __location__);");
 	}
 	$self->deindent;
 	$self->pidl("}");
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 6099fe5cae..c785619adb 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -431,7 +431,7 @@ sub PythonFunctionUnpackOut($$$)
 	} elsif (defined($fn->{RETURN_TYPE}) and $fn->{RETURN_TYPE} eq "WERROR") {
 		$self->handle_werror("r->out.result", "NULL", undef);
 	} elsif (defined($fn->{RETURN_TYPE})) {
-		my $conv = $self->ConvertObjectToPythonData("r", $fn->{RETURN_TYPE}, "r->out.result");
+		my $conv = $self->ConvertObjectToPythonData("r", $fn->{RETURN_TYPE}, "r->out.result", $fn);
 		if ($result_size > 1) {
 			$self->pidl("PyTuple_SetItem(result, $i, $conv);");
 		} else {
@@ -766,6 +766,11 @@ sub register_module_import($$)
 sub use_type_variable($$)
 {
 	my ($self, $orig_ctype) = @_;
+	# FIXME: Have a global lookup table for types that look different on the 
+	# wire than they are named in C?
+	if ($orig_ctype->{NAME} eq "dom_sid2") {
+		$orig_ctype->{NAME} = "dom_sid";
+	}
 	my $ctype = resolveType($orig_ctype);
 	unless (defined($ctype->{BASEFILE})) {
 		return undef;
@@ -815,11 +820,11 @@ sub assign($$$)
 	}
 }
 
-sub ConvertObjectFromPythonData($$$$$$)
+sub ConvertObjectFromPythonData($$$$$$;$)
 {
-	my ($self, $mem_ctx, $cvar, $ctype, $target, $fail) = @_;
+	my ($self, $mem_ctx, $cvar, $ctype, $target, $fail, $location) = @_;
 
-	die("undef type for $cvar") unless(defined($ctype));
+	fatal($location, "undef type for $cvar") unless(defined($ctype));
 
 	$ctype = resolveType($ctype);
 
@@ -839,13 +844,12 @@ sub ConvertObjectFromPythonData($$$$$$)
 	if ($actual_ctype->{TYPE} eq "STRUCT" or $actual_ctype->{TYPE} eq "INTERFACE") {
 		my $ctype_name = $self->use_type_variable($ctype);
 		unless (defined ($ctype_name)) {
-			error(undef, "Unable to determine origin of type " . mapTypeName($ctype));
-			$self->assign($target, "NULL");
-			# FIXME:
+			error($location, "Unable to determine origin of type `" . mapTypeName($ctype) . "'");
+			$self->pidl("PyErr_SetString(PyExc_TypeError, \"Can not convert C Type " . mapTypeName($ctype) . " to Python\");");
 			return;
 		}
 		$self->pidl("PY_CHECK_TYPE($ctype_name, $cvar, $fail);");
-		$self->assign($target, "talloc_ptrtype(py_talloc_get_ptr($cvar), $target)");
+		$self->assign($target, "py_talloc_get_ptr($cvar)");
 		return;
 	}
 
@@ -886,7 +890,7 @@ sub ConvertObjectFromPythonData($$$$$$)
 		return;
 	}
 
-	fatal($ctype, "unknown type $actual_ctype->{TYPE} for ".mapTypeName($ctype) . ": $cvar");
+	fatal($location, "unknown type `$actual_ctype->{TYPE}' for ".mapTypeName($ctype) . ": $cvar");
 
 }
 
@@ -946,7 +950,7 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
 		if (not Parse::Pidl::Typelist::is_scalar($l->{DATA_TYPE})) {
 			$var_name = get_pointer_to($var_name);
 		}
-		$self->ConvertObjectFromPythonData($mem_ctx, $py_var, $l->{DATA_TYPE}, $var_name, $fail);
+		$self->ConvertObjectFromPythonData($mem_ctx, $py_var, $l->{DATA_TYPE}, $var_name, $fail, $e->{ORIGINAL});
 	} elsif ($l->{TYPE} eq "SWITCH") {
 		$var_name = get_pointer_to($var_name);
 		my $switch = ParseExpr($l->{SWITCH_IS}, $env, $e);
@@ -954,7 +958,7 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
 	} elsif ($l->{TYPE} eq "SUBCONTEXT") {
 		$self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var, $e, GetNextLevel($e, $l), $var_name, $fail);
 	} else {
-		die("unknown level type $l->{TYPE}");
+		fatal($e->{ORIGINAL}, "unknown level type $l->{TYPE}");
 	}
 }
 
@@ -994,18 +998,18 @@ sub ConvertScalarToPython($$$)
 	}
 
 	# Not yet supported
-	if ($ctypename eq "string_array") { return "PyCObject_FromVoidPtr($cvar)"; }
+	if ($ctypename eq "string_array") { return "PyCObject_FromTallocPtr($cvar)"; }
 	if ($ctypename eq "ipv4address") { return "PyString_FromString($cvar)"; }
 	if ($ctypename eq "pointer") {
-		return "PyCObject_FromVoidPtr($cvar, talloc_free)";
+		return "PyCObject_FromTallocPtr($cvar)";
 	}
 
 	die("Unknown scalar type $ctypename");
 }
 
-sub ConvertObjectToPythonData($$$$$)
+sub ConvertObjectToPythonData($$$$$;$)
 {
-	my ($self, $mem_ctx, $ctype, $cvar) = @_;
+	my ($self, $mem_ctx, $ctype, $cvar, $location) = @_;
 
 	die("undef type for $cvar") unless(defined($ctype));
 
@@ -1027,13 +1031,13 @@ sub ConvertObjectToPythonData($$$$$)
 	} elsif ($actual_ctype->{TYPE} eq "STRUCT" or $actual_ctype->{TYPE} eq "INTERFACE") {
 		my $ctype_name = $self->use_type_variable($ctype);
 		unless (defined($ctype_name)) {
-			error(undef, "Unable to determine origin of type " . mapTypeName($ctype));
+			error($location, "Unable to determine origin of type `" . mapTypeName($ctype) . "'");
 			return "NULL"; # FIXME!
 		}
-		return "py_talloc_import_ex($ctype_name, $mem_ctx, $cvar)";
+		return "py_talloc_reference_ex($ctype_name, $mem_ctx, $cvar)";
 	}
 
-	fatal($ctype, "unknown type $actual_ctype->{TYPE} for ".mapTypeName($ctype) . ": $cvar");
+	fatal($location, "unknown type $actual_ctype->{TYPE} for ".mapTypeName($ctype) . ": $cvar");
 }
 
 sub fail_on_null($$$)
@@ -1113,12 +1117,12 @@ sub ConvertObjectToPythonLevel($$$$$$)
 		if (not Parse::Pidl::Typelist::is_scalar($l->{DATA_TYPE})) {
 			$var_name = get_pointer_to($var_name);
 		}
-		my $conv = $self->ConvertObjectToPythonData($mem_ctx, $l->{DATA_TYPE}, $var_name);
+		my $conv = $self->ConvertObjectToPythonData($mem_ctx, $l->{DATA_TYPE}, $var_name, $e->{ORIGINAL});
 		$self->pidl("$py_var = $conv;");
 	} elsif ($l->{TYPE} eq "SUBCONTEXT") {
 		$self->ConvertObjectToPythonLevel($mem_ctx, $env, $e, GetNextLevel($e, $l), $var_name, $py_var, $fail);
 	} else {
-		die("Unknown level type $l->{TYPE} $var_name");
+		fatal($e->{ORIGINAL}, "Unknown level type $l->{TYPE} $var_name");
 	}
 }
 
@@ -1223,7 +1227,7 @@ sub Parse($$$$$)
 		} elsif ($cvar =~ /^".*"$/) {
 			$py_obj = "PyString_FromString($cvar)";
 		} else {
-			$py_obj = $self->ConvertObjectToPythonData("NULL", expandAlias($ctype), $cvar);
+			$py_obj = $self->ConvertObjectToPythonData("NULL", expandAlias($ctype), $cvar, undef);
 		}
 
 		$self->pidl("PyModule_AddObject(m, \"$name\", $py_obj);");
diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index 568dff5adf..c0749304ef 100644
--- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
@@ -7,6 +7,7 @@ package Parse::Pidl::Samba4::TDR;
 use Parse::Pidl qw(fatal);
 use Parse::Pidl::Util qw(has_property ParseExpr is_constant);
 use Parse::Pidl::Samba4 qw(is_intree choose_header);
+use Parse::Pidl::Typelist qw(mapTypeName);
 
 use Exporter;
 @ISA = qw(Exporter);
@@ -195,15 +196,16 @@ sub ParserEnum($$$$)
 {
 	my ($self,$e,$t,$p) = @_;
 	my $bt = Parse::Pidl::Typelist::enum_type_fn($e);
+	my $mt = mapTypeName($bt);
 
 	$self->fn_declare($p, "NTSTATUS tdr_$t\_$e->{NAME} (struct tdr_$t *tdr".typearg($t).", enum $e->{NAME} *v)");
 	$self->pidl("{");
 	if ($t eq "pull") {
-		$self->pidl("\t$bt\_t r;");
+		$self->pidl("\t$mt r;");
 		$self->pidl("\tTDR_CHECK(tdr_$t\_$bt(tdr, mem_ctx, \&r));");
 		$self->pidl("\t*v = r;");
 	} elsif ($t eq "push") {
-		$self->pidl("\tTDR_CHECK(tdr_$t\_$bt(tdr, ($bt\_t *)v));");
+		$self->pidl("\tTDR_CHECK(tdr_$t\_$bt(tdr, ($mt *)v));");
 	} elsif ($t eq "print") {
 		$self->pidl("\t/* FIXME */");
 	}
@@ -271,7 +273,7 @@ sub Parser($$$$)
 	$self->pidl("");
 	$self->pidl_hdr("/* autogenerated by pidl */");
 	$self->pidl_hdr("#include \"$baseheader\"");
-	$self->pidl_hdr(choose_header("tdr/tdr.h", "tdr.h"));
+	$self->pidl_hdr(choose_header("lib/tdr/tdr.h", "tdr.h"));
 	$self->pidl_hdr("");
 
 	foreach (@$idl) { $self->ParserInterface($_) if ($_->{TYPE} eq "INTERFACE"); }	
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 4f9d982c21..ca5ea0cfd2 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -32,12 +32,15 @@ my %scalars = (
 	"uint8"		=> "uint8_t",
 	"int16"		=> "int16_t",
 	"uint16"	=> "uint16_t",
+	"int1632"	=> "int16_t",
+	"uint1632"	=> "uint16_t",
 	"int32"		=> "int32_t",
 	"uint32"	=> "uint32_t",
 	"hyper"		=> "uint64_t",
 	"dlong"		=> "int64_t",
 	"udlong"	=> "uint64_t",
 	"udlongr"	=> "uint64_t",
+	"double"	=> "double",
 	"pointer"	=> "void*",
 	"DATA_BLOB"	=> "DATA_BLOB",
 	"string"	=> "const char *",
@@ -219,7 +222,7 @@ sub enum_type_fn($)
 	} elsif (has_property($enum->{PARENT}, "v1_enum")) {
 		return "uint32";
 	}
-	return "uint16";
+	return "uint1632";
 }
 
 sub bitmap_type_fn($)
@@ -272,12 +275,15 @@ sub mapTypeName($)
 	my $dt;
 	$t = expandAlias($t);
 
-	unless ($dt or ($dt = getType($t))) {
+	if ($dt = getType($t)) {
+		return mapType($dt, $dt->{NAME});
+	} elsif (ref($t) eq "HASH" and defined($t->{NAME})) {
+		return mapType($t, $t->{NAME});
+	} else {
 		# Best guess
 		return "struct $t";
 	}
 
-	return mapType($dt, $dt->{NAME});
 }
 
 sub LoadIdl($;$)
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 8846b740ab..a9ad555cca 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -380,7 +380,7 @@ sub Element($$$)
 			MASK => 0,
 			VALSSTRING => "NULL",
 			FT_TYPE => "FT_NONE",
-			BASE_TYPE => "BASE_HEX"
+			BASE_TYPE => "BASE_NONE"
 		};
 	}
 
@@ -389,7 +389,7 @@ sub Element($$$)
 			MASK => 0,
 			VALSSTRING => "NULL",
 			FT_TYPE => "FT_STRING",
-			BASE_TYPE => "BASE_DEC"
+			BASE_TYPE => "BASE_NONE"
 		};
 	}
 
@@ -874,7 +874,7 @@ sub Initialize($$)
 	$self->register_type("policy_handle", "offset = PIDL_dissect_policy_hnd(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_BYTES", "BASE_NONE", 0, "NULL", 4);
 	$self->register_type("NTTIME", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);","FT_ABSOLUTE_TIME", "BASE_NONE", 0, "NULL", 4);
 	$self->register_type("NTTIME_hyper", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);","FT_ABSOLUTE_TIME", "BASE_NONE", 0, "NULL", 4);
-	$self->register_type("time_t", "offset = dissect_ndr_time_t(tvb, offset, pinfo,tree, drep, \@HF\@, NULL);","FT_ABSOLUTE_TIME", "BASE_DEC", 0, "NULL", 4);
+	$self->register_type("time_t", "offset = dissect_ndr_time_t(tvb, offset, pinfo,tree, drep, \@HF\@, NULL);","FT_ABSOLUTE_TIME", "BASE_NONE", 0, "NULL", 4);
 	$self->register_type("NTTIME_1sec", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, \@HF\@);", "FT_ABSOLUTE_TIME", "BASE_NONE", 0, "NULL", 4);
 	$self->register_type("SID", "
 		dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -882,7 +882,7 @@ sub Initialize($$)
 		di->hf_index = \@HF\@;
 
 		offset = dissect_ndr_nt_SID_with_options(tvb, offset, pinfo, tree, drep, param);
-	","FT_STRING", "BASE_DEC", 0, "NULL", 4);
+	","FT_STRING", "BASE_NONE", 0, "NULL", 4);
 	$self->register_type("WERROR", 
 		"offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(WERR_errors)", 4);
 	$self->register_type("NTSTATUS", 
@@ -1055,6 +1055,20 @@ sub DumpHfDeclaration($)
 	return "$res\n";
 }
 
+sub make_str_or_null($)
+{
+      my $str = shift;
+      if (substr($str, 0, 1) eq "\"") {
+              $str = substr($str, 1, length($str)-2);
+      }
+      $str =~ s/^\s*//;
+      $str =~ s/\s*$//;
+      if ($str eq "") {
+              return "NULL";
+      }
+      return make_str($str);
+}
+
 sub DumpHfList($)
 {
 	my ($self) = @_;
@@ -1063,7 +1077,7 @@ sub DumpHfList($)
 	foreach (values %{$self->{conformance}->{header_fields}}) 
 	{
 		$res .= "\t{ &$_->{INDEX}, 
-	  { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str($_->{BLURB}).", HFILL }},
+	  { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},
 ";
 	}