Skip to content

Commit

Permalink
Perlito5 - js - formatting, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@fglock
fglock committed Jun 11, 2015
1 parent 31e406a commit 169110f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions perlito5.pl
View file
Expand Up @@ -9866,14 +9866,14 @@ package Perlito5::AST::Apply;
$optional = 1
}
elsif ($c eq '$' || $c eq '_') {
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level, 'scalar'))
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level + 1, 'scalar'))
}
elsif ($c eq '@') {
(@in || !$optional) && ($close = '].concat(' . Perlito5::Javascript2::to_list(\@in) . ')');
(@in || !$optional) && ($close = '].concat(' . Perlito5::Javascript2::to_list(\@in, $level + 1) . ')');
@in = ()
}
elsif ($c eq '&') {
push(@out, shift(@in)->emit_javascript2($level, 'scalar'))
push(@out, shift(@in)->emit_javascript2($level + 1, 'scalar'))
}
elsif ($c eq '*') {
if (@in || !$optional) {
Expand All @@ -9882,26 +9882,26 @@ package Perlito5::AST::Apply;
push(@out, Perlito5::Javascript2::escape_string($arg->{'code'}))
}
else {
push(@out, $arg->emit_javascript2($level, 'scalar'))
push(@out, $arg->emit_javascript2($level + 1, 'scalar'))
}
}
}
elsif ($c eq chr(92)) {
if (substr($sig, 0, 2) eq chr(92) . '$') {
$sig = substr($sig, 1);
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level, 'scalar'))
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level + 1, 'scalar'))
}
elsif (substr($sig, 0, 2) eq chr(92) . '@' || substr($sig, 0, 2) eq chr(92) . '%') {
$sig = substr($sig, 1);
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level, 'list'))
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level + 1, 'list'))
}
elsif (substr($sig, 0, 5) eq chr(92) . '[@%]') {
$sig = substr($sig, 4);
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level, 'list'))
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level + 1, 'list'))
}
elsif (substr($sig, 0, 6) eq chr(92) . '[$@%]') {
$sig = substr($sig, 5);
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level, 'list'))
(@in || !$optional) && push(@out, shift(@in)->emit_javascript2($level + 1, 'list'))
}
}
$sig = substr($sig, 1)
Expand Down
16 changes: 8 additions & 8 deletions src5/lib/Perlito5/Javascript2/Emitter.pm
View file
Expand Up @@ -2802,15 +2802,15 @@ package Perlito5::AST::Apply;
$optional = 1;
}
elsif ($c eq '$' || $c eq '_') {
push @out, shift(@in)->emit_javascript2( $level, 'scalar' ) if @in || !$optional;
push @out, shift(@in)->emit_javascript2( $level + 1, 'scalar' ) if @in || !$optional;
}
elsif ($c eq '@') {
$close = '].concat(' . Perlito5::Javascript2::to_list(\@in) . ')'
$close = '].concat(' . Perlito5::Javascript2::to_list(\@in, $level + 1) . ')'
if @in || !$optional;
@in = ();
}
elsif ($c eq '&') {
push @out, shift(@in)->emit_javascript2( $level, 'scalar' );
push @out, shift(@in)->emit_javascript2( $level + 1, 'scalar' );
}
elsif ($c eq '*') {
if (@in || !$optional) {
Expand All @@ -2819,29 +2819,29 @@ package Perlito5::AST::Apply;
push @out, Perlito5::Javascript2::escape_string($arg->{code});
}
else {
push @out, $arg->emit_javascript2( $level, 'scalar' );
push @out, $arg->emit_javascript2( $level + 1, 'scalar' );
}
}
}
elsif ($c eq '\\') {
if (substr($sig, 0, 2) eq '\\$') {
$sig = substr($sig, 1);
push @out, shift(@in)->emit_javascript2( $level, 'scalar' ) if @in || !$optional;
push @out, shift(@in)->emit_javascript2( $level + 1, 'scalar' ) if @in || !$optional;
}
elsif (substr($sig, 0, 2) eq '\\@'
|| substr($sig, 0, 2) eq '\\%'
)
{
$sig = substr($sig, 1);
push @out, shift(@in)->emit_javascript2( $level, 'list' ) if @in || !$optional;
push @out, shift(@in)->emit_javascript2( $level + 1, 'list' ) if @in || !$optional;
}
elsif (substr($sig, 0, 5) eq '\\[@%]') {
$sig = substr($sig, 4);
push @out, shift(@in)->emit_javascript2( $level, 'list' ) if @in || !$optional;
push @out, shift(@in)->emit_javascript2( $level + 1, 'list' ) if @in || !$optional;
}
elsif (substr($sig, 0, 6) eq '\\[$@%]') {
$sig = substr($sig, 5);
push @out, shift(@in)->emit_javascript2( $level, 'list' ) if @in || !$optional;
push @out, shift(@in)->emit_javascript2( $level + 1, 'list' ) if @in || !$optional;
}
}
$sig = substr($sig, 1);
Expand Down
2 changes: 1 addition & 1 deletion src5/lib/Perlito5X/Exporter.pm
View file
Expand Up @@ -14,7 +14,7 @@ sub import {
my $pkg = shift;
my $callpkg = caller($ExportLevel);

say "import: from $pkg to $callpkg [@_]";
# say "import: from $pkg to $callpkg [@_]";

if ( $pkg eq "Exporter" and @_ and $_[0] eq "import" ) {
*{ $callpkg . "::import" } = \&import;
Expand Down

0 comments on commit 169110f

Please sign in to comment.