compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27392

Modified Files:
	05-CEL.pl 
Log Message:
Array are (implicitly) localy defined in blocks, function, and containers.

Index: 05-CEL.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-CEL.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 05-CEL.pl	7 Mar 2007 18:01:28 -0000	1.3
--- 05-CEL.pl	8 Mar 2007 17:15:10 -0000	1.4
***************
*** 279,291 ****
  
    ok($cg0->Evaluate() eq "0", "Undefined");
- 
  }
  
  
  sub test_array_add {
    my $array = shift;
    my $str   = shift;
  
    my $A = new CBM::CelArrayAdd();
    my $al = new CBM::CelStr($array);
    my $ai = new CBM::CelStr($str);
--- 279,292 ----
  
    ok($cg0->Evaluate() eq "0", "Undefined");
  }
  
  
  sub test_array_add {
+   my $BL    = shift;
    my $array = shift;
    my $str   = shift;
  
    my $A = new CBM::CelArrayAdd();
+   $BL->add($A);
    my $al = new CBM::CelStr($array);
    my $ai = new CBM::CelStr($str);
***************
*** 297,301 ****
--- 298,305 ----
  
  sub test_array {
+ 
+   my $BL  = new CBM::CelBlock();
    my $A   = new CBM::CelArrayDef();
+   $BL->add($A);
  
    my $an  = new CBM::CelStr("a");
***************
*** 306,317 ****
    my $AS  = new CBM::CelArraySize();
    my $ans = new CBM::CelStr("a");
  
    $AS->add($an);
    ok($AS->Evaluate() eq "0", "array a is empty");
  
!   test_array_add("a", "y");
    ok($AS->Evaluate() eq "1", "array a has one element");
  
    my $AG = new CBM::CelArrayGet();
    my $ags = new CBM::CelStr("a");
    my $agi = new CBM::CelStr("0");
--- 310,323 ----
    my $AS  = new CBM::CelArraySize();
    my $ans = new CBM::CelStr("a");
+   $BL->add($AS);
  
    $AS->add($an);
    ok($AS->Evaluate() eq "0", "array a is empty");
  
!   test_array_add($BL, "a", "y");
    ok($AS->Evaluate() eq "1", "array a has one element");
  
    my $AG = new CBM::CelArrayGet();
+   $BL->add($AG);
    my $ags = new CBM::CelStr("a");
    my $agi = new CBM::CelStr("0");
***************
*** 323,327 ****
  
  
!   test_array_add("a", "z");
  
    ok($AS->Evaluate() eq "2", "array a has two element");
--- 329,333 ----
  
  
!   test_array_add($BL, "a", "z");
  
    ok($AS->Evaluate() eq "2", "array a has two element");
***************
*** 333,336 ****
--- 339,344 ----
    my $ags2 = new CBM::CelStr("a");
    my $agi2 = new CBM::CelStr("1");
+ 
+   $BL->add($AG2);
    $AG2->add($ags2);
    $AG2->add($agi2);