Change comma_list in grammar to always produce an array ref.

Fix 'implements' to handle multiple classes.
timbunce · Jul 10, 2010 · 2605a35 · 2605a35
1 parent bc1ffdd
commit 2605a35
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 50 deletions.
diff --git a/lib/Java/Javap/Generator/Std.pm b/lib/Java/Javap/Generator/Std.pm
@@ -156,8 +156,8 @@ sub _cast_names {
     my $class_parent = defined $ast->{parent} ? $type_caster->cast($ast->{parent}) : '';
     $ast->{cast_parent} = ($class_parent eq 'Mu') ? '' : $class_parent;
 
-    my $class_implements = defined $ast->{implements} ? $type_caster->cast($ast->{implements}) : '';
-    $ast->{cast_implements} = ($class_implements eq 'Mu') ? '' : $class_implements;
+    my @class_implements = map { $type_caster->cast($_) } @{ $ast->{implements} };
+    $ast->{cast_implements} = \@class_implements;
 
     foreach my $element (@{$ast->{contents}}) {
         next unless $element->{body_element} =~ /^(method|constructor)/;
@@ -232,6 +232,8 @@ sub _get_prologue {
         my $target = $type_caster->cast($ast->{parent});
         $perl_types{$target}++;
     }
+
+    $perl_types{$_}++ for @{ $ast->{cast_implements} };
 
     foreach my $element (@{$ast->{contents}}) {
 
@@ -347,7 +349,7 @@ sub _get_template_for_class {
 
 class [% ast.perl_qualified_name %]
     [%- ast.cast_parent == '' ? '' : ' is ' %][% ast.cast_parent -%]
-    [%- IF ast.cast_implements != '' %] does [% ast.cast_implements %] [% END -%]
+    [%- IF ast.cast_implements.size > 0 %] does [% ast.cast_implements.join(" does ") %] [% END -%]
  {
 
 [% FOREACH element IN ast.method_list %]