@@ -158,10 +158,9 @@ def Cython2PythonType(cython_type: str) -> str:
158
158
def expression2str (expression : Union [ParseResults , str ]):
159
159
"""EXPRESSION parsed tree to string"""
160
160
161
- expression_string = ""
162
-
163
161
if isinstance (expression , ParseResults ):
164
-
162
+ expression_string = ""
163
+
165
164
if expression .getName () == 'list' :
166
165
expression_string += "[" + ', ' .join (expression2str (e ) for e in expression ) + "]"
167
166
@@ -174,14 +173,14 @@ def expression2str(expression: Union[ParseResults, str]):
174
173
elif expression .getName () == 'dict' :
175
174
expression_string += "{" + ', ' .join (f"{ expression2str (k )} : { expression2str (v )} " for k , v in expression ) + "}"
176
175
177
- elif isinstance ( expression , ParseResults ) :
176
+ else :
178
177
for e in expression :
179
178
expression_string += expression2str (e )
179
+
180
+ return expression_string
180
181
181
- if isinstance (expression , str ):
182
+ elif isinstance (expression , str ):
182
183
return expression
183
-
184
- return expression_string
185
184
186
185
def type2str (type_tree : ParseResults ):
187
186
"""type_definition parsed tree to string"""
@@ -242,7 +241,7 @@ def format_arg(arg):
242
241
if arg [0 ] == "self" : return "self" # handle unique case cdef inside class
243
242
t , n , d = arg
244
243
type_str = type2str (t )
245
- default_str = f' = { d } ' if d else ''
244
+ default_str = f' = { expression2str ( d ) } ' if d else ''
246
245
return f'{ n } : { type_str } { default_str } '
247
246
248
247
joiner = f',\n { INDENT } ' if newlines else ', '
0 commit comments