Files
mono/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/Json.cs
T
Marek Habersack 93a1d2ad6c 2008-09-19 Marek Habersack <[email protected]>
* Json.cs: added new Serialize overload which takes a TextWriter
	for its output parameter.
	Added Deserialize methods.

	* JsonSerializer.cs: made InitialJavaScriptDateTicks internal.
	Added new Serialize overload which takes a TextWriter for its
	output parameter.
	Added WriteValue overloads for float and double - they must not be
	converted to strings as IConvertibles because their Max/MinValue
	end up converted incorrectly.

	* JavaScriptSerializer.cs: adjustments for the new JSON
	(de)serializer.

	* JsonDeserializer.cs: new JSON deserializer code, fully compliant
	with the .NET AJAX one.

2008-09-19  Marek Habersack  <[email protected]>

	* JavaScriptSerializerTest.cs: enabled some tests which were
	failing with the old (de)serializer, but work with the new one.

2008-09-19  Marek Habersack  <[email protected]>

	* System.Web.Extensions.dll.sources: removed most of the
	Newtonsoft JSON code, leaving only ReflectionUtils and
	JavaScriptUtils.


svn path=/trunk/mcs/; revision=113590
2008-09-19 21:13:55 +00:00

70 lines
2.1 KiB
C#

//
// Json.cs
//
// Author:
// Marek Habersack <[email protected]>
//
// (C) 2008 Novell, Inc. http://novell.com/
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.IO;
using System.Text;
namespace System.Web.Script.Serialization
{
internal static class Json
{
public static void Serialize (object obj, JavaScriptSerializer jss, StringBuilder output)
{
JsonSerializer js = new JsonSerializer (jss);
js.Serialize (obj, output);
js = null;
}
public static void Serialize (object obj, JavaScriptSerializer jss, TextWriter output)
{
JsonSerializer js = new JsonSerializer (jss);
js.Serialize (obj, output);
js = null;
}
public static object Deserialize (string input, JavaScriptSerializer jss)
{
if (jss == null)
throw new ArgumentNullException ("jss");
return Deserialize (new StringReader (input), jss);
}
public static object Deserialize (TextReader input, JavaScriptSerializer jss)
{
if (jss == null)
throw new ArgumentNullException ("jss");
JsonDeserializer ser = new JsonDeserializer (jss);
return ser.Deserialize (input);
}
}
}