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

contrib/library/text/parser/json/.gitignore

@@ -0,0 +1 @@
+*.swp

contrib/library/text/parser/json/library/gobo/converters/json_ds_hash_table_converter.e

@@ -64,7 +64,11 @@ feature -- Conversion
             until
                 c.after
             loop
+                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)

contrib/library/text/parser/json/library/kernel/converters/json_hash_table_converter.e

@@ -71,7 +71,11 @@ feature -- Conversion
             until
                 c.after
             loop
+                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)

contrib/library/text/parser/json/library/kernel/ejson.e

@@ -245,7 +245,7 @@ feature {NONE} -- Implementation (Exceptions)
 		do
 			Result := exception_prefix + "Failed to convert JSON_VALUE to an Eiffel object: " + a_value.generator
 			if base_class /= Void then
-                Result.append (" -> " + base_class)
+				Result.append (" -> {" + base_class + "}")
 			end
 		end
 
@@ -254,7 +254,7 @@ feature {NONE} -- Implementation (Exceptions)
 		do
 			Result := exception_prefix + "Failed to convert Eiffel object to a JSON_VALUE"
 			if an_object /= Void then
-				Result := ": " + an_object.generator
+				Result.append (" : {" + an_object.generator + "}")
 			end
 		end
 

contrib/library/text/parser/json/test/autotest/test_suite/test_json_core.e

@@ -632,7 +632,7 @@ feature -- Test
             jrep := "%"foo\\bar%""
 			create parser.make_parser (jrep)
 			if attached {JSON_STRING} parser.parse as jstring then
-				assert ("unescaped string %"foo\\bar%" to %"foo\bar%"", jstring.unescaped_string.same_string ("foo\bar"))
+				assert ("unescaped string %"foo\\bar%" to %"foo\bar%"", jstring.unescaped_string_8.same_string ("foo\bar"))
 			end
 
             create js.make_json_from_string_32 ({STRING_32}"%/20320/%/22909/")