Make index variables uintC.

diff --git a/ChangeLog b/ChangeLog
index 19b764cf2a493eac4ad85d2d534d4af4a1e9ca4e..a2c46e11268b433d6db0966808800d1b43b2febb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-02-22  Richard B. Kreckel  <kreckel@ginac.de>
+
+       * include/cln/integer_io.h (read_integer): Make index args uintC.
+       * src/integer/input/cl_I_readparsed.cc: Likewise.
+       * include/cln/rational_io.h (read_rational): Likewise.
+       * src/rational/input/cl_RA_readparsed.cc: Likewise
+       * include/cln/float_io.h (read_float): Likewise.
+       * src/float/input/cl_F_readparsed.cc: Likewise.
+       * src/vector/output/cl_GV_number_aprint.cc: Vector lengths are uintC.
+       * src/vector/output/cl_SV_aprint.cc: Likewise.
+       * src/vector/output/cl_SV_number_aprint.cc: Likewise.
+
 2007-02-15  Richard B. Kreckel  <kreckel@ginac.de>
 
        * m4/cc.m4 (CL_HAVE_ATTRIBUTE_FLATTEN): More robust definition allows...

diff --git a/include/cln/float_io.h b/include/cln/float_io.h
index efc354d1201e9bdbb356497b5586e6800124b5c4..f7e121949e549d425dd3de433331c2327bb88a3b 100644 (file)
--- a/include/cln/float_io.h
+++ b/include/cln/float_io.h
@@ -26,7 +26,7 @@ namespace cln {
 //    Exponenten-Ziffer)
 // < ergebnis: Float
 extern const cl_F read_float (unsigned int base, float_format_t prec,
-                  cl_signean sign, const char * string, uintL index1, uintL index4, uintL index2, uintL index3);
+                  cl_signean sign, const char * string, uintC index1, uintC index4, uintC index2, uintC index3);
 
 // The following does strictly the same as the general read_complex.
 // It is here only so that you don't need the complex and rational number

diff --git a/include/cln/integer_io.h b/include/cln/integer_io.h
index 5255d1df7f78be02e734803f815e6b7f0e7b1ba2..c1d2b60ee1fe990d3857f5e2d3c4b4f7c69ca5b1 100644 (file)
--- a/include/cln/integer_io.h
+++ b/include/cln/integer_io.h
@@ -21,7 +21,7 @@ namespace cln {
 //   (also index2-index1 Ziffern, incl. evtl. Dezimalpunkt am Schluß)
 // < ergebnis: Integer
 extern const cl_I read_integer (unsigned int base,
-                  cl_signean sign, const char * string, uintL index1, uintL index2);
+                  cl_signean sign, const char * string, uintC index1, uintC index2);
 
 // The following does strictly the same as the general read_complex.
 // It is here only so that you don't need the rational, complex and float number

diff --git a/include/cln/rational_io.h b/include/cln/rational_io.h
index 4b886ceb29a4876a708498d3890d136da19bd5cd..a9552218df5429bbd63ee5b356e4d96a26bccc07 100644 (file)
--- a/include/cln/rational_io.h
+++ b/include/cln/rational_io.h
@@ -21,7 +21,7 @@ namespace cln {
 //   (also index3-index1 Zähler-Ziffern, index2-index3-1 Nenner-Ziffern)
 // < ergebnis: rationale Zahl
 extern const cl_RA read_rational (unsigned int base,
-                   cl_signean sign, const char * string, uintL index1, uintL index3, uintL index2);
+                   cl_signean sign, const char * string, uintC index1, uintC index3, uintC index2);
 
 // The following does strictly the same as the general read_complex.
 // It is here only so that you don't need the complex and float number

diff --git a/src/float/input/cl_F_readparsed.cc b/src/float/input/cl_F_readparsed.cc
index 18c858fb73f0c64e6fa2a2017ebb26470e97b0ab..ebb471d9c1ef686969a8dfb694a40ebeca00cecb 100644 (file)
--- a/src/float/input/cl_F_readparsed.cc
+++ b/src/float/input/cl_F_readparsed.cc
@@ -26,11 +26,11 @@
 
 namespace cln {
 
-const cl_F read_float (unsigned int base, float_format_t prec, cl_signean sign, const char * string, uintL index1, uintL index4, uintL index2, uintL index3)
+const cl_F read_float (unsigned int base, float_format_t prec, cl_signean sign, const char * string, uintC index1, uintC index4, uintC index2, uintC index3)
 {
        var cl_I exponent;
        {
-               var uintL exp_len = index2-index4; // Anzahl Stellen des Exponenten
+               var uintC exp_len = index2-index4; // Anzahl Stellen des Exponenten
                if (exp_len > 0) {
                        var const char * ptr = &string[index4]; // zeigt auf den Exponentmarker
                        ptr++; exp_len--; // Exponentmarker überlesen

diff --git a/src/integer/input/cl_I_readparsed.cc b/src/integer/input/cl_I_readparsed.cc
index a700e1130ac32fb7f23ff49bf0b7f8f98884f6f7..66609b9e3b6c3b727f274d9f2f7d2518b1d175bb 100644 (file)
--- a/src/integer/input/cl_I_readparsed.cc
+++ b/src/integer/input/cl_I_readparsed.cc
@@ -13,7 +13,7 @@
 
 namespace cln {
 
-const cl_I read_integer (unsigned int base, cl_signean sign, const char * string, uintL index1, uintL index2)
+const cl_I read_integer (unsigned int base, cl_signean sign, const char * string, uintC index1, uintC index2)
 {
        var cl_I x = digits_to_I(&string[index1],index2-index1,(uintD)base);
        if (sign == 0)

diff --git a/src/rational/input/cl_RA_readparsed.cc b/src/rational/input/cl_RA_readparsed.cc
index 44e3ae9be65f64ccc11aaa682e1d7879cb2fa07a..bdf80f0186087dcfdb954e6a004e5b789f7f0bd9 100644 (file)
--- a/src/rational/input/cl_RA_readparsed.cc
+++ b/src/rational/input/cl_RA_readparsed.cc
@@ -15,9 +15,9 @@
 
 namespace cln {
 
-const cl_RA read_rational (unsigned int base, cl_signean sign, const char * string, uintL index1, uintL index3, uintL index2)
+const cl_RA read_rational (unsigned int base, cl_signean sign, const char * string, uintC index1, uintC index3, uintC index2)
 {
-       var uintL index3_1 = index3+1; // Index der ersten Nennerziffer
+       var uintC index3_1 = index3+1; // Index der ersten Nennerziffer
        var cl_I den = // Nenner
          digits_to_I(&string[index3_1],index2-index3_1,(uintD)base);
        if (zerop(den)) // Division durch 0 abfangen

diff --git a/src/vector/output/cl_GV_number_aprint.cc b/src/vector/output/cl_GV_number_aprint.cc
index aa77ffc1268940783d0317c2ea5dfe739caafd24..d585fb035dc99457faa5f0d794ac5c9922ee5ada 100644 (file)
--- a/src/vector/output/cl_GV_number_aprint.cc
+++ b/src/vector/output/cl_GV_number_aprint.cc
@@ -19,13 +19,13 @@ namespace cln {
 
 void print_vector (std::ostream& stream, const cl_print_flags& flags, void (* printfun) (std::ostream&, const cl_print_flags&, const cl_number&), const cl_GV_number& vector)
 {
-       var uintL len = vector.length();
+       var uintC len = vector.length();
        if (flags.vector_syntax == vsyntax_commonlisp) {
                fprintchar(stream,'#');
                fprintchar(stream,'(');
        } else
                fprintchar(stream,'[');
-       for (var uintL i = 0; i < len; i++) {
+       for (var uintC i = 0; i < len; i++) {
                if (i > 0) {
                        if (flags.vector_syntax == vsyntax_algebraic)
                                fprintchar(stream,',');

diff --git a/src/vector/output/cl_SV_aprint.cc b/src/vector/output/cl_SV_aprint.cc
index f414e5a1833c499610e8731b3f8d3541d1f7d94c..7cfb89feaafa151f4167c8c8d34906261db8990b 100644 (file)
--- a/src/vector/output/cl_SV_aprint.cc
+++ b/src/vector/output/cl_SV_aprint.cc
@@ -16,13 +16,13 @@ namespace cln {
 void fprint (std::ostream& stream, const cl_ring& R, const cl_SV_ringelt& vector)
 {
        var const cl_print_flags& flags = default_print_flags;
-       var uintL len = vector.length();
+       var uintC len = vector.length();
        if (flags.vector_syntax == vsyntax_commonlisp) {
                fprintchar(stream,'#');
                fprintchar(stream,'(');
        } else
                fprintchar(stream,'[');
-       for (var uintL i = 0; i < len; i++) {
+       for (var uintC i = 0; i < len; i++) {
                if (i > 0) {
                        if (flags.vector_syntax == vsyntax_algebraic)
                                fprintchar(stream,',');

diff --git a/src/vector/output/cl_SV_number_aprint.cc b/src/vector/output/cl_SV_number_aprint.cc
index 8da73d2d81cba5f0fbba85424ee8579f52754c65..ac80026b44d92009a16a0f432ef51621e13901e5 100644 (file)
--- a/src/vector/output/cl_SV_number_aprint.cc
+++ b/src/vector/output/cl_SV_number_aprint.cc
@@ -19,13 +19,13 @@ namespace cln {
 
 void print_vector (std::ostream& stream, const cl_print_flags& flags, void (* printfun) (std::ostream&, const cl_print_flags&, const cl_number&), const cl_SV_number& vector)
 {
-       var uintL len = vector.length();
+       var uintC len = vector.length();
        if (flags.vector_syntax == vsyntax_commonlisp) {
                fprintchar(stream,'#');
                fprintchar(stream,'(');
        } else
                fprintchar(stream,'[');
-       for (var uintL i = 0; i < len; i++) {
+       for (var uintC i = 0; i < len; i++) {
                if (i > 0) {
                        if (flags.vector_syntax == vsyntax_algebraic)
                                fprintchar(stream,',');