Поддержка порядка ключей у объектов в модуле json

Author: aNNiMON

src/main/java/com/annimon/ownlang/lib/ValueUtils.java

@@ -4,6 +4,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -28,7 +29,7 @@ public static Object toObject(Value val) {
     }
 
     public static JSONObject toObject(MapValue map) {
-        final JSONObject result = new JSONObject();
+        final JSONObject result = new JSONObject(new LinkedHashMap<String, Object>());
         for (Map.Entry<Value, Value> entry : map) {
             final String key = entry.getKey().asString();
             final Object value = toObject(entry.getValue());
@@ -66,7 +67,7 @@ public static Value toValue(Object obj) {
     }
 
     public static MapValue toValue(JSONObject json) {
-        final MapValue result = new MapValue(json.length());
+        final MapValue result = new MapValue(new LinkedHashMap<>(json.length()));
         final Iterator<String> it = json.keys();
         while(it.hasNext()) {
             final String key = it.next();

src/main/java/com/annimon/ownlang/modules/yaml/yaml_encode.java

@@ -2,7 +2,7 @@
 
 import com.annimon.ownlang.lib.*;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.yaml.snakeyaml.Yaml;
@@ -37,7 +37,7 @@ private Object process(Value val) {
     }
 
     private Object process(MapValue map) {
-        final Map<String, Object> result = new HashMap<>();
+        final Map<String, Object> result = new LinkedHashMap<>();
         for (Map.Entry<Value, Value> entry : map) {
             final String key = entry.getKey().asString();
             final Object value = process(entry.getValue());

src/main/java/com/annimon/ownlang/utils/ModulesInfoCreator.java

@@ -131,7 +131,7 @@ public List<Map<String, Object>> constants() {
                 constant.put("type", value.type());
                 constant.put("typeName", Types.typeToString(value.type()));
                 if (value.type() == Types.MAP) {
-                    String text = ((Map<Value, Value>) value.raw()).entrySet().stream()
+                    String text = ((MapValue) value).getMap().entrySet().stream()
                             .sorted(Comparator.comparing(
                                     e -> ((MapValue)value).size() > 16 ? e.getKey() : e.getValue()))
                             .map(Object::toString)