r9463: Fix DumpFunction() (was ignoring elements)

Fix use of pidl for people that don't have it installed...
Generate documentation for pidl debian package

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 8c62eed660f75cdc5cea730fded379ded9f1da68..61002f4a32e6a81a7e8837e6f64128b10e28afd5 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -32,7 +32,7 @@ build: configure
        $(MAKE) -C $(SOURCEPATH) proto 
        -$(MAKE) -C $(SOURCEPATH) pch
        $(MAKE) -C $(SOURCEPATH) all
        $(MAKE) -C $(SOURCEPATH) proto 
        -$(MAKE) -C $(SOURCEPATH) pch
        $(MAKE) -C $(SOURCEPATH) all

-       $(MAKE) -C $(SOURCEPATH)/pidl all
+       $(MAKE) -C $(SOURCEPATH)/pidl all doc

        touch $@
 
 clean:
        touch $@
 
 clean:

diff --git a/source/pidl/lib/Parse/Pidl/Dump.pm b/source/pidl/lib/Parse/Pidl/Dump.pm
index bca599262aa4161634946f49f981322e10bdbd3d..7f426c1c0bd8552086e42d90d30600e2d6adb81f 100644 (file)
--- a/source/pidl/lib/Parse/Pidl/Dump.pm
+++ b/source/pidl/lib/Parse/Pidl/Dump.pm
@@ -208,9 +208,9 @@ sub DumpFunction($)
 
     $res .= DumpType($function->{RETURN_TYPE});
     $res .= " $function->{NAME}(\n";
 
     $res .= DumpType($function->{RETURN_TYPE});
     $res .= " $function->{NAME}(\n";

-    for my $d (@{$function->{DATA}}) {
-       $first || ($res .= ",\n"); $first = 0;
-       $res .= DumpElement($d);
+    for my $d (@{$function->{ELEMENTS}}) {
+               unless ($first) { $res .= ",\n"; } $first = 0;
+               $res .= DumpElement($d);

     }
     $res .= "\n);\n\n";
 
     }
     $res .= "\n);\n\n";
 

diff --git a/source/pidl/pidl b/source/pidl/pidl
index 14be05c042db38621f0dd739c9d01f7a3c4a579b..1cc2ee44cbbc1ae2aa6f4fa53c1367b7b189c4df 100755 (executable)
--- a/source/pidl/pidl
+++ b/source/pidl/pidl
@@ -8,8 +8,9 @@
 # released under the GNU GPL
 
 use strict;
 # released under the GNU GPL
 
 use strict;

-
-use lib "lib";
+use FindBin qw($RealBin);
+use lib "$RealBin";
+use lib "$RealBin/lib";

 use Getopt::Long;
 use File::Basename;
 use Parse::Pidl;
 use Getopt::Long;
 use File::Basename;
 use Parse::Pidl;