Skip to content

Commit 00785fa

Browse files
committed
remove unused "indent" handling in _json module
1 parent bd8ba44 commit 00785fa

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONEncoderBuiltins.java

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ protected ArgumentClinicProvider getArgumentClinic() {
8888

8989
@Specialization
9090
@TruffleBoundary
91-
protected PTuple call(PJSONEncoder self, Object obj, int indent) {
91+
protected PTuple call(PJSONEncoder self, Object obj, @SuppressWarnings("unused") int indent) {
9292
StringBuilder builder = new StringBuilder();
93-
appendListObj(self, builder, obj, indent);
93+
appendListObj(self, builder, obj);
9494
return factory.createTuple(new Object[]{builder.toString()});
9595
}
9696

@@ -170,17 +170,17 @@ private boolean appendSimpleObj(PJSONEncoder encoder, StringBuilder builder, Obj
170170
return true;
171171
}
172172

173-
private void appendListObj(PJSONEncoder encoder, StringBuilder builder, Object obj, int indentLevel) {
173+
private void appendListObj(PJSONEncoder encoder, StringBuilder builder, Object obj) {
174174
if (appendSimpleObj(encoder, builder, obj)) {
175175
// done
176176
} else if (obj instanceof PList || obj instanceof PTuple) {
177-
appendList(encoder, builder, (PSequence) obj, indentLevel);
177+
appendList(encoder, builder, (PSequence) obj);
178178
} else if (obj instanceof PDict) {
179-
appendDict(encoder, builder, (PDict) obj, indentLevel);
179+
appendDict(encoder, builder, (PDict) obj);
180180
} else {
181181
startRecursion(encoder, obj);
182182
Object newObj = callDefaultFn.executeObject(encoder.defaultFn, obj);
183-
appendListObj(encoder, builder, newObj, indentLevel);
183+
appendListObj(encoder, builder, newObj);
184184
endRecursion(encoder, obj);
185185
}
186186
}
@@ -200,7 +200,7 @@ private void startRecursion(PJSONEncoder encoder, Object obj) {
200200
}
201201
}
202202

203-
private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict, int indentLevel) {
203+
private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict) {
204204
HashingStorage storage = dict.getDictStorage();
205205

206206
if (dictLib.length(storage) == 0) {
@@ -209,15 +209,11 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
209209
startRecursion(encoder, dict);
210210
builder.append('{');
211211

212-
if (encoder.indent != PNone.NONE) {
213-
indentLevel++;
214-
}
215-
216212
if (!encoder.sortKeys && IsBuiltinClassProfile.profileClassSlowPath(getDictClass.execute(dict), PythonBuiltinClassType.PDict)) {
217213
HashingStorageIterable<DictEntry> entries = dictLib.entries(storage);
218214
boolean first = true;
219215
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);
221217
}
222218
} else {
223219
Object items = constructList.execute(null, callGetItems.executeObject(null, dict));
@@ -240,7 +236,7 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
240236
SequenceStorage sequenceStorage = ((PTuple) item).getSequenceStorage();
241237
Object key = sequenceStorage.getItemNormalized(0);
242238
Object value = sequenceStorage.getItemNormalized(1);
243-
first = appendDictEntry(encoder, builder, indentLevel, first, key, value);
239+
first = appendDictEntry(encoder, builder, first, key, value);
244240
}
245241
}
246242

@@ -249,7 +245,7 @@ private void appendDict(PJSONEncoder encoder, StringBuilder builder, PDict dict,
249245
}
250246
}
251247

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) {
253249
if (!first) {
254250
builder.append(encoder.itemSeparator);
255251
}
@@ -270,28 +266,24 @@ private boolean appendDictEntry(PJSONEncoder encoder, StringBuilder builder, int
270266
builder.append('"');
271267
}
272268
builder.append(encoder.keySeparator);
273-
appendListObj(encoder, builder, value, indentLevel);
269+
appendListObj(encoder, builder, value);
274270
return false;
275271
}
276272

277-
private void appendList(PJSONEncoder encoder, StringBuilder builder, PSequence list, int indentLevel) {
273+
private void appendList(PJSONEncoder encoder, StringBuilder builder, PSequence list) {
278274
SequenceStorage storage = list.getSequenceStorage();
279275

280276
if (storage.length() == 0) {
281277
builder.append("[]");
282278
} else {
283279
startRecursion(encoder, list);
284-
285280
builder.append('[');
286-
if (encoder.indent != PNone.NONE) {
287-
indentLevel++;
288-
}
289281

290282
for (int i = 0; i < storage.length(); i++) {
291283
if (i > 0) {
292284
builder.append(encoder.itemSeparator);
293285
}
294-
appendListObj(encoder, builder, storage.getItemNormalized(i), indentLevel);
286+
appendListObj(encoder, builder, storage.getItemNormalized(i));
295287
}
296288

297289
builder.append(']');

0 commit comments

Comments
 (0)