r6516: use only one list of scalar types and make "string" just a simple scalar type (mostly)

metze
(This used to be commit ba1686e31a0d70a1fddabf4289d20fa8fe13b566)

2 files changed, 147 insertions, 77 deletions

diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index 0804737747..3c75b29227 100644
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -216,35 +216,6 @@ sub find_largest_alignment($)
 	return $align;
 }
 
-my %scalar_alignments = 
-(
-     "char"           => 1,
-     "int8"           => 1,
-     "uint8"          => 1,
-     "short"          => 2,
-     "wchar_t"        => 2,
-     "int16"          => 2,
-     "uint16"         => 2,
-     "long"           => 4,
-     "int32"          => 4,
-     "uint32"         => 4,
-     "dlong"          => 4,
-     "udlong"         => 4,
-     "udlongr"        => 4,
-     "NTTIME"         => 4,
-     "NTTIME_1sec"    => 4,
-     "time_t"         => 4,
-     "DATA_BLOB"      => 4,
-     "error_status_t" => 4,
-     "WERROR"         => 4,
-	 "NTSTATUS" 	  => 4,
-     "boolean32"      => 4,
-     "unsigned32"     => 4,
-     "ipv4address"    => 4,
-     "hyper"          => 8,
-     "NTTIME_hyper"   => 8
-);
-
 #####################################################################
 # align a type
 sub align_type
@@ -266,10 +237,10 @@ sub align_type
 	} elsif (($dt->{TYPE} eq "STRUCT") or ($dt->{TYPE} eq "UNION")) {
 		return find_largest_alignment($dt);
 	} elsif ($dt->{TYPE} eq "SCALAR") {
-		return $scalar_alignments{$dt->{NAME}};
-	} else { 
-		die("Unknown data type type $dt->{TYPE}");
+		return typelist::getScalarAlignment($dt->{NAME});
 	}
+
+	die("Unknown data type type $dt->{TYPE}");
 }
 
 # determine if an element needs a reference pointer on the wire
diff --git a/source4/build/pidl/typelist.pm b/source4/build/pidl/typelist.pm
index af37a1b8db..32210c4dab 100644
--- a/source4/build/pidl/typelist.pm
+++ b/source4/build/pidl/typelist.pm
@@ -9,6 +9,147 @@ use strict;
 
 my %typedefs = ();
 
+# a list of known scalar types
+my $scalars = {
+	# 0 byte types
+	"void"		=> {
+				C_TYPE		=> "void",
+				NDR_ALIGN	=> 0
+			},
+
+	# 1 byte types
+	"char"		=> {
+				C_TYPE		=> "char",
+				NDR_ALIGN	=> 1
+			},
+	"int8"		=> {
+				C_TYPE		=> "int8_t",
+				NDR_ALIGN	=> 1
+			},
+	"uint8"		=> {
+				C_TYPE		=> "uint8_t",
+				NDR_ALIGN	=> 1
+			},
+
+	# 2 byte types
+	"int16"		=> {
+				C_TYPE		=> "int16_t",
+				NDR_ALIGN	=> 2
+			},
+	"uint16"	=> {	C_TYPE		=> "uint16_t",
+				NDR_ALIGN	=> 2
+			},
+
+	# 4 byte types
+	"int32"		=> {
+				C_TYPE		=> "int32_t",
+				NDR_ALIGN	=> 4
+			},
+	"uint32"	=> {	C_TYPE		=> "uint32_t",
+				NDR_ALIGN	=> 4
+			},
+
+	# 8 byte types
+	"int64"		=> {
+				C_TYPE		=> "int64_t",
+				NDR_ALIGN	=> 8
+			},
+	"uint64"	=> {
+				C_TYPE		=> "uint64_t",
+				NDR_ALIGN	=> 8
+			},
+	"hyper"		=> {
+				C_TYPE		=> "uint64_t",
+				NDR_ALIGN	=> 8
+			},
+	"dlong"		=> {
+				C_TYPE		=> "int64_t",
+				NDR_ALIGN	=> 4
+			},
+	"udlong"	=> {
+				C_TYPE		=> "uint64_t",
+				NDR_ALIGN	=> 4
+			},
+	"udlongr"	=> {
+				C_TYPE		=> "uint64_t",
+				NDR_ALIGN	=> 4
+			},
+
+	# DATA_BLOB types
+	"DATA_BLOB"	=> {
+				C_TYPE		=> "DATA_BLOB",
+				NDR_ALIGN	=> 4
+			},
+
+	# string types
+	"string"	=> {
+				C_TYPE		=> "const char *",
+				NDR_ALIGN	=> 4 #???
+			},
+
+	# time types
+	"time_t"	=> {
+				C_TYPE		=> "time_t",
+				NDR_ALIGN	=> 4
+			},
+	"NTTIME"	=> {
+				C_TYPE		=> "NTTIME",
+				NDR_ALIGN	=> 4
+			},
+	"NTTIME_1sec"	=> {
+				C_TYPE		=> "NTTIME",
+				NDR_ALIGN	=> 4
+			},
+	"NTTIME_hyper"	=> {
+				C_TYPE		=> "NTTIME",
+				NDR_ALIGN	=> 8
+			},
+
+
+	# error code types
+	"WERROR"	=> {
+				C_TYPE		=> "WERROR",
+				NDR_ALIGN	=> 4
+			},
+	"NTSTATUS"	=> {
+				C_TYPE		=> "NTSTATUS",
+				NDR_ALIGN	=> 4
+			},
+
+	# special types
+	"nbt_string"	=> {
+				C_TYPE		=> "const char *",
+				NDR_ALIGN	=> 4 #???
+			},
+	"ipv4address"	=> {
+				C_TYPE		=> "const char *",
+				NDR_ALIGN	=> 4
+			}
+};
+
+# map from a IDL type to a C header type
+sub mapScalarType($)
+{
+	my $name = shift;
+
+	# it's a bug when a type is not in the list
+	# of known scalars or has no mapping
+	return $scalars->{$name}{C_TYPE} if defined($scalars->{$name}) and defined($scalars->{$name}{C_TYPE});
+
+	die("Unknown scalar type $name");
+}
+
+sub getScalarAlignment($)
+{
+	my $name = shift;
+
+	# it's a bug when a type is not in the list
+	# of known scalars or has no mapping
+	return $scalars->{$name}{NDR_ALIGN} if defined($scalars->{$name}) and defined($scalars->{$name}{NDR_ALIGN});
+
+	die("Unknown scalar type $name");
+}
+
 sub addType($)
 {
 	my $t = shift;
@@ -38,17 +179,9 @@ sub hasType($)
 	return 0;
 }
 
-sub RegisterPrimitives()
+sub RegisterScalars()
 {
-	my @primitives = (
-		"char", "int8", "uint8", "short", "wchar_t", 
-		"int16", "uint16", "long", "int32", "uint32", 
-		"dlong", "udlong", "udlongr", "NTTIME", "NTTIME_1sec", 
-		"time_t", "DATA_BLOB", "error_status_t", "WERROR", 
-		"NTSTATUS", "boolean32", "unsigned32", "ipv4address", 
-		"hyper", "NTTIME_hyper");
-		
-	foreach my $k (@primitives) {
+	foreach my $k (keys %{$scalars}) {
 		$typedefs{$k} = {
 			NAME => $k,
 			TYPE => "TYPEDEF",
@@ -85,39 +218,6 @@ sub bitmap_type_fn($)
 	return "uint32";
 }
 
-# provide mappings between IDL base types and types in our headers
-my %scalar_type_mappings = 
-    (
-     "int8"         => "int8_t",
-     "uint8"        => "uint8_t",
-     "short"        => "int16_t",
-     "wchar_t"      => "uint16_t",
-     "int16"        => "int16_t",
-     "uint16"       => "uint16_t",
-     "int32"        => "int32_t",
-     "uint32"       => "uint32_t",
-     "int64"        => "int64_t",
-     "uint64"       => "uint64_t",
-     "dlong"        => "int64_t",
-     "udlong"       => "uint64_t",
-     "udlongr"      => "uint64_t",
-     "hyper"        => "uint64_t",
-     "NTTIME_1sec"  => "NTTIME",
-     "NTTIME_hyper" => "NTTIME",
-     "ipv4address"  => "const char *",
-     "nbt_string"   => "const char *"
-     );
-
-# map from a IDL type to a C header type
-sub mapScalarType($)
-{
-	my $name = shift;
-	if (my $ret = $scalar_type_mappings{$name}) {
-		return $ret;
-	}
-	return $name;
-}
-
 sub mapType($)
 {
 	my $e = shift;
@@ -165,7 +265,6 @@ sub LoadIdl($)
 	}
 }
 
-RegisterPrimitives();
-
+RegisterScalars();
 
 1;