Skip to content

Commit

Permalink
Revert "[JVM] Avoid StringIndexOutOfBoundsException"
Browse files Browse the repository at this point in the history
This reverts commit 07b4f74.

This fix is not needed since 0effc37. That other commit
made sure $execname is always an absolute path. With an absolute
path the path manipulation logic here works without modification.
  • Loading branch information
PatZim committed Apr 27, 2019
1 parent de42e71 commit cac95fb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/main.nqp
Expand Up @@ -23,9 +23,8 @@ my $config := nqp::backendconfig();
my $sep := $config<osname> eq 'MSWin32' ?? '\\' !! '/'; my $sep := $config<osname> eq 'MSWin32' ?? '\\' !! '/';
#?if jvm #?if jvm
my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname'); my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
my $rindex-pos := nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1);
my $install-dir := $execname ne '' my $install-dir := $execname ne ''
?? nqp::substr($execname, 0, nqp::rindex($execname, $sep, $rindex-pos < 0 ?? nqp::chars($execname) !! $rindex-pos)) ?? nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1))
!! $comp.config<prefix>; !! $comp.config<prefix>;
#?endif #?endif
#?if moar #?if moar
Expand Down
3 changes: 1 addition & 2 deletions src/perl6-debug.nqp
Expand Up @@ -471,9 +471,8 @@ sub MAIN(*@ARGS) {
my $sep := $config<osname> eq 'MSWin32' ?? '\\' !! '/'; my $sep := $config<osname> eq 'MSWin32' ?? '\\' !! '/';
#?if jvm #?if jvm
my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname'); my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
my $rindex-pos := nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1);
my $install-dir := $execname ne '' my $install-dir := $execname ne ''
?? nqp::substr($execname, 0, nqp::rindex($execname, $sep, $rindex-pos < 0 ?? nqp::chars($execname) !! $rindex-pos)) ?? nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1))
!! $comp.config<prefix>; !! $comp.config<prefix>;
#?endif #?endif
#?if moar #?if moar
Expand Down

0 comments on commit cac95fb

Please sign in to comment.