Support inf, -inf, nan literals (and any

jimbaker · jimbaker · commit 1f90f04d8c7c · 2008-07-30T15:46:31.000Z
uppercasing). struct.pack("d") ducktypes like CPython and calls
__float__. This fixes a number of issues for PyAMF.
diff --git a/src/org/python/core/PyFloat.java b/src/org/python/core/PyFloat.java
@@ -105,6 +105,10 @@ final PyString float___repr__() {
     }
 
     private String formatDouble(int precision) {
+        if (Double.isNaN(value)) {
+            return "nan";
+        }
+        
         String result = String.format("%%.%dg", precision);
         result = Py.newString(result).__mod__(this).toString();
 
diff --git a/src/org/python/core/PyString.java b/src/org/python/core/PyString.java
@@ -1510,6 +1510,10 @@ public double atof() {
         try {
             // Double.valueOf allows format specifier ("d" or "f") at the end
             String lowSval = sval.toLowerCase();
+            if (lowSval.equals("nan")) return Double.NaN;
+            else if (lowSval.equals("inf")) return Double.POSITIVE_INFINITY;
+            else if (lowSval.equals("-inf")) return Double.NEGATIVE_INFINITY;
+            
             if (lowSval.endsWith("d") || lowSval.endsWith("f")) {
                 throw new NumberFormatException("format specifiers not allowed");
             }
diff --git a/src/org/python/modules/struct.java b/src/org/python/modules/struct.java
@@ -351,8 +351,6 @@ BigInteger get_ulong(PyObject value) {
         }
 
         double get_float(PyObject value) {
-            if (!(value instanceof PyFloat))
-                throw StructError("required argument is not an float");
             return value.__float__().getValue();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,10 @@ final PyString float___repr__() {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`private String formatDouble(int precision) {`
	`108`	`+ if (Double.isNaN(value)) {`
	`109`	`+ return "nan";`
	`110`	`+ }`
	`111`	`+`
`108`	`112`	`String result = String.format("%%.%dg", precision);`
`109`	`113`	`result = Py.newString(result).__mod__(this).toString();`
`110`	`114`
Original file line number	Diff line number	Diff line change
`@@ -351,8 +351,6 @@ BigInteger get_ulong(PyObject value) {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`double get_float(PyObject value) {`
`354`		`- if (!(value instanceof PyFloat))`
`355`		`- throw StructError("required argument is not an float");`
`356`	`354`	`return value.__float__().getValue();`
`357`	`355`	`}`
`358`	`356`