Skip to content

Commit 1b703d7

Browse files
committed
[GR-17499] Complex number with negative zero is printed with positive zero.
1 parent 8a48496 commit 1b703d7

File tree

2 files changed

+54
-2
lines changed
  • graalpython
    • com.oracle.graal.python.test/src/com/oracle/graal/python/test/basic
    • com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex

2 files changed

+54
-2
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package com.oracle.graal.python.test.basic;
2+
3+
import static com.oracle.graal.python.test.PythonTests.assertPrints;
4+
import org.junit.Test;
5+
6+
/*
7+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
8+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9+
*
10+
* The Universal Permissive License (UPL), Version 1.0
11+
*
12+
* Subject to the condition set forth below, permission is hereby granted to any
13+
* person obtaining a copy of this software, associated documentation and/or
14+
* data (collectively the "Software"), free of charge and under any and all
15+
* copyright rights in the Software, and any and all patent rights owned or
16+
* freely licensable by each licensor hereunder covering either (i) the
17+
* unmodified Software as contributed to or provided by such licensor, or (ii)
18+
* the Larger Works (as defined below), to deal in both
19+
*
20+
* (a) the Software, and
21+
*
22+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
23+
* one is included with the Software each a "Larger Work" to which the Software
24+
* is contributed by such licensors),
25+
*
26+
* without restriction, including without limitation the rights to copy, create
27+
* derivative works of, display, perform, and distribute the Software and make,
28+
* use, sell, offer for sale, import, export, have made, and have sold the
29+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
30+
* either these or other terms.
31+
*
32+
* This license is subject to the following condition:
33+
*
34+
* The above copyright notice and either this complete permission notice or at a
35+
* minimum a reference to the UPL must be included in all copies or substantial
36+
* portions of the Software.
37+
*
38+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
39+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
40+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
41+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
42+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
43+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
44+
* SOFTWARE.
45+
*/
46+
47+
public class ComplexTexts {
48+
@Test
49+
public void negativeZero() {
50+
assertPrints("(1-0j)\n", "print(complex(1,-0.0))");
51+
}
52+
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/PComplex.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.
@@ -99,7 +99,7 @@ public String toString() {
9999
// special case where real is actually -0.0
100100
realString = "-0";
101101
}
102-
if (imag >= 0) {
102+
if (Double.compare(imag, 0.0) >= 0) {
103103
return String.format("(%s+%sj)", realString, toString(imag));
104104
} else {
105105
return String.format("(%s-%sj)", realString, toString(-imag));

0 commit comments

Comments
 (0)