[Jython-checkins] SF.net SVN: jython: [2890] trunk/jython/src/org/python/core/PyString.java

[<cg...@us...>]

Revision: 2890
Author:   cgroves
Date:     2006-08-14 21:03:46 -0700 (Mon, 14 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/jython/?rev=2890&view=rev

Log Message:
-----------
Allow arbitrary precision for formatted strings, but only 250 chars for
decimal, integer and long.  From patch #1512745.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyString.java
Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java	2006-08-15 03:45:52 UTC (rev 2889)
+++ trunk/jython/src/org/python/core/PyString.java	2006-08-15 04:03:46 UTC (rev 2890)
@@ -4870,7 +4870,16 @@
         }
     }
 
+    private void checkPrecision(String type) {
+        if(precision > 250) {
+            // A magic number. Larger than in CPython.
+            throw Py.OverflowError("formatted " + type + " is too long (precision too long?)");
+        }
+        
+    }
+
     public String formatLong(PyString arg, char type, boolean altFlag) {
+        checkPrecision("long");
         String s = arg.toString();
         int end = s.length();
         int ptr = 0;
@@ -4928,6 +4937,7 @@
     }
 
     public String formatInteger(long v, int radix, boolean unsigned) {
+        checkPrecision("integer");
         if (unsigned) {
             if (v < 0)
                 v = 0x100000000l + v;
@@ -4949,6 +4959,7 @@
     }
 
     public String formatFloatDecimal(double v, boolean truncate) {
+        checkPrecision("decimal");
         java.text.NumberFormat format = java.text.NumberFormat.getInstance(
                                            java.util.Locale.US);
         int prec = precision;
@@ -5087,11 +5098,6 @@
                 precision = getNumber();
                 if (precision < -1)
                     precision = 0;
-                if (precision > 250) {
-                    // A magic number. Larger than in CPython.
-                    throw Py.OverflowError(
-                         "formatted float is too long (precision too long?)");
-                }
 
                 c = pop();
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.