Add support for double type in pidl.

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index b6cc44cc325cd3c5b9ab777e5da8fcd3fb66c899..d46590f0cb55e629c1a6b811d58b219660a835fc 100644 (file)
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -125,6 +125,18 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags,
        return NDR_ERR_SUCCESS;
 }
 
        return NDR_ERR_SUCCESS;
 }
 

+/*
+  parse a double
+*/
+_PUBLIC_ enum ndr_err_code ndr_pull_double(struct ndr_pull *ndr, int ndr_flags, double *v)
+{
+       NDR_PULL_ALIGN(ndr, 8);
+       NDR_PULL_NEED_BYTES(ndr, 8);
+       memcpy(v, ndr->data+ndr->offset, 8);
+       ndr->offset += 8;
+       return NDR_ERR_SUCCESS;
+}
+

 /*
   parse a pointer referent identifier
 */
 /*
   parse a pointer referent identifier
 */


@@ -388,6 +400,18 @@ _PUBLIC_ enum ndr_err_code ndr_push_hyper(struct ndr_push *ndr, int ndr_flags, u
        return ndr_push_udlong(ndr, NDR_SCALARS, v);
 }
 
        return ndr_push_udlong(ndr, NDR_SCALARS, v);
 }
 

+/*
+  push a double
+*/
+_PUBLIC_ enum ndr_err_code ndr_push_double(struct ndr_push *ndr, int ndr_flags, double v)
+{
+       NDR_PUSH_ALIGN(ndr, 8);
+       NDR_PUSH_NEED_BYTES(ndr, 8);
+       memcpy(ndr->data+ndr->offset, &v, 8);
+       ndr->offset += 8;
+       return NDR_ERR_SUCCESS;
+}
+

 /*
   push a pointer
 */
 /*
   push a pointer
 */


@@ -506,7 +530,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME(struct ndr_pull *ndr, int ndr_flags,
 }
 
 /*
 }
 
 /*

-  push a NTTIME
+  push a NTTIME_1sec

 */
 _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
 {
 */
 _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
 {


@@ -679,6 +703,11 @@ _PUBLIC_ void ndr_print_dlong(struct ndr_print *ndr, const char *name, int64_t v
        ndr->print(ndr, "%-25s: 0x%016llx (%lld)", name, (unsigned long long)v, (long long)v);
 }
 
        ndr->print(ndr, "%-25s: 0x%016llx (%lld)", name, (unsigned long long)v, (long long)v);
 }
 

+_PUBLIC_ void ndr_print_double(struct ndr_print *ndr, const char *name, double v)
+{
+       ndr->print(ndr, "%-25s: %f", name, v);
+}
+

 _PUBLIC_ void ndr_print_hyper(struct ndr_print *ndr, const char *name, uint64_t v)
 {
        ndr_print_dlong(ndr, name, v);
 _PUBLIC_ void ndr_print_hyper(struct ndr_print *ndr, const char *name, uint64_t v)
 {
        ndr_print_dlong(ndr, name, v);

diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 5ee26d16b68c76f611c4fedc832aab5671f513e1..95cd4b9dc3deeddd033cc72dd76411ecaa5e5175 100644 (file)
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -53,6 +53,7 @@ my $scalar_alignment = {
        'int32' => 4,
        'uint32' => 4,
        'hyper' => 8,
        'int32' => 4,
        'uint32' => 4,
        'hyper' => 8,

+       'double' => 8,

        'pointer' => 8,
        'dlong' => 4,
        'udlong' => 4,
        'pointer' => 8,
        'dlong' => 4,
        'udlong' => 4,

diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 4f9d982c215fdade246b69a4ff2aefdbfa8e9341..e63b3c990f302271ccdcf78473243212d00f1207 100644 (file)
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -38,6 +38,7 @@ my %scalars = (
        "dlong"         => "int64_t",
        "udlong"        => "uint64_t",
        "udlongr"       => "uint64_t",
        "dlong"         => "int64_t",
        "udlong"        => "uint64_t",
        "udlongr"       => "uint64_t",

+       "double"        => "double",

        "pointer"       => "void*",
        "DATA_BLOB"     => "DATA_BLOB",
        "string"        => "const char *",
        "pointer"       => "void*",
        "DATA_BLOB"     => "DATA_BLOB",
        "string"        => "const char *",

diff --git a/pidl/tests/ndr.pl b/pidl/tests/ndr.pl
index 504b7ec8dedba221ad6676a9a81d37f96aadbdf4..53b8cb89e3b47834c8f85eaf2c859fb5b218838d 100755 (executable)
--- a/pidl/tests/ndr.pl
+++ b/pidl/tests/ndr.pl
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use Test::More tests => 46;
+use Test::More tests => 47;

 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;


@@ -480,6 +480,7 @@ $ne = ParseElement($e, undef);
 is($ne->{REPRESENTATION_TYPE}, "uint8");
 
 is(align_type("hyper"), 8);
 is($ne->{REPRESENTATION_TYPE}, "uint8");
 
 is(align_type("hyper"), 8);

+is(align_type("double"), 8);

 is(align_type("uint32"), 4);
 is(align_type("uint16"), 2);
 is(align_type("uint8"), 1);
 is(align_type("uint32"), 4);
 is(align_type("uint16"), 2);
 is(align_type("uint8"), 1);

diff --git a/pidl/tests/typelist.pl b/pidl/tests/typelist.pl
index 80ee868f9d7a4ca1e9d94cb168d5b6365b7e03e6..28bf394275dded8490506daa02f84422eb27b101 100755 (executable)
--- a/pidl/tests/typelist.pl
+++ b/pidl/tests/typelist.pl
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use Test::More tests => 54;
+use Test::More tests => 56;

 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;
 use FindBin qw($RealBin);
 use lib "$RealBin";
 use Util;


@@ -21,6 +21,7 @@ is("int32", expandAlias("int32"));
 is("uint32_t", mapScalarType("uint32"));
 is("void", mapScalarType("void"));
 is("uint64_t", mapScalarType("hyper"));
 is("uint32_t", mapScalarType("uint32"));
 is("void", mapScalarType("void"));
 is("uint64_t", mapScalarType("hyper"));

+is("double", mapScalarType("double"));

 
 my $x = { TYPE => "ENUM", NAME => "foo", EXTRADATA => 1 };
 addType($x);
 
 my $x = { TYPE => "ENUM", NAME => "foo", EXTRADATA => 1 };
 addType($x);


@@ -34,6 +35,11 @@ is_deeply(getType("uint16"), {
                TYPE => "TYPEDEF",
                DATA => { NAME => "uint16", TYPE => "SCALAR" }});
 
                TYPE => "TYPEDEF",
                DATA => { NAME => "uint16", TYPE => "SCALAR" }});
 

+is_deeply(getType("double"), {
+               NAME => "double",
+               TYPE => "TYPEDEF",
+               DATA => { NAME => "double", TYPE => "SCALAR" }});
+

 is(0, typeIs("someUnknownType", "ENUM"));
 is(0, typeIs("foo", "ENUM"));
 addType({NAME => "mytypedef", TYPE => "TYPEDEF", DATA => { TYPE => "ENUM" }});
 is(0, typeIs("someUnknownType", "ENUM"));
 is(0, typeIs("foo", "ENUM"));
 addType({NAME => "mytypedef", TYPE => "TYPEDEF", DATA => { TYPE => "ENUM" }});