From ac63290db741f5503c52ec6d3321fff8503b0ade Mon Sep 17 00:00:00 2001 From: HyeockJinKim Date: Sun, 29 Sep 2019 01:55:37 +0900 Subject: [PATCH 1/4] Handle the non-integer return of __index__ Generate TypeError when __index__ return non-integer value Fixes #96 --- py/internal.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/py/internal.go b/py/internal.go index bf654631..df0e285c 100644 --- a/py/internal.go +++ b/py/internal.go @@ -95,11 +95,12 @@ func Index(a Object) (Int, error) { if err != nil { return 0, err } + if res, ok := A.(Int); ok { return res, nil } - return 0, err + return 0, ExceptionNewf(TypeError, "__index__ returned non-int: (type %s)", A.Type().Name) } return 0, ExceptionNewf(TypeError, "unsupported operand type(s) for index: '%s'", a.Type().Name) From 22ccb4a1288c395cbdb5e6ee2657ffc4de0116a9 Mon Sep 17 00:00:00 2001 From: HyeockJinKim Date: Sun, 29 Sep 2019 02:38:38 +0900 Subject: [PATCH 2/4] Handle error of slice in range type When an error occurs, the error is returned and when the value is none the slice's values have a default value. --- py/range.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/py/range.go b/py/range.go index fe31497e..a54005c8 100644 --- a/py/range.go +++ b/py/range.go @@ -160,6 +160,16 @@ func computeRangeLength(start, stop, step Int) Int { return res } +func getIndexWithDefault(i Object, d Int) (Int, error) { + if i == None { + return d, nil + } else if res, err := Index(i); err != nil { + return 0, err + } else { + return res, nil + } +} + func computeNegativeIndex(index, length Int) Int { if index < 0 { index += length @@ -177,19 +187,19 @@ func computeBoundIndex(index, length Int) Int { } func computeRangeSlice(r *Range, s *Slice) (Object, error) { - start, err := Index(s.Start) + start, err := getIndexWithDefault(s.Start, 0) if err != nil { - start = 0 + return nil, err } - stop, err := Index(s.Stop) + stop, err := getIndexWithDefault(s.Stop, r.Length) if err != nil { - stop = r.Length + return nil, err } - - step, err := Index(s.Step) + step, err := getIndexWithDefault(s.Step, 1) if err != nil { - step = 1 + return nil, err } + if step == 0 { return nil, ExceptionNewf(ValueError, "slice step cannot be zero") } From 9cc7591414d238ba37754e3f28fe2b154d61724f Mon Sep 17 00:00:00 2001 From: HyeockJinKim Date: Sun, 29 Sep 2019 03:06:21 +0900 Subject: [PATCH 3/4] Add tests for __index__ --- py/tests/range.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/py/tests/range.py b/py/tests/range.py index 44eca5db..c027b4fe 100644 --- a/py/tests/range.py +++ b/py/tests/range.py @@ -116,4 +116,24 @@ def __index__(self): assert a[b:10] == a[1:10] assert a[10:b:-1] == a[10:1:-1] +class NonIntegerIndex: + def __index__(self): + return 1.1 + +a = range(10) +b = NonIntegerIndex() +try: + a[b] +except TypeError: + pass +else: + assert False, "TypeError not raised" + +try: + a[b:10] +except TypeError: + pass +else: + assert False, "TypeError not raised" + doc="finished" From 313242b4d6dd99059ef2f6a73b606114555152d2 Mon Sep 17 00:00:00 2001 From: HyeockJinKim Date: Sun, 29 Sep 2019 22:00:33 +0900 Subject: [PATCH 4/4] Add tests for __index__ function Add tests for __index__ in list, tuple, string --- py/tests/list.py | 30 ++++++++++++++++++++++++++++++ py/tests/string.py | 31 +++++++++++++++++++++++++++++++ py/tests/tuple.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/py/tests/list.py b/py/tests/list.py index 3e8468b0..c4ffcb00 100644 --- a/py/tests/list.py +++ b/py/tests/list.py @@ -111,4 +111,34 @@ assertRaises(TypeError, lambda: list.sort(s5, key=1)) assertRaises(TypeError, lambda: list.sort(1)) +class Index: + def __index__(self): + return 1 + +a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +b = Index() +assert a[b] == 1 +assert a[b:10] == a[1:10] +assert a[10:b:-1] == a[10:1:-1] + +class NonIntegerIndex: + def __index__(self): + return 1.1 + +a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +b = NonIntegerIndex() +try: + a[b] +except TypeError: + pass +else: + assert False, "TypeError not raised" + +try: + a[b:10] +except TypeError: + pass +else: + assert False, "TypeError not raised" + doc="finished" diff --git a/py/tests/string.py b/py/tests/string.py index 8eb3b691..43487328 100644 --- a/py/tests/string.py +++ b/py/tests/string.py @@ -886,4 +886,35 @@ def index(s, i): assert uni[7:7:2] == '' assert uni[7:7:3] == '' +class Index: + def __index__(self): + return 1 + +a = '012345678910' +b = Index() +assert a[b] == '1' +assert a[b:10] == a[1:10] +assert a[10:b:-1] == a[10:1:-1] + +class NonIntegerIndex: + def __index__(self): + return 1.1 + +a = '012345678910' +b = NonIntegerIndex() +try: + a[b] +except TypeError: + pass +else: + assert False, "TypeError not raised" + +try: + a[b:10] +except TypeError: + pass +else: + assert False, "TypeError not raised" + + doc="finished" diff --git a/py/tests/tuple.py b/py/tests/tuple.py index 609a687c..8bc6df20 100644 --- a/py/tests/tuple.py +++ b/py/tests/tuple.py @@ -20,4 +20,34 @@ assert a * 0 == () assert a * -1 == () +class Index: + def __index__(self): + return 1 + +a = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10) +b = Index() +assert a[b] == 1 +assert a[b:10] == a[1:10] +assert a[10:b:-1] == a[10:1:-1] + +class NonIntegerIndex: + def __index__(self): + return 1.1 + +a = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10) +b = NonIntegerIndex() +try: + a[b] +except TypeError: + pass +else: + assert False, "TypeError not raised" + +try: + a[b:10] +except TypeError: + pass +else: + assert False, "TypeError not raised" + doc="finished" pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy