daviddoji/pytudes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cast map return values to lists

Browse Source 
For Python 3.x, map() returns a map object which needs to be cast to a list for some of the return values in the expand and let methods. Otherwise, some tests will fail.
This commit is contained in:
Nischal Shrestha 2019-09-08 02:37:56 -04:00 committed by GitHub
parent f38dfe836a
commit a56edfe0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/lispy.py
View File

@ -230,7 +230,7 @@ def expand(x, toplevel=False):
elif x[0] is _if: elif x[0] is _if:
if len(x)==3: x = x + [None] # (if t c) => (if t c None) if len(x)==3: x = x + [None] # (if t c) => (if t c None)
require(x, len(x)==4) require(x, len(x)==4)
return map(expand, x) return list(map(expand, x))
elif x[0] is _set: elif x[0] is _set:
require(x, len(x)==3); require(x, len(x)==3);
var = x[1] # (set! non-var exp) => Error var = x[1] # (set! non-var exp) => Error
@ -269,7 +269,7 @@ def expand(x, toplevel=False):
elif isa(x[0], Symbol) and x[0] in macro_table: elif isa(x[0], Symbol) and x[0] in macro_table:
return expand(macro_table[x[0]](*x[1:]), toplevel) # (m arg...) return expand(macro_table[x[0]](*x[1:]), toplevel) # (m arg...)
else: # => macroexpand if m isa macro else: # => macroexpand if m isa macro
return map(expand, x) # (f arg...) => expand each return list(map(expand, x)) # (f arg...) => expand each
def require(x, predicate, msg="wrong length"): def require(x, predicate, msg="wrong length"):
"Signal a syntax error if predicate is false." "Signal a syntax error if predicate is false."
@ -299,7 +299,7 @@ def let(*args):
require(x, all(isa(b, list) and len(b)==2 and isa(b[0], Symbol) require(x, all(isa(b, list) and len(b)==2 and isa(b[0], Symbol)
for b in bindings), "illegal binding list") for b in bindings), "illegal binding list")
vars, vals = zip(*bindings) vars, vals = zip(*bindings)
return [[_lambda, list(vars)]+map(expand, body)] + map(expand, vals) return [[_lambda, list(vars)]+list(map(expand, body))] + list(map(expand, vals))
macro_table = {_let:let} ## More macros can go here macro_table = {_let:let} ## More macros can go here