Fix spectest errors caused by Index changes

This is actually mostly a revert of 391bdb1 , but using new with/without functionality where appropriate
rakudo · Aug 8, 2015 · 42e19ee · 42e19ee
1 parent a32c146
commit 42e19ee
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/core/Main.pm b/src/core/Main.pm
@@ -46,7 +46,7 @@ my sub MAIN_HELPER($retval = 0) {
             if $passed-value ~~ /^ ( '--' | '-' | ':' ) ('/'?) (<-[0..9\.]> .*) $/ {
                 my ($switch, $negate, $arg) = (~$0, ?((~$1).chars), ~$2);
 
-                if $arg.index('=') {
+                with $arg.index('=') {
                     my ($name, $value) = $arg.split('=', 2);
                     $value = hack-val($value);
                     $value = $value but False if $negate;

diff --git a/src/core/Num.pm b/src/core/Num.pm
@@ -27,10 +27,14 @@ my class Num does Real { # declared in BOOTSTRAP
     multi method new($n) { nqp::box_n($n.Num, self) }
 
     multi method perl(Num:D:) {
-        my $p = self.Str;
-        nqp::isnanorinf(nqp::unbox_n(self)) || $p.index('e') || $p.index('E')
-          ?? $p
-          !! $p ~ 'e0';
+        my $res = self.Str;
+        if nqp::isnanorinf(nqp::unbox_n(self))
+           || $res.index('e').defined
+           || $res.index('E').defined {
+            $res;
+        } else {
+            $res ~ 'e0';
+        }
     }
 
     method Rat(Num:D: Real $epsilon = 1.0e-6, :$fat) {

diff --git a/src/core/Parameter.pm b/src/core/Parameter.pm
@@ -44,7 +44,7 @@ my class Parameter { # declared in BOOTSTRAP
             if $!flags +& $SIG_ELEM_IS_CAPTURE {
                 $sigil = '|';
             } elsif $!flags +& $SIG_ELEM_IS_PARCEL {
-                $sigil = '\\' unless '@$%&'.index($sigil);
+                $sigil = '\\' without '@$%&'.index($sigil);
             }
         } else {
             if $!flags +& $SIG_ELEM_IS_CAPTURE {
@@ -219,8 +219,7 @@ my class Parameter { # declared in BOOTSTRAP
             if $!flags +& $SIG_ELEM_IS_CAPTURE {
                 $name = '|' ~ $name;
             } elsif $!flags +& $SIG_ELEM_IS_PARCEL {
-                $name = '\\' ~ $name
-                    unless '@$%&'.index(substr($name,0,1));
+                $name = '\\' ~ $name without '@$%&'.index(substr($name,0,1));
             }
         } else {
             if $!flags +& $SIG_ELEM_IS_CAPTURE {

diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -534,7 +534,7 @@ sub INDIRECT_NAME_LOOKUP($root, *@chunks) is rw {
     my Str $name = @chunks.join('::');
     my @parts    = $name.split('::');
     my $first    = @parts.shift;
-    if @parts && '$@%&'.index(substr($first,0, 1)) {
+    if @parts && '$@%&'.index(substr($first,0, 1)).defined {
         # move sigil from first to last chunk, because
         # $Foo::Bar::baz is actually stored as Foo::Bar::$baz
         my $last_idx      = @parts.end;