Merge branch '64bit-index-support' of ssh://git.code.sf.net/p/pdl/cod…

…e into 64bit-index-support
PDLPorters · May 6, 2013 · 6519430 · 6519430
2 parents e31cb3a + cde0c39
commit 6519430
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Basic/Gen/PP/PDLCode.pm b/Basic/Gen/PP/PDLCode.pm
@@ -272,7 +272,7 @@ sub new { my($type,$args,$sizeprivs,$parent) = @_;
 		print "SIZP $sizeprivs, $_\n" if $::PP_VERBOSE;
 		my $i = $parent->make_loopind($_);
 		$sizeprivs->{$i->[0]} =
-		  "register int __$i->[0]_size = \$PRIV(__$i->[0]_size);\n";
+		  "register PDL_Index __$i->[0]_size = \$PRIV(__$i->[0]_size);\n";
 		print "SP :",(join ',',%$sizeprivs),"\n" if $::PP_VERBOSE;
 	}
 	return $this;
@@ -284,7 +284,7 @@ sub myprelude { my($this,$parent,$context) = @_;
 	push @$context, map {
 		$i = $parent->make_loopind($_);
 # Used to be $PRIV(.._size) but now we have it in a register.
-		$text .= "{PDL_COMMENT(\"Open $_\") register int $_;
+		$text .= "{PDL_COMMENT(\"Open $_\") register PDL_Index $_;
 			for($_=0; $_<(__$i->[0]_size); $_++) {";
 		$i;
 	} @{$this->[0]};

diff --git a/t/proj_transform.t b/t/proj_transform.t
@@ -121,7 +121,8 @@ SKIP: {
    foreach my $i ( 0 .. $#slices )
    {
       my $str = $slices[$i];
-      my $slice = $eqc->slice($str);
+      my $slice = $eqc->slice($str)->copy;
+      $slice->badflag(0);
       # ok( "$slice" eq $ref_eqc_slices[$i], "check ref_eqc for slices[$i]" );
       is( "$slice", $ref_eqc_slices[$i], "check ref_eqc for slices[$i]" );
    }
@@ -138,7 +139,8 @@ SKIP: {
    foreach my $i ( 0 .. $#slices )
    {
       my $str = $slices[$i];
-      my $slice = $ortho->slice($str);
+      my $slice = $ortho->slice($str)->copy;
+      $slice->badflag(0);
       # ok( "$slice" eq $ref_ortho_slices[$i], "check ref_ortho for slices[$i]" );
       is( "$slice", $ref_ortho_slices[$i], "check ref_ortho for slices[$i]" );
    }
@@ -153,7 +155,8 @@ SKIP: {
    foreach my $i ( 0 .. $#slices )
    {
       my $str = $slices[$i];
-      my $slice = $ortho2->slice($str);
+      my $slice = $ortho2->slice($str)->copy;
+      $slice->badflag(0);
       # ok( "$slice" eq $ref_ortho_slices[$i], "check ref_ortho2 for slices[$i]" );
       is( "$slice", $ref_ortho_slices[$i], "check ref_ortho2 for slices[$i]" );
    }