Skip to content

Commit be7b31b

Browse files
committed
fixed trainwrecks
1 parent 31b1031 commit be7b31b

1 file changed

Lines changed: 23 additions & 10 deletions

File tree

  • src/org/rascalmpl/library/lang/json

src/org/rascalmpl/library/lang/json/IO.java

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ public IValue readJSON(IValue type, ISourceLocation loc, IString dateTimeFormat,
6565
try (JsonReader in = new JsonReader(URIResolverRegistry.getInstance().getCharacterReader(loc))) {
6666
in.setLenient(lenient.getValue());
6767
return new JsonValueReader(values, store, monitor, trackOrigins.getValue() ? loc : null)
68-
.setCalendarFormat(dateTimeFormat.getValue()).setParsers(parsers).setNulls(unreify(nulls))
68+
.setCalendarFormat(dateTimeFormat.getValue())
69+
.setParsers(parsers)
70+
.setNulls(unreify(nulls))
6971
.setExplicitConstructorNames(explicitConstructorNames.getValue())
7072
.setExplicitDataTypes(explicitDataTypes.getValue()).read(in, start);
7173
}
@@ -92,7 +94,9 @@ public IValue parseJSON(IValue type, IString src, IString dateTimeFormat, IBool
9294
in.setLenient(lenient.getValue());
9395
return new JsonValueReader(values, store, monitor,
9496
trackOrigins.getValue() ? URIUtil.rootLocation("unknown") : null)
95-
.setCalendarFormat(dateTimeFormat.getValue()).setParsers(parsers).setNulls(unreify(nulls))
97+
.setCalendarFormat(dateTimeFormat.getValue())
98+
.setParsers(parsers)
99+
.setNulls(unreify(nulls))
96100
.setExplicitConstructorNames(explicitConstructorNames.getValue())
97101
.setExplicitDataTypes(explicitDataTypes.getValue()).read(in, start);
98102
}
@@ -114,10 +118,15 @@ public void writeJSON(ISourceLocation loc, IValue value, IBool unpackedLocations
114118
out.setIndent(" ".substring(0, indent.intValue() % 9));
115119
}
116120

117-
new JsonValueWriter().setCalendarFormat(dateTimeFormat.getValue()).setDatesAsInt(dateTimeAsInt.getValue())
118-
.setUnpackedLocations(unpackedLocations.getValue()).setDropOrigins(dropOrigins.getValue())
119-
.setFormatters(formatter).setExplicitConstructorNames(explicitConstructorNames.getValue())
120-
.setExplicitDataTypes(explicitDataTypes.getValue()).write(out, value);
121+
new JsonValueWriter()
122+
.setCalendarFormat(dateTimeFormat.getValue())
123+
.setDatesAsInt(dateTimeAsInt.getValue())
124+
.setUnpackedLocations(unpackedLocations.getValue())
125+
.setDropOrigins(dropOrigins.getValue())
126+
.setFormatters(formatter)
127+
.setExplicitConstructorNames(explicitConstructorNames.getValue())
128+
.setExplicitDataTypes(explicitDataTypes.getValue())
129+
.write(out, value);
121130
}
122131
catch (IOException e) {
123132
throw RuntimeExceptionFactory.io(values.string(e.getMessage()), null, null);
@@ -133,10 +142,14 @@ public IString asJSON(IValue value, IBool unpackedLocations, IString dateTimeFor
133142
if (indent.intValue() > 0) {
134143
out.setIndent(" ".substring(0, indent.intValue() % 9));
135144
}
136-
new JsonValueWriter().setCalendarFormat(dateTimeFormat.getValue()).setDatesAsInt(dateTimeAsInt.getValue())
137-
.setUnpackedLocations(unpackedLocations.getValue()).setDropOrigins(dropOrigins.getValue())
138-
.setFormatters(formatter).setExplicitConstructorNames(explicitConstructorNames.getValue())
139-
.setExplicitDataTypes(explicitDataTypes.getValue()).write(out, value);
145+
new JsonValueWriter().setCalendarFormat(dateTimeFormat.getValue())
146+
.setDatesAsInt(dateTimeAsInt.getValue())
147+
.setUnpackedLocations(unpackedLocations.getValue())
148+
.setDropOrigins(dropOrigins.getValue())
149+
.setFormatters(formatter)
150+
.setExplicitConstructorNames(explicitConstructorNames.getValue())
151+
.setExplicitDataTypes(explicitDataTypes.getValue())
152+
.write(out, value);
140153

141154
return values.string(string.toString());
142155
}

0 commit comments

Comments
 (0)