99from lambdas import CONS , CAR , CDR
1010from lambdas import SIGN , UNSIGN , NEG , ISPOS , ISNEG , SADD , SSUB , SMUL
1111from lambdas import FAC , FIB
12- from lambdas import make_number
12+ from lambdas import decode_number
1313
1414
1515@pytest .mark .parametrize ('left, right, expected' , [
@@ -59,7 +59,7 @@ def test_xor(left, right, expected):
5959 (SIX , 6 ),
6060])
6161def test_numbers (given , expected ):
62- assert make_number (given ) == expected
62+ assert decode_number (given ) == expected
6363
6464
6565@pytest .mark .parametrize ('given, expected' , [
@@ -69,7 +69,7 @@ def test_numbers(given, expected):
6969 (THREE , 4 ),
7070])
7171def test_inc (given , expected ):
72- assert make_number (INC (given )) == expected
72+ assert decode_number (INC (given )) == expected
7373
7474
7575@pytest .mark .parametrize ('given, expected' , [
@@ -79,7 +79,7 @@ def test_inc(given, expected):
7979 (THREE , 2 ),
8080])
8181def test_dec (given , expected ):
82- assert make_number (DEC (given )) == expected
82+ assert decode_number (DEC (given )) == expected
8383
8484
8585@pytest .mark .parametrize ('left, right, expected' , [
@@ -88,7 +88,7 @@ def test_dec(given, expected):
8888 (THREE , TWO , 5 ),
8989])
9090def test_add (left , right , expected ):
91- assert make_number (ADD (left )(right )) == expected
91+ assert decode_number (ADD (left )(right )) == expected
9292
9393
9494@pytest .mark .parametrize ('left, right, expected' , [
@@ -98,7 +98,7 @@ def test_add(left, right, expected):
9898 (FOUR , ONE , 3 ),
9999])
100100def test_sub (left , right , expected ):
101- assert make_number (SUB (left )(right )) == expected
101+ assert decode_number (SUB (left )(right )) == expected
102102
103103
104104@pytest .mark .parametrize ('left, right, expected' , [
@@ -107,7 +107,7 @@ def test_sub(left, right, expected):
107107 (THREE , TWO , 6 ),
108108])
109109def test_mul (left , right , expected ):
110- assert make_number (MUL (left )(right )) == expected
110+ assert decode_number (MUL (left )(right )) == expected
111111
112112
113113@pytest .mark .parametrize ('left, right, expected' , [
@@ -118,7 +118,7 @@ def test_mul(left, right, expected):
118118 (THREE , THREE , 27 ),
119119])
120120def test_pow (left , right , expected ):
121- assert make_number (POW (left )(right )) == expected
121+ assert decode_number (POW (left )(right )) == expected
122122
123123
124124@pytest .mark .parametrize ('given, expected' , [
@@ -173,7 +173,7 @@ def test_pair():
173173 (FOUR , 24 ),
174174])
175175def test_fac (given , expected ):
176- assert make_number (FAC (given )) == expected
176+ assert decode_number (FAC (given )) == expected
177177
178178
179179@pytest .mark .parametrize ('given, expected' , [
@@ -185,7 +185,7 @@ def test_fac(given, expected):
185185 (SIX , 8 ),
186186])
187187def test_fib (given , expected ):
188- assert make_number (FIB (given )) == expected
188+ assert decode_number (FIB (given )) == expected
189189
190190
191191@pytest .mark .parametrize ('left, right, expected' , [
@@ -195,15 +195,15 @@ def test_fib(given, expected):
195195 (SIX , TWO , 3 ),
196196])
197197def test_div (left , right , expected ):
198- assert make_number (DIV (left )(right )) == expected
198+ assert decode_number (DIV (left )(right )) == expected
199199
200200
201201@pytest .mark .parametrize ('given, expected' , [
202202 (THREE , 3 ),
203203 (FOUR , 4 ),
204204])
205205def test_sign_unsign (given , expected ):
206- assert make_number (UNSIGN (SIGN (given ))) == expected
206+ assert decode_number (UNSIGN (SIGN (given ))) == expected
207207
208208
209209def test_sign_checks ():
@@ -227,7 +227,7 @@ def test_sadd(lsign, left, rsign, right, expsign, expvalue):
227227 rv = CONS (rsign )(right )
228228 res = SADD (lv )(rv )
229229 assert CAR (res ) is expsign
230- assert make_number (CDR (res )) == expvalue
230+ assert decode_number (CDR (res )) == expvalue
231231
232232
233233@pytest .mark .parametrize ('lsign, left, rsign, right, expsign, expvalue' , [
@@ -239,7 +239,7 @@ def test_ssub(lsign, left, rsign, right, expsign, expvalue):
239239 rv = CONS (rsign )(right )
240240 res = SSUB (lv )(rv )
241241 assert CAR (res ) is expsign
242- assert make_number (CDR (res )) == expvalue
242+ assert decode_number (CDR (res )) == expvalue
243243
244244
245245@pytest .mark .parametrize ('lsign, left, rsign, right, expsign, expvalue' , [
@@ -253,7 +253,7 @@ def test_smul(lsign, left, rsign, right, expsign, expvalue):
253253 rv = CONS (rsign )(right )
254254 res = SMUL (lv )(rv )
255255 assert CAR (res ) is expsign
256- assert make_number (CDR (res )) == expvalue
256+ assert decode_number (CDR (res )) == expvalue
257257
258258
259259if __name__ == '__main__' :
0 commit comments