Permalink
Browse files

import version 2.46 from backpan

  • Loading branch information...
1 parent d50513a commit e31b605c11330656589c17e9b439b9cf00585f54 @fperrad committed with May 18, 2006
Showing with 14 additions and 7 deletions.
  1. +3 −0 Changes
  2. +2 −1 META.yml
  3. +2 −1 Makefile.PL
  4. +6 −4 node.pm
  5. +1 −1 repos_id.pm
View
@@ -1,5 +1,8 @@
Revision history for Perl extension CORBA::IDL.
+2.46 Thu May 18 12:30:00 2006
+ - node.pm & repos_id.pm : minor fix
+
2.45 Tue Jul 19 18:30:00 2005
- node.pm : native exception
- repos_id.pm : add uidVisitor
View
@@ -1,10 +1,11 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: CORBA-IDL
-version: 2.45
+version: 2.46
version_from: node.pm
installdirs: site
requires:
+ Digest::SHA1: 0
Math::BigInt: 1.66
distribution_type: module
View
@@ -6,7 +6,8 @@ WriteMakefile(
'VERSION_FROM' => 'node.pm',
'ABSTRACT' => 'CORBA-IDL 3.0 parser',
'PREREQ_PM' => {
- 'Math::BigInt' => 1.66
+ 'Digest::SHA1' => 0,
+ 'Math::BigInt' => 1.66,
},
'PM' => {
'ascii.pm' => '$(INST_LIBDIR)/IDL/ascii.pm',
View
10 node.pm
@@ -8,7 +8,7 @@ use UNIVERSAL;
package CORBA::IDL::node;
use vars qw($VERSION);
-$VERSION = '2.45';
+$VERSION = '2.46';
sub _Build {
my $proto = shift;
@@ -1135,7 +1135,11 @@ sub _Eval {
if ($type eq $parser->YYData->{symbtab}->Lookup($elt->{type})) {
return $elt;
} else {
- $parser->Error("'$elt->{idf}' is not a '$type->{idf}'.\n");
+ if ($type->isa('EnumType')) {
+ $parser->Error("'$elt->{idf}' is not a '$type->{idf}'.\n");
+ } else {
+ $parser->Error("'$elt->{idf}' is not a '$type->{value}'.\n");
+ }
return undef;
}
} elsif ($elt->isa('IntegerLiteral')) {
@@ -1335,7 +1339,6 @@ sub _Init {
and ! $defn->isa('OctetType')
and ! $defn->isa('EnumType') ) {
my $idf = $defn->{idf} if (exists $defn->{idf});
- $idf ||= $type->{idf} if (exists $type->{idf});
$idf ||= $type;
$parser->Error("'$idf' refers a bad type for constant.\n");
return $self;
@@ -1789,7 +1792,6 @@ sub Configure {
and ! $defn->isa('BooleanType')
and ! $defn->isa('EnumType') ) {
my $idf = $defn->{idf} if (exists $defn->{idf});
- $idf ||= $dis->{idf} if (exists $dis->{idf});
$idf ||= $dis;
$parser->Error("'$idf' refers a bad type for union discriminator.\n");
return $self;
View
@@ -566,7 +566,7 @@ sub visitUnionType {
my $defn = $self->_get_defn($elt->{value});
my $type = $self->_get_defn($defn->{type});
$uid_str .= $defn->{idf};
- $uid_str .= $type->{serial_uid} || $type->{value};
+ $uid_str .= ($type->{serial_uid} || $type->{value} || "");
if (exists $defn->{array_size}) {
foreach (@{$defn->{array_size}}) {
$uid_str .= "[" . $_->{value} . "]";

0 comments on commit e31b605

Please sign in to comment.