Merge branch 'master' of https://github.com/eiffelhub/json

2012-11-15 16:29:02 +01:00
parent 814ea051f1 ab84e5a7a0
commit e65c2da528
5 changed files with 240 additions and 231 deletions
@@ -64,7 +64,11 @@ feature -- Conversion
            until
                c.after
            loop
-                create js.make_json (c.key.out)
+                if attached {JSON_STRING} json.value (c.key) as l_key then
+                    js := l_key
+                else
+                    create js.make_json (c.key.out)
+                end
                jv := json.value (c.item)
                if jv /= Void then
                    Result.put (jv, js)