FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Change repr(float) if float(int(f)) == f · Pull Request #104 · go-python/gpython · GitHub

/ gpython Public

Change repr(float) if float(int(f)) == f #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ncw merged 4 commits into from Sep 30, 2019
Conversation 2 Commits 4 Checks 0 Files changed
Merged

Change repr(float) if float(int(f)) == f #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5cd9f2
Fix 103
Tim-St Sep 29, 2019
804ee41
more tests
Tim-St Sep 29, 2019
5057b16
target only integer-like floats
Tim-St Sep 29, 2019
95ae69d
Update float.py
Tim-St Sep 29, 2019
File filter

Filter by extension

Filter by extension .go  (1) .py  (3) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions py/float.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ func FloatNew(metatype *Type, args Tuple, kwargs StringDict) (Object, error) {
}

func (a Float) M__str__() (Object, error) {
if i := int64(a); Float(i) == a {
return String(fmt.Sprintf("%d.0", i)), nil
}
return String(fmt.Sprintf("%g", a)), nil
}

Expand Down
20 changes: 20 additions & 0 deletions py/tests/float.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,24 @@
assert float(" -1E400") == float("-inf")
assertRaises(ValueError, float, "1 E200")

doc="repr"
assert repr(float("1.0")) == "1.0"
assert repr(float("1.")) == "1.0"
assert repr(float("1.1")) == "1.1"
assert repr(float("1.11")) == "1.11"
assert repr(float("-1.0")) == "-1.0"
assert repr(float("1.00101")) == "1.00101"
assert repr(float("1.00")) == "1.0"
assert repr(float("2.010")) == "2.01"

doc="str"
assert str(float("1.0")) == "1.0"
assert str(float("1.")) == "1.0"
assert str(float("1.1")) == "1.1"
assert str(float("1.11")) == "1.11"
assert str(float("-1.0")) == "-1.0"
assert str(float("1.00101")) == "1.00101"
assert str(float("1.00")) == "1.0"
assert str(float("2.010")) == "2.01"

doc="finished"
2 changes: 2 additions & 0 deletions py/tests/list.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
assert str([1,2,3]) == "[1, 2, 3]"
assert str([1,[2,3],4]) == "[1, [2, 3], 4]"
assert str(["1",[2.5,17,[]]]) == "['1', [2.5, 17, []]]"
assert str([1, 1.0]) == "[1, 1.0]"

doc="repr"
assert repr([]) == "[]"
assert repr([1,2,3]) == "[1, 2, 3]"
assert repr([1,[2,3],4]) == "[1, [2, 3], 4]"
assert repr(["1",[2.5,17,[]]]) == "['1', [2.5, 17, []]]"
assert repr([1, 1.0]) == "[1, 1.0]"

doc="enumerate"
a = [e for e in enumerate([3,4,5,6,7], 4)]
Expand Down
2 changes: 2 additions & 0 deletions py/tests/tuple.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
assert str((1,2,3)) == "(1, 2, 3)"
assert str((1,(2,3),4)) == "(1, (2, 3), 4)"
assert str(("1",(2.5,17,()))) == "('1', (2.5, 17, ()))"
assert str((1, 1.0)) == "(1, 1.0)"

doc="repr"
assert repr(()) == "()"
assert repr((1,2,3)) == "(1, 2, 3)"
assert repr((1,(2,3),4)) == "(1, (2, 3), 4)"
assert repr(("1",(2.5,17,()))) == "('1', (2.5, 17, ()))"
assert repr((1, 1.0)) == "(1, 1.0)"

doc="mul"
a = (1, 2, 3)
Expand Down
Back | FazBrowse Home | New Git URL