1.1 --- a/test/Tools/isac/Interpret/calchead.sml	Tue May 03 16:23:07 2011 +0200
     1.2 +++ b/test/Tools/isac/Interpret/calchead.sml	Wed May 04 09:01:10 2011 +0200
     1.3 @@ -331,9 +331,9 @@
     1.4  "--------- match_ags, is_cp, cpy_nam +with EqSystem (!)--";
     1.5  "--------- match_ags, is_cp, cpy_nam +with EqSystem (!)--";
     1.6  val Const ("Script.SubProblem",_) $
     1.7 -	  (Const ("Pair",_) $
     1.8 +	  (Const ("Product_Type.Pair",_) $
     1.9  		 Free (dI',_) $ 
    1.10 -		 (Const ("Pair",_) $ pI' $ mI')) $ ags' =
    1.11 +		 (Const ("Product_Type.Pair",_) $ pI' $ mI')) $ ags' =
    1.12      (*...copied from stac2tac_*)
    1.13      str2term (
    1.14  	"SubProblem (EqSystem', [linear, system], [no_met])         " ^
    1.15 @@ -357,9 +357,9 @@
    1.16  
    1.17  "-b------------------------------------------------------";
    1.18  val Const ("Script.SubProblem",_) $
    1.19 -	  (Const ("Pair",_) $
    1.20 +	  (Const ("Product_Type.Pair",_) $
    1.21  		 Free (dI',_) $ 
    1.22 -		 (Const ("Pair",_) $ pI' $ mI')) $ ags' =
    1.23 +		 (Const ("Product_Type.Pair",_) $ pI' $ mI')) $ ags' =
    1.24      (*...copied from stac2tac_*)
    1.25      str2term (
    1.26  	"SubProblem (EqSystem', [linear, system], [no_met])         " ^
    1.27 @@ -384,9 +384,9 @@
    1.28  
    1.29  "-c---ERROR case: stac is missing #Given equalities e_s--";
    1.30  val stac as Const ("Script.SubProblem",_) $
    1.31 -	 (Const ("Pair",_) $
    1.32 +	 (Const ("Product_Type.Pair",_) $
    1.33  		Free (dI',_) $ 
    1.34 -		(Const ("Pair",_) $ pI' $ mI')) $ ags' =
    1.35 +		(Const ("Product_Type.Pair",_) $ pI' $ mI')) $ ags' =
    1.36      (*...copied from stac2tac_*)
    1.37      str2term (
    1.38  	"SubProblem (EqSystem', [linear, system], [no_met]) " ^
    1.39 @@ -430,9 +430,9 @@
    1.40  
    1.41  "-d------------------------------------------------------";
    1.42  val stac as Const ("Script.SubProblem",_) $
    1.43 -	 (Const ("Pair",_) $
    1.44 +	 (Const ("Product_Type.Pair",_) $
    1.45  		Free (dI',_) $ 
    1.46 -		(Const ("Pair",_) $ pI' $ mI')) $ ags' =
    1.47 +		(Const ("Product_Type.Pair",_) $ pI' $ mI')) $ ags' =
    1.48      (*...copied from stac2tac_*)
    1.49      str2term (
    1.50  	"SubProblem (Test',[univariate,equation,test]," ^
    1.51 @@ -625,7 +625,7 @@
    1.52  	("Integrate", ["integrate", "function"], ["diff", "integration"]),
    1.53  	Const ("Integrate.Integrate",
    1.54  	       "(RealDef.real, RealDef.real) * => RealDef.real") $
    1.55 -	       (Const ("Pair",
    1.56 +	       (Const ("Product_Type.Pair",
    1.57  		       "[RealDef.real, RealDef.real]
    1.58                                    => (RealDef.real, RealDef.real) *") $
    1.59  		 (Const ("op +",
    1.60 @@ -698,7 +698,7 @@
    1.61  	("Integrate", ["integrate", "function"], ["diff", "integration"]),
    1.62  	Const ("Integrate.Integrate",
    1.63  	       "(RealDef.real, RealDef.real) * => RealDef.real") $
    1.64 -	   (Const ("Pair",
    1.65 +	   (Const ("Product_Type.Pair",
    1.66  		   "[RealDef.real, RealDef.real]
    1.67                           => (RealDef.real, RealDef.real) *") $
    1.68  	     (Const ("op +",