Skip to content

Commit 357de0d

Browse files
committed
Merge pull request lightbend#305 from fpringvaldsen/task/configparser-cleanup
Cleanup ConfigParser comments
2 parents 7107ec0 + b1eadee commit 357de0d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

config/src/main/java/com/typesafe/config/impl/ConfigParser.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ private AbstractConfigValue parseConcatenation(ConfigNodeConcatenation n) {
5959
if (flavor == ConfigSyntax.JSON)
6060
throw new ConfigException.BugOrBroken("Found a concatenation node in JSON");
6161

62-
// create only if we have value tokens
6362
List<AbstractConfigValue> values = new ArrayList<AbstractConfigValue>();
6463

6564
for (AbstractConfigNode node : n.children()) {
@@ -213,7 +212,6 @@ private void parseInclude(Map<String, AbstractConfigValue> values, ConfigNodeInc
213212
}
214213

215214
private AbstractConfigObject parseObject(ConfigNodeObject n) {
216-
// invoked just after the OPEN_CURLY (or START, if !hadOpenCurly)
217215
Map<String, AbstractConfigValue> values = new HashMap<String, AbstractConfigValue>();
218216
SimpleConfigOrigin objectOrigin = lineOrigin();
219217
boolean lastWasNewline = false;
@@ -348,7 +346,6 @@ private AbstractConfigObject parseObject(ConfigNodeObject n) {
348346
}
349347

350348
private SimpleConfigList parseArray(ConfigNodeArray n) {
351-
// invoked just after the OPEN_SQUARE
352349
arrayCount += 1;
353350

354351
SimpleConfigOrigin arrayOrigin = lineOrigin();
@@ -358,7 +355,7 @@ private SimpleConfigList parseArray(ConfigNodeArray n) {
358355
List<String> comments = new ArrayList<String>();
359356

360357
AbstractConfigValue v = null;
361-
// now remaining elements
358+
362359
for (AbstractConfigNode node : n.children()) {
363360
if (node instanceof ConfigNodeComment) {
364361
comments.add(((ConfigNodeComment) node).commentText());

config/src/main/java/com/typesafe/config/impl/Parseable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ private AbstractConfigValue rawParseValue(Reader reader, ConfigOrigin origin,
262262
}
263263
}
264264

265-
// this is parseValue without post-processing the IOException or handling
265+
// this is parseDocument without post-processing the IOException or handling
266266
// options.getAllowMissing()
267267
protected ConfigDocument rawParseDocument(ConfigOrigin origin, ConfigParseOptions finalOptions)
268268
throws IOException {

0 commit comments

Comments
 (0)