Changeset 19154

Timestamp:

12/10/07 20:07:47 (12 months ago)

Author:

dlo

Message:

[kp6] Modified Perl6.pm to be a bit more liberal with its newlines

Location:

v6/v6-KindaPerl6

Files:

• compiled/perl5-kp6-mp6/lib/KindaPerl6/Visitor/Emit/Perl6.pm (modified) (3 diffs)
• src/KindaPerl6/Visitor/Emit/Perl6.pm (modified) (5 diffs)

v6/v6-KindaPerl6/compiled/perl5-kp6-mp6/lib/KindaPerl6/Visitor/Emit/Perl6.pm

@@ -142 +142 @@
     my $name;
     do {
-        for my $name ( @{ $self->{pad}->variable_names() } ) { my $decl = Decl->new( 'decl' => 'my', 'type' => '', 'var' => Var->new( 'sigil' => '', 'twigil' => '', 'name' => $name, ), ); $s = ( $s . ( $name->emit_perl6() . '; ' ) ) }
-    };
-    return ( ( $s . Main::join( [ map { $_->emit_perl6() } @{ $self->{body} } ], '; ' ) ) );
+        for my $name ( @{ $self->{pad}->variable_names() } ) {
+            my $decl = Decl->new( 'decl' => 'my', 'type' => '', 'var' => Var->new( 'sigil' => '', 'twigil' => '', 'name' => $name, ), );
+            $s = ( $s . ( $name->emit_perl6() . ( '; ' . Main::newline() ) ) );
+        }
+    };
+    return ( ( $s . Main::join( [ map { $_->emit_perl6() } @{ $self->{body} } ], ( '; ' . Main::newline() ) ) ) );
 }
 
@@ -376 +379 @@
     my $field;
     do {
-        for my $field ( @{$pos} ) { $str = ( $str . ( 'my ' . ( $field->emit_perl6() . '; ' ) ) ) }
+        for my $field ( @{$pos} ) { $str = ( $str . ( 'my ' . ( $field->emit_perl6() . ( '; ' . Main::newline() ) ) ) ) }
     };
     my $bind = Bind->new( 'parameters' => Lit::Array->new( 'array' => $sig->positional(), ), 'arguments' => Var->new( 'sigil' => '@', 'twigil' => '', 'name' => '_', ), );
-    $str = ( $str . ( $bind->emit_perl6() . '; ' ) );
+    $str = ( $str . ( $bind->emit_perl6() . ( '; ' . Main::newline() ) ) );
     ( 'sub ' . ( $self->{name} . ( ' { ' . ( 'my ' . ( $invocant->emit_perl6() . ( ' = shift; ' . ( $str . ( $self->{block}->emit_perl6() . ' }' ) ) ) ) ) ) ) );
 }
@@ -399 +402 @@
             my $field;
             do {
-                for my $field ( @{$pos} ) { $str = ( $str . ( 'my ' . ( $field->emit_perl6() . '; ' ) ) ) }
+                for my $field ( @{$pos} ) { $str = ( $str . ( 'my ' . ( $field->emit_perl6() . ( '; ' . Main::newline() ) ) ) ) }
             };
             my $bind = Bind->new( 'parameters' => Lit::Array->new( 'array' => $sig->positional(), ), 'arguments' => Var->new( 'sigil' => '@', 'twigil' => '', 'name' => '_', ), );
-            $str = ( $str . ( $bind->emit_perl6() . '; ' ) );
+            $str = ( $str . ( $bind->emit_perl6() . ( '; ' . Main::newline() ) ) );
         }
         else { }

v6/v6-KindaPerl6/src/KindaPerl6/Visitor/Emit/Perl6.pm

@@ -103 +103 @@
                 ),
             );
-            $s := $s ~ $name.emit_perl6 ~ '; ';
+            $s := $s ~ $name.emit_perl6 ~ '; ' ~ Main::newline();
             #$s := $s ~ 'my ' ~ $name ~ '; ';
         };
         return
             $s
-            ~ (@.body.>>emit_perl6).join('; ');
+            ~ (@.body.>>emit_perl6).join('; ' ~ Main::newline() );
     }
 }
@@ -301 +301 @@
         my $field;
         for @$pos -> $field {
-            $str := $str ~ 'my ' ~ $field.emit_perl6 ~ '; ';
+            $str := $str ~ 'my ' ~ $field.emit_perl6 ~ '; ' ~ Main::newline();
         };
 
@@ -308 +308 @@
             'arguments'  => ::Var( sigil => '@', twigil => '', name => '_' )
         );
-        $str := $str ~ $bind.emit_perl6 ~ '; ';
+        $str := $str ~ $bind.emit_perl6 ~ '; ' ~ Main::newline();
 
         'sub ' ~ $.name ~ ' { ' ~
@@ -332 +332 @@
                   my $field;
             for @$pos -> $field {
-                $str := $str ~ 'my ' ~ $field.emit_perl6 ~ '; ';
+                $str := $str ~ 'my ' ~ $field.emit_perl6 ~ '; ' ~ Main::newline();
             };
 
@@ -339 +339 @@
                 'arguments'  => ::Var( sigil => '@', twigil => '', name => '_' )
             );
-            $str := $str ~ $bind.emit_perl6 ~ '; ';
+            $str := $str ~ $bind.emit_perl6 ~ '; ' ~ Main::newline();
         };
         my $code :=