chore: update parsing test cases and fix printing

Author: alightgoesout

src/main/java/kdl/objects/KDLNode.java

@@ -1,14 +1,20 @@
 package kdl.objects;
 
-import kdl.print.PrintConfig;
-import kdl.print.PrintUtil;
-
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
+import kdl.print.PrintConfig;
+
+import static kdl.print.PrintUtil.writeStringQuotedAppropriately;
 
 public class KDLNode implements KDLObject {
     private final String identifier;
@@ -69,41 +75,31 @@ public void writeKDL(Writer writer, PrintConfig printConfig) throws IOException
     void writeKDLPretty(Writer writer, int depth, PrintConfig printConfig) throws IOException {
         if (type.isPresent()) {
             writer.write('(');
-            PrintUtil.writeStringQuotedAppropriately(writer, type.get(), true, printConfig);
+            writeStringQuotedAppropriately(writer, type.get(), true, printConfig);
             writer.write(')');
         }
 
-        PrintUtil.writeStringQuotedAppropriately(writer, identifier, true, printConfig);
-        if (!args.isEmpty() || !props.isEmpty() || child.isPresent()) {
-            writer.write(' ');
-        }
+        writeStringQuotedAppropriately(writer, identifier, true, printConfig);
 
-        for (int i = 0; i < this.args.size(); i++) {
-            final KDLValue<?> value = this.args.get(i);
-            if (!(value instanceof KDLNull) || printConfig.shouldPrintNullArgs()) {
-                value.writeKDL(writer, printConfig);
-                if (i < this.args.size() - 1 || !props.isEmpty() || child.isPresent()) {
-                    writer.write(' ');
-                }
-            }
-        }
+		for (var value : this.args) {
+			if (!(value instanceof KDLNull) || printConfig.shouldPrintNullArgs()) {
+				writer.write(' ');
+				value.writeKDL(writer, printConfig);
+			}
+		}
 
-        final ArrayList<String> keys = new ArrayList<>(props.keySet());
-        for (int i = 0; i < keys.size(); i++) {
-            final KDLValue<?> value = props.get(keys.get(i));
-            if (!(value instanceof KDLNull) || printConfig.shouldPrintNullProps()) {
-                PrintUtil.writeStringQuotedAppropriately(writer, keys.get(i), true, printConfig);
-                writer.write('=');
-                value.writeKDL(writer, printConfig);
-                if (i < keys.size() - 1 || child.isPresent()) {
-                    writer.write(' ');
-                }
-            }
-        }
+		for (var entry : props.entrySet()) {
+			if (!(entry.getValue() instanceof KDLNull) || printConfig.shouldPrintNullProps()) {
+				writer.write(' ');
+				writeStringQuotedAppropriately(writer, entry.getKey(), true, printConfig);
+				writer.write('=');
+				entry.getValue().writeKDL(writer, printConfig);
+			}
+		}
 
         if (child.isPresent()) {
             if (!child.get().getNodes().isEmpty() || printConfig.shouldPrintEmptyChildren()) {
-                writer.write('{');
+                writer.write(" {");
                 writer.write(printConfig.getNewline());
                 child.get().writeKDL(writer, depth + 1, printConfig);
                 for (int i = 0; i < printConfig.getIndent() * depth; i++) {

src/test/java/kdl/RoundTripTest.java

@@ -64,6 +64,8 @@ static List<Arguments> inputs() throws IOException {
 	private static final Path EXPECTED_FOLDER = Paths.get("src/test/resources/test_cases/expected_kdl");
 	private static final PrintConfig PRINT_CONFIG = PrintConfig.builder()
 		.setEscapeLinespace(true)
+		.setRespectRadix(false)
+		.setPrintEmptyChildren(false)
 		.build();
 
 }

src/test/resources/test_cases/expected_kdl/all_escapes.kdl

@@ -1 +1 @@
-node "\"\\\b\f\n\r\t"
+node "\"\\/\b\f\n\r\t"

src/test/resources/test_cases/expected_kdl/arg_hex_type.kdl

@@ -1 +1 @@
-node (type)0x10
+node (type)16

src/test/resources/test_cases/expected_kdl/binary.kdl

@@ -1 +1 @@
-node 0b10
+node 2

src/test/resources/test_cases/expected_kdl/binary_trailing_underscore.kdl

@@ -1 +1 @@
-node 0b10
+node 2

src/test/resources/test_cases/expected_kdl/binary_underscore.kdl

@@ -1 +1 @@
-node 0b10
+node 2

src/test/resources/test_cases/expected_kdl/empty_child.kdl

@@ -1,2 +1 @@
-node {
-}
+node

src/test/resources/test_cases/expected_kdl/empty_child_different_lines.kdl

@@ -1,2 +1 @@
-node {
-}
+node

src/test/resources/test_cases/expected_kdl/empty_child_same_line.kdl

@@ -1,2 +1 @@
-node {
-}
+node

src/test/resources/test_cases/expected_kdl/empty_child_whitespace.kdl

@@ -1,2 +1 @@
-node {
-}
+node

src/test/resources/test_cases/expected_kdl/escline_comment_node.kdl

@@ -0,0 +1 @@
+false_id

src/test/resources/test_cases/expected_kdl/false_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node false_id=1

src/test/resources/test_cases/expected_kdl/false_prefix_in_prop_key.kdl

@@ -1 +1 @@
-node 0xabcdef1234567890
+node 12379813812177893520

src/test/resources/test_cases/expected_kdl/hex.kdl

@@ -1 +1 @@
-node 0xabcdef0123456789abcdef
+node 207698809136909011942886895

src/test/resources/test_cases/expected_kdl/hex_int.kdl

@@ -1 +1 @@
-node 0xabcdef0123
+node 737894400291

src/test/resources/test_cases/expected_kdl/hex_int_underscores.kdl

@@ -1 +1 @@
-node 0x1
+node 1

src/test/resources/test_cases/expected_kdl/hex_leading_zero.kdl

@@ -1 +1 @@
-node 0b1
+node 1

src/test/resources/test_cases/expected_kdl/leading_zero_binary.kdl

@@ -1 +1 @@
-node 0o1
+node 1

src/test/resources/test_cases/expected_kdl/leading_zero_oct.kdl

@@ -0,0 +1 @@
+null_id

src/test/resources/test_cases/expected_kdl/null_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node null_id=1

src/test/resources/test_cases/expected_kdl/null_prefix_in_prop_key.kdl

@@ -1 +1 @@
-node 0o76543210
+node 16434824

src/test/resources/test_cases/expected_kdl/octal.kdl

@@ -1 +1 @@
-node 1 1.0 1.0E+10 1.0E-10 0x1 0o7 0b10 "arg" "arg\\\\" true false null
+node 1 1.0 1.0E+10 1.0E-10 1 7 2 "arg" "arg\\\\" true false null

src/test/resources/test_cases/expected_kdl/parse_all_arg_types.kdl

@@ -1 +1 @@
-node key=(type)0x10
+node key=(type)16

src/test/resources/test_cases/expected_kdl/prop_hex_type.kdl

@@ -1,2 +1 @@
-node1 {
-}
+node1

src/test/resources/test_cases/expected_kdl/slashdash_node_in_child.kdl

@@ -0,0 +1 @@
+node arg="correct"

src/test/resources/test_cases/expected_kdl/slashdash_repeated_prop.kdl

@@ -1 +1 @@
-node 0x123abc
+node 1194684

src/test/resources/test_cases/expected_kdl/trailing_underscore_hex.kdl

@@ -1 +1 @@
-node 0o123
+node 83

src/test/resources/test_cases/expected_kdl/trailing_underscore_octal.kdl

@@ -0,0 +1 @@
+true_id

src/test/resources/test_cases/expected_kdl/true_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node true_id=1

src/test/resources/test_cases/expected_kdl/true_prefix_in_prop_key.kdl

@@ -1 +1 @@
-node 0o1234567
+node 342391

src/test/resources/test_cases/expected_kdl/underscore_in_octal.kdl

@@ -1 +1 @@
-node "\"\\\b\f\n\r\t"
+node "\"\\\/\b\f\n\r\t"

src/test/resources/test_cases/input/all_escapes.kdl

@@ -1 +1 @@
-foo123\bar "weeee"
+foo123\bar "weeee"

src/test/resources/test_cases/input/backslash_in_bare_id.kdl

@@ -1 +1 @@
-foo123{bar}foo "weeee"
+foo123{bar}foo "weeee"

src/test/resources/test_cases/input/brackets_in_bare_id.kdl

@@ -1 +1 @@
-foo123<bar>foo "weeee"
+foo123<bar>foo "weeee"

src/test/resources/test_cases/input/chevrons_in_bare_id.kdl

@@ -1 +1 @@
-foo123,bar "weeee"
+foo123,bar "weeee"

src/test/resources/test_cases/input/comma_in_bare_id.kdl

@@ -1,2 +1,2 @@
-node1
+node1
 node2

src/test/resources/test_cases/input/crlf_between_nodes.kdl

@@ -0,0 +1 @@
+false_id

src/test/resources/test_cases/input/escline_comment_node.kdl

@@ -0,0 +1 @@
+node false_id=1

src/test/resources/test_cases/input/false_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node false=1

src/test/resources/test_cases/input/false_prefix_in_prop_key.kdl

@@ -0,0 +1 @@
+null_id

src/test/resources/test_cases/input/false_prop_key.kdl

@@ -0,0 +1 @@
+node null_id=1

src/test/resources/test_cases/input/null_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node null=1

src/test/resources/test_cases/input/null_prefix_in_prop_key.kdl

@@ -1 +1 @@
-// comment
+// comment

src/test/resources/test_cases/input/null_prop_key.kdl

@@ -1 +1 @@
-foo123(bar)foo "weeee"
+foo123(bar)foo "weeee"

src/test/resources/test_cases/input/only_line_comment_crlf.kdl

@@ -1 +1 @@
-foo123"bar "weeee"
+foo123"bar "weeee"

src/test/resources/test_cases/input/parens_in_bare_id.kdl

@@ -1 +1 @@
-foo123/bar "weeee"
+foo123/bar "weeee"

src/test/resources/test_cases/input/quote_in_bare_id.kdl

@@ -0,0 +1 @@
+node arg="correct" /- arg="wrong"

src/test/resources/test_cases/input/slash_in_bare_id.kdl

@@ -1 +1 @@
-foo123[bar]foo "weeee"
+foo123[bar]foo "weeee"

src/test/resources/test_cases/input/slashdash_repeated_prop.kdl

@@ -1 +1 @@
-node
+node

src/test/resources/test_cases/input/square_bracket_in_bare_id.kdl

@@ -0,0 +1 @@
+true_id

src/test/resources/test_cases/input/trailing_crlf.kdl

@@ -0,0 +1 @@
+node true_id=1

src/test/resources/test_cases/input/true_prefix_in_bare_id.kdl

@@ -0,0 +1 @@
+node true=1