backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	draft/library/gobo/shared_gobo_ejson.e
	draft/library/kernel/converters/json_converter.e
	draft/library/kernel/converters/json_hash_table_converter.e
	draft/library/kernel/converters/json_linked_list_converter.e
	draft/library/kernel/ejson.e
	draft/library/kernel/shared_ejson.e
	draft/test/autotest/test_suite/json_author_converter.e
	draft/test/autotest/test_suite/json_book_collection_converter.e
	draft/test/autotest/test_suite/json_book_converter.e
	draft/test/autotest/test_suite/test_json_core.e
This commit is contained in:
Jocelyn Fiat
2012-08-24 02:40:54 -07:00
parent 5487b04922 b6464cf5e7
commit 40e524337e
13 changed files with 329 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/library/text/parser/json/test/autotest/test_suite/json_author_converter.e
View File

@@ -1,9 +1,8 @@
note
description: "A JSON converter for AUTHOR"
author: "Paul Cohen"
date: "$Date: 2010-03-08 20:46:59 -0300 (Mon, 08 Mar 2010) $"
revision: "$Revision: 82 $"
file: "$HeadURL: https://svn.origo.ethz.ch/ejson/branches/POC-converters-factory/test/json_author_converter.e $"
date: "$Date$"
revision: "$Revision$"
class JSON_AUTHOR_CONVERTER

5
contrib/library/text/parser/json/test/autotest/test_suite/json_book_collection_converter.e
View File

@@ -1,9 +1,8 @@
note
description: "A JSON converter for BOOK_COLLECTION"
author: "Paul Cohen"
date: "$Date: 2010-03-08 20:46:59 -0300 (Mon, 08 Mar 2010) $"
revision: "$Revision: 82 $"
file: "$HeadURL: https://svn.origo.ethz.ch/ejson/branches/POC-converters-factory/test/json_book_collection_converter.e $"
date: "$Date$"
revision: "$Revision$"
class JSON_BOOK_COLLECTION_CONVERTER

5
contrib/library/text/parser/json/test/autotest/test_suite/json_book_converter.e
View File

@@ -1,9 +1,8 @@
note
description: "A JSON converter for BOOK"
author: "Paul Cohen"
date: "$Date: 2010-03-08 20:46:59 -0300 (Mon, 08 Mar 2010) $"
revision: "$Revision: 82 $"
file: "$HeadURL: https://svn.origo.ethz.ch/ejson/branches/POC-converters-factory/test/json_book_converter.e $"
date: "$Date$"
revision: "$Revision$"
class JSON_BOOK_CONVERTER

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

@@ -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_8.same_string ("foo\bar"))
assert ("unescaped string %"foo\\bar%" to %"foo\bar%"", jstring.unescaped_string.same_string ("foo\bar"))
end
create js.make_json_from_string_32 ({STRING_32}"%/20320/%/22909/")