@@ -88,9 +88,9 @@ protected ArgumentClinicProvider getArgumentClinic() {
88
88
89
89
@ Specialization
90
90
@ TruffleBoundary
91
- protected PTuple call (PJSONEncoder self , Object obj , int indent ) {
91
+ protected PTuple call (PJSONEncoder self , Object obj , @ SuppressWarnings ( "unused" ) int indent ) {
92
92
StringBuilder builder = new StringBuilder ();
93
- appendListObj (self , builder , obj , indent );
93
+ appendListObj (self , builder , obj );
94
94
return factory .createTuple (new Object []{builder .toString ()});
95
95
}
96
96
@@ -170,17 +170,17 @@ private boolean appendSimpleObj(PJSONEncoder encoder, StringBuilder builder, Obj
170
170
return true ;
171
171
}
172
172
173
- private void appendListObj (PJSONEncoder encoder , StringBuilder builder , Object obj , int indentLevel ) {
173
+ private void appendListObj (PJSONEncoder encoder , StringBuilder builder , Object obj ) {
174
174
if (appendSimpleObj (encoder , builder , obj )) {
175
175
// done
176
176
} else if (obj instanceof PList || obj instanceof PTuple ) {
177
- appendList (encoder , builder , (PSequence ) obj , indentLevel );
177
+ appendList (encoder , builder , (PSequence ) obj );
178
178
} else if (obj instanceof PDict ) {
179
- appendDict (encoder , builder , (PDict ) obj , indentLevel );
179
+ appendDict (encoder , builder , (PDict ) obj );
180
180
} else {
181
181
startRecursion (encoder , obj );
182
182
Object newObj = callDefaultFn .executeObject (encoder .defaultFn , obj );
183
- appendListObj (encoder , builder , newObj , indentLevel );
183
+ appendListObj (encoder , builder , newObj );
184
184
endRecursion (encoder , obj );
185
185
}
186
186
}
@@ -200,7 +200,7 @@ private void startRecursion(PJSONEncoder encoder, Object obj) {
200
200
}
201
201
}
202
202
203
- private void appendDict (PJSONEncoder encoder , StringBuilder builder , PDict dict , int indentLevel ) {
203
+ private void appendDict (PJSONEncoder encoder , StringBuilder builder , PDict dict ) {
204
204
HashingStorage storage = dict .getDictStorage ();
205
205
206
206
if (dictLib .length (storage ) == 0 ) {
@@ -209,15 +209,11 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
209
209
startRecursion (encoder , dict );
210
210
builder .append ('{' );
211
211
212
- if (encoder .indent != PNone .NONE ) {
213
- indentLevel ++;
214
- }
215
-
216
212
if (!encoder .sortKeys && IsBuiltinClassProfile .profileClassSlowPath (getDictClass .execute (dict ), PythonBuiltinClassType .PDict )) {
217
213
HashingStorageIterable <DictEntry > entries = dictLib .entries (storage );
218
214
boolean first = true ;
219
215
for (DictEntry entry : entries ) {
220
- first = appendDictEntry (encoder , builder , indentLevel , first , entry .key , entry .value );
216
+ first = appendDictEntry (encoder , builder , first , entry .key , entry .value );
221
217
}
222
218
} else {
223
219
Object items = constructList .execute (null , callGetItems .executeObject (null , dict ));
@@ -240,7 +236,7 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
240
236
SequenceStorage sequenceStorage = ((PTuple ) item ).getSequenceStorage ();
241
237
Object key = sequenceStorage .getItemNormalized (0 );
242
238
Object value = sequenceStorage .getItemNormalized (1 );
243
- first = appendDictEntry (encoder , builder , indentLevel , first , key , value );
239
+ first = appendDictEntry (encoder , builder , first , key , value );
244
240
}
245
241
}
246
242
@@ -249,7 +245,7 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
249
245
}
250
246
}
251
247
252
- private boolean appendDictEntry (PJSONEncoder encoder , StringBuilder builder , int indentLevel , boolean first , Object key , Object value ) {
248
+ private boolean appendDictEntry (PJSONEncoder encoder , StringBuilder builder , boolean first , Object key , Object value ) {
253
249
if (!first ) {
254
250
builder .append (encoder .itemSeparator );
255
251
}
@@ -270,28 +266,24 @@ private boolean appendDictEntry(PJSONEncoder encoder, StringBuilder builder, int
270
266
builder .append ('"' );
271
267
}
272
268
builder .append (encoder .keySeparator );
273
- appendListObj (encoder , builder , value , indentLevel );
269
+ appendListObj (encoder , builder , value );
274
270
return false ;
275
271
}
276
272
277
- private void appendList (PJSONEncoder encoder , StringBuilder builder , PSequence list , int indentLevel ) {
273
+ private void appendList (PJSONEncoder encoder , StringBuilder builder , PSequence list ) {
278
274
SequenceStorage storage = list .getSequenceStorage ();
279
275
280
276
if (storage .length () == 0 ) {
281
277
builder .append ("[]" );
282
278
} else {
283
279
startRecursion (encoder , list );
284
-
285
280
builder .append ('[' );
286
- if (encoder .indent != PNone .NONE ) {
287
- indentLevel ++;
288
- }
289
281
290
282
for (int i = 0 ; i < storage .length (); i ++) {
291
283
if (i > 0 ) {
292
284
builder .append (encoder .itemSeparator );
293
285
}
294
- appendListObj (encoder , builder , storage .getItemNormalized (i ), indentLevel );
286
+ appendListObj (encoder , builder , storage .getItemNormalized (i ));
295
287
}
296
288
297
289
builder .append (']' );
0 commit comments