X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Ffloat%2Ftranscendental%2Fcl_LF_ratseries_pqa.cc;h=ee0dba17fc6340b23716a70cf253858757b925a4;hb=c486b78a1a0613f07a10816d6f6ca9e485bc8290;hp=05aa7432a8cdfb2478c3e3ed2f6e2e4b86dabe86;hpb=850abfde7f0d985ba01526c346bcd0d733562943;p=cln.git

diff --git a/src/float/transcendental/cl_LF_ratseries_pqa.cc b/src/float/transcendental/cl_LF_ratseries_pqa.cc
index 05aa743..ee0dba1 100644
--- a/src/float/transcendental/cl_LF_ratseries_pqa.cc
+++ b/src/float/transcendental/cl_LF_ratseries_pqa.cc
@@ -11,7 +11,7 @@
 
 #include "cln/lfloat.h"
 #include "cln/integer.h"
-#include "cln/abort.h"
+#include "cln/exception.h"
 #include "cl_LF.h"
 
 namespace cln {
@@ -22,13 +22,13 @@ namespace cln {
 // and T = B*Q*S (all integers). On entry N1 < N2.
 // P will not be computed if a NULL pointer is passed.
 
-static void eval_pqa_series_aux (uintL N1, uintL N2,
+static void eval_pqa_series_aux (uintC N1, uintC N2,
                                  const cl_pqa_series& args,
                                  cl_I* P, cl_I* Q, cl_I* T)
 {
 	switch (N2 - N1) {
 	case 0:
-		cl_abort(); break;
+		throw runtime_exception(); break;
 	case 1:
 		if (P) { *P = args.pv[N1]; }
 		*Q = args.qv[N1];
@@ -68,7 +68,7 @@ static void eval_pqa_series_aux (uintL N1, uintL N2,
 		break;
 		}
 	default: {
-		var uintL Nm = (N1+N2)/2; // midpoint
+		var uintC Nm = (N1+N2)/2; // midpoint
 		// Compute left part.
 		var cl_I LP, LQ, LT;
 		eval_pqa_series_aux(N1,Nm,args,&LP,&LQ,&LT);
@@ -85,13 +85,13 @@ static void eval_pqa_series_aux (uintL N1, uintL N2,
 	}
 }
 
-static void eval_pqsa_series_aux (uintL N1, uintL N2,
+static void eval_pqsa_series_aux (uintC N1, uintC N2,
                                   const cl_pqa_series& args,
-                                  cl_I* P, cl_I* Q, uintL* QS, cl_I* T)
+                                  cl_I* P, cl_I* Q, uintC* QS, cl_I* T)
 {
 	switch (N2 - N1) {
 	case 0:
-		cl_abort(); break;
+		throw runtime_exception(); break;
 	case 1:
 		if (P) { *P = args.pv[N1]; }
 		*Q = args.qv[N1];
@@ -135,14 +135,14 @@ static void eval_pqsa_series_aux (uintL N1, uintL N2,
 		break;
 		}
 	default: {
-		var uintL Nm = (N1+N2)/2; // midpoint
+		var uintC Nm = (N1+N2)/2; // midpoint
 		// Compute left part.
 		var cl_I LP, LQ, LT;
-		var uintL LQS;
+		var uintC LQS;
 		eval_pqsa_series_aux(N1,Nm,args,&LP,&LQ,&LQS,&LT);
 		// Compute right part.
 		var cl_I RP, RQ, RT;
-		var uintL RQS;
+		var uintC RQS;
 		eval_pqsa_series_aux(Nm,N2,args,(P?&RP:(cl_I*)0),&RQ,&RQS,&RT);
 		// Put together partial results.
 		if (P) { *P = LP*RP; }
@@ -155,7 +155,7 @@ static void eval_pqsa_series_aux (uintL N1, uintL N2,
 	}
 }
 
-const cl_LF eval_rational_series (uintL N, const cl_pqa_series& args, uintC len)
+const cl_LF eval_rational_series (uintC N, const cl_pqa_series& args, uintC len)
 {
 	if (N==0)
 		return cl_I_to_LF(0,len);
@@ -168,10 +168,10 @@ const cl_LF eval_rational_series (uintL N, const cl_pqa_series& args, uintC len)
 		// Split qv[n] into qv[n]*2^qsv[n].
 		{
 			var cl_I* qp = args.qv;
-			var uintL* qsp = args.qsv;
-			for (var uintL n = 0; n < N; n++, qp++, qsp++) {
+			var uintC* qsp = args.qsv;
+			for (var uintC n = 0; n < N; n++, qp++, qsp++) {
 				// Pull out maximal power of 2 out of *qp = args.qv[n].
-				var uintL qs = 0;
+				var uintC qs = 0;
 				if (!zerop(*qp)) {
 					qs = ord2(*qp);
 					if (qs > 0)
@@ -181,7 +181,7 @@ const cl_LF eval_rational_series (uintL N, const cl_pqa_series& args, uintC len)
 			}
 		}
 		// Main computation.
-		var uintL QS;
+		var uintC QS;
 		eval_pqsa_series_aux(0,N,args,NULL,&Q,&QS,&T);
 		return cl_I_to_LF(T,len) / scale_float(cl_I_to_LF(Q,len),QS);
 	}