diff --git a/Docs/README.md b/Docs/README.md
index c5249a9d..ff7a00c8 100644
--- a/Docs/README.md
+++ b/Docs/README.md
@@ -18,8 +18,10 @@ SDK下载地址：[https://github.com/qiniu/csharp-sdk/tags](https://github.com/
**云存储接口**
- [新建资源表](#rs-NewService)
-- [获得上传授权](#rs-PutAuth)
- [上传文件](#rs-PutFile)
+ - [服务器端上传](#server-PutFile)
+ - [客户端使用授权URL上传](#client-PutFile)
+ - [客户端使用UpToken上传](#client-PutFileWithUpToke)
- [获取已上传文件信息](#rs-Stat)
- [下载文件](#rs-Get)
- [发布公开资源](#rs-Publish)
@@ -61,8 +63,6 @@ SDK下载地址：[https://github.com/qiniu/csharp-sdk/tags](https://github.com/
### 1. 新建资源表
-新建资源表的意义在于，您可以将所有上传的资源分布式加密存储在七牛云存储服务端后还能保持相应的完整映射索引。
-
// 首先定义资源表名
string tableName = "tableName";
@@ -71,48 +71,63 @@ SDK下载地址：[https://github.com/qiniu/csharp-sdk/tags](https://github.com/
// 签名认证完成后，即可使用该认证来新建资源表
RSService rs = new RSService(conn, tableName);
-
-
-
-
-### 2. 获得上传授权
-
-客户端上传文件之前需要取得上传授权。所谓上传授权，就是获得一个可匿名直传的临时有效URL。实例代码如下：
-
- // 调用资源表对象的 putAuth() 方法来获得上传授权
- PutAuthRet putAuthRet = rs.PutAuth();
-
-
-如果请求成功，putAuthRet 会包含 Url 和 Expires 两个字段。Url 字段对应的值为匿名上传的临时URL，Expires 对应的值则是该临时URL的有效期。
+ CallRet callRet = rs.MkBucket();
-### 3. 上传文件
+### 2. 上传文件
七牛云存储上传文件的方式分为服务器端上传和客户端上传两种。
-##### 1. 服务器端上传
+
-上传某个本地文件，示例代码如下：
+##### 2.1 服务器端上传
// 调用资源表对象的 PutFile() 方法进行文件上传
PutFileRet putFileRet = rs.PutFile(key, mimeType, filePath, customMeta);
-##### 2. 客户端上传
+
+
+##### 2.2 客户端使用授权URL上传
-因为服务器端已经在之前进行过签名认证持有相应的安全凭证，因此可以直接进行上传。而由于客户端并不持有对RS的安全凭证，所以需要获取上传授权，从而得到一个有上传权限的URL，参见[获得上传授权](#rs-PutAuth)。在获得上传授权URL后，就可以开始上传文件了，示例代码如下：
+###### 2.2.1 获取经过授权的临时URL
- // 在客户端上传文件之前，需要获得上传授权，得到经过授权的临时URL
+客户端上传文件之前需要取得上传授权，可以是一个临时有效URL。
+
+ // 调用资源表对象的 putAuth() 方法来获取授权的临时URL
PutAuthRet putAuthRet = rs.PutAuth();
uploadUrl = putAuthRet.Url;
+如果请求成功，putAuthRet 会包含 Url 和 Expires 两个字段。Url 字段对应的值为匿名上传的临时 URL，Expires 对应的值则是该临时 URL 的有效期。
+
+###### 2.2.2 使用临时URL上传文件
+
// 通过该临时 URL 进行文件上传
PutFileRet putFileRet = RSClient.PutFile(uploadUrl, tableName, key, mimeType,
filePath, customMeta, callbackParam);
+
+
+##### 2.3 客户端使用UpToken上传
+
+###### 2.3.1 生成用于上传文件的临时凭证UpToken
+
+客户端上传文件之前需要取得上传授权，可以一个 UpToken，UpToken 是服务器端颁发给客户端的上传凭证，参数 expires 对应的值则是该 UpToken 的有效期。
+
+ // 生成 UpToken
+ var authPolicy = new AuthPolicy(tabletName, expires);
+ string upToken = authPolicy.MakeAuthTokenString();
+
+###### 2.3.2 使用UpToken上传文件
+
+ // 使用 UpToken 上传文件
+ PutFileRet putFileRet = RSClient.PutFileWithUpToken(
+ upToken, tableName, key, mimeType,
+ filePath, customMeta, callbackParam);
+
-### 4. 获取已上传文件信息
+### 3. 获取已上传文件信息
您可以调用资源表对象的 Stat() 方法并传入一个 Key 来获取指定文件的相关信息。
@@ -128,9 +143,9 @@ SDK下载地址：[https://github.com/qiniu/csharp-sdk/tags](https://github.com/
-### 5. 下载文件
+### 4. 下载文件
-要下载一个文件，首先需要取得下载授权，所谓下载授权，就是取得一个临时合法有效的下载链接，只需传入相应的文件 Key 和下载要保存的文件名作为参数即可，示例代码如下：
+要下载一个文件，首先需要取得下载授权，所谓下载授权，就是取得一个临时合法有效的下载链接，只需传入相应的文件 Key 和下载要保存的文件名作为参数即可。
// 下载资源表中的特定文件
GetRet getRet = rs.Get(key, filename);
@@ -147,39 +162,39 @@ SDK下载地址：[https://github.com/qiniu/csharp-sdk/tags](https://github.com/
-### 6. 发布公开资源
+### 5. 发布公开资源
使用七牛云存储提供的资源发布功能，您可以将一个资源表里边的所有文件以静态链接可访问的方式公开发布到您自己的域名下。
-要公开发布一个资源表里边的所有文件，只需调用该资源表对象的 Publish() 方法并传入域名作为参数即可。如下示例：
+要公开发布一个资源表里边的所有文件，只需调用该资源表对象的 Publish() 方法并传入域名作为参数即可。
// 公开发布某个资源表
- PublishRet publishRet = rs.Publish(DomainName);
+ CallRet publishRet = rs.Publish(DomainName);
-### 7. 取消资源发布
+### 6. 取消资源发布
调用资源表对象的 Unpublish() 方法可取消该资源表内所有文件的静态外链。
// 取消公开发布某个资源表
- PublishRet unpublishRet = rs.Unpublish(DomainName);
+ CallRet unpublishRet = rs.Unpublish(DomainName);
-### 8. 删除已上传的文件
+### 7. 删除已上传的文件
-要删除指定的文件，只需调用资源表对象的 Delete() 方法并传入文件 key 作为参数即可。如下示例代码：
+要删除指定的文件，只需调用资源表对象的 Delete() 方法并传入文件 key 作为参数即可。
// 删除资源表中的某个文件
- DeleteRet deleteRet = rs.Delete(key);
+ CallRet deleteRet = rs.Delete(key);
-### 9. 删除整张资源表
+### 8. 删除整张资源表
要删除整个资源表及该表里边的所有文件，可以调用资源表对象的 Drop() 方法。
-需慎重，这会删除整个表及其所有文件。如下示例代码：
+需慎重，这会删除整个表及其所有文件。
// 删除整个资源表
- DropRet dropRet = rs.Drop();
+ CallRet dropRet = rs.Drop();
diff --git a/Example/RSDemo.cs b/Example/RSDemo.cs
index afdc4f92..adf84bbd 100755
--- a/Example/RSDemo.cs
+++ b/Example/RSDemo.cs
@@ -3,15 +3,17 @@
using System.Linq;
using System.Text;
using System.Diagnostics;
+using QBox.Auth;
+using QBox.RS;
-namespace QBox
+namespace QBox.Example
{
public class RSDemo
{
- public static string tableName = "Bucket";
+ public static string bucketName;
public static string key;
public static string localFile;
- public static string DEMO_DOMAIN = "iovip.qbox.me/bucket";
+ public static string DEMO_DOMAIN;
public static Client conn;
public static RSService rs;
@@ -19,40 +21,32 @@ public static void Main()
{
Config.ACCESS_KEY = "";
Config.SECRET_KEY = "";
-
+
+ bucketName = "csharpbucket";
+ DEMO_DOMAIN = "iovip.qbox.me/csharpbucket";
conn = new DigestAuthClient();
- rs = new RSService(conn, tableName);
+ rs = new RSService(conn, bucketName);
localFile = Process.GetCurrentProcess().MainModule.FileName;
key = System.IO.Path.GetFileName(localFile);
- try
- {
- PutFile();
- Get();
- Stat();
- Delete();
- CliPutFile();
- Get();
- Stat();
- Publish();
- UnPublish();
- Drop();
+ CallRet callRet = rs.MkBucket();
+ PrintRet(callRet);
- UpToken();
- }
- catch (Exception e)
- {
- Console.WriteLine("RS Exception");
- Console.WriteLine(e.ToString());
- }
+ RSPutFile();
+ RSClientPutFile();
+ Get();
+ Stat();
+ Publish();
+ UnPublish();
+ Delete();
+ Drop();
Console.ReadLine();
}
- public static void PutFile()
+ public static void RSPutFile()
{
- Console.WriteLine("\n--- PutFile ---");
- PrintInput(tableName, key, localFile, null);
+ Console.WriteLine("\n===> RSService.PutFile");
PutFileRet putFileRet = rs.PutFile(key, null, localFile, null);
PrintRet(putFileRet);
if (putFileRet.OK)
@@ -65,10 +59,54 @@ public static void PutFile()
}
}
+ public static void RSClientPutFile()
+ {
+ Console.WriteLine("\n==> PutAuth");
+ PutAuthRet putAuthRet = rs.PutAuth();
+ PrintRet(putAuthRet);
+ if (putAuthRet.OK)
+ {
+ Console.WriteLine("Expires: " + putAuthRet.Expires.ToString());
+ Console.WriteLine("Url: " + putAuthRet.Url);
+ }
+ else
+ {
+ Console.WriteLine("Failed to PutAuth");
+ }
+
+ Console.WriteLine("\n===> RSClient.PutFile");
+ PutFileRet putFileRet = RSClient.PutFile(putAuthRet.Url, bucketName, key, null, localFile, null, "key=");
+ PrintRet(putFileRet);
+ if (putFileRet.OK)
+ {
+ Console.WriteLine("Hash: " + putFileRet.Hash);
+ }
+ else
+ {
+ Console.WriteLine("Failed to RSClient.PutFile");
+ }
+
+ Console.WriteLine("\n===> Generate UpToken");
+ var authPolicy = new AuthPolicy(bucketName, 3600);
+ string upToken = authPolicy.MakeAuthTokenString();
+ Console.WriteLine("upToken: " + upToken);
+
+ Console.WriteLine("\n===> RSClient.PutFileWithUpToken");
+ putFileRet = RSClient.PutFileWithUpToken(upToken, bucketName, key, null, localFile, null, "key=");
+ PrintRet(putFileRet);
+ if (putFileRet.OK)
+ {
+ Console.WriteLine("Hash: " + putFileRet.Hash);
+ }
+ else
+ {
+ Console.WriteLine("Failed to RSClient.PutFileWithUpToken");
+ }
+ }
+
public static void Get()
{
- Console.WriteLine("\n--- Get ---");
- PrintInput(tableName, key, null, null);
+ Console.WriteLine("\n===> Get");
GetRet getRet = rs.Get(key, "attName");
PrintRet(getRet);
if (getRet.OK)
@@ -83,8 +121,7 @@ public static void Get()
Console.WriteLine("Failed to Get");
}
- Console.WriteLine("\n--- GetIfNotModified ---");
- PrintInput(tableName, key, null, null);
+ Console.WriteLine("\n===> GetIfNotModified");
getRet = rs.GetIfNotModified(key, "attName", getRet.Hash);
PrintRet(getRet);
if (getRet.OK)
@@ -102,8 +139,7 @@ public static void Get()
public static void Stat()
{
- Console.WriteLine("\n--- Stat ---");
- PrintInput(tableName, key, null, null);
+ Console.WriteLine("\n===> Stat");
StatRet statRet = rs.Stat(key);
PrintRet(statRet);
if (statRet.OK)
@@ -121,9 +157,8 @@ public static void Stat()
public static void Delete()
{
- Console.WriteLine("\n--- Delete ---");
- PrintInput(tableName, key, null, null);
- DeleteRet deleteRet = rs.Delete(key);
+ Console.WriteLine("\n===> Delete");
+ CallRet deleteRet = rs.Delete(key);
PrintRet(deleteRet);
if (!deleteRet.OK)
{
@@ -133,9 +168,8 @@ public static void Delete()
public static void Drop()
{
- Console.WriteLine("\n--- Drop ---");
- PrintInput(tableName, null, null, null);
- DropRet dropRet = rs.Drop();
+ Console.WriteLine("\n===> Drop");
+ CallRet dropRet = rs.Drop();
PrintRet(dropRet);
if (!dropRet.OK)
{
@@ -145,9 +179,8 @@ public static void Drop()
public static void Publish()
{
- Console.WriteLine("\n--- Publish ---");
- PrintInput(tableName, null, null, DEMO_DOMAIN);
- PublishRet publishRet = rs.Publish(DEMO_DOMAIN);
+ Console.WriteLine("\n===> Publish");
+ CallRet publishRet = rs.Publish(DEMO_DOMAIN);
PrintRet(publishRet);
if (!publishRet.OK)
{
@@ -157,9 +190,8 @@ public static void Publish()
public static void UnPublish()
{
- Console.WriteLine("\n--- UnPublish ---");
- PrintInput(tableName, null, null, DEMO_DOMAIN);
- PublishRet publishRet = rs.Unpublish(DEMO_DOMAIN);
+ Console.WriteLine("\n===> UnPublish");
+ CallRet publishRet = rs.Unpublish(DEMO_DOMAIN);
PrintRet(publishRet);
if (!publishRet.OK)
{
@@ -167,73 +199,9 @@ public static void UnPublish()
}
}
- public static PutAuthRet PutAuth()
- {
- Console.WriteLine("\n--- PutAuth ---");
- PrintInput(null, null, null, null);
- PutAuthRet putAuthRet = rs.PutAuth();
- PrintRet(putAuthRet);
- if (putAuthRet.OK)
- {
- Console.WriteLine("Expires: " + putAuthRet.Expires.ToString());
- Console.WriteLine("Url: " + putAuthRet.Url);
- }
- else
- {
- Console.WriteLine("Failed to PutAuth");
- }
- return putAuthRet;
- }
-
- public static void CliPutFile()
- {
- PutAuthRet putAuthRet = PutAuth();
- Console.WriteLine("\n--- CliPutFile ---");
- PrintInput(tableName, key, localFile, null);
- PutFileRet putFileRet = RSClient.PutFile(putAuthRet.Url, tableName,
- key, null, localFile, null, "key=Config.cs");
- PrintRet(putFileRet);
- if (putFileRet.OK)
- {
- Console.WriteLine("Hash: " + putFileRet.Hash);
- }
- else
- {
- Console.WriteLine("Failed to CliPutFile");
- }
-
- }
-
- public static void UpToken()
- {
- Console.WriteLine("\n--- Gen UpToken ---");
- var authPolicy = new AuthPolicy(tableName, 3600);
- Console.WriteLine("Json: " + authPolicy.Marshal());
- Console.WriteLine("Token: " + authPolicy.MakeAuthTokenString());
- }
-
- public static void PrintInput(
- string tblName, string key, string localFile, string domain)
- {
- StringBuilder sb = new StringBuilder();
- sb.AppendLine("\n[In]");
- if (!String.IsNullOrEmpty(tblName))
- sb.AppendLine("TableName: " + tblName);
- if (!String.IsNullOrEmpty(key))
- sb.AppendLine("Key: " + key);
- if (!String.IsNullOrEmpty(localFile))
- sb.AppendLine("LocalFile: " + localFile);
- if (!String.IsNullOrEmpty(domain))
- sb.AppendLine("Domain: " + domain);
- Console.WriteLine(sb.ToString());
- }
-
-
public static void PrintRet(CallRet callRet)
{
- Console.WriteLine("\n[Out]");
-
- Console.WriteLine("\nCallRet");
+ Console.WriteLine("\n[CallRet]");
Console.WriteLine("StatusCode: " + callRet.StatusCode.ToString());
Console.WriteLine("Response:\n" + callRet.Response);
Console.WriteLine();
diff --git a/Json/IJsonWrapper.cs b/Json/IJsonWrapper.cs
index 9b7e2d16..2acebede 100755
--- a/Json/IJsonWrapper.cs
+++ b/Json/IJsonWrapper.cs
@@ -1,60 +1,60 @@
-#region Header
-/**
- * IJsonWrapper.cs
- * Interface that represents a type capable of handling all kinds of JSON
- * data. This is mainly used when mapping objects through JsonMapper, and
- * it's implemented by JsonData.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System.Collections;
-using System.Collections.Specialized;
-
-
-namespace LitJson
-{
- public enum JsonType
- {
- None,
-
- Object,
- Array,
- String,
- Int,
- Long,
- Double,
- Boolean
- }
-
- public interface IJsonWrapper : IList, IOrderedDictionary
- {
- bool IsArray { get; }
- bool IsBoolean { get; }
- bool IsDouble { get; }
- bool IsInt { get; }
- bool IsLong { get; }
- bool IsObject { get; }
- bool IsString { get; }
-
- bool GetBoolean ();
- double GetDouble ();
- int GetInt ();
- JsonType GetJsonType ();
- long GetLong ();
- string GetString ();
-
- void SetBoolean (bool val);
- void SetDouble (double val);
- void SetInt (int val);
- void SetJsonType (JsonType type);
- void SetLong (long val);
- void SetString (string val);
-
- string ToJson ();
- void ToJson (JsonWriter writer);
- }
-}
+#region Header
+/**
+ * IJsonWrapper.cs
+ * Interface that represents a type capable of handling all kinds of JSON
+ * data. This is mainly used when mapping objects through JsonMapper, and
+ * it's implemented by JsonData.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System.Collections;
+using System.Collections.Specialized;
+
+
+namespace LitJson
+{
+ public enum JsonType
+ {
+ None,
+
+ Object,
+ Array,
+ String,
+ Int,
+ Long,
+ Double,
+ Boolean
+ }
+
+ public interface IJsonWrapper : IList, IOrderedDictionary
+ {
+ bool IsArray { get; }
+ bool IsBoolean { get; }
+ bool IsDouble { get; }
+ bool IsInt { get; }
+ bool IsLong { get; }
+ bool IsObject { get; }
+ bool IsString { get; }
+
+ bool GetBoolean ();
+ double GetDouble ();
+ int GetInt ();
+ JsonType GetJsonType ();
+ long GetLong ();
+ string GetString ();
+
+ void SetBoolean (bool val);
+ void SetDouble (double val);
+ void SetInt (int val);
+ void SetJsonType (JsonType type);
+ void SetLong (long val);
+ void SetString (string val);
+
+ string ToJson ();
+ void ToJson (JsonWriter writer);
+ }
+}
diff --git a/Json/JsonData.cs b/Json/JsonData.cs
index ccc56872..b0ca03cc 100755
--- a/Json/JsonData.cs
+++ b/Json/JsonData.cs
@@ -1,993 +1,993 @@
-#region Header
-/**
- * JsonData.cs
- * Generic type to hold JSON data (objects, arrays, and so on). This is
- * the default type returned by JsonMapper.ToObject().
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-
-
-namespace LitJson
-{
- public class JsonData : IJsonWrapper, IEquatable
- {
- #region Fields
- private IList inst_array;
- private bool inst_boolean;
- private double inst_double;
- private int inst_int;
- private long inst_long;
- private IDictionary inst_object;
- private string inst_string;
- private string json;
- private JsonType type;
-
- // Used to implement the IOrderedDictionary interface
- private IList> object_list;
- #endregion
-
-
- #region Properties
- public int Count {
- get { return EnsureCollection ().Count; }
- }
-
- public bool IsArray {
- get { return type == JsonType.Array; }
- }
-
- public bool IsBoolean {
- get { return type == JsonType.Boolean; }
- }
-
- public bool IsDouble {
- get { return type == JsonType.Double; }
- }
-
- public bool IsInt {
- get { return type == JsonType.Int; }
- }
-
- public bool IsLong {
- get { return type == JsonType.Long; }
- }
-
- public bool IsObject {
- get { return type == JsonType.Object; }
- }
-
- public bool IsString {
- get { return type == JsonType.String; }
- }
- #endregion
-
-
- #region ICollection Properties
- int ICollection.Count {
- get {
- return Count;
- }
- }
-
- bool ICollection.IsSynchronized {
- get {
- return EnsureCollection ().IsSynchronized;
- }
- }
-
- object ICollection.SyncRoot {
- get {
- return EnsureCollection ().SyncRoot;
- }
- }
- #endregion
-
-
- #region IDictionary Properties
- bool IDictionary.IsFixedSize {
- get {
- return EnsureDictionary ().IsFixedSize;
- }
- }
-
- bool IDictionary.IsReadOnly {
- get {
- return EnsureDictionary ().IsReadOnly;
- }
- }
-
- ICollection IDictionary.Keys {
- get {
- EnsureDictionary ();
- IList keys = new List ();
-
- foreach (KeyValuePair entry in
- object_list) {
- keys.Add (entry.Key);
- }
-
- return (ICollection) keys;
- }
- }
-
- ICollection IDictionary.Values {
- get {
- EnsureDictionary ();
- IList values = new List ();
-
- foreach (KeyValuePair entry in
- object_list) {
- values.Add (entry.Value);
- }
-
- return (ICollection) values;
- }
- }
- #endregion
-
-
-
- #region IJsonWrapper Properties
- bool IJsonWrapper.IsArray {
- get { return IsArray; }
- }
-
- bool IJsonWrapper.IsBoolean {
- get { return IsBoolean; }
- }
-
- bool IJsonWrapper.IsDouble {
- get { return IsDouble; }
- }
-
- bool IJsonWrapper.IsInt {
- get { return IsInt; }
- }
-
- bool IJsonWrapper.IsLong {
- get { return IsLong; }
- }
-
- bool IJsonWrapper.IsObject {
- get { return IsObject; }
- }
-
- bool IJsonWrapper.IsString {
- get { return IsString; }
- }
- #endregion
-
-
- #region IList Properties
- bool IList.IsFixedSize {
- get {
- return EnsureList ().IsFixedSize;
- }
- }
-
- bool IList.IsReadOnly {
- get {
- return EnsureList ().IsReadOnly;
- }
- }
- #endregion
-
-
- #region IDictionary Indexer
- object IDictionary.this[object key] {
- get {
- return EnsureDictionary ()[key];
- }
-
- set {
- if (! (key is String))
- throw new ArgumentException (
- "The key has to be a string");
-
- JsonData data = ToJsonData (value);
-
- this[(string) key] = data;
- }
- }
- #endregion
-
-
- #region IOrderedDictionary Indexer
- object IOrderedDictionary.this[int idx] {
- get {
- EnsureDictionary ();
- return object_list[idx].Value;
- }
-
- set {
- EnsureDictionary ();
- JsonData data = ToJsonData (value);
-
- KeyValuePair old_entry = object_list[idx];
-
- inst_object[old_entry.Key] = data;
-
- KeyValuePair entry =
- new KeyValuePair (old_entry.Key, data);
-
- object_list[idx] = entry;
- }
- }
- #endregion
-
-
- #region IList Indexer
- object IList.this[int index] {
- get {
- return EnsureList ()[index];
- }
-
- set {
- EnsureList ();
- JsonData data = ToJsonData (value);
-
- this[index] = data;
- }
- }
- #endregion
-
-
- #region Public Indexers
- public JsonData this[string prop_name] {
- get {
- EnsureDictionary ();
- return inst_object[prop_name];
- }
-
- set {
- EnsureDictionary ();
-
- KeyValuePair entry =
- new KeyValuePair (prop_name, value);
-
- if (inst_object.ContainsKey (prop_name)) {
- for (int i = 0; i < object_list.Count; i++) {
- if (object_list[i].Key == prop_name) {
- object_list[i] = entry;
- break;
- }
- }
- } else
- object_list.Add (entry);
-
- inst_object[prop_name] = value;
-
- json = null;
- }
- }
-
- public JsonData this[int index] {
- get {
- EnsureCollection ();
-
- if (type == JsonType.Array)
- return inst_array[index];
-
- return object_list[index].Value;
- }
-
- set {
- EnsureCollection ();
-
- if (type == JsonType.Array)
- inst_array[index] = value;
- else {
- KeyValuePair entry = object_list[index];
- KeyValuePair new_entry =
- new KeyValuePair (entry.Key, value);
-
- object_list[index] = new_entry;
- inst_object[entry.Key] = value;
- }
-
- json = null;
- }
- }
- #endregion
-
-
- #region Constructors
- public JsonData ()
- {
- }
-
- public JsonData (bool boolean)
- {
- type = JsonType.Boolean;
- inst_boolean = boolean;
- }
-
- public JsonData (double number)
- {
- type = JsonType.Double;
- inst_double = number;
- }
-
- public JsonData (int number)
- {
- type = JsonType.Int;
- inst_int = number;
- }
-
- public JsonData (long number)
- {
- type = JsonType.Long;
- inst_long = number;
- }
-
- public JsonData (object obj)
- {
- if (obj is Boolean) {
- type = JsonType.Boolean;
- inst_boolean = (bool) obj;
- return;
- }
-
- if (obj is Double) {
- type = JsonType.Double;
- inst_double = (double) obj;
- return;
- }
-
- if (obj is Int32) {
- type = JsonType.Int;
- inst_int = (int) obj;
- return;
- }
-
- if (obj is Int64) {
- type = JsonType.Long;
- inst_long = (long) obj;
- return;
- }
-
- if (obj is String) {
- type = JsonType.String;
- inst_string = (string) obj;
- return;
- }
-
- throw new ArgumentException (
- "Unable to wrap the given object with JsonData");
- }
-
- public JsonData (string str)
- {
- type = JsonType.String;
- inst_string = str;
- }
- #endregion
-
-
- #region Implicit Conversions
- public static implicit operator JsonData (Boolean data)
- {
- return new JsonData (data);
- }
-
- public static implicit operator JsonData (Double data)
- {
- return new JsonData (data);
- }
-
- public static implicit operator JsonData (Int32 data)
- {
- return new JsonData (data);
- }
-
- public static implicit operator JsonData (Int64 data)
- {
- return new JsonData (data);
- }
-
- public static implicit operator JsonData (String data)
- {
- return new JsonData (data);
- }
- #endregion
-
-
- #region Explicit Conversions
- public static explicit operator Boolean (JsonData data)
- {
- if (data.type != JsonType.Boolean)
- throw new InvalidCastException (
- "Instance of JsonData doesn't hold a double");
-
- return data.inst_boolean;
- }
-
- public static explicit operator Double (JsonData data)
- {
- if (data.type != JsonType.Double)
- throw new InvalidCastException (
- "Instance of JsonData doesn't hold a double");
-
- return data.inst_double;
- }
-
- public static explicit operator Int32 (JsonData data)
- {
- if (data.type != JsonType.Int)
- throw new InvalidCastException (
- "Instance of JsonData doesn't hold an int");
-
- return data.inst_int;
- }
-
- public static explicit operator Int64 (JsonData data)
- {
- if (data.type != JsonType.Long)
- throw new InvalidCastException (
- "Instance of JsonData doesn't hold an int");
-
- return data.inst_long;
- }
-
- public static explicit operator String (JsonData data)
- {
- if (data.type != JsonType.String)
- throw new InvalidCastException (
- "Instance of JsonData doesn't hold a string");
-
- return data.inst_string;
- }
- #endregion
-
-
- #region ICollection Methods
- void ICollection.CopyTo (Array array, int index)
- {
- EnsureCollection ().CopyTo (array, index);
- }
- #endregion
-
-
- #region IDictionary Methods
- void IDictionary.Add (object key, object value)
- {
- JsonData data = ToJsonData (value);
-
- EnsureDictionary ().Add (key, data);
-
- KeyValuePair entry =
- new KeyValuePair ((string) key, data);
- object_list.Add (entry);
-
- json = null;
- }
-
- void IDictionary.Clear ()
- {
- EnsureDictionary ().Clear ();
- object_list.Clear ();
- json = null;
- }
-
- bool IDictionary.Contains (object key)
- {
- return EnsureDictionary ().Contains (key);
- }
-
- IDictionaryEnumerator IDictionary.GetEnumerator ()
- {
- return ((IOrderedDictionary) this).GetEnumerator ();
- }
-
- void IDictionary.Remove (object key)
- {
- EnsureDictionary ().Remove (key);
-
- for (int i = 0; i < object_list.Count; i++) {
- if (object_list[i].Key == (string) key) {
- object_list.RemoveAt (i);
- break;
- }
- }
-
- json = null;
- }
- #endregion
-
-
- #region IEnumerable Methods
- IEnumerator IEnumerable.GetEnumerator ()
- {
- return EnsureCollection ().GetEnumerator ();
- }
- #endregion
-
-
- #region IJsonWrapper Methods
- bool IJsonWrapper.GetBoolean ()
- {
- if (type != JsonType.Boolean)
- throw new InvalidOperationException (
- "JsonData instance doesn't hold a boolean");
-
- return inst_boolean;
- }
-
- double IJsonWrapper.GetDouble ()
- {
- if (type != JsonType.Double)
- throw new InvalidOperationException (
- "JsonData instance doesn't hold a double");
-
- return inst_double;
- }
-
- int IJsonWrapper.GetInt ()
- {
- if (type != JsonType.Int)
- throw new InvalidOperationException (
- "JsonData instance doesn't hold an int");
-
- return inst_int;
- }
-
- long IJsonWrapper.GetLong ()
- {
- if (type != JsonType.Long)
- throw new InvalidOperationException (
- "JsonData instance doesn't hold a long");
-
- return inst_long;
- }
-
- string IJsonWrapper.GetString ()
- {
- if (type != JsonType.String)
- throw new InvalidOperationException (
- "JsonData instance doesn't hold a string");
-
- return inst_string;
- }
-
- void IJsonWrapper.SetBoolean (bool val)
- {
- type = JsonType.Boolean;
- inst_boolean = val;
- json = null;
- }
-
- void IJsonWrapper.SetDouble (double val)
- {
- type = JsonType.Double;
- inst_double = val;
- json = null;
- }
-
- void IJsonWrapper.SetInt (int val)
- {
- type = JsonType.Int;
- inst_int = val;
- json = null;
- }
-
- void IJsonWrapper.SetLong (long val)
- {
- type = JsonType.Long;
- inst_long = val;
- json = null;
- }
-
- void IJsonWrapper.SetString (string val)
- {
- type = JsonType.String;
- inst_string = val;
- json = null;
- }
-
- string IJsonWrapper.ToJson ()
- {
- return ToJson ();
- }
-
- void IJsonWrapper.ToJson (JsonWriter writer)
- {
- ToJson (writer);
- }
- #endregion
-
-
- #region IList Methods
- int IList.Add (object value)
- {
- return Add (value);
- }
-
- void IList.Clear ()
- {
- EnsureList ().Clear ();
- json = null;
- }
-
- bool IList.Contains (object value)
- {
- return EnsureList ().Contains (value);
- }
-
- int IList.IndexOf (object value)
- {
- return EnsureList ().IndexOf (value);
- }
-
- void IList.Insert (int index, object value)
- {
- EnsureList ().Insert (index, value);
- json = null;
- }
-
- void IList.Remove (object value)
- {
- EnsureList ().Remove (value);
- json = null;
- }
-
- void IList.RemoveAt (int index)
- {
- EnsureList ().RemoveAt (index);
- json = null;
- }
- #endregion
-
-
- #region IOrderedDictionary Methods
- IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
- {
- EnsureDictionary ();
-
- return new OrderedDictionaryEnumerator (
- object_list.GetEnumerator ());
- }
-
- void IOrderedDictionary.Insert (int idx, object key, object value)
- {
- string property = (string) key;
- JsonData data = ToJsonData (value);
-
- this[property] = data;
-
- KeyValuePair entry =
- new KeyValuePair (property, data);
-
- object_list.Insert (idx, entry);
- }
-
- void IOrderedDictionary.RemoveAt (int idx)
- {
- EnsureDictionary ();
-
- inst_object.Remove (object_list[idx].Key);
- object_list.RemoveAt (idx);
- }
- #endregion
-
-
- #region Private Methods
- private ICollection EnsureCollection ()
- {
- if (type == JsonType.Array)
- return (ICollection) inst_array;
-
- if (type == JsonType.Object)
- return (ICollection) inst_object;
-
- throw new InvalidOperationException (
- "The JsonData instance has to be initialized first");
- }
-
- private IDictionary EnsureDictionary ()
- {
- if (type == JsonType.Object)
- return (IDictionary) inst_object;
-
- if (type != JsonType.None)
- throw new InvalidOperationException (
- "Instance of JsonData is not a dictionary");
-
- type = JsonType.Object;
- inst_object = new Dictionary ();
- object_list = new List> ();
-
- return (IDictionary) inst_object;
- }
-
- private IList EnsureList ()
- {
- if (type == JsonType.Array)
- return (IList) inst_array;
-
- if (type != JsonType.None)
- throw new InvalidOperationException (
- "Instance of JsonData is not a list");
-
- type = JsonType.Array;
- inst_array = new List ();
-
- return (IList) inst_array;
- }
-
- private JsonData ToJsonData (object obj)
- {
- if (obj == null)
- return null;
-
- if (obj is JsonData)
- return (JsonData) obj;
-
- return new JsonData (obj);
- }
-
- private static void WriteJson (IJsonWrapper obj, JsonWriter writer)
- {
- if (obj.IsString) {
- writer.Write (obj.GetString ());
- return;
- }
-
- if (obj.IsBoolean) {
- writer.Write (obj.GetBoolean ());
- return;
- }
-
- if (obj.IsDouble) {
- writer.Write (obj.GetDouble ());
- return;
- }
-
- if (obj.IsInt) {
- writer.Write (obj.GetInt ());
- return;
- }
-
- if (obj.IsLong) {
- writer.Write (obj.GetLong ());
- return;
- }
-
- if (obj.IsArray) {
- writer.WriteArrayStart ();
- foreach (object elem in (IList) obj)
- WriteJson ((JsonData) elem, writer);
- writer.WriteArrayEnd ();
-
- return;
- }
-
- if (obj.IsObject) {
- writer.WriteObjectStart ();
-
- foreach (DictionaryEntry entry in ((IDictionary) obj)) {
- writer.WritePropertyName ((string) entry.Key);
- WriteJson ((JsonData) entry.Value, writer);
- }
- writer.WriteObjectEnd ();
-
- return;
- }
- }
- #endregion
-
-
- public int Add (object value)
- {
- JsonData data = ToJsonData (value);
-
- json = null;
-
- return EnsureList ().Add (data);
- }
-
- public void Clear ()
- {
- if (IsObject) {
- ((IDictionary) this).Clear ();
- return;
- }
-
- if (IsArray) {
- ((IList) this).Clear ();
- return;
- }
- }
-
- public bool Equals (JsonData x)
- {
- if (x == null)
- return false;
-
- if (x.type != this.type)
- return false;
-
- switch (this.type) {
- case JsonType.None:
- return true;
-
- case JsonType.Object:
- return this.inst_object.Equals (x.inst_object);
-
- case JsonType.Array:
- return this.inst_array.Equals (x.inst_array);
-
- case JsonType.String:
- return this.inst_string.Equals (x.inst_string);
-
- case JsonType.Int:
- return this.inst_int.Equals (x.inst_int);
-
- case JsonType.Long:
- return this.inst_long.Equals (x.inst_long);
-
- case JsonType.Double:
- return this.inst_double.Equals (x.inst_double);
-
- case JsonType.Boolean:
- return this.inst_boolean.Equals (x.inst_boolean);
- }
-
- return false;
- }
-
- public JsonType GetJsonType ()
- {
- return type;
- }
-
- public void SetJsonType (JsonType type)
- {
- if (this.type == type)
- return;
-
- switch (type) {
- case JsonType.None:
- break;
-
- case JsonType.Object:
- inst_object = new Dictionary ();
- object_list = new List> ();
- break;
-
- case JsonType.Array:
- inst_array = new List ();
- break;
-
- case JsonType.String:
- inst_string = default (String);
- break;
-
- case JsonType.Int:
- inst_int = default (Int32);
- break;
-
- case JsonType.Long:
- inst_long = default (Int64);
- break;
-
- case JsonType.Double:
- inst_double = default (Double);
- break;
-
- case JsonType.Boolean:
- inst_boolean = default (Boolean);
- break;
- }
-
- this.type = type;
- }
-
- public string ToJson ()
- {
- if (json != null)
- return json;
-
- StringWriter sw = new StringWriter ();
- JsonWriter writer = new JsonWriter (sw);
- writer.Validate = false;
-
- WriteJson (this, writer);
- json = sw.ToString ();
-
- return json;
- }
-
- public void ToJson (JsonWriter writer)
- {
- bool old_validate = writer.Validate;
-
- writer.Validate = false;
-
- WriteJson (this, writer);
-
- writer.Validate = old_validate;
- }
-
- public override string ToString ()
- {
- switch (type) {
- case JsonType.Array:
- return "JsonData array";
-
- case JsonType.Boolean:
- return inst_boolean.ToString ();
-
- case JsonType.Double:
- return inst_double.ToString ();
-
- case JsonType.Int:
- return inst_int.ToString ();
-
- case JsonType.Long:
- return inst_long.ToString ();
-
- case JsonType.Object:
- return "JsonData object";
-
- case JsonType.String:
- return inst_string;
- }
-
- return "Uninitialized JsonData";
- }
- }
-
-
- internal class OrderedDictionaryEnumerator : IDictionaryEnumerator
- {
- IEnumerator> list_enumerator;
-
-
- public object Current {
- get { return Entry; }
- }
-
- public DictionaryEntry Entry {
- get {
- KeyValuePair curr = list_enumerator.Current;
- return new DictionaryEntry (curr.Key, curr.Value);
- }
- }
-
- public object Key {
- get { return list_enumerator.Current.Key; }
- }
-
- public object Value {
- get { return list_enumerator.Current.Value; }
- }
-
-
- public OrderedDictionaryEnumerator (
- IEnumerator> enumerator)
- {
- list_enumerator = enumerator;
- }
-
-
- public bool MoveNext ()
- {
- return list_enumerator.MoveNext ();
- }
-
- public void Reset ()
- {
- list_enumerator.Reset ();
- }
- }
-}
+#region Header
+/**
+ * JsonData.cs
+ * Generic type to hold JSON data (objects, arrays, and so on). This is
+ * the default type returned by JsonMapper.ToObject().
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+
+
+namespace LitJson
+{
+ public class JsonData : IJsonWrapper, IEquatable
+ {
+ #region Fields
+ private IList inst_array;
+ private bool inst_boolean;
+ private double inst_double;
+ private int inst_int;
+ private long inst_long;
+ private IDictionary inst_object;
+ private string inst_string;
+ private string json;
+ private JsonType type;
+
+ // Used to implement the IOrderedDictionary interface
+ private IList> object_list;
+ #endregion
+
+
+ #region Properties
+ public int Count {
+ get { return EnsureCollection ().Count; }
+ }
+
+ public bool IsArray {
+ get { return type == JsonType.Array; }
+ }
+
+ public bool IsBoolean {
+ get { return type == JsonType.Boolean; }
+ }
+
+ public bool IsDouble {
+ get { return type == JsonType.Double; }
+ }
+
+ public bool IsInt {
+ get { return type == JsonType.Int; }
+ }
+
+ public bool IsLong {
+ get { return type == JsonType.Long; }
+ }
+
+ public bool IsObject {
+ get { return type == JsonType.Object; }
+ }
+
+ public bool IsString {
+ get { return type == JsonType.String; }
+ }
+ #endregion
+
+
+ #region ICollection Properties
+ int ICollection.Count {
+ get {
+ return Count;
+ }
+ }
+
+ bool ICollection.IsSynchronized {
+ get {
+ return EnsureCollection ().IsSynchronized;
+ }
+ }
+
+ object ICollection.SyncRoot {
+ get {
+ return EnsureCollection ().SyncRoot;
+ }
+ }
+ #endregion
+
+
+ #region IDictionary Properties
+ bool IDictionary.IsFixedSize {
+ get {
+ return EnsureDictionary ().IsFixedSize;
+ }
+ }
+
+ bool IDictionary.IsReadOnly {
+ get {
+ return EnsureDictionary ().IsReadOnly;
+ }
+ }
+
+ ICollection IDictionary.Keys {
+ get {
+ EnsureDictionary ();
+ IList keys = new List ();
+
+ foreach (KeyValuePair entry in
+ object_list) {
+ keys.Add (entry.Key);
+ }
+
+ return (ICollection) keys;
+ }
+ }
+
+ ICollection IDictionary.Values {
+ get {
+ EnsureDictionary ();
+ IList values = new List ();
+
+ foreach (KeyValuePair entry in
+ object_list) {
+ values.Add (entry.Value);
+ }
+
+ return (ICollection) values;
+ }
+ }
+ #endregion
+
+
+
+ #region IJsonWrapper Properties
+ bool IJsonWrapper.IsArray {
+ get { return IsArray; }
+ }
+
+ bool IJsonWrapper.IsBoolean {
+ get { return IsBoolean; }
+ }
+
+ bool IJsonWrapper.IsDouble {
+ get { return IsDouble; }
+ }
+
+ bool IJsonWrapper.IsInt {
+ get { return IsInt; }
+ }
+
+ bool IJsonWrapper.IsLong {
+ get { return IsLong; }
+ }
+
+ bool IJsonWrapper.IsObject {
+ get { return IsObject; }
+ }
+
+ bool IJsonWrapper.IsString {
+ get { return IsString; }
+ }
+ #endregion
+
+
+ #region IList Properties
+ bool IList.IsFixedSize {
+ get {
+ return EnsureList ().IsFixedSize;
+ }
+ }
+
+ bool IList.IsReadOnly {
+ get {
+ return EnsureList ().IsReadOnly;
+ }
+ }
+ #endregion
+
+
+ #region IDictionary Indexer
+ object IDictionary.this[object key] {
+ get {
+ return EnsureDictionary ()[key];
+ }
+
+ set {
+ if (! (key is String))
+ throw new ArgumentException (
+ "The key has to be a string");
+
+ JsonData data = ToJsonData (value);
+
+ this[(string) key] = data;
+ }
+ }
+ #endregion
+
+
+ #region IOrderedDictionary Indexer
+ object IOrderedDictionary.this[int idx] {
+ get {
+ EnsureDictionary ();
+ return object_list[idx].Value;
+ }
+
+ set {
+ EnsureDictionary ();
+ JsonData data = ToJsonData (value);
+
+ KeyValuePair old_entry = object_list[idx];
+
+ inst_object[old_entry.Key] = data;
+
+ KeyValuePair entry =
+ new KeyValuePair (old_entry.Key, data);
+
+ object_list[idx] = entry;
+ }
+ }
+ #endregion
+
+
+ #region IList Indexer
+ object IList.this[int index] {
+ get {
+ return EnsureList ()[index];
+ }
+
+ set {
+ EnsureList ();
+ JsonData data = ToJsonData (value);
+
+ this[index] = data;
+ }
+ }
+ #endregion
+
+
+ #region Public Indexers
+ public JsonData this[string prop_name] {
+ get {
+ EnsureDictionary ();
+ return inst_object[prop_name];
+ }
+
+ set {
+ EnsureDictionary ();
+
+ KeyValuePair entry =
+ new KeyValuePair (prop_name, value);
+
+ if (inst_object.ContainsKey (prop_name)) {
+ for (int i = 0; i < object_list.Count; i++) {
+ if (object_list[i].Key == prop_name) {
+ object_list[i] = entry;
+ break;
+ }
+ }
+ } else
+ object_list.Add (entry);
+
+ inst_object[prop_name] = value;
+
+ json = null;
+ }
+ }
+
+ public JsonData this[int index] {
+ get {
+ EnsureCollection ();
+
+ if (type == JsonType.Array)
+ return inst_array[index];
+
+ return object_list[index].Value;
+ }
+
+ set {
+ EnsureCollection ();
+
+ if (type == JsonType.Array)
+ inst_array[index] = value;
+ else {
+ KeyValuePair entry = object_list[index];
+ KeyValuePair new_entry =
+ new KeyValuePair (entry.Key, value);
+
+ object_list[index] = new_entry;
+ inst_object[entry.Key] = value;
+ }
+
+ json = null;
+ }
+ }
+ #endregion
+
+
+ #region Constructors
+ public JsonData ()
+ {
+ }
+
+ public JsonData (bool boolean)
+ {
+ type = JsonType.Boolean;
+ inst_boolean = boolean;
+ }
+
+ public JsonData (double number)
+ {
+ type = JsonType.Double;
+ inst_double = number;
+ }
+
+ public JsonData (int number)
+ {
+ type = JsonType.Int;
+ inst_int = number;
+ }
+
+ public JsonData (long number)
+ {
+ type = JsonType.Long;
+ inst_long = number;
+ }
+
+ public JsonData (object obj)
+ {
+ if (obj is Boolean) {
+ type = JsonType.Boolean;
+ inst_boolean = (bool) obj;
+ return;
+ }
+
+ if (obj is Double) {
+ type = JsonType.Double;
+ inst_double = (double) obj;
+ return;
+ }
+
+ if (obj is Int32) {
+ type = JsonType.Int;
+ inst_int = (int) obj;
+ return;
+ }
+
+ if (obj is Int64) {
+ type = JsonType.Long;
+ inst_long = (long) obj;
+ return;
+ }
+
+ if (obj is String) {
+ type = JsonType.String;
+ inst_string = (string) obj;
+ return;
+ }
+
+ throw new ArgumentException (
+ "Unable to wrap the given object with JsonData");
+ }
+
+ public JsonData (string str)
+ {
+ type = JsonType.String;
+ inst_string = str;
+ }
+ #endregion
+
+
+ #region Implicit Conversions
+ public static implicit operator JsonData (Boolean data)
+ {
+ return new JsonData (data);
+ }
+
+ public static implicit operator JsonData (Double data)
+ {
+ return new JsonData (data);
+ }
+
+ public static implicit operator JsonData (Int32 data)
+ {
+ return new JsonData (data);
+ }
+
+ public static implicit operator JsonData (Int64 data)
+ {
+ return new JsonData (data);
+ }
+
+ public static implicit operator JsonData (String data)
+ {
+ return new JsonData (data);
+ }
+ #endregion
+
+
+ #region Explicit Conversions
+ public static explicit operator Boolean (JsonData data)
+ {
+ if (data.type != JsonType.Boolean)
+ throw new InvalidCastException (
+ "Instance of JsonData doesn't hold a double");
+
+ return data.inst_boolean;
+ }
+
+ public static explicit operator Double (JsonData data)
+ {
+ if (data.type != JsonType.Double)
+ throw new InvalidCastException (
+ "Instance of JsonData doesn't hold a double");
+
+ return data.inst_double;
+ }
+
+ public static explicit operator Int32 (JsonData data)
+ {
+ if (data.type != JsonType.Int)
+ throw new InvalidCastException (
+ "Instance of JsonData doesn't hold an int");
+
+ return data.inst_int;
+ }
+
+ public static explicit operator Int64 (JsonData data)
+ {
+ if (data.type != JsonType.Long)
+ throw new InvalidCastException (
+ "Instance of JsonData doesn't hold an int");
+
+ return data.inst_long;
+ }
+
+ public static explicit operator String (JsonData data)
+ {
+ if (data.type != JsonType.String)
+ throw new InvalidCastException (
+ "Instance of JsonData doesn't hold a string");
+
+ return data.inst_string;
+ }
+ #endregion
+
+
+ #region ICollection Methods
+ void ICollection.CopyTo (Array array, int index)
+ {
+ EnsureCollection ().CopyTo (array, index);
+ }
+ #endregion
+
+
+ #region IDictionary Methods
+ void IDictionary.Add (object key, object value)
+ {
+ JsonData data = ToJsonData (value);
+
+ EnsureDictionary ().Add (key, data);
+
+ KeyValuePair entry =
+ new KeyValuePair ((string) key, data);
+ object_list.Add (entry);
+
+ json = null;
+ }
+
+ void IDictionary.Clear ()
+ {
+ EnsureDictionary ().Clear ();
+ object_list.Clear ();
+ json = null;
+ }
+
+ bool IDictionary.Contains (object key)
+ {
+ return EnsureDictionary ().Contains (key);
+ }
+
+ IDictionaryEnumerator IDictionary.GetEnumerator ()
+ {
+ return ((IOrderedDictionary) this).GetEnumerator ();
+ }
+
+ void IDictionary.Remove (object key)
+ {
+ EnsureDictionary ().Remove (key);
+
+ for (int i = 0; i < object_list.Count; i++) {
+ if (object_list[i].Key == (string) key) {
+ object_list.RemoveAt (i);
+ break;
+ }
+ }
+
+ json = null;
+ }
+ #endregion
+
+
+ #region IEnumerable Methods
+ IEnumerator IEnumerable.GetEnumerator ()
+ {
+ return EnsureCollection ().GetEnumerator ();
+ }
+ #endregion
+
+
+ #region IJsonWrapper Methods
+ bool IJsonWrapper.GetBoolean ()
+ {
+ if (type != JsonType.Boolean)
+ throw new InvalidOperationException (
+ "JsonData instance doesn't hold a boolean");
+
+ return inst_boolean;
+ }
+
+ double IJsonWrapper.GetDouble ()
+ {
+ if (type != JsonType.Double)
+ throw new InvalidOperationException (
+ "JsonData instance doesn't hold a double");
+
+ return inst_double;
+ }
+
+ int IJsonWrapper.GetInt ()
+ {
+ if (type != JsonType.Int)
+ throw new InvalidOperationException (
+ "JsonData instance doesn't hold an int");
+
+ return inst_int;
+ }
+
+ long IJsonWrapper.GetLong ()
+ {
+ if (type != JsonType.Long)
+ throw new InvalidOperationException (
+ "JsonData instance doesn't hold a long");
+
+ return inst_long;
+ }
+
+ string IJsonWrapper.GetString ()
+ {
+ if (type != JsonType.String)
+ throw new InvalidOperationException (
+ "JsonData instance doesn't hold a string");
+
+ return inst_string;
+ }
+
+ void IJsonWrapper.SetBoolean (bool val)
+ {
+ type = JsonType.Boolean;
+ inst_boolean = val;
+ json = null;
+ }
+
+ void IJsonWrapper.SetDouble (double val)
+ {
+ type = JsonType.Double;
+ inst_double = val;
+ json = null;
+ }
+
+ void IJsonWrapper.SetInt (int val)
+ {
+ type = JsonType.Int;
+ inst_int = val;
+ json = null;
+ }
+
+ void IJsonWrapper.SetLong (long val)
+ {
+ type = JsonType.Long;
+ inst_long = val;
+ json = null;
+ }
+
+ void IJsonWrapper.SetString (string val)
+ {
+ type = JsonType.String;
+ inst_string = val;
+ json = null;
+ }
+
+ string IJsonWrapper.ToJson ()
+ {
+ return ToJson ();
+ }
+
+ void IJsonWrapper.ToJson (JsonWriter writer)
+ {
+ ToJson (writer);
+ }
+ #endregion
+
+
+ #region IList Methods
+ int IList.Add (object value)
+ {
+ return Add (value);
+ }
+
+ void IList.Clear ()
+ {
+ EnsureList ().Clear ();
+ json = null;
+ }
+
+ bool IList.Contains (object value)
+ {
+ return EnsureList ().Contains (value);
+ }
+
+ int IList.IndexOf (object value)
+ {
+ return EnsureList ().IndexOf (value);
+ }
+
+ void IList.Insert (int index, object value)
+ {
+ EnsureList ().Insert (index, value);
+ json = null;
+ }
+
+ void IList.Remove (object value)
+ {
+ EnsureList ().Remove (value);
+ json = null;
+ }
+
+ void IList.RemoveAt (int index)
+ {
+ EnsureList ().RemoveAt (index);
+ json = null;
+ }
+ #endregion
+
+
+ #region IOrderedDictionary Methods
+ IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
+ {
+ EnsureDictionary ();
+
+ return new OrderedDictionaryEnumerator (
+ object_list.GetEnumerator ());
+ }
+
+ void IOrderedDictionary.Insert (int idx, object key, object value)
+ {
+ string property = (string) key;
+ JsonData data = ToJsonData (value);
+
+ this[property] = data;
+
+ KeyValuePair entry =
+ new KeyValuePair (property, data);
+
+ object_list.Insert (idx, entry);
+ }
+
+ void IOrderedDictionary.RemoveAt (int idx)
+ {
+ EnsureDictionary ();
+
+ inst_object.Remove (object_list[idx].Key);
+ object_list.RemoveAt (idx);
+ }
+ #endregion
+
+
+ #region Private Methods
+ private ICollection EnsureCollection ()
+ {
+ if (type == JsonType.Array)
+ return (ICollection) inst_array;
+
+ if (type == JsonType.Object)
+ return (ICollection) inst_object;
+
+ throw new InvalidOperationException (
+ "The JsonData instance has to be initialized first");
+ }
+
+ private IDictionary EnsureDictionary ()
+ {
+ if (type == JsonType.Object)
+ return (IDictionary) inst_object;
+
+ if (type != JsonType.None)
+ throw new InvalidOperationException (
+ "Instance of JsonData is not a dictionary");
+
+ type = JsonType.Object;
+ inst_object = new Dictionary ();
+ object_list = new List> ();
+
+ return (IDictionary) inst_object;
+ }
+
+ private IList EnsureList ()
+ {
+ if (type == JsonType.Array)
+ return (IList) inst_array;
+
+ if (type != JsonType.None)
+ throw new InvalidOperationException (
+ "Instance of JsonData is not a list");
+
+ type = JsonType.Array;
+ inst_array = new List ();
+
+ return (IList) inst_array;
+ }
+
+ private JsonData ToJsonData (object obj)
+ {
+ if (obj == null)
+ return null;
+
+ if (obj is JsonData)
+ return (JsonData) obj;
+
+ return new JsonData (obj);
+ }
+
+ private static void WriteJson (IJsonWrapper obj, JsonWriter writer)
+ {
+ if (obj.IsString) {
+ writer.Write (obj.GetString ());
+ return;
+ }
+
+ if (obj.IsBoolean) {
+ writer.Write (obj.GetBoolean ());
+ return;
+ }
+
+ if (obj.IsDouble) {
+ writer.Write (obj.GetDouble ());
+ return;
+ }
+
+ if (obj.IsInt) {
+ writer.Write (obj.GetInt ());
+ return;
+ }
+
+ if (obj.IsLong) {
+ writer.Write (obj.GetLong ());
+ return;
+ }
+
+ if (obj.IsArray) {
+ writer.WriteArrayStart ();
+ foreach (object elem in (IList) obj)
+ WriteJson ((JsonData) elem, writer);
+ writer.WriteArrayEnd ();
+
+ return;
+ }
+
+ if (obj.IsObject) {
+ writer.WriteObjectStart ();
+
+ foreach (DictionaryEntry entry in ((IDictionary) obj)) {
+ writer.WritePropertyName ((string) entry.Key);
+ WriteJson ((JsonData) entry.Value, writer);
+ }
+ writer.WriteObjectEnd ();
+
+ return;
+ }
+ }
+ #endregion
+
+
+ public int Add (object value)
+ {
+ JsonData data = ToJsonData (value);
+
+ json = null;
+
+ return EnsureList ().Add (data);
+ }
+
+ public void Clear ()
+ {
+ if (IsObject) {
+ ((IDictionary) this).Clear ();
+ return;
+ }
+
+ if (IsArray) {
+ ((IList) this).Clear ();
+ return;
+ }
+ }
+
+ public bool Equals (JsonData x)
+ {
+ if (x == null)
+ return false;
+
+ if (x.type != this.type)
+ return false;
+
+ switch (this.type) {
+ case JsonType.None:
+ return true;
+
+ case JsonType.Object:
+ return this.inst_object.Equals (x.inst_object);
+
+ case JsonType.Array:
+ return this.inst_array.Equals (x.inst_array);
+
+ case JsonType.String:
+ return this.inst_string.Equals (x.inst_string);
+
+ case JsonType.Int:
+ return this.inst_int.Equals (x.inst_int);
+
+ case JsonType.Long:
+ return this.inst_long.Equals (x.inst_long);
+
+ case JsonType.Double:
+ return this.inst_double.Equals (x.inst_double);
+
+ case JsonType.Boolean:
+ return this.inst_boolean.Equals (x.inst_boolean);
+ }
+
+ return false;
+ }
+
+ public JsonType GetJsonType ()
+ {
+ return type;
+ }
+
+ public void SetJsonType (JsonType type)
+ {
+ if (this.type == type)
+ return;
+
+ switch (type) {
+ case JsonType.None:
+ break;
+
+ case JsonType.Object:
+ inst_object = new Dictionary ();
+ object_list = new List> ();
+ break;
+
+ case JsonType.Array:
+ inst_array = new List ();
+ break;
+
+ case JsonType.String:
+ inst_string = default (String);
+ break;
+
+ case JsonType.Int:
+ inst_int = default (Int32);
+ break;
+
+ case JsonType.Long:
+ inst_long = default (Int64);
+ break;
+
+ case JsonType.Double:
+ inst_double = default (Double);
+ break;
+
+ case JsonType.Boolean:
+ inst_boolean = default (Boolean);
+ break;
+ }
+
+ this.type = type;
+ }
+
+ public string ToJson ()
+ {
+ if (json != null)
+ return json;
+
+ StringWriter sw = new StringWriter ();
+ JsonWriter writer = new JsonWriter (sw);
+ writer.Validate = false;
+
+ WriteJson (this, writer);
+ json = sw.ToString ();
+
+ return json;
+ }
+
+ public void ToJson (JsonWriter writer)
+ {
+ bool old_validate = writer.Validate;
+
+ writer.Validate = false;
+
+ WriteJson (this, writer);
+
+ writer.Validate = old_validate;
+ }
+
+ public override string ToString ()
+ {
+ switch (type) {
+ case JsonType.Array:
+ return "JsonData array";
+
+ case JsonType.Boolean:
+ return inst_boolean.ToString ();
+
+ case JsonType.Double:
+ return inst_double.ToString ();
+
+ case JsonType.Int:
+ return inst_int.ToString ();
+
+ case JsonType.Long:
+ return inst_long.ToString ();
+
+ case JsonType.Object:
+ return "JsonData object";
+
+ case JsonType.String:
+ return inst_string;
+ }
+
+ return "Uninitialized JsonData";
+ }
+ }
+
+
+ internal class OrderedDictionaryEnumerator : IDictionaryEnumerator
+ {
+ IEnumerator> list_enumerator;
+
+
+ public object Current {
+ get { return Entry; }
+ }
+
+ public DictionaryEntry Entry {
+ get {
+ KeyValuePair curr = list_enumerator.Current;
+ return new DictionaryEntry (curr.Key, curr.Value);
+ }
+ }
+
+ public object Key {
+ get { return list_enumerator.Current.Key; }
+ }
+
+ public object Value {
+ get { return list_enumerator.Current.Value; }
+ }
+
+
+ public OrderedDictionaryEnumerator (
+ IEnumerator> enumerator)
+ {
+ list_enumerator = enumerator;
+ }
+
+
+ public bool MoveNext ()
+ {
+ return list_enumerator.MoveNext ();
+ }
+
+ public void Reset ()
+ {
+ list_enumerator.Reset ();
+ }
+ }
+}
diff --git a/Json/JsonException.cs b/Json/JsonException.cs
index 8ad6f0a2..f7f8db09 100755
--- a/Json/JsonException.cs
+++ b/Json/JsonException.cs
@@ -1,60 +1,60 @@
-#region Header
-/**
- * JsonException.cs
- * Base class throwed by LitJSON when a parsing error occurs.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-
-
-namespace LitJson
-{
- public class JsonException : ApplicationException
- {
- public JsonException () : base ()
- {
- }
-
- internal JsonException (ParserToken token) :
- base (String.Format (
- "Invalid token '{0}' in input string", token))
- {
- }
-
- internal JsonException (ParserToken token,
- Exception inner_exception) :
- base (String.Format (
- "Invalid token '{0}' in input string", token),
- inner_exception)
- {
- }
-
- internal JsonException (int c) :
- base (String.Format (
- "Invalid character '{0}' in input string", (char) c))
- {
- }
-
- internal JsonException (int c, Exception inner_exception) :
- base (String.Format (
- "Invalid character '{0}' in input string", (char) c),
- inner_exception)
- {
- }
-
-
- public JsonException (string message) : base (message)
- {
- }
-
- public JsonException (string message, Exception inner_exception) :
- base (message, inner_exception)
- {
- }
- }
-}
+#region Header
+/**
+ * JsonException.cs
+ * Base class throwed by LitJSON when a parsing error occurs.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+
+
+namespace LitJson
+{
+ public class JsonException : ApplicationException
+ {
+ public JsonException () : base ()
+ {
+ }
+
+ internal JsonException (ParserToken token) :
+ base (String.Format (
+ "Invalid token '{0}' in input string", token))
+ {
+ }
+
+ internal JsonException (ParserToken token,
+ Exception inner_exception) :
+ base (String.Format (
+ "Invalid token '{0}' in input string", token),
+ inner_exception)
+ {
+ }
+
+ internal JsonException (int c) :
+ base (String.Format (
+ "Invalid character '{0}' in input string", (char) c))
+ {
+ }
+
+ internal JsonException (int c, Exception inner_exception) :
+ base (String.Format (
+ "Invalid character '{0}' in input string", (char) c),
+ inner_exception)
+ {
+ }
+
+
+ public JsonException (string message) : base (message)
+ {
+ }
+
+ public JsonException (string message, Exception inner_exception) :
+ base (message, inner_exception)
+ {
+ }
+ }
+}
diff --git a/Json/JsonMapper.cs b/Json/JsonMapper.cs
index 752afab7..f82646ca 100755
--- a/Json/JsonMapper.cs
+++ b/Json/JsonMapper.cs
@@ -1,911 +1,911 @@
-#region Header
-/**
- * JsonMapper.cs
- * JSON to .Net object and object to JSON conversions.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-
-
-namespace LitJson
-{
- internal struct PropertyMetadata
- {
- public MemberInfo Info;
- public bool IsField;
- public Type Type;
- }
-
-
- internal struct ArrayMetadata
- {
- private Type element_type;
- private bool is_array;
- private bool is_list;
-
-
- public Type ElementType {
- get {
- if (element_type == null)
- return typeof (JsonData);
-
- return element_type;
- }
-
- set { element_type = value; }
- }
-
- public bool IsArray {
- get { return is_array; }
- set { is_array = value; }
- }
-
- public bool IsList {
- get { return is_list; }
- set { is_list = value; }
- }
- }
-
-
- internal struct ObjectMetadata
- {
- private Type element_type;
- private bool is_dictionary;
-
- private IDictionary properties;
-
-
- public Type ElementType {
- get {
- if (element_type == null)
- return typeof (JsonData);
-
- return element_type;
- }
-
- set { element_type = value; }
- }
-
- public bool IsDictionary {
- get { return is_dictionary; }
- set { is_dictionary = value; }
- }
-
- public IDictionary Properties {
- get { return properties; }
- set { properties = value; }
- }
- }
-
-
- internal delegate void ExporterFunc (object obj, JsonWriter writer);
- public delegate void ExporterFunc (T obj, JsonWriter writer);
-
- internal delegate object ImporterFunc (object input);
- public delegate TValue ImporterFunc (TJson input);
-
- public delegate IJsonWrapper WrapperFactory ();
-
-
- public class JsonMapper
- {
- #region Fields
- private static int max_nesting_depth;
-
- private static IFormatProvider datetime_format;
-
- private static IDictionary base_exporters_table;
- private static IDictionary custom_exporters_table;
-
- private static IDictionary> base_importers_table;
- private static IDictionary> custom_importers_table;
-
- private static IDictionary array_metadata;
- private static readonly object array_metadata_lock = new Object ();
-
- private static IDictionary> conv_ops;
- private static readonly object conv_ops_lock = new Object ();
-
- private static IDictionary object_metadata;
- private static readonly object object_metadata_lock = new Object ();
-
- private static IDictionary> type_properties;
- private static readonly object type_properties_lock = new Object ();
-
- private static JsonWriter static_writer;
- private static readonly object static_writer_lock = new Object ();
- #endregion
-
-
- #region Constructors
- static JsonMapper ()
- {
- max_nesting_depth = 100;
-
- array_metadata = new Dictionary ();
- conv_ops = new Dictionary> ();
- object_metadata = new Dictionary ();
- type_properties = new Dictionary> ();
-
- static_writer = new JsonWriter ();
-
- datetime_format = DateTimeFormatInfo.InvariantInfo;
-
- base_exporters_table = new Dictionary ();
- custom_exporters_table = new Dictionary ();
-
- base_importers_table = new Dictionary> ();
- custom_importers_table = new Dictionary> ();
-
- RegisterBaseExporters ();
- RegisterBaseImporters ();
- }
- #endregion
-
-
- #region Private Methods
- private static void AddArrayMetadata (Type type)
- {
- if (array_metadata.ContainsKey (type))
- return;
-
- ArrayMetadata data = new ArrayMetadata ();
-
- data.IsArray = type.IsArray;
-
- if (type.GetInterface ("System.Collections.IList") != null)
- data.IsList = true;
-
- foreach (PropertyInfo p_info in type.GetProperties ()) {
- if (p_info.Name != "Item")
- continue;
-
- ParameterInfo[] parameters = p_info.GetIndexParameters ();
-
- if (parameters.Length != 1)
- continue;
-
- if (parameters[0].ParameterType == typeof (int))
- data.ElementType = p_info.PropertyType;
- }
-
- lock (array_metadata_lock) {
- try {
- array_metadata.Add (type, data);
- } catch (ArgumentException) {
- return;
- }
- }
- }
-
- private static void AddObjectMetadata (Type type)
- {
- if (object_metadata.ContainsKey (type))
- return;
-
- ObjectMetadata data = new ObjectMetadata ();
-
- if (type.GetInterface ("System.Collections.IDictionary") != null)
- data.IsDictionary = true;
-
- data.Properties = new Dictionary ();
-
- foreach (PropertyInfo p_info in type.GetProperties ()) {
- if (p_info.Name == "Item") {
- ParameterInfo[] parameters = p_info.GetIndexParameters ();
-
- if (parameters.Length != 1)
- continue;
-
- if (parameters[0].ParameterType == typeof (string))
- data.ElementType = p_info.PropertyType;
-
- continue;
- }
-
- PropertyMetadata p_data = new PropertyMetadata ();
- p_data.Info = p_info;
- p_data.Type = p_info.PropertyType;
-
- data.Properties.Add (p_info.Name, p_data);
- }
-
- foreach (FieldInfo f_info in type.GetFields ()) {
- PropertyMetadata p_data = new PropertyMetadata ();
- p_data.Info = f_info;
- p_data.IsField = true;
- p_data.Type = f_info.FieldType;
-
- data.Properties.Add (f_info.Name, p_data);
- }
-
- lock (object_metadata_lock) {
- try {
- object_metadata.Add (type, data);
- } catch (ArgumentException) {
- return;
- }
- }
- }
-
- private static void AddTypeProperties (Type type)
- {
- if (type_properties.ContainsKey (type))
- return;
-
- IList props = new List ();
-
- foreach (PropertyInfo p_info in type.GetProperties ()) {
- if (p_info.Name == "Item")
- continue;
-
- PropertyMetadata p_data = new PropertyMetadata ();
- p_data.Info = p_info;
- p_data.IsField = false;
- props.Add (p_data);
- }
-
- foreach (FieldInfo f_info in type.GetFields ()) {
- PropertyMetadata p_data = new PropertyMetadata ();
- p_data.Info = f_info;
- p_data.IsField = true;
-
- props.Add (p_data);
- }
-
- lock (type_properties_lock) {
- try {
- type_properties.Add (type, props);
- } catch (ArgumentException) {
- return;
- }
- }
- }
-
- private static MethodInfo GetConvOp (Type t1, Type t2)
- {
- lock (conv_ops_lock) {
- if (! conv_ops.ContainsKey (t1))
- conv_ops.Add (t1, new Dictionary ());
- }
-
- if (conv_ops[t1].ContainsKey (t2))
- return conv_ops[t1][t2];
-
- MethodInfo op = t1.GetMethod (
- "op_Implicit", new Type[] { t2 });
-
- lock (conv_ops_lock) {
- try {
- conv_ops[t1].Add (t2, op);
- } catch (ArgumentException) {
- return conv_ops[t1][t2];
- }
- }
-
- return op;
- }
-
- private static object ReadValue (Type inst_type, JsonReader reader)
- {
- reader.Read ();
-
- if (reader.Token == JsonToken.ArrayEnd)
- return null;
-
- if (reader.Token == JsonToken.Null) {
-
- if (! inst_type.IsClass)
- throw new JsonException (String.Format (
- "Can't assign null to an instance of type {0}",
- inst_type));
-
- return null;
- }
-
- if (reader.Token == JsonToken.Double ||
- reader.Token == JsonToken.Int ||
- reader.Token == JsonToken.Long ||
- reader.Token == JsonToken.String ||
- reader.Token == JsonToken.Boolean) {
-
- Type json_type = reader.Value.GetType ();
-
- if (inst_type.IsAssignableFrom (json_type))
- return reader.Value;
-
- // If there's a custom importer that fits, use it
- if (custom_importers_table.ContainsKey (json_type) &&
- custom_importers_table[json_type].ContainsKey (
- inst_type)) {
-
- ImporterFunc importer =
- custom_importers_table[json_type][inst_type];
-
- return importer (reader.Value);
- }
-
- // Maybe there's a base importer that works
- if (base_importers_table.ContainsKey (json_type) &&
- base_importers_table[json_type].ContainsKey (
- inst_type)) {
-
- ImporterFunc importer =
- base_importers_table[json_type][inst_type];
-
- return importer (reader.Value);
- }
-
- // Maybe it's an enum
- if (inst_type.IsEnum)
- return Enum.ToObject (inst_type, reader.Value);
-
- // Try using an implicit conversion operator
- MethodInfo conv_op = GetConvOp (inst_type, json_type);
-
- if (conv_op != null)
- return conv_op.Invoke (null,
- new object[] { reader.Value });
-
- // No luck
- throw new JsonException (String.Format (
- "Can't assign value '{0}' (type {1}) to type {2}",
- reader.Value, json_type, inst_type));
- }
-
- object instance = null;
-
- if (reader.Token == JsonToken.ArrayStart) {
-
- AddArrayMetadata (inst_type);
- ArrayMetadata t_data = array_metadata[inst_type];
-
- if (! t_data.IsArray && ! t_data.IsList)
- throw new JsonException (String.Format (
- "Type {0} can't act as an array",
- inst_type));
-
- IList list;
- Type elem_type;
-
- if (! t_data.IsArray) {
- list = (IList) Activator.CreateInstance (inst_type);
- elem_type = t_data.ElementType;
- } else {
- list = new ArrayList ();
- elem_type = inst_type.GetElementType ();
- }
-
- while (true) {
- object item = ReadValue (elem_type, reader);
- if (reader.Token == JsonToken.ArrayEnd)
- break;
-
- list.Add (item);
- }
-
- if (t_data.IsArray) {
- int n = list.Count;
- instance = Array.CreateInstance (elem_type, n);
-
- for (int i = 0; i < n; i++)
- ((Array) instance).SetValue (list[i], i);
- } else
- instance = list;
-
- } else if (reader.Token == JsonToken.ObjectStart) {
-
- AddObjectMetadata (inst_type);
- ObjectMetadata t_data = object_metadata[inst_type];
-
- instance = Activator.CreateInstance (inst_type);
-
- while (true) {
- reader.Read ();
-
- if (reader.Token == JsonToken.ObjectEnd)
- break;
-
- string property = (string) reader.Value;
-
- if (t_data.Properties.ContainsKey (property)) {
- PropertyMetadata prop_data =
- t_data.Properties[property];
-
- if (prop_data.IsField) {
- ((FieldInfo) prop_data.Info).SetValue (
- instance, ReadValue (prop_data.Type, reader));
- } else {
- PropertyInfo p_info =
- (PropertyInfo) prop_data.Info;
-
- if (p_info.CanWrite)
- p_info.SetValue (
- instance,
- ReadValue (prop_data.Type, reader),
- null);
- else
- ReadValue (prop_data.Type, reader);
- }
-
- } else {
- if (! t_data.IsDictionary)
- throw new JsonException (String.Format (
- "The type {0} doesn't have the " +
- "property '{1}'", inst_type, property));
-
- ((IDictionary) instance).Add (
- property, ReadValue (
- t_data.ElementType, reader));
- }
-
- }
-
- }
-
- return instance;
- }
-
- private static IJsonWrapper ReadValue (WrapperFactory factory,
- JsonReader reader)
- {
- reader.Read ();
-
- if (reader.Token == JsonToken.ArrayEnd ||
- reader.Token == JsonToken.Null)
- return null;
-
- IJsonWrapper instance = factory ();
-
- if (reader.Token == JsonToken.String) {
- instance.SetString ((string) reader.Value);
- return instance;
- }
-
- if (reader.Token == JsonToken.Double) {
- instance.SetDouble ((double) reader.Value);
- return instance;
- }
-
- if (reader.Token == JsonToken.Int) {
- instance.SetInt ((int) reader.Value);
- return instance;
- }
-
- if (reader.Token == JsonToken.Long) {
- instance.SetLong ((long) reader.Value);
- return instance;
- }
-
- if (reader.Token == JsonToken.Boolean) {
- instance.SetBoolean ((bool) reader.Value);
- return instance;
- }
-
- if (reader.Token == JsonToken.ArrayStart) {
- instance.SetJsonType (JsonType.Array);
-
- while (true) {
- IJsonWrapper item = ReadValue (factory, reader);
- if (reader.Token == JsonToken.ArrayEnd)
- break;
-
- ((IList) instance).Add (item);
- }
- }
- else if (reader.Token == JsonToken.ObjectStart) {
- instance.SetJsonType (JsonType.Object);
-
- while (true) {
- reader.Read ();
-
- if (reader.Token == JsonToken.ObjectEnd)
- break;
-
- string property = (string) reader.Value;
-
- ((IDictionary) instance)[property] = ReadValue (
- factory, reader);
- }
-
- }
-
- return instance;
- }
-
- private static void RegisterBaseExporters ()
- {
- base_exporters_table[typeof (byte)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToInt32 ((byte) obj));
- };
-
- base_exporters_table[typeof (char)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToString ((char) obj));
- };
-
- base_exporters_table[typeof (DateTime)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToString ((DateTime) obj,
- datetime_format));
- };
-
- base_exporters_table[typeof (decimal)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write ((decimal) obj);
- };
-
- base_exporters_table[typeof (sbyte)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToInt32 ((sbyte) obj));
- };
-
- base_exporters_table[typeof (short)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToInt32 ((short) obj));
- };
-
- base_exporters_table[typeof (ushort)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToInt32 ((ushort) obj));
- };
-
- base_exporters_table[typeof (uint)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write (Convert.ToUInt64 ((uint) obj));
- };
-
- base_exporters_table[typeof (ulong)] =
- delegate (object obj, JsonWriter writer) {
- writer.Write ((ulong) obj);
- };
- }
-
- private static void RegisterBaseImporters ()
- {
- ImporterFunc importer;
-
- importer = delegate (object input) {
- return Convert.ToByte ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (byte), importer);
-
- importer = delegate (object input) {
- return Convert.ToUInt64 ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (ulong), importer);
-
- importer = delegate (object input) {
- return Convert.ToSByte ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (sbyte), importer);
-
- importer = delegate (object input) {
- return Convert.ToInt16 ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (short), importer);
-
- importer = delegate (object input) {
- return Convert.ToUInt16 ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (ushort), importer);
-
- importer = delegate (object input) {
- return Convert.ToUInt32 ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (uint), importer);
-
- importer = delegate (object input) {
- return Convert.ToSingle ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (float), importer);
-
- importer = delegate (object input) {
- return Convert.ToDouble ((int) input);
- };
- RegisterImporter (base_importers_table, typeof (int),
- typeof (double), importer);
-
- importer = delegate (object input) {
- return Convert.ToDecimal ((double) input);
- };
- RegisterImporter (base_importers_table, typeof (double),
- typeof (decimal), importer);
-
-
- importer = delegate (object input) {
- return Convert.ToUInt32 ((long) input);
- };
- RegisterImporter (base_importers_table, typeof (long),
- typeof (uint), importer);
-
- importer = delegate (object input) {
- return Convert.ToChar ((string) input);
- };
- RegisterImporter (base_importers_table, typeof (string),
- typeof (char), importer);
-
- importer = delegate (object input) {
- return Convert.ToDateTime ((string) input, datetime_format);
- };
- RegisterImporter (base_importers_table, typeof (string),
- typeof (DateTime), importer);
- }
-
- private static void RegisterImporter (
- IDictionary> table,
- Type json_type, Type value_type, ImporterFunc importer)
- {
- if (! table.ContainsKey (json_type))
- table.Add (json_type, new Dictionary ());
-
- table[json_type][value_type] = importer;
- }
-
- private static void WriteValue (object obj, JsonWriter writer,
- bool writer_is_private,
- int depth)
- {
- if (depth > max_nesting_depth)
- throw new JsonException (
- String.Format ("Max allowed object depth reached while " +
- "trying to export from type {0}",
- obj.GetType ()));
-
- if (obj == null) {
- writer.Write (null);
- return;
- }
-
- if (obj is IJsonWrapper) {
- if (writer_is_private)
- writer.TextWriter.Write (((IJsonWrapper) obj).ToJson ());
- else
- ((IJsonWrapper) obj).ToJson (writer);
-
- return;
- }
-
- if (obj is String) {
- writer.Write ((string) obj);
- return;
- }
-
- if (obj is Double) {
- writer.Write ((double) obj);
- return;
- }
-
- if (obj is Int32) {
- writer.Write ((int) obj);
- return;
- }
-
- if (obj is Boolean) {
- writer.Write ((bool) obj);
- return;
- }
-
- if (obj is Int64) {
- writer.Write ((long) obj);
- return;
- }
-
- if (obj is Array) {
- writer.WriteArrayStart ();
-
- foreach (object elem in (Array) obj)
- WriteValue (elem, writer, writer_is_private, depth + 1);
-
- writer.WriteArrayEnd ();
-
- return;
- }
-
- if (obj is IList) {
- writer.WriteArrayStart ();
- foreach (object elem in (IList) obj)
- WriteValue (elem, writer, writer_is_private, depth + 1);
- writer.WriteArrayEnd ();
-
- return;
- }
-
- if (obj is IDictionary) {
- writer.WriteObjectStart ();
- foreach (DictionaryEntry entry in (IDictionary) obj) {
- writer.WritePropertyName ((string) entry.Key);
- WriteValue (entry.Value, writer, writer_is_private,
- depth + 1);
- }
- writer.WriteObjectEnd ();
-
- return;
- }
-
- Type obj_type = obj.GetType ();
-
- // See if there's a custom exporter for the object
- if (custom_exporters_table.ContainsKey (obj_type)) {
- ExporterFunc exporter = custom_exporters_table[obj_type];
- exporter (obj, writer);
-
- return;
- }
-
- // If not, maybe there's a base exporter
- if (base_exporters_table.ContainsKey (obj_type)) {
- ExporterFunc exporter = base_exporters_table[obj_type];
- exporter (obj, writer);
-
- return;
- }
-
- // Last option, let's see if it's an enum
- if (obj is Enum) {
- Type e_type = Enum.GetUnderlyingType (obj_type);
-
- if (e_type == typeof (long)
- || e_type == typeof (uint)
- || e_type == typeof (ulong))
- writer.Write ((ulong) obj);
- else
- writer.Write ((int) obj);
-
- return;
- }
-
- // Okay, so it looks like the input should be exported as an
- // object
- AddTypeProperties (obj_type);
- IList props = type_properties[obj_type];
-
- writer.WriteObjectStart ();
- foreach (PropertyMetadata p_data in props) {
- if (p_data.IsField) {
- writer.WritePropertyName (p_data.Info.Name);
- WriteValue (((FieldInfo) p_data.Info).GetValue (obj),
- writer, writer_is_private, depth + 1);
- }
- else {
- PropertyInfo p_info = (PropertyInfo) p_data.Info;
-
- if (p_info.CanRead) {
- writer.WritePropertyName (p_data.Info.Name);
- WriteValue (p_info.GetValue (obj, null),
- writer, writer_is_private, depth + 1);
- }
- }
- }
- writer.WriteObjectEnd ();
- }
- #endregion
-
-
- public static string ToJson (object obj)
- {
- lock (static_writer_lock) {
- static_writer.Reset ();
-
- WriteValue (obj, static_writer, true, 0);
-
- return static_writer.ToString ();
- }
- }
-
- public static void ToJson (object obj, JsonWriter writer)
- {
- WriteValue (obj, writer, false, 0);
- }
-
- public static JsonData ToObject (JsonReader reader)
- {
- return (JsonData) ToWrapper (
- delegate { return new JsonData (); }, reader);
- }
-
- public static JsonData ToObject (TextReader reader)
- {
- JsonReader json_reader = new JsonReader (reader);
-
- return (JsonData) ToWrapper (
- delegate { return new JsonData (); }, json_reader);
- }
-
- public static JsonData ToObject (string json)
- {
- return (JsonData) ToWrapper (
- delegate { return new JsonData (); }, json);
- }
-
- public static T ToObject (JsonReader reader)
- {
- return (T) ReadValue (typeof (T), reader);
- }
-
- public static T ToObject (TextReader reader)
- {
- JsonReader json_reader = new JsonReader (reader);
-
- return (T) ReadValue (typeof (T), json_reader);
- }
-
- public static T ToObject (string json)
- {
- JsonReader reader = new JsonReader (json);
-
- return (T) ReadValue (typeof (T), reader);
- }
-
- public static IJsonWrapper ToWrapper (WrapperFactory factory,
- JsonReader reader)
- {
- return ReadValue (factory, reader);
- }
-
- public static IJsonWrapper ToWrapper (WrapperFactory factory,
- string json)
- {
- JsonReader reader = new JsonReader (json);
-
- return ReadValue (factory, reader);
- }
-
- public static void RegisterExporter (ExporterFunc exporter)
- {
- ExporterFunc exporter_wrapper =
- delegate (object obj, JsonWriter writer) {
- exporter ((T) obj, writer);
- };
-
- custom_exporters_table[typeof (T)] = exporter_wrapper;
- }
-
- public static void RegisterImporter (
- ImporterFunc importer)
- {
- ImporterFunc importer_wrapper =
- delegate (object input) {
- return importer ((TJson) input);
- };
-
- RegisterImporter (custom_importers_table, typeof (TJson),
- typeof (TValue), importer_wrapper);
- }
-
- public static void UnregisterExporters ()
- {
- custom_exporters_table.Clear ();
- }
-
- public static void UnregisterImporters ()
- {
- custom_importers_table.Clear ();
- }
- }
-}
+#region Header
+/**
+ * JsonMapper.cs
+ * JSON to .Net object and object to JSON conversions.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+
+
+namespace LitJson
+{
+ internal struct PropertyMetadata
+ {
+ public MemberInfo Info;
+ public bool IsField;
+ public Type Type;
+ }
+
+
+ internal struct ArrayMetadata
+ {
+ private Type element_type;
+ private bool is_array;
+ private bool is_list;
+
+
+ public Type ElementType {
+ get {
+ if (element_type == null)
+ return typeof (JsonData);
+
+ return element_type;
+ }
+
+ set { element_type = value; }
+ }
+
+ public bool IsArray {
+ get { return is_array; }
+ set { is_array = value; }
+ }
+
+ public bool IsList {
+ get { return is_list; }
+ set { is_list = value; }
+ }
+ }
+
+
+ internal struct ObjectMetadata
+ {
+ private Type element_type;
+ private bool is_dictionary;
+
+ private IDictionary properties;
+
+
+ public Type ElementType {
+ get {
+ if (element_type == null)
+ return typeof (JsonData);
+
+ return element_type;
+ }
+
+ set { element_type = value; }
+ }
+
+ public bool IsDictionary {
+ get { return is_dictionary; }
+ set { is_dictionary = value; }
+ }
+
+ public IDictionary Properties {
+ get { return properties; }
+ set { properties = value; }
+ }
+ }
+
+
+ internal delegate void ExporterFunc (object obj, JsonWriter writer);
+ public delegate void ExporterFunc (T obj, JsonWriter writer);
+
+ internal delegate object ImporterFunc (object input);
+ public delegate TValue ImporterFunc (TJson input);
+
+ public delegate IJsonWrapper WrapperFactory ();
+
+
+ public class JsonMapper
+ {
+ #region Fields
+ private static int max_nesting_depth;
+
+ private static IFormatProvider datetime_format;
+
+ private static IDictionary base_exporters_table;
+ private static IDictionary custom_exporters_table;
+
+ private static IDictionary> base_importers_table;
+ private static IDictionary> custom_importers_table;
+
+ private static IDictionary array_metadata;
+ private static readonly object array_metadata_lock = new Object ();
+
+ private static IDictionary> conv_ops;
+ private static readonly object conv_ops_lock = new Object ();
+
+ private static IDictionary object_metadata;
+ private static readonly object object_metadata_lock = new Object ();
+
+ private static IDictionary> type_properties;
+ private static readonly object type_properties_lock = new Object ();
+
+ private static JsonWriter static_writer;
+ private static readonly object static_writer_lock = new Object ();
+ #endregion
+
+
+ #region Constructors
+ static JsonMapper ()
+ {
+ max_nesting_depth = 100;
+
+ array_metadata = new Dictionary ();
+ conv_ops = new Dictionary> ();
+ object_metadata = new Dictionary ();
+ type_properties = new Dictionary> ();
+
+ static_writer = new JsonWriter ();
+
+ datetime_format = DateTimeFormatInfo.InvariantInfo;
+
+ base_exporters_table = new Dictionary ();
+ custom_exporters_table = new Dictionary ();
+
+ base_importers_table = new Dictionary> ();
+ custom_importers_table = new Dictionary> ();
+
+ RegisterBaseExporters ();
+ RegisterBaseImporters ();
+ }
+ #endregion
+
+
+ #region Private Methods
+ private static void AddArrayMetadata (Type type)
+ {
+ if (array_metadata.ContainsKey (type))
+ return;
+
+ ArrayMetadata data = new ArrayMetadata ();
+
+ data.IsArray = type.IsArray;
+
+ if (type.GetInterface ("System.Collections.IList") != null)
+ data.IsList = true;
+
+ foreach (PropertyInfo p_info in type.GetProperties ()) {
+ if (p_info.Name != "Item")
+ continue;
+
+ ParameterInfo[] parameters = p_info.GetIndexParameters ();
+
+ if (parameters.Length != 1)
+ continue;
+
+ if (parameters[0].ParameterType == typeof (int))
+ data.ElementType = p_info.PropertyType;
+ }
+
+ lock (array_metadata_lock) {
+ try {
+ array_metadata.Add (type, data);
+ } catch (ArgumentException) {
+ return;
+ }
+ }
+ }
+
+ private static void AddObjectMetadata (Type type)
+ {
+ if (object_metadata.ContainsKey (type))
+ return;
+
+ ObjectMetadata data = new ObjectMetadata ();
+
+ if (type.GetInterface ("System.Collections.IDictionary") != null)
+ data.IsDictionary = true;
+
+ data.Properties = new Dictionary ();
+
+ foreach (PropertyInfo p_info in type.GetProperties ()) {
+ if (p_info.Name == "Item") {
+ ParameterInfo[] parameters = p_info.GetIndexParameters ();
+
+ if (parameters.Length != 1)
+ continue;
+
+ if (parameters[0].ParameterType == typeof (string))
+ data.ElementType = p_info.PropertyType;
+
+ continue;
+ }
+
+ PropertyMetadata p_data = new PropertyMetadata ();
+ p_data.Info = p_info;
+ p_data.Type = p_info.PropertyType;
+
+ data.Properties.Add (p_info.Name, p_data);
+ }
+
+ foreach (FieldInfo f_info in type.GetFields ()) {
+ PropertyMetadata p_data = new PropertyMetadata ();
+ p_data.Info = f_info;
+ p_data.IsField = true;
+ p_data.Type = f_info.FieldType;
+
+ data.Properties.Add (f_info.Name, p_data);
+ }
+
+ lock (object_metadata_lock) {
+ try {
+ object_metadata.Add (type, data);
+ } catch (ArgumentException) {
+ return;
+ }
+ }
+ }
+
+ private static void AddTypeProperties (Type type)
+ {
+ if (type_properties.ContainsKey (type))
+ return;
+
+ IList props = new List ();
+
+ foreach (PropertyInfo p_info in type.GetProperties ()) {
+ if (p_info.Name == "Item")
+ continue;
+
+ PropertyMetadata p_data = new PropertyMetadata ();
+ p_data.Info = p_info;
+ p_data.IsField = false;
+ props.Add (p_data);
+ }
+
+ foreach (FieldInfo f_info in type.GetFields ()) {
+ PropertyMetadata p_data = new PropertyMetadata ();
+ p_data.Info = f_info;
+ p_data.IsField = true;
+
+ props.Add (p_data);
+ }
+
+ lock (type_properties_lock) {
+ try {
+ type_properties.Add (type, props);
+ } catch (ArgumentException) {
+ return;
+ }
+ }
+ }
+
+ private static MethodInfo GetConvOp (Type t1, Type t2)
+ {
+ lock (conv_ops_lock) {
+ if (! conv_ops.ContainsKey (t1))
+ conv_ops.Add (t1, new Dictionary ());
+ }
+
+ if (conv_ops[t1].ContainsKey (t2))
+ return conv_ops[t1][t2];
+
+ MethodInfo op = t1.GetMethod (
+ "op_Implicit", new Type[] { t2 });
+
+ lock (conv_ops_lock) {
+ try {
+ conv_ops[t1].Add (t2, op);
+ } catch (ArgumentException) {
+ return conv_ops[t1][t2];
+ }
+ }
+
+ return op;
+ }
+
+ private static object ReadValue (Type inst_type, JsonReader reader)
+ {
+ reader.Read ();
+
+ if (reader.Token == JsonToken.ArrayEnd)
+ return null;
+
+ if (reader.Token == JsonToken.Null) {
+
+ if (! inst_type.IsClass)
+ throw new JsonException (String.Format (
+ "Can't assign null to an instance of type {0}",
+ inst_type));
+
+ return null;
+ }
+
+ if (reader.Token == JsonToken.Double ||
+ reader.Token == JsonToken.Int ||
+ reader.Token == JsonToken.Long ||
+ reader.Token == JsonToken.String ||
+ reader.Token == JsonToken.Boolean) {
+
+ Type json_type = reader.Value.GetType ();
+
+ if (inst_type.IsAssignableFrom (json_type))
+ return reader.Value;
+
+ // If there's a custom importer that fits, use it
+ if (custom_importers_table.ContainsKey (json_type) &&
+ custom_importers_table[json_type].ContainsKey (
+ inst_type)) {
+
+ ImporterFunc importer =
+ custom_importers_table[json_type][inst_type];
+
+ return importer (reader.Value);
+ }
+
+ // Maybe there's a base importer that works
+ if (base_importers_table.ContainsKey (json_type) &&
+ base_importers_table[json_type].ContainsKey (
+ inst_type)) {
+
+ ImporterFunc importer =
+ base_importers_table[json_type][inst_type];
+
+ return importer (reader.Value);
+ }
+
+ // Maybe it's an enum
+ if (inst_type.IsEnum)
+ return Enum.ToObject (inst_type, reader.Value);
+
+ // Try using an implicit conversion operator
+ MethodInfo conv_op = GetConvOp (inst_type, json_type);
+
+ if (conv_op != null)
+ return conv_op.Invoke (null,
+ new object[] { reader.Value });
+
+ // No luck
+ throw new JsonException (String.Format (
+ "Can't assign value '{0}' (type {1}) to type {2}",
+ reader.Value, json_type, inst_type));
+ }
+
+ object instance = null;
+
+ if (reader.Token == JsonToken.ArrayStart) {
+
+ AddArrayMetadata (inst_type);
+ ArrayMetadata t_data = array_metadata[inst_type];
+
+ if (! t_data.IsArray && ! t_data.IsList)
+ throw new JsonException (String.Format (
+ "Type {0} can't act as an array",
+ inst_type));
+
+ IList list;
+ Type elem_type;
+
+ if (! t_data.IsArray) {
+ list = (IList) Activator.CreateInstance (inst_type);
+ elem_type = t_data.ElementType;
+ } else {
+ list = new ArrayList ();
+ elem_type = inst_type.GetElementType ();
+ }
+
+ while (true) {
+ object item = ReadValue (elem_type, reader);
+ if (reader.Token == JsonToken.ArrayEnd)
+ break;
+
+ list.Add (item);
+ }
+
+ if (t_data.IsArray) {
+ int n = list.Count;
+ instance = Array.CreateInstance (elem_type, n);
+
+ for (int i = 0; i < n; i++)
+ ((Array) instance).SetValue (list[i], i);
+ } else
+ instance = list;
+
+ } else if (reader.Token == JsonToken.ObjectStart) {
+
+ AddObjectMetadata (inst_type);
+ ObjectMetadata t_data = object_metadata[inst_type];
+
+ instance = Activator.CreateInstance (inst_type);
+
+ while (true) {
+ reader.Read ();
+
+ if (reader.Token == JsonToken.ObjectEnd)
+ break;
+
+ string property = (string) reader.Value;
+
+ if (t_data.Properties.ContainsKey (property)) {
+ PropertyMetadata prop_data =
+ t_data.Properties[property];
+
+ if (prop_data.IsField) {
+ ((FieldInfo) prop_data.Info).SetValue (
+ instance, ReadValue (prop_data.Type, reader));
+ } else {
+ PropertyInfo p_info =
+ (PropertyInfo) prop_data.Info;
+
+ if (p_info.CanWrite)
+ p_info.SetValue (
+ instance,
+ ReadValue (prop_data.Type, reader),
+ null);
+ else
+ ReadValue (prop_data.Type, reader);
+ }
+
+ } else {
+ if (! t_data.IsDictionary)
+ throw new JsonException (String.Format (
+ "The type {0} doesn't have the " +
+ "property '{1}'", inst_type, property));
+
+ ((IDictionary) instance).Add (
+ property, ReadValue (
+ t_data.ElementType, reader));
+ }
+
+ }
+
+ }
+
+ return instance;
+ }
+
+ private static IJsonWrapper ReadValue (WrapperFactory factory,
+ JsonReader reader)
+ {
+ reader.Read ();
+
+ if (reader.Token == JsonToken.ArrayEnd ||
+ reader.Token == JsonToken.Null)
+ return null;
+
+ IJsonWrapper instance = factory ();
+
+ if (reader.Token == JsonToken.String) {
+ instance.SetString ((string) reader.Value);
+ return instance;
+ }
+
+ if (reader.Token == JsonToken.Double) {
+ instance.SetDouble ((double) reader.Value);
+ return instance;
+ }
+
+ if (reader.Token == JsonToken.Int) {
+ instance.SetInt ((int) reader.Value);
+ return instance;
+ }
+
+ if (reader.Token == JsonToken.Long) {
+ instance.SetLong ((long) reader.Value);
+ return instance;
+ }
+
+ if (reader.Token == JsonToken.Boolean) {
+ instance.SetBoolean ((bool) reader.Value);
+ return instance;
+ }
+
+ if (reader.Token == JsonToken.ArrayStart) {
+ instance.SetJsonType (JsonType.Array);
+
+ while (true) {
+ IJsonWrapper item = ReadValue (factory, reader);
+ if (reader.Token == JsonToken.ArrayEnd)
+ break;
+
+ ((IList) instance).Add (item);
+ }
+ }
+ else if (reader.Token == JsonToken.ObjectStart) {
+ instance.SetJsonType (JsonType.Object);
+
+ while (true) {
+ reader.Read ();
+
+ if (reader.Token == JsonToken.ObjectEnd)
+ break;
+
+ string property = (string) reader.Value;
+
+ ((IDictionary) instance)[property] = ReadValue (
+ factory, reader);
+ }
+
+ }
+
+ return instance;
+ }
+
+ private static void RegisterBaseExporters ()
+ {
+ base_exporters_table[typeof (byte)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToInt32 ((byte) obj));
+ };
+
+ base_exporters_table[typeof (char)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToString ((char) obj));
+ };
+
+ base_exporters_table[typeof (DateTime)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToString ((DateTime) obj,
+ datetime_format));
+ };
+
+ base_exporters_table[typeof (decimal)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write ((decimal) obj);
+ };
+
+ base_exporters_table[typeof (sbyte)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToInt32 ((sbyte) obj));
+ };
+
+ base_exporters_table[typeof (short)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToInt32 ((short) obj));
+ };
+
+ base_exporters_table[typeof (ushort)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToInt32 ((ushort) obj));
+ };
+
+ base_exporters_table[typeof (uint)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write (Convert.ToUInt64 ((uint) obj));
+ };
+
+ base_exporters_table[typeof (ulong)] =
+ delegate (object obj, JsonWriter writer) {
+ writer.Write ((ulong) obj);
+ };
+ }
+
+ private static void RegisterBaseImporters ()
+ {
+ ImporterFunc importer;
+
+ importer = delegate (object input) {
+ return Convert.ToByte ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (byte), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToUInt64 ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (ulong), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToSByte ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (sbyte), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToInt16 ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (short), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToUInt16 ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (ushort), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToUInt32 ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (uint), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToSingle ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (float), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToDouble ((int) input);
+ };
+ RegisterImporter (base_importers_table, typeof (int),
+ typeof (double), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToDecimal ((double) input);
+ };
+ RegisterImporter (base_importers_table, typeof (double),
+ typeof (decimal), importer);
+
+
+ importer = delegate (object input) {
+ return Convert.ToUInt32 ((long) input);
+ };
+ RegisterImporter (base_importers_table, typeof (long),
+ typeof (uint), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToChar ((string) input);
+ };
+ RegisterImporter (base_importers_table, typeof (string),
+ typeof (char), importer);
+
+ importer = delegate (object input) {
+ return Convert.ToDateTime ((string) input, datetime_format);
+ };
+ RegisterImporter (base_importers_table, typeof (string),
+ typeof (DateTime), importer);
+ }
+
+ private static void RegisterImporter (
+ IDictionary> table,
+ Type json_type, Type value_type, ImporterFunc importer)
+ {
+ if (! table.ContainsKey (json_type))
+ table.Add (json_type, new Dictionary ());
+
+ table[json_type][value_type] = importer;
+ }
+
+ private static void WriteValue (object obj, JsonWriter writer,
+ bool writer_is_private,
+ int depth)
+ {
+ if (depth > max_nesting_depth)
+ throw new JsonException (
+ String.Format ("Max allowed object depth reached while " +
+ "trying to export from type {0}",
+ obj.GetType ()));
+
+ if (obj == null) {
+ writer.Write (null);
+ return;
+ }
+
+ if (obj is IJsonWrapper) {
+ if (writer_is_private)
+ writer.TextWriter.Write (((IJsonWrapper) obj).ToJson ());
+ else
+ ((IJsonWrapper) obj).ToJson (writer);
+
+ return;
+ }
+
+ if (obj is String) {
+ writer.Write ((string) obj);
+ return;
+ }
+
+ if (obj is Double) {
+ writer.Write ((double) obj);
+ return;
+ }
+
+ if (obj is Int32) {
+ writer.Write ((int) obj);
+ return;
+ }
+
+ if (obj is Boolean) {
+ writer.Write ((bool) obj);
+ return;
+ }
+
+ if (obj is Int64) {
+ writer.Write ((long) obj);
+ return;
+ }
+
+ if (obj is Array) {
+ writer.WriteArrayStart ();
+
+ foreach (object elem in (Array) obj)
+ WriteValue (elem, writer, writer_is_private, depth + 1);
+
+ writer.WriteArrayEnd ();
+
+ return;
+ }
+
+ if (obj is IList) {
+ writer.WriteArrayStart ();
+ foreach (object elem in (IList) obj)
+ WriteValue (elem, writer, writer_is_private, depth + 1);
+ writer.WriteArrayEnd ();
+
+ return;
+ }
+
+ if (obj is IDictionary) {
+ writer.WriteObjectStart ();
+ foreach (DictionaryEntry entry in (IDictionary) obj) {
+ writer.WritePropertyName ((string) entry.Key);
+ WriteValue (entry.Value, writer, writer_is_private,
+ depth + 1);
+ }
+ writer.WriteObjectEnd ();
+
+ return;
+ }
+
+ Type obj_type = obj.GetType ();
+
+ // See if there's a custom exporter for the object
+ if (custom_exporters_table.ContainsKey (obj_type)) {
+ ExporterFunc exporter = custom_exporters_table[obj_type];
+ exporter (obj, writer);
+
+ return;
+ }
+
+ // If not, maybe there's a base exporter
+ if (base_exporters_table.ContainsKey (obj_type)) {
+ ExporterFunc exporter = base_exporters_table[obj_type];
+ exporter (obj, writer);
+
+ return;
+ }
+
+ // Last option, let's see if it's an enum
+ if (obj is Enum) {
+ Type e_type = Enum.GetUnderlyingType (obj_type);
+
+ if (e_type == typeof (long)
+ || e_type == typeof (uint)
+ || e_type == typeof (ulong))
+ writer.Write ((ulong) obj);
+ else
+ writer.Write ((int) obj);
+
+ return;
+ }
+
+ // Okay, so it looks like the input should be exported as an
+ // object
+ AddTypeProperties (obj_type);
+ IList props = type_properties[obj_type];
+
+ writer.WriteObjectStart ();
+ foreach (PropertyMetadata p_data in props) {
+ if (p_data.IsField) {
+ writer.WritePropertyName (p_data.Info.Name);
+ WriteValue (((FieldInfo) p_data.Info).GetValue (obj),
+ writer, writer_is_private, depth + 1);
+ }
+ else {
+ PropertyInfo p_info = (PropertyInfo) p_data.Info;
+
+ if (p_info.CanRead) {
+ writer.WritePropertyName (p_data.Info.Name);
+ WriteValue (p_info.GetValue (obj, null),
+ writer, writer_is_private, depth + 1);
+ }
+ }
+ }
+ writer.WriteObjectEnd ();
+ }
+ #endregion
+
+
+ public static string ToJson (object obj)
+ {
+ lock (static_writer_lock) {
+ static_writer.Reset ();
+
+ WriteValue (obj, static_writer, true, 0);
+
+ return static_writer.ToString ();
+ }
+ }
+
+ public static void ToJson (object obj, JsonWriter writer)
+ {
+ WriteValue (obj, writer, false, 0);
+ }
+
+ public static JsonData ToObject (JsonReader reader)
+ {
+ return (JsonData) ToWrapper (
+ delegate { return new JsonData (); }, reader);
+ }
+
+ public static JsonData ToObject (TextReader reader)
+ {
+ JsonReader json_reader = new JsonReader (reader);
+
+ return (JsonData) ToWrapper (
+ delegate { return new JsonData (); }, json_reader);
+ }
+
+ public static JsonData ToObject (string json)
+ {
+ return (JsonData) ToWrapper (
+ delegate { return new JsonData (); }, json);
+ }
+
+ public static T ToObject (JsonReader reader)
+ {
+ return (T) ReadValue (typeof (T), reader);
+ }
+
+ public static T ToObject (TextReader reader)
+ {
+ JsonReader json_reader = new JsonReader (reader);
+
+ return (T) ReadValue (typeof (T), json_reader);
+ }
+
+ public static T ToObject (string json)
+ {
+ JsonReader reader = new JsonReader (json);
+
+ return (T) ReadValue (typeof (T), reader);
+ }
+
+ public static IJsonWrapper ToWrapper (WrapperFactory factory,
+ JsonReader reader)
+ {
+ return ReadValue (factory, reader);
+ }
+
+ public static IJsonWrapper ToWrapper (WrapperFactory factory,
+ string json)
+ {
+ JsonReader reader = new JsonReader (json);
+
+ return ReadValue (factory, reader);
+ }
+
+ public static void RegisterExporter (ExporterFunc exporter)
+ {
+ ExporterFunc exporter_wrapper =
+ delegate (object obj, JsonWriter writer) {
+ exporter ((T) obj, writer);
+ };
+
+ custom_exporters_table[typeof (T)] = exporter_wrapper;
+ }
+
+ public static void RegisterImporter (
+ ImporterFunc importer)
+ {
+ ImporterFunc importer_wrapper =
+ delegate (object input) {
+ return importer ((TJson) input);
+ };
+
+ RegisterImporter (custom_importers_table, typeof (TJson),
+ typeof (TValue), importer_wrapper);
+ }
+
+ public static void UnregisterExporters ()
+ {
+ custom_exporters_table.Clear ();
+ }
+
+ public static void UnregisterImporters ()
+ {
+ custom_importers_table.Clear ();
+ }
+ }
+}
diff --git a/Json/JsonReader.cs b/Json/JsonReader.cs
index bdbe24f8..4d12475c 100755
--- a/Json/JsonReader.cs
+++ b/Json/JsonReader.cs
@@ -1,455 +1,455 @@
-#region Header
-/**
- * JsonReader.cs
- * Stream-like access to JSON text.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
- public enum JsonToken
- {
- None,
-
- ObjectStart,
- PropertyName,
- ObjectEnd,
-
- ArrayStart,
- ArrayEnd,
-
- Int,
- Long,
- Double,
-
- String,
-
- Boolean,
- Null
- }
-
-
- public class JsonReader
- {
- #region Fields
- private static IDictionary> parse_table;
-
- private Stack automaton_stack;
- private int current_input;
- private int current_symbol;
- private bool end_of_json;
- private bool end_of_input;
- private Lexer lexer;
- private bool parser_in_string;
- private bool parser_return;
- private bool read_started;
- private TextReader reader;
- private bool reader_is_owned;
- private object token_value;
- private JsonToken token;
- #endregion
-
-
- #region Public Properties
- public bool AllowComments {
- get { return lexer.AllowComments; }
- set { lexer.AllowComments = value; }
- }
-
- public bool AllowSingleQuotedStrings {
- get { return lexer.AllowSingleQuotedStrings; }
- set { lexer.AllowSingleQuotedStrings = value; }
- }
-
- public bool EndOfInput {
- get { return end_of_input; }
- }
-
- public bool EndOfJson {
- get { return end_of_json; }
- }
-
- public JsonToken Token {
- get { return token; }
- }
-
- public object Value {
- get { return token_value; }
- }
- #endregion
-
-
- #region Constructors
- static JsonReader ()
- {
- PopulateParseTable ();
- }
-
- public JsonReader (string json_text) :
- this (new StringReader (json_text), true)
- {
- }
-
- public JsonReader (TextReader reader) :
- this (reader, false)
- {
- }
-
- private JsonReader (TextReader reader, bool owned)
- {
- if (reader == null)
- throw new ArgumentNullException ("reader");
-
- parser_in_string = false;
- parser_return = false;
-
- read_started = false;
- automaton_stack = new Stack ();
- automaton_stack.Push ((int) ParserToken.End);
- automaton_stack.Push ((int) ParserToken.Text);
-
- lexer = new Lexer (reader);
-
- end_of_input = false;
- end_of_json = false;
-
- this.reader = reader;
- reader_is_owned = owned;
- }
- #endregion
-
-
- #region Static Methods
- private static void PopulateParseTable ()
- {
- parse_table = new Dictionary> ();
-
- TableAddRow (ParserToken.Array);
- TableAddCol (ParserToken.Array, '[',
- '[',
- (int) ParserToken.ArrayPrime);
-
- TableAddRow (ParserToken.ArrayPrime);
- TableAddCol (ParserToken.ArrayPrime, '"',
- (int) ParserToken.Value,
-
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, '[',
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, ']',
- ']');
- TableAddCol (ParserToken.ArrayPrime, '{',
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Number,
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.True,
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.False,
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
- TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Null,
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest,
- ']');
-
- TableAddRow (ParserToken.Object);
- TableAddCol (ParserToken.Object, '{',
- '{',
- (int) ParserToken.ObjectPrime);
-
- TableAddRow (ParserToken.ObjectPrime);
- TableAddCol (ParserToken.ObjectPrime, '"',
- (int) ParserToken.Pair,
- (int) ParserToken.PairRest,
- '}');
- TableAddCol (ParserToken.ObjectPrime, '}',
- '}');
-
- TableAddRow (ParserToken.Pair);
- TableAddCol (ParserToken.Pair, '"',
- (int) ParserToken.String,
- ':',
- (int) ParserToken.Value);
-
- TableAddRow (ParserToken.PairRest);
- TableAddCol (ParserToken.PairRest, ',',
- ',',
- (int) ParserToken.Pair,
- (int) ParserToken.PairRest);
- TableAddCol (ParserToken.PairRest, '}',
- (int) ParserToken.Epsilon);
-
- TableAddRow (ParserToken.String);
- TableAddCol (ParserToken.String, '"',
- '"',
- (int) ParserToken.CharSeq,
- '"');
-
- TableAddRow (ParserToken.Text);
- TableAddCol (ParserToken.Text, '[',
- (int) ParserToken.Array);
- TableAddCol (ParserToken.Text, '{',
- (int) ParserToken.Object);
-
- TableAddRow (ParserToken.Value);
- TableAddCol (ParserToken.Value, '"',
- (int) ParserToken.String);
- TableAddCol (ParserToken.Value, '[',
- (int) ParserToken.Array);
- TableAddCol (ParserToken.Value, '{',
- (int) ParserToken.Object);
- TableAddCol (ParserToken.Value, (int) ParserToken.Number,
- (int) ParserToken.Number);
- TableAddCol (ParserToken.Value, (int) ParserToken.True,
- (int) ParserToken.True);
- TableAddCol (ParserToken.Value, (int) ParserToken.False,
- (int) ParserToken.False);
- TableAddCol (ParserToken.Value, (int) ParserToken.Null,
- (int) ParserToken.Null);
-
- TableAddRow (ParserToken.ValueRest);
- TableAddCol (ParserToken.ValueRest, ',',
- ',',
- (int) ParserToken.Value,
- (int) ParserToken.ValueRest);
- TableAddCol (ParserToken.ValueRest, ']',
- (int) ParserToken.Epsilon);
- }
-
- private static void TableAddCol (ParserToken row, int col,
- params int[] symbols)
- {
- parse_table[(int) row].Add (col, symbols);
- }
-
- private static void TableAddRow (ParserToken rule)
- {
- parse_table.Add ((int) rule, new Dictionary ());
- }
- #endregion
-
-
- #region Private Methods
- private void ProcessNumber (string number)
- {
- if (number.IndexOf ('.') != -1 ||
- number.IndexOf ('e') != -1 ||
- number.IndexOf ('E') != -1) {
-
- double n_double;
- if (Double.TryParse (number, out n_double)) {
- token = JsonToken.Double;
- token_value = n_double;
-
- return;
- }
- }
-
- int n_int32;
- if (Int32.TryParse (number, out n_int32)) {
- token = JsonToken.Int;
- token_value = n_int32;
-
- return;
- }
-
- long n_int64;
- if (Int64.TryParse (number, out n_int64)) {
- token = JsonToken.Long;
- token_value = n_int64;
-
- return;
- }
-
- // Shouldn't happen, but just in case, return something
- token = JsonToken.Int;
- token_value = 0;
- }
-
- private void ProcessSymbol ()
- {
- if (current_symbol == '[') {
- token = JsonToken.ArrayStart;
- parser_return = true;
-
- } else if (current_symbol == ']') {
- token = JsonToken.ArrayEnd;
- parser_return = true;
-
- } else if (current_symbol == '{') {
- token = JsonToken.ObjectStart;
- parser_return = true;
-
- } else if (current_symbol == '}') {
- token = JsonToken.ObjectEnd;
- parser_return = true;
-
- } else if (current_symbol == '"') {
- if (parser_in_string) {
- parser_in_string = false;
-
- parser_return = true;
-
- } else {
- if (token == JsonToken.None)
- token = JsonToken.String;
-
- parser_in_string = true;
- }
-
- } else if (current_symbol == (int) ParserToken.CharSeq) {
- token_value = lexer.StringValue;
-
- } else if (current_symbol == (int) ParserToken.False) {
- token = JsonToken.Boolean;
- token_value = false;
- parser_return = true;
-
- } else if (current_symbol == (int) ParserToken.Null) {
- token = JsonToken.Null;
- parser_return = true;
-
- } else if (current_symbol == (int) ParserToken.Number) {
- ProcessNumber (lexer.StringValue);
-
- parser_return = true;
-
- } else if (current_symbol == (int) ParserToken.Pair) {
- token = JsonToken.PropertyName;
-
- } else if (current_symbol == (int) ParserToken.True) {
- token = JsonToken.Boolean;
- token_value = true;
- parser_return = true;
-
- }
- }
-
- private bool ReadToken ()
- {
- if (end_of_input)
- return false;
-
- lexer.NextToken ();
-
- if (lexer.EndOfInput) {
- Close ();
-
- return false;
- }
-
- current_input = lexer.Token;
-
- return true;
- }
- #endregion
-
-
- public void Close ()
- {
- if (end_of_input)
- return;
-
- end_of_input = true;
- end_of_json = true;
-
- if (reader_is_owned)
- reader.Close ();
-
- reader = null;
- }
-
- public bool Read ()
- {
- if (end_of_input)
- return false;
-
- if (end_of_json) {
- end_of_json = false;
- automaton_stack.Clear ();
- automaton_stack.Push ((int) ParserToken.End);
- automaton_stack.Push ((int) ParserToken.Text);
- }
-
- parser_in_string = false;
- parser_return = false;
-
- token = JsonToken.None;
- token_value = null;
-
- if (! read_started) {
- read_started = true;
-
- if (! ReadToken ())
- return false;
- }
-
-
- int[] entry_symbols;
-
- while (true) {
- if (parser_return) {
- if (automaton_stack.Peek () == (int) ParserToken.End)
- end_of_json = true;
-
- return true;
- }
-
- current_symbol = automaton_stack.Pop ();
-
- ProcessSymbol ();
-
- if (current_symbol == current_input) {
- if (! ReadToken ()) {
- if (automaton_stack.Peek () != (int) ParserToken.End)
- throw new JsonException (
- "Input doesn't evaluate to proper JSON text");
-
- if (parser_return)
- return true;
-
- return false;
- }
-
- continue;
- }
-
- try {
-
- entry_symbols =
- parse_table[current_symbol][current_input];
-
- } catch (KeyNotFoundException e) {
- throw new JsonException ((ParserToken) current_input, e);
- }
-
- if (entry_symbols[0] == (int) ParserToken.Epsilon)
- continue;
-
- for (int i = entry_symbols.Length - 1; i >= 0; i--)
- automaton_stack.Push (entry_symbols[i]);
- }
- }
-
- }
-}
+#region Header
+/**
+ * JsonReader.cs
+ * Stream-like access to JSON text.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+ public enum JsonToken
+ {
+ None,
+
+ ObjectStart,
+ PropertyName,
+ ObjectEnd,
+
+ ArrayStart,
+ ArrayEnd,
+
+ Int,
+ Long,
+ Double,
+
+ String,
+
+ Boolean,
+ Null
+ }
+
+
+ public class JsonReader
+ {
+ #region Fields
+ private static IDictionary> parse_table;
+
+ private Stack automaton_stack;
+ private int current_input;
+ private int current_symbol;
+ private bool end_of_json;
+ private bool end_of_input;
+ private Lexer lexer;
+ private bool parser_in_string;
+ private bool parser_return;
+ private bool read_started;
+ private TextReader reader;
+ private bool reader_is_owned;
+ private object token_value;
+ private JsonToken token;
+ #endregion
+
+
+ #region Public Properties
+ public bool AllowComments {
+ get { return lexer.AllowComments; }
+ set { lexer.AllowComments = value; }
+ }
+
+ public bool AllowSingleQuotedStrings {
+ get { return lexer.AllowSingleQuotedStrings; }
+ set { lexer.AllowSingleQuotedStrings = value; }
+ }
+
+ public bool EndOfInput {
+ get { return end_of_input; }
+ }
+
+ public bool EndOfJson {
+ get { return end_of_json; }
+ }
+
+ public JsonToken Token {
+ get { return token; }
+ }
+
+ public object Value {
+ get { return token_value; }
+ }
+ #endregion
+
+
+ #region Constructors
+ static JsonReader ()
+ {
+ PopulateParseTable ();
+ }
+
+ public JsonReader (string json_text) :
+ this (new StringReader (json_text), true)
+ {
+ }
+
+ public JsonReader (TextReader reader) :
+ this (reader, false)
+ {
+ }
+
+ private JsonReader (TextReader reader, bool owned)
+ {
+ if (reader == null)
+ throw new ArgumentNullException ("reader");
+
+ parser_in_string = false;
+ parser_return = false;
+
+ read_started = false;
+ automaton_stack = new Stack ();
+ automaton_stack.Push ((int) ParserToken.End);
+ automaton_stack.Push ((int) ParserToken.Text);
+
+ lexer = new Lexer (reader);
+
+ end_of_input = false;
+ end_of_json = false;
+
+ this.reader = reader;
+ reader_is_owned = owned;
+ }
+ #endregion
+
+
+ #region Static Methods
+ private static void PopulateParseTable ()
+ {
+ parse_table = new Dictionary> ();
+
+ TableAddRow (ParserToken.Array);
+ TableAddCol (ParserToken.Array, '[',
+ '[',
+ (int) ParserToken.ArrayPrime);
+
+ TableAddRow (ParserToken.ArrayPrime);
+ TableAddCol (ParserToken.ArrayPrime, '"',
+ (int) ParserToken.Value,
+
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, '[',
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, ']',
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, '{',
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Number,
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.True,
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.False,
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+ TableAddCol (ParserToken.ArrayPrime, (int) ParserToken.Null,
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest,
+ ']');
+
+ TableAddRow (ParserToken.Object);
+ TableAddCol (ParserToken.Object, '{',
+ '{',
+ (int) ParserToken.ObjectPrime);
+
+ TableAddRow (ParserToken.ObjectPrime);
+ TableAddCol (ParserToken.ObjectPrime, '"',
+ (int) ParserToken.Pair,
+ (int) ParserToken.PairRest,
+ '}');
+ TableAddCol (ParserToken.ObjectPrime, '}',
+ '}');
+
+ TableAddRow (ParserToken.Pair);
+ TableAddCol (ParserToken.Pair, '"',
+ (int) ParserToken.String,
+ ':',
+ (int) ParserToken.Value);
+
+ TableAddRow (ParserToken.PairRest);
+ TableAddCol (ParserToken.PairRest, ',',
+ ',',
+ (int) ParserToken.Pair,
+ (int) ParserToken.PairRest);
+ TableAddCol (ParserToken.PairRest, '}',
+ (int) ParserToken.Epsilon);
+
+ TableAddRow (ParserToken.String);
+ TableAddCol (ParserToken.String, '"',
+ '"',
+ (int) ParserToken.CharSeq,
+ '"');
+
+ TableAddRow (ParserToken.Text);
+ TableAddCol (ParserToken.Text, '[',
+ (int) ParserToken.Array);
+ TableAddCol (ParserToken.Text, '{',
+ (int) ParserToken.Object);
+
+ TableAddRow (ParserToken.Value);
+ TableAddCol (ParserToken.Value, '"',
+ (int) ParserToken.String);
+ TableAddCol (ParserToken.Value, '[',
+ (int) ParserToken.Array);
+ TableAddCol (ParserToken.Value, '{',
+ (int) ParserToken.Object);
+ TableAddCol (ParserToken.Value, (int) ParserToken.Number,
+ (int) ParserToken.Number);
+ TableAddCol (ParserToken.Value, (int) ParserToken.True,
+ (int) ParserToken.True);
+ TableAddCol (ParserToken.Value, (int) ParserToken.False,
+ (int) ParserToken.False);
+ TableAddCol (ParserToken.Value, (int) ParserToken.Null,
+ (int) ParserToken.Null);
+
+ TableAddRow (ParserToken.ValueRest);
+ TableAddCol (ParserToken.ValueRest, ',',
+ ',',
+ (int) ParserToken.Value,
+ (int) ParserToken.ValueRest);
+ TableAddCol (ParserToken.ValueRest, ']',
+ (int) ParserToken.Epsilon);
+ }
+
+ private static void TableAddCol (ParserToken row, int col,
+ params int[] symbols)
+ {
+ parse_table[(int) row].Add (col, symbols);
+ }
+
+ private static void TableAddRow (ParserToken rule)
+ {
+ parse_table.Add ((int) rule, new Dictionary ());
+ }
+ #endregion
+
+
+ #region Private Methods
+ private void ProcessNumber (string number)
+ {
+ if (number.IndexOf ('.') != -1 ||
+ number.IndexOf ('e') != -1 ||
+ number.IndexOf ('E') != -1) {
+
+ double n_double;
+ if (Double.TryParse (number, out n_double)) {
+ token = JsonToken.Double;
+ token_value = n_double;
+
+ return;
+ }
+ }
+
+ int n_int32;
+ if (Int32.TryParse (number, out n_int32)) {
+ token = JsonToken.Int;
+ token_value = n_int32;
+
+ return;
+ }
+
+ long n_int64;
+ if (Int64.TryParse (number, out n_int64)) {
+ token = JsonToken.Long;
+ token_value = n_int64;
+
+ return;
+ }
+
+ // Shouldn't happen, but just in case, return something
+ token = JsonToken.Int;
+ token_value = 0;
+ }
+
+ private void ProcessSymbol ()
+ {
+ if (current_symbol == '[') {
+ token = JsonToken.ArrayStart;
+ parser_return = true;
+
+ } else if (current_symbol == ']') {
+ token = JsonToken.ArrayEnd;
+ parser_return = true;
+
+ } else if (current_symbol == '{') {
+ token = JsonToken.ObjectStart;
+ parser_return = true;
+
+ } else if (current_symbol == '}') {
+ token = JsonToken.ObjectEnd;
+ parser_return = true;
+
+ } else if (current_symbol == '"') {
+ if (parser_in_string) {
+ parser_in_string = false;
+
+ parser_return = true;
+
+ } else {
+ if (token == JsonToken.None)
+ token = JsonToken.String;
+
+ parser_in_string = true;
+ }
+
+ } else if (current_symbol == (int) ParserToken.CharSeq) {
+ token_value = lexer.StringValue;
+
+ } else if (current_symbol == (int) ParserToken.False) {
+ token = JsonToken.Boolean;
+ token_value = false;
+ parser_return = true;
+
+ } else if (current_symbol == (int) ParserToken.Null) {
+ token = JsonToken.Null;
+ parser_return = true;
+
+ } else if (current_symbol == (int) ParserToken.Number) {
+ ProcessNumber (lexer.StringValue);
+
+ parser_return = true;
+
+ } else if (current_symbol == (int) ParserToken.Pair) {
+ token = JsonToken.PropertyName;
+
+ } else if (current_symbol == (int) ParserToken.True) {
+ token = JsonToken.Boolean;
+ token_value = true;
+ parser_return = true;
+
+ }
+ }
+
+ private bool ReadToken ()
+ {
+ if (end_of_input)
+ return false;
+
+ lexer.NextToken ();
+
+ if (lexer.EndOfInput) {
+ Close ();
+
+ return false;
+ }
+
+ current_input = lexer.Token;
+
+ return true;
+ }
+ #endregion
+
+
+ public void Close ()
+ {
+ if (end_of_input)
+ return;
+
+ end_of_input = true;
+ end_of_json = true;
+
+ if (reader_is_owned)
+ reader.Close ();
+
+ reader = null;
+ }
+
+ public bool Read ()
+ {
+ if (end_of_input)
+ return false;
+
+ if (end_of_json) {
+ end_of_json = false;
+ automaton_stack.Clear ();
+ automaton_stack.Push ((int) ParserToken.End);
+ automaton_stack.Push ((int) ParserToken.Text);
+ }
+
+ parser_in_string = false;
+ parser_return = false;
+
+ token = JsonToken.None;
+ token_value = null;
+
+ if (! read_started) {
+ read_started = true;
+
+ if (! ReadToken ())
+ return false;
+ }
+
+
+ int[] entry_symbols;
+
+ while (true) {
+ if (parser_return) {
+ if (automaton_stack.Peek () == (int) ParserToken.End)
+ end_of_json = true;
+
+ return true;
+ }
+
+ current_symbol = automaton_stack.Pop ();
+
+ ProcessSymbol ();
+
+ if (current_symbol == current_input) {
+ if (! ReadToken ()) {
+ if (automaton_stack.Peek () != (int) ParserToken.End)
+ throw new JsonException (
+ "Input doesn't evaluate to proper JSON text");
+
+ if (parser_return)
+ return true;
+
+ return false;
+ }
+
+ continue;
+ }
+
+ try {
+
+ entry_symbols =
+ parse_table[current_symbol][current_input];
+
+ } catch (KeyNotFoundException e) {
+ throw new JsonException ((ParserToken) current_input, e);
+ }
+
+ if (entry_symbols[0] == (int) ParserToken.Epsilon)
+ continue;
+
+ for (int i = entry_symbols.Length - 1; i >= 0; i--)
+ automaton_stack.Push (entry_symbols[i]);
+ }
+ }
+
+ }
+}
diff --git a/Json/JsonWriter.cs b/Json/JsonWriter.cs
index bdcf9c44..0d910d42 100755
--- a/Json/JsonWriter.cs
+++ b/Json/JsonWriter.cs
@@ -1,462 +1,462 @@
-#region Header
-/**
- * JsonWriter.cs
- * Stream-like facility to output JSON text.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
- internal enum Condition
- {
- InArray,
- InObject,
- NotAProperty,
- Property,
- Value
- }
-
- internal class WriterContext
- {
- public int Count;
- public bool InArray;
- public bool InObject;
- public bool ExpectingValue;
- public int Padding;
- }
-
- public class JsonWriter
- {
- #region Fields
- private static NumberFormatInfo number_format;
-
- private WriterContext context;
- private Stack ctx_stack;
- private bool has_reached_end;
- private char[] hex_seq;
- private int indentation;
- private int indent_value;
- private StringBuilder inst_string_builder;
- private bool pretty_print;
- private bool validate;
- private TextWriter writer;
- #endregion
-
-
- #region Properties
- public int IndentValue {
- get { return indent_value; }
- set {
- indentation = (indentation / indent_value) * value;
- indent_value = value;
- }
- }
-
- public bool PrettyPrint {
- get { return pretty_print; }
- set { pretty_print = value; }
- }
-
- public TextWriter TextWriter {
- get { return writer; }
- }
-
- public bool Validate {
- get { return validate; }
- set { validate = value; }
- }
- #endregion
-
-
- #region Constructors
- static JsonWriter ()
- {
- number_format = NumberFormatInfo.InvariantInfo;
- }
-
- public JsonWriter ()
- {
- inst_string_builder = new StringBuilder ();
- writer = new StringWriter (inst_string_builder);
-
- Init ();
- }
-
- public JsonWriter (StringBuilder sb) :
- this (new StringWriter (sb))
- {
- }
-
- public JsonWriter (TextWriter writer)
- {
- if (writer == null)
- throw new ArgumentNullException ("writer");
-
- this.writer = writer;
-
- Init ();
- }
- #endregion
-
-
- #region Private Methods
- private void DoValidation (Condition cond)
- {
- if (! context.ExpectingValue)
- context.Count++;
-
- if (! validate)
- return;
-
- if (has_reached_end)
- throw new JsonException (
- "A complete JSON symbol has already been written");
-
- switch (cond) {
- case Condition.InArray:
- if (! context.InArray)
- throw new JsonException (
- "Can't close an array here");
- break;
-
- case Condition.InObject:
- if (! context.InObject || context.ExpectingValue)
- throw new JsonException (
- "Can't close an object here");
- break;
-
- case Condition.NotAProperty:
- if (context.InObject && ! context.ExpectingValue)
- throw new JsonException (
- "Expected a property");
- break;
-
- case Condition.Property:
- if (! context.InObject || context.ExpectingValue)
- throw new JsonException (
- "Can't add a property here");
- break;
-
- case Condition.Value:
- if (! context.InArray &&
- (! context.InObject || ! context.ExpectingValue))
- throw new JsonException (
- "Can't add a value here");
-
- break;
- }
- }
-
- private void Init ()
- {
- has_reached_end = false;
- hex_seq = new char[4];
- indentation = 0;
- indent_value = 4;
- pretty_print = false;
- validate = true;
-
- ctx_stack = new Stack ();
- context = new WriterContext ();
- ctx_stack.Push (context);
- }
-
- private static void IntToHex (int n, char[] hex)
- {
- int num;
-
- for (int i = 0; i < 4; i++) {
- num = n % 16;
-
- if (num < 10)
- hex[3 - i] = (char) ('0' + num);
- else
- hex[3 - i] = (char) ('A' + (num - 10));
-
- n >>= 4;
- }
- }
-
- private void Indent ()
- {
- if (pretty_print)
- indentation += indent_value;
- }
-
-
- private void Put (string str)
- {
- if (pretty_print && ! context.ExpectingValue)
- for (int i = 0; i < indentation; i++)
- writer.Write (' ');
-
- writer.Write (str);
- }
-
- private void PutNewline ()
- {
- PutNewline (true);
- }
-
- private void PutNewline (bool add_comma)
- {
- if (add_comma && ! context.ExpectingValue &&
- context.Count > 1)
- writer.Write (',');
-
- if (pretty_print && ! context.ExpectingValue)
- writer.Write ('\n');
- }
-
- private void PutString (string str)
- {
- Put (String.Empty);
-
- writer.Write ('"');
-
- int n = str.Length;
- for (int i = 0; i < n; i++) {
- switch (str[i]) {
- case '\n':
- writer.Write ("\\n");
- continue;
-
- case '\r':
- writer.Write ("\\r");
- continue;
-
- case '\t':
- writer.Write ("\\t");
- continue;
-
- case '"':
- case '\\':
- writer.Write ('\\');
- writer.Write (str[i]);
- continue;
-
- case '\f':
- writer.Write ("\\f");
- continue;
-
- case '\b':
- writer.Write ("\\b");
- continue;
- }
-
- if ((int) str[i] >= 32 && (int) str[i] <= 126) {
- writer.Write (str[i]);
- continue;
- }
-
- // Default, turn into a \uXXXX sequence
- IntToHex ((int) str[i], hex_seq);
- writer.Write ("\\u");
- writer.Write (hex_seq);
- }
-
- writer.Write ('"');
- }
-
- private void Unindent ()
- {
- if (pretty_print)
- indentation -= indent_value;
- }
- #endregion
-
-
- public override string ToString ()
- {
- if (inst_string_builder == null)
- return String.Empty;
-
- return inst_string_builder.ToString ();
- }
-
- public void Reset ()
- {
- has_reached_end = false;
-
- ctx_stack.Clear ();
- context = new WriterContext ();
- ctx_stack.Push (context);
-
- if (inst_string_builder != null)
- inst_string_builder.Remove (0, inst_string_builder.Length);
- }
-
- public void Write (bool boolean)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- Put (boolean ? "true" : "false");
-
- context.ExpectingValue = false;
- }
-
- public void Write (decimal number)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- Put (Convert.ToString (number, number_format));
-
- context.ExpectingValue = false;
- }
-
- public void Write (double number)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- string str = Convert.ToString (number, number_format);
- Put (str);
-
- if (str.IndexOf ('.') == -1 &&
- str.IndexOf ('E') == -1)
- writer.Write (".0");
-
- context.ExpectingValue = false;
- }
-
- public void Write (int number)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- Put (Convert.ToString (number, number_format));
-
- context.ExpectingValue = false;
- }
-
- public void Write (long number)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- Put (Convert.ToString (number, number_format));
-
- context.ExpectingValue = false;
- }
-
- public void Write (string str)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- if (str == null)
- Put ("null");
- else
- PutString (str);
-
- context.ExpectingValue = false;
- }
-
- public void Write (ulong number)
- {
- DoValidation (Condition.Value);
- PutNewline ();
-
- Put (Convert.ToString (number, number_format));
-
- context.ExpectingValue = false;
- }
-
- public void WriteArrayEnd ()
- {
- DoValidation (Condition.InArray);
- PutNewline (false);
-
- ctx_stack.Pop ();
- if (ctx_stack.Count == 1)
- has_reached_end = true;
- else {
- context = ctx_stack.Peek ();
- context.ExpectingValue = false;
- }
-
- Unindent ();
- Put ("]");
- }
-
- public void WriteArrayStart ()
- {
- DoValidation (Condition.NotAProperty);
- PutNewline ();
-
- Put ("[");
-
- context = new WriterContext ();
- context.InArray = true;
- ctx_stack.Push (context);
-
- Indent ();
- }
-
- public void WriteObjectEnd ()
- {
- DoValidation (Condition.InObject);
- PutNewline (false);
-
- ctx_stack.Pop ();
- if (ctx_stack.Count == 1)
- has_reached_end = true;
- else {
- context = ctx_stack.Peek ();
- context.ExpectingValue = false;
- }
-
- Unindent ();
- Put ("}");
- }
-
- public void WriteObjectStart ()
- {
- DoValidation (Condition.NotAProperty);
- PutNewline ();
-
- Put ("{");
-
- context = new WriterContext ();
- context.InObject = true;
- ctx_stack.Push (context);
-
- Indent ();
- }
-
- public void WritePropertyName (string property_name)
- {
- DoValidation (Condition.Property);
- PutNewline ();
-
- PutString (property_name);
-
- if (pretty_print) {
- if (property_name.Length > context.Padding)
- context.Padding = property_name.Length;
-
- for (int i = context.Padding - property_name.Length;
- i >= 0; i--)
- writer.Write (' ');
-
- writer.Write (": ");
- } else
- writer.Write (':');
-
- context.ExpectingValue = true;
- }
- }
-}
+#region Header
+/**
+ * JsonWriter.cs
+ * Stream-like facility to output JSON text.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+ internal enum Condition
+ {
+ InArray,
+ InObject,
+ NotAProperty,
+ Property,
+ Value
+ }
+
+ internal class WriterContext
+ {
+ public int Count;
+ public bool InArray;
+ public bool InObject;
+ public bool ExpectingValue;
+ public int Padding;
+ }
+
+ public class JsonWriter
+ {
+ #region Fields
+ private static NumberFormatInfo number_format;
+
+ private WriterContext context;
+ private Stack ctx_stack;
+ private bool has_reached_end;
+ private char[] hex_seq;
+ private int indentation;
+ private int indent_value;
+ private StringBuilder inst_string_builder;
+ private bool pretty_print;
+ private bool validate;
+ private TextWriter writer;
+ #endregion
+
+
+ #region Properties
+ public int IndentValue {
+ get { return indent_value; }
+ set {
+ indentation = (indentation / indent_value) * value;
+ indent_value = value;
+ }
+ }
+
+ public bool PrettyPrint {
+ get { return pretty_print; }
+ set { pretty_print = value; }
+ }
+
+ public TextWriter TextWriter {
+ get { return writer; }
+ }
+
+ public bool Validate {
+ get { return validate; }
+ set { validate = value; }
+ }
+ #endregion
+
+
+ #region Constructors
+ static JsonWriter ()
+ {
+ number_format = NumberFormatInfo.InvariantInfo;
+ }
+
+ public JsonWriter ()
+ {
+ inst_string_builder = new StringBuilder ();
+ writer = new StringWriter (inst_string_builder);
+
+ Init ();
+ }
+
+ public JsonWriter (StringBuilder sb) :
+ this (new StringWriter (sb))
+ {
+ }
+
+ public JsonWriter (TextWriter writer)
+ {
+ if (writer == null)
+ throw new ArgumentNullException ("writer");
+
+ this.writer = writer;
+
+ Init ();
+ }
+ #endregion
+
+
+ #region Private Methods
+ private void DoValidation (Condition cond)
+ {
+ if (! context.ExpectingValue)
+ context.Count++;
+
+ if (! validate)
+ return;
+
+ if (has_reached_end)
+ throw new JsonException (
+ "A complete JSON symbol has already been written");
+
+ switch (cond) {
+ case Condition.InArray:
+ if (! context.InArray)
+ throw new JsonException (
+ "Can't close an array here");
+ break;
+
+ case Condition.InObject:
+ if (! context.InObject || context.ExpectingValue)
+ throw new JsonException (
+ "Can't close an object here");
+ break;
+
+ case Condition.NotAProperty:
+ if (context.InObject && ! context.ExpectingValue)
+ throw new JsonException (
+ "Expected a property");
+ break;
+
+ case Condition.Property:
+ if (! context.InObject || context.ExpectingValue)
+ throw new JsonException (
+ "Can't add a property here");
+ break;
+
+ case Condition.Value:
+ if (! context.InArray &&
+ (! context.InObject || ! context.ExpectingValue))
+ throw new JsonException (
+ "Can't add a value here");
+
+ break;
+ }
+ }
+
+ private void Init ()
+ {
+ has_reached_end = false;
+ hex_seq = new char[4];
+ indentation = 0;
+ indent_value = 4;
+ pretty_print = false;
+ validate = true;
+
+ ctx_stack = new Stack ();
+ context = new WriterContext ();
+ ctx_stack.Push (context);
+ }
+
+ private static void IntToHex (int n, char[] hex)
+ {
+ int num;
+
+ for (int i = 0; i < 4; i++) {
+ num = n % 16;
+
+ if (num < 10)
+ hex[3 - i] = (char) ('0' + num);
+ else
+ hex[3 - i] = (char) ('A' + (num - 10));
+
+ n >>= 4;
+ }
+ }
+
+ private void Indent ()
+ {
+ if (pretty_print)
+ indentation += indent_value;
+ }
+
+
+ private void Put (string str)
+ {
+ if (pretty_print && ! context.ExpectingValue)
+ for (int i = 0; i < indentation; i++)
+ writer.Write (' ');
+
+ writer.Write (str);
+ }
+
+ private void PutNewline ()
+ {
+ PutNewline (true);
+ }
+
+ private void PutNewline (bool add_comma)
+ {
+ if (add_comma && ! context.ExpectingValue &&
+ context.Count > 1)
+ writer.Write (',');
+
+ if (pretty_print && ! context.ExpectingValue)
+ writer.Write ('\n');
+ }
+
+ private void PutString (string str)
+ {
+ Put (String.Empty);
+
+ writer.Write ('"');
+
+ int n = str.Length;
+ for (int i = 0; i < n; i++) {
+ switch (str[i]) {
+ case '\n':
+ writer.Write ("\\n");
+ continue;
+
+ case '\r':
+ writer.Write ("\\r");
+ continue;
+
+ case '\t':
+ writer.Write ("\\t");
+ continue;
+
+ case '"':
+ case '\\':
+ writer.Write ('\\');
+ writer.Write (str[i]);
+ continue;
+
+ case '\f':
+ writer.Write ("\\f");
+ continue;
+
+ case '\b':
+ writer.Write ("\\b");
+ continue;
+ }
+
+ if ((int) str[i] >= 32 && (int) str[i] <= 126) {
+ writer.Write (str[i]);
+ continue;
+ }
+
+ // Default, turn into a \uXXXX sequence
+ IntToHex ((int) str[i], hex_seq);
+ writer.Write ("\\u");
+ writer.Write (hex_seq);
+ }
+
+ writer.Write ('"');
+ }
+
+ private void Unindent ()
+ {
+ if (pretty_print)
+ indentation -= indent_value;
+ }
+ #endregion
+
+
+ public override string ToString ()
+ {
+ if (inst_string_builder == null)
+ return String.Empty;
+
+ return inst_string_builder.ToString ();
+ }
+
+ public void Reset ()
+ {
+ has_reached_end = false;
+
+ ctx_stack.Clear ();
+ context = new WriterContext ();
+ ctx_stack.Push (context);
+
+ if (inst_string_builder != null)
+ inst_string_builder.Remove (0, inst_string_builder.Length);
+ }
+
+ public void Write (bool boolean)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ Put (boolean ? "true" : "false");
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (decimal number)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ Put (Convert.ToString (number, number_format));
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (double number)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ string str = Convert.ToString (number, number_format);
+ Put (str);
+
+ if (str.IndexOf ('.') == -1 &&
+ str.IndexOf ('E') == -1)
+ writer.Write (".0");
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (int number)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ Put (Convert.ToString (number, number_format));
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (long number)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ Put (Convert.ToString (number, number_format));
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (string str)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ if (str == null)
+ Put ("null");
+ else
+ PutString (str);
+
+ context.ExpectingValue = false;
+ }
+
+ public void Write (ulong number)
+ {
+ DoValidation (Condition.Value);
+ PutNewline ();
+
+ Put (Convert.ToString (number, number_format));
+
+ context.ExpectingValue = false;
+ }
+
+ public void WriteArrayEnd ()
+ {
+ DoValidation (Condition.InArray);
+ PutNewline (false);
+
+ ctx_stack.Pop ();
+ if (ctx_stack.Count == 1)
+ has_reached_end = true;
+ else {
+ context = ctx_stack.Peek ();
+ context.ExpectingValue = false;
+ }
+
+ Unindent ();
+ Put ("]");
+ }
+
+ public void WriteArrayStart ()
+ {
+ DoValidation (Condition.NotAProperty);
+ PutNewline ();
+
+ Put ("[");
+
+ context = new WriterContext ();
+ context.InArray = true;
+ ctx_stack.Push (context);
+
+ Indent ();
+ }
+
+ public void WriteObjectEnd ()
+ {
+ DoValidation (Condition.InObject);
+ PutNewline (false);
+
+ ctx_stack.Pop ();
+ if (ctx_stack.Count == 1)
+ has_reached_end = true;
+ else {
+ context = ctx_stack.Peek ();
+ context.ExpectingValue = false;
+ }
+
+ Unindent ();
+ Put ("}");
+ }
+
+ public void WriteObjectStart ()
+ {
+ DoValidation (Condition.NotAProperty);
+ PutNewline ();
+
+ Put ("{");
+
+ context = new WriterContext ();
+ context.InObject = true;
+ ctx_stack.Push (context);
+
+ Indent ();
+ }
+
+ public void WritePropertyName (string property_name)
+ {
+ DoValidation (Condition.Property);
+ PutNewline ();
+
+ PutString (property_name);
+
+ if (pretty_print) {
+ if (property_name.Length > context.Padding)
+ context.Padding = property_name.Length;
+
+ for (int i = context.Padding - property_name.Length;
+ i >= 0; i--)
+ writer.Write (' ');
+
+ writer.Write (": ");
+ } else
+ writer.Write (':');
+
+ context.ExpectingValue = true;
+ }
+ }
+}
diff --git a/Json/Lexer.cs b/Json/Lexer.cs
index 2ea484b0..3314227e 100755
--- a/Json/Lexer.cs
+++ b/Json/Lexer.cs
@@ -1,910 +1,910 @@
-#region Header
-/**
- * Lexer.cs
- * JSON lexer implementation based on a finite state machine.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-
-namespace LitJson
-{
- internal class FsmContext
- {
- public bool Return;
- public int NextState;
- public Lexer L;
- public int StateStack;
- }
-
-
- internal class Lexer
- {
- #region Fields
- private delegate bool StateHandler (FsmContext ctx);
-
- private static int[] fsm_return_table;
- private static StateHandler[] fsm_handler_table;
-
- private bool allow_comments;
- private bool allow_single_quoted_strings;
- private bool end_of_input;
- private FsmContext fsm_context;
- private int input_buffer;
- private int input_char;
- private TextReader reader;
- private int state;
- private StringBuilder string_buffer;
- private string string_value;
- private int token;
- private int unichar;
- #endregion
-
-
- #region Properties
- public bool AllowComments {
- get { return allow_comments; }
- set { allow_comments = value; }
- }
-
- public bool AllowSingleQuotedStrings {
- get { return allow_single_quoted_strings; }
- set { allow_single_quoted_strings = value; }
- }
-
- public bool EndOfInput {
- get { return end_of_input; }
- }
-
- public int Token {
- get { return token; }
- }
-
- public string StringValue {
- get { return string_value; }
- }
- #endregion
-
-
- #region Constructors
- static Lexer ()
- {
- PopulateFsmTables ();
- }
-
- public Lexer (TextReader reader)
- {
- allow_comments = true;
- allow_single_quoted_strings = true;
-
- input_buffer = 0;
- string_buffer = new StringBuilder (128);
- state = 1;
- end_of_input = false;
- this.reader = reader;
-
- fsm_context = new FsmContext ();
- fsm_context.L = this;
- }
- #endregion
-
-
- #region Static Methods
- private static int HexValue (int digit)
- {
- switch (digit) {
- case 'a':
- case 'A':
- return 10;
-
- case 'b':
- case 'B':
- return 11;
-
- case 'c':
- case 'C':
- return 12;
-
- case 'd':
- case 'D':
- return 13;
-
- case 'e':
- case 'E':
- return 14;
-
- case 'f':
- case 'F':
- return 15;
-
- default:
- return digit - '0';
- }
- }
-
- private static void PopulateFsmTables ()
- {
- fsm_handler_table = new StateHandler[28] {
- State1,
- State2,
- State3,
- State4,
- State5,
- State6,
- State7,
- State8,
- State9,
- State10,
- State11,
- State12,
- State13,
- State14,
- State15,
- State16,
- State17,
- State18,
- State19,
- State20,
- State21,
- State22,
- State23,
- State24,
- State25,
- State26,
- State27,
- State28
- };
-
- fsm_return_table = new int[28] {
- (int) ParserToken.Char,
- 0,
- (int) ParserToken.Number,
- (int) ParserToken.Number,
- 0,
- (int) ParserToken.Number,
- 0,
- (int) ParserToken.Number,
- 0,
- 0,
- (int) ParserToken.True,
- 0,
- 0,
- 0,
- (int) ParserToken.False,
- 0,
- 0,
- (int) ParserToken.Null,
- (int) ParserToken.CharSeq,
- (int) ParserToken.Char,
- 0,
- 0,
- (int) ParserToken.CharSeq,
- (int) ParserToken.Char,
- 0,
- 0,
- 0,
- 0
- };
- }
-
- private static char ProcessEscChar (int esc_char)
- {
- switch (esc_char) {
- case '"':
- case '\'':
- case '\\':
- case '/':
- return Convert.ToChar (esc_char);
-
- case 'n':
- return '\n';
-
- case 't':
- return '\t';
-
- case 'r':
- return '\r';
-
- case 'b':
- return '\b';
-
- case 'f':
- return '\f';
-
- default:
- // Unreachable
- return '?';
- }
- }
-
- private static bool State1 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char == ' ' ||
- ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r')
- continue;
-
- if (ctx.L.input_char >= '1' && ctx.L.input_char <= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 3;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case '"':
- ctx.NextState = 19;
- ctx.Return = true;
- return true;
-
- case ',':
- case ':':
- case '[':
- case ']':
- case '{':
- case '}':
- ctx.NextState = 1;
- ctx.Return = true;
- return true;
-
- case '-':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 2;
- return true;
-
- case '0':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 4;
- return true;
-
- case 'f':
- ctx.NextState = 12;
- return true;
-
- case 'n':
- ctx.NextState = 16;
- return true;
-
- case 't':
- ctx.NextState = 9;
- return true;
-
- case '\'':
- if (! ctx.L.allow_single_quoted_strings)
- return false;
-
- ctx.L.input_char = '"';
- ctx.NextState = 23;
- ctx.Return = true;
- return true;
-
- case '/':
- if (! ctx.L.allow_comments)
- return false;
-
- ctx.NextState = 25;
- return true;
-
- default:
- return false;
- }
- }
-
- return true;
- }
-
- private static bool State2 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- if (ctx.L.input_char >= '1' && ctx.L.input_char<= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 3;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case '0':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 4;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State3 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- continue;
- }
-
- if (ctx.L.input_char == ' ' ||
- ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case ',':
- case ']':
- case '}':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- case '.':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 5;
- return true;
-
- case 'e':
- case 'E':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 7;
- return true;
-
- default:
- return false;
- }
- }
- return true;
- }
-
- private static bool State4 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- if (ctx.L.input_char == ' ' ||
- ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case ',':
- case ']':
- case '}':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- case '.':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 5;
- return true;
-
- case 'e':
- case 'E':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 7;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State5 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 6;
- return true;
- }
-
- return false;
- }
-
- private static bool State6 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- continue;
- }
-
- if (ctx.L.input_char == ' ' ||
- ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case ',':
- case ']':
- case '}':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- case 'e':
- case 'E':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 7;
- return true;
-
- default:
- return false;
- }
- }
-
- return true;
- }
-
- private static bool State7 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 8;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case '+':
- case '-':
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- ctx.NextState = 8;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State8 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- continue;
- }
-
- if (ctx.L.input_char == ' ' ||
- ctx.L.input_char >= '\t' && ctx.L.input_char<= '\r') {
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
- }
-
- switch (ctx.L.input_char) {
- case ',':
- case ']':
- case '}':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- return true;
- }
-
- private static bool State9 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'r':
- ctx.NextState = 10;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State10 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'u':
- ctx.NextState = 11;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State11 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'e':
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State12 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'a':
- ctx.NextState = 13;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State13 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'l':
- ctx.NextState = 14;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State14 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 's':
- ctx.NextState = 15;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State15 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'e':
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State16 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'u':
- ctx.NextState = 17;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State17 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'l':
- ctx.NextState = 18;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State18 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'l':
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State19 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- switch (ctx.L.input_char) {
- case '"':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 20;
- return true;
-
- case '\\':
- ctx.StateStack = 19;
- ctx.NextState = 21;
- return true;
-
- default:
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- continue;
- }
- }
-
- return true;
- }
-
- private static bool State20 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case '"':
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State21 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case 'u':
- ctx.NextState = 22;
- return true;
-
- case '"':
- case '\'':
- case '/':
- case '\\':
- case 'b':
- case 'f':
- case 'n':
- case 'r':
- case 't':
- ctx.L.string_buffer.Append (
- ProcessEscChar (ctx.L.input_char));
- ctx.NextState = ctx.StateStack;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State22 (FsmContext ctx)
- {
- int counter = 0;
- int mult = 4096;
-
- ctx.L.unichar = 0;
-
- while (ctx.L.GetChar ()) {
-
- if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9' ||
- ctx.L.input_char >= 'A' && ctx.L.input_char <= 'F' ||
- ctx.L.input_char >= 'a' && ctx.L.input_char <= 'f') {
-
- ctx.L.unichar += HexValue (ctx.L.input_char) * mult;
-
- counter++;
- mult /= 16;
-
- if (counter == 4) {
- ctx.L.string_buffer.Append (
- Convert.ToChar (ctx.L.unichar));
- ctx.NextState = ctx.StateStack;
- return true;
- }
-
- continue;
- }
-
- return false;
- }
-
- return true;
- }
-
- private static bool State23 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- switch (ctx.L.input_char) {
- case '\'':
- ctx.L.UngetChar ();
- ctx.Return = true;
- ctx.NextState = 24;
- return true;
-
- case '\\':
- ctx.StateStack = 23;
- ctx.NextState = 21;
- return true;
-
- default:
- ctx.L.string_buffer.Append ((char) ctx.L.input_char);
- continue;
- }
- }
-
- return true;
- }
-
- private static bool State24 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case '\'':
- ctx.L.input_char = '"';
- ctx.Return = true;
- ctx.NextState = 1;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State25 (FsmContext ctx)
- {
- ctx.L.GetChar ();
-
- switch (ctx.L.input_char) {
- case '*':
- ctx.NextState = 27;
- return true;
-
- case '/':
- ctx.NextState = 26;
- return true;
-
- default:
- return false;
- }
- }
-
- private static bool State26 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char == '\n') {
- ctx.NextState = 1;
- return true;
- }
- }
-
- return true;
- }
-
- private static bool State27 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char == '*') {
- ctx.NextState = 28;
- return true;
- }
- }
-
- return true;
- }
-
- private static bool State28 (FsmContext ctx)
- {
- while (ctx.L.GetChar ()) {
- if (ctx.L.input_char == '*')
- continue;
-
- if (ctx.L.input_char == '/') {
- ctx.NextState = 1;
- return true;
- }
-
- ctx.NextState = 27;
- return true;
- }
-
- return true;
- }
- #endregion
-
-
- private bool GetChar ()
- {
- if ((input_char = NextChar ()) != -1)
- return true;
-
- end_of_input = true;
- return false;
- }
-
- private int NextChar ()
- {
- if (input_buffer != 0) {
- int tmp = input_buffer;
- input_buffer = 0;
-
- return tmp;
- }
-
- return reader.Read ();
- }
-
- public bool NextToken ()
- {
- StateHandler handler;
- fsm_context.Return = false;
-
- while (true) {
- handler = fsm_handler_table[state - 1];
-
- if (! handler (fsm_context))
- throw new JsonException (input_char);
-
- if (end_of_input)
- return false;
-
- if (fsm_context.Return) {
- string_value = string_buffer.ToString ();
- string_buffer.Remove (0, string_buffer.Length);
- token = fsm_return_table[state - 1];
-
- if (token == (int) ParserToken.Char)
- token = input_char;
-
- state = fsm_context.NextState;
-
- return true;
- }
-
- state = fsm_context.NextState;
- }
- }
-
- private void UngetChar ()
- {
- input_buffer = input_char;
- }
- }
-}
+#region Header
+/**
+ * Lexer.cs
+ * JSON lexer implementation based on a finite state machine.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+
+namespace LitJson
+{
+ internal class FsmContext
+ {
+ public bool Return;
+ public int NextState;
+ public Lexer L;
+ public int StateStack;
+ }
+
+
+ internal class Lexer
+ {
+ #region Fields
+ private delegate bool StateHandler (FsmContext ctx);
+
+ private static int[] fsm_return_table;
+ private static StateHandler[] fsm_handler_table;
+
+ private bool allow_comments;
+ private bool allow_single_quoted_strings;
+ private bool end_of_input;
+ private FsmContext fsm_context;
+ private int input_buffer;
+ private int input_char;
+ private TextReader reader;
+ private int state;
+ private StringBuilder string_buffer;
+ private string string_value;
+ private int token;
+ private int unichar;
+ #endregion
+
+
+ #region Properties
+ public bool AllowComments {
+ get { return allow_comments; }
+ set { allow_comments = value; }
+ }
+
+ public bool AllowSingleQuotedStrings {
+ get { return allow_single_quoted_strings; }
+ set { allow_single_quoted_strings = value; }
+ }
+
+ public bool EndOfInput {
+ get { return end_of_input; }
+ }
+
+ public int Token {
+ get { return token; }
+ }
+
+ public string StringValue {
+ get { return string_value; }
+ }
+ #endregion
+
+
+ #region Constructors
+ static Lexer ()
+ {
+ PopulateFsmTables ();
+ }
+
+ public Lexer (TextReader reader)
+ {
+ allow_comments = true;
+ allow_single_quoted_strings = true;
+
+ input_buffer = 0;
+ string_buffer = new StringBuilder (128);
+ state = 1;
+ end_of_input = false;
+ this.reader = reader;
+
+ fsm_context = new FsmContext ();
+ fsm_context.L = this;
+ }
+ #endregion
+
+
+ #region Static Methods
+ private static int HexValue (int digit)
+ {
+ switch (digit) {
+ case 'a':
+ case 'A':
+ return 10;
+
+ case 'b':
+ case 'B':
+ return 11;
+
+ case 'c':
+ case 'C':
+ return 12;
+
+ case 'd':
+ case 'D':
+ return 13;
+
+ case 'e':
+ case 'E':
+ return 14;
+
+ case 'f':
+ case 'F':
+ return 15;
+
+ default:
+ return digit - '0';
+ }
+ }
+
+ private static void PopulateFsmTables ()
+ {
+ fsm_handler_table = new StateHandler[28] {
+ State1,
+ State2,
+ State3,
+ State4,
+ State5,
+ State6,
+ State7,
+ State8,
+ State9,
+ State10,
+ State11,
+ State12,
+ State13,
+ State14,
+ State15,
+ State16,
+ State17,
+ State18,
+ State19,
+ State20,
+ State21,
+ State22,
+ State23,
+ State24,
+ State25,
+ State26,
+ State27,
+ State28
+ };
+
+ fsm_return_table = new int[28] {
+ (int) ParserToken.Char,
+ 0,
+ (int) ParserToken.Number,
+ (int) ParserToken.Number,
+ 0,
+ (int) ParserToken.Number,
+ 0,
+ (int) ParserToken.Number,
+ 0,
+ 0,
+ (int) ParserToken.True,
+ 0,
+ 0,
+ 0,
+ (int) ParserToken.False,
+ 0,
+ 0,
+ (int) ParserToken.Null,
+ (int) ParserToken.CharSeq,
+ (int) ParserToken.Char,
+ 0,
+ 0,
+ (int) ParserToken.CharSeq,
+ (int) ParserToken.Char,
+ 0,
+ 0,
+ 0,
+ 0
+ };
+ }
+
+ private static char ProcessEscChar (int esc_char)
+ {
+ switch (esc_char) {
+ case '"':
+ case '\'':
+ case '\\':
+ case '/':
+ return Convert.ToChar (esc_char);
+
+ case 'n':
+ return '\n';
+
+ case 't':
+ return '\t';
+
+ case 'r':
+ return '\r';
+
+ case 'b':
+ return '\b';
+
+ case 'f':
+ return '\f';
+
+ default:
+ // Unreachable
+ return '?';
+ }
+ }
+
+ private static bool State1 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char == ' ' ||
+ ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r')
+ continue;
+
+ if (ctx.L.input_char >= '1' && ctx.L.input_char <= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 3;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case '"':
+ ctx.NextState = 19;
+ ctx.Return = true;
+ return true;
+
+ case ',':
+ case ':':
+ case '[':
+ case ']':
+ case '{':
+ case '}':
+ ctx.NextState = 1;
+ ctx.Return = true;
+ return true;
+
+ case '-':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 2;
+ return true;
+
+ case '0':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 4;
+ return true;
+
+ case 'f':
+ ctx.NextState = 12;
+ return true;
+
+ case 'n':
+ ctx.NextState = 16;
+ return true;
+
+ case 't':
+ ctx.NextState = 9;
+ return true;
+
+ case '\'':
+ if (! ctx.L.allow_single_quoted_strings)
+ return false;
+
+ ctx.L.input_char = '"';
+ ctx.NextState = 23;
+ ctx.Return = true;
+ return true;
+
+ case '/':
+ if (! ctx.L.allow_comments)
+ return false;
+
+ ctx.NextState = 25;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State2 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ if (ctx.L.input_char >= '1' && ctx.L.input_char<= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 3;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case '0':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 4;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State3 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ continue;
+ }
+
+ if (ctx.L.input_char == ' ' ||
+ ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case ',':
+ case ']':
+ case '}':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ case '.':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 5;
+ return true;
+
+ case 'e':
+ case 'E':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 7;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static bool State4 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ if (ctx.L.input_char == ' ' ||
+ ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case ',':
+ case ']':
+ case '}':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ case '.':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 5;
+ return true;
+
+ case 'e':
+ case 'E':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 7;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State5 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 6;
+ return true;
+ }
+
+ return false;
+ }
+
+ private static bool State6 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ continue;
+ }
+
+ if (ctx.L.input_char == ' ' ||
+ ctx.L.input_char >= '\t' && ctx.L.input_char <= '\r') {
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case ',':
+ case ']':
+ case '}':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ case 'e':
+ case 'E':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 7;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State7 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 8;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case '+':
+ case '-':
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ ctx.NextState = 8;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State8 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char >= '0' && ctx.L.input_char<= '9') {
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ continue;
+ }
+
+ if (ctx.L.input_char == ' ' ||
+ ctx.L.input_char >= '\t' && ctx.L.input_char<= '\r') {
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+ }
+
+ switch (ctx.L.input_char) {
+ case ',':
+ case ']':
+ case '}':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State9 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'r':
+ ctx.NextState = 10;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State10 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'u':
+ ctx.NextState = 11;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State11 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'e':
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State12 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'a':
+ ctx.NextState = 13;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State13 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'l':
+ ctx.NextState = 14;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State14 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 's':
+ ctx.NextState = 15;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State15 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'e':
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State16 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'u':
+ ctx.NextState = 17;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State17 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'l':
+ ctx.NextState = 18;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State18 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'l':
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State19 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ switch (ctx.L.input_char) {
+ case '"':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 20;
+ return true;
+
+ case '\\':
+ ctx.StateStack = 19;
+ ctx.NextState = 21;
+ return true;
+
+ default:
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ continue;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State20 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case '"':
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State21 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case 'u':
+ ctx.NextState = 22;
+ return true;
+
+ case '"':
+ case '\'':
+ case '/':
+ case '\\':
+ case 'b':
+ case 'f':
+ case 'n':
+ case 'r':
+ case 't':
+ ctx.L.string_buffer.Append (
+ ProcessEscChar (ctx.L.input_char));
+ ctx.NextState = ctx.StateStack;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State22 (FsmContext ctx)
+ {
+ int counter = 0;
+ int mult = 4096;
+
+ ctx.L.unichar = 0;
+
+ while (ctx.L.GetChar ()) {
+
+ if (ctx.L.input_char >= '0' && ctx.L.input_char <= '9' ||
+ ctx.L.input_char >= 'A' && ctx.L.input_char <= 'F' ||
+ ctx.L.input_char >= 'a' && ctx.L.input_char <= 'f') {
+
+ ctx.L.unichar += HexValue (ctx.L.input_char) * mult;
+
+ counter++;
+ mult /= 16;
+
+ if (counter == 4) {
+ ctx.L.string_buffer.Append (
+ Convert.ToChar (ctx.L.unichar));
+ ctx.NextState = ctx.StateStack;
+ return true;
+ }
+
+ continue;
+ }
+
+ return false;
+ }
+
+ return true;
+ }
+
+ private static bool State23 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ switch (ctx.L.input_char) {
+ case '\'':
+ ctx.L.UngetChar ();
+ ctx.Return = true;
+ ctx.NextState = 24;
+ return true;
+
+ case '\\':
+ ctx.StateStack = 23;
+ ctx.NextState = 21;
+ return true;
+
+ default:
+ ctx.L.string_buffer.Append ((char) ctx.L.input_char);
+ continue;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State24 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case '\'':
+ ctx.L.input_char = '"';
+ ctx.Return = true;
+ ctx.NextState = 1;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State25 (FsmContext ctx)
+ {
+ ctx.L.GetChar ();
+
+ switch (ctx.L.input_char) {
+ case '*':
+ ctx.NextState = 27;
+ return true;
+
+ case '/':
+ ctx.NextState = 26;
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ private static bool State26 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char == '\n') {
+ ctx.NextState = 1;
+ return true;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State27 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char == '*') {
+ ctx.NextState = 28;
+ return true;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool State28 (FsmContext ctx)
+ {
+ while (ctx.L.GetChar ()) {
+ if (ctx.L.input_char == '*')
+ continue;
+
+ if (ctx.L.input_char == '/') {
+ ctx.NextState = 1;
+ return true;
+ }
+
+ ctx.NextState = 27;
+ return true;
+ }
+
+ return true;
+ }
+ #endregion
+
+
+ private bool GetChar ()
+ {
+ if ((input_char = NextChar ()) != -1)
+ return true;
+
+ end_of_input = true;
+ return false;
+ }
+
+ private int NextChar ()
+ {
+ if (input_buffer != 0) {
+ int tmp = input_buffer;
+ input_buffer = 0;
+
+ return tmp;
+ }
+
+ return reader.Read ();
+ }
+
+ public bool NextToken ()
+ {
+ StateHandler handler;
+ fsm_context.Return = false;
+
+ while (true) {
+ handler = fsm_handler_table[state - 1];
+
+ if (! handler (fsm_context))
+ throw new JsonException (input_char);
+
+ if (end_of_input)
+ return false;
+
+ if (fsm_context.Return) {
+ string_value = string_buffer.ToString ();
+ string_buffer.Remove (0, string_buffer.Length);
+ token = fsm_return_table[state - 1];
+
+ if (token == (int) ParserToken.Char)
+ token = input_char;
+
+ state = fsm_context.NextState;
+
+ return true;
+ }
+
+ state = fsm_context.NextState;
+ }
+ }
+
+ private void UngetChar ()
+ {
+ input_buffer = input_char;
+ }
+ }
+}
diff --git a/Json/ParserToken.cs b/Json/ParserToken.cs
index c5a9a43c..9aaee977 100755
--- a/Json/ParserToken.cs
+++ b/Json/ParserToken.cs
@@ -1,44 +1,44 @@
-#region Header
-/**
- * ParserToken.cs
- * Internal representation of the tokens used by the lexer and the parser.
- *
- * The authors disclaim copyright to this source code. For more details, see
- * the COPYING file included with this distribution.
- **/
-#endregion
-
-
-namespace LitJson
-{
- internal enum ParserToken
- {
- // Lexer tokens
- None = System.Char.MaxValue + 1,
- Number,
- True,
- False,
- Null,
- CharSeq,
- // Single char
- Char,
-
- // Parser Rules
- Text,
- Object,
- ObjectPrime,
- Pair,
- PairRest,
- Array,
- ArrayPrime,
- Value,
- ValueRest,
- String,
-
- // End of input
- End,
-
- // The empty rule
- Epsilon
- }
-}
+#region Header
+/**
+ * ParserToken.cs
+ * Internal representation of the tokens used by the lexer and the parser.
+ *
+ * The authors disclaim copyright to this source code. For more details, see
+ * the COPYING file included with this distribution.
+ **/
+#endregion
+
+
+namespace LitJson
+{
+ internal enum ParserToken
+ {
+ // Lexer tokens
+ None = System.Char.MaxValue + 1,
+ Number,
+ True,
+ False,
+ Null,
+ CharSeq,
+ // Single char
+ Char,
+
+ // Parser Rules
+ Text,
+ Object,
+ ObjectPrime,
+ Pair,
+ PairRest,
+ Array,
+ ArrayPrime,
+ Value,
+ ValueRest,
+ String,
+
+ // End of input
+ End,
+
+ // The empty rule
+ Epsilon
+ }
+}
diff --git a/QBox/AuthPolicy.cs b/QBox/Auth/AuthPolicy.cs
old mode 100644
new mode 100755
similarity index 95%
rename from QBox/AuthPolicy.cs
rename to QBox/Auth/AuthPolicy.cs
index 23099506..be68d919
--- a/QBox/AuthPolicy.cs
+++ b/QBox/Auth/AuthPolicy.cs
@@ -3,8 +3,9 @@
using System.IO;
using LitJson;
using System.Security.Cryptography;
+using QBox.RS;
-namespace QBox
+namespace QBox.Auth
{
public class AuthPolicy
{
diff --git a/QBox/DigestAuthClient.cs b/QBox/Auth/DigestAuthClient.cs
similarity index 86%
rename from QBox/DigestAuthClient.cs
rename to QBox/Auth/DigestAuthClient.cs
index f8663575..1aca0e95 100755
--- a/QBox/DigestAuthClient.cs
+++ b/QBox/Auth/DigestAuthClient.cs
@@ -3,12 +3,13 @@
using System.Net;
using System.IO;
using System.Security.Cryptography;
+using QBox.RS;
-namespace QBox
+namespace QBox.Auth
{
public class DigestAuthClient : Client
{
- public override void SetAuth(HttpWebRequest request, byte[] body)
+ public override void SetAuth(HttpWebRequest request, Stream body)
{
byte[] secretKey = Encoding.ASCII.GetBytes(Config.SECRET_KEY);
using (HMACSHA1 hmac = new HMACSHA1(secretKey))
@@ -21,7 +22,7 @@ public override void SetAuth(HttpWebRequest request, byte[] body)
buffer.WriteByte((byte)'\n');
if (request.ContentType == "application/x-www-form-urlencoded" && body != null)
{
- buffer.Write(body, 0, body.Length);
+ body.CopyTo(buffer);
}
byte[] digest = hmac.ComputeHash(buffer.ToArray());
string digestBase64 = Base64UrlSafe.Encode(digest);
diff --git a/QBox/Config.cs b/QBox/Config.cs
deleted file mode 100755
index 84583a04..00000000
--- a/QBox/Config.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace QBox
-{
- public class Config
- {
- public static string ACCESS_KEY = "";
- public static string SECRET_KEY = "";
-
- public static string REDIRECT_URI = "";
- public static string AUTHORIZATION_ENDPOINT = "";
- public static string TOKEN_ENDPOINT = "https://acc.qbox.me/oauth2/token";
-
- public static string IO_HOST = "http://iovip.qbox.me";
- public static string FS_HOST = "https://fs.qbox.me";
- public static string RS_HOST = "http://rs.qbox.me:10100";
- public static string UP_HOST = "http://up.qbox.me";
-
- public static int BLOCK_SIZE = 1024 * 1024 * 4;
- public static int PUT_CHUNK_SIZE = 1024 * 256;
- public static int PUT_RETRY_TIMES = 3;
- public static int PUT_TIMEOUT = 300000; // 300s = 5m
- }
-}
diff --git a/QBox/DeleteRet.cs b/QBox/DeleteRet.cs
deleted file mode 100755
index b9f6575f..00000000
--- a/QBox/DeleteRet.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace QBox
-{
- public class DeleteRet : CallRet
- {
- public DeleteRet(CallRet ret)
- : base(ret) { }
- }
-}
diff --git a/QBox/DropRet.cs b/QBox/DropRet.cs
deleted file mode 100755
index 3a25194f..00000000
--- a/QBox/DropRet.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace QBox
-{
- public class DropRet : CallRet
- {
- public DropRet(CallRet ret)
- : base(ret) { }
- }
-}
diff --git a/QBox/MultiPartFormDataPost.cs b/QBox/MultiPartFormDataPost.cs
deleted file mode 100755
index 7d8de541..00000000
--- a/QBox/MultiPartFormDataPost.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Net;
-
-namespace QBox
-{
- public static class MultiPartFormDataPost
- {
- public static Encoding encoding = Encoding.ASCII;
-
- private static byte[] GetBody(Dictionary postParams, string boundary)
- {
- using (var buffer = new MemoryStream())
- {
- bool needsCLRF = false;
- foreach (var param in postParams)
- {
- if (needsCLRF)
- buffer.Write(encoding.GetBytes("\r\n"), 0, encoding.GetByteCount("\r\n"));
-
- needsCLRF = true;
-
- if (param.Value is FileParameter)
- {
- FileParameter fileToUpload = (FileParameter)param.Value;
-
- string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
- string header = string.Format(headfmt, boundary, param.Key,
- fileToUpload.FileName ?? param.Key,
- fileToUpload.MimeType ?? "application/octet-stream");
-
- buffer.Write(encoding.GetBytes(header), 0, encoding.GetByteCount(header));
- using (FileStream fs = File.OpenRead(fileToUpload.FileName))
- {
- fs.CopyTo(buffer);
- }
- }
- else
- {
- string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
- string partData = string.Format(headfmt, boundary, param.Key, param.Value);
- buffer.Write(encoding.GetBytes(partData), 0, encoding.GetByteCount(partData));
- }
- }
-
- string footer = "\r\n--" + boundary + "--\r\n";
- buffer.Write(encoding.GetBytes(footer), 0, encoding.GetByteCount(footer));
-
- return buffer.ToArray();
- }
- }
-
- private static CallRet CallWithBinary(string url, string contentType, byte[] body)
- {
- Console.WriteLine("URL: " + url);
- try
- {
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
- request.Method = "POST";
- request.ContentType = contentType;
- request.ContentLength = body.Length;
- using (Stream requestStream = request.GetRequestStream())
- {
- requestStream.Write(body, 0, body.Length);
- }
- using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
- {
- return Client.HandleResult(response);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.ToString());
- return new CallRet(HttpStatusCode.BadRequest, e);
- }
- }
-
- public static CallRet DoPost(string url, Dictionary postParams)
- {
- string boundary = String.Format("----------{0:N}", Guid.NewGuid());
- string contentType = "multipart/form-data; boundary=" + boundary;
-
- byte[] body = GetBody(postParams, boundary);
- return CallWithBinary(url, contentType, body);
- }
- }
-}
diff --git a/QBox/PublishRet.cs b/QBox/PublishRet.cs
deleted file mode 100755
index 22374a00..00000000
--- a/QBox/PublishRet.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace QBox
-{
- public class PublishRet : CallRet
- {
- public PublishRet(CallRet ret)
- : base(ret) { }
- }
-}
diff --git a/QBox/Base64UrlSafe.cs b/QBox/RS/Base64UrlSafe.cs
similarity index 51%
rename from QBox/Base64UrlSafe.cs
rename to QBox/RS/Base64UrlSafe.cs
index d36195f2..3d603cbd 100755
--- a/QBox/Base64UrlSafe.cs
+++ b/QBox/RS/Base64UrlSafe.cs
@@ -1,7 +1,7 @@
using System;
using System.Text;
-namespace QBox
+namespace QBox.RS
{
public static class Base64UrlSafe
{
@@ -9,17 +9,17 @@ public static string Encode(string text)
{
if (String.IsNullOrEmpty(text)) return "";
byte[] bs = Encoding.ASCII.GetBytes(text);
- string encoded = Convert.ToBase64String(bs);
- encoded = encoded.Replace('+', '-').Replace('/', '_');
- return encoded;
+ string encodedStr = Convert.ToBase64String(bs);
+ encodedStr = encodedStr.Replace('+', '-').Replace('/', '_');
+ return encodedStr;
}
public static string Encode(byte[] bs)
{
if (bs == null || bs.Length == 0) return "";
- string encoded = Convert.ToBase64String(bs);
- encoded = encoded.Replace('+', '-').Replace('/', '_');
- return encoded;
+ string encodedStr = Convert.ToBase64String(bs);
+ encodedStr = encodedStr.Replace('+', '-').Replace('/', '_');
+ return encodedStr;
}
}
}
diff --git a/QBox/CallRet.cs b/QBox/RS/CallRet.cs
similarity index 94%
rename from QBox/CallRet.cs
rename to QBox/RS/CallRet.cs
index 94d1632f..540a1328 100755
--- a/QBox/CallRet.cs
+++ b/QBox/RS/CallRet.cs
@@ -1,7 +1,7 @@
using System;
using System.Net;
-namespace QBox
+namespace QBox.RS
{
public class CallRet
{
diff --git a/QBox/Client.cs b/QBox/RS/Client.cs
similarity index 89%
rename from QBox/Client.cs
rename to QBox/RS/Client.cs
index 8d76dc5b..3ef28c61 100755
--- a/QBox/Client.cs
+++ b/QBox/RS/Client.cs
@@ -2,11 +2,11 @@
using System.Net;
using System.IO;
-namespace QBox
+namespace QBox.RS
{
public abstract class Client
{
- public abstract void SetAuth(HttpWebRequest request, byte[] body);
+ public abstract void SetAuth(HttpWebRequest request, Stream body);
public CallRet Call(string url)
{
@@ -28,7 +28,7 @@ public CallRet Call(string url)
}
}
- public CallRet CallWithBinary(string url, string contentType, byte[] body)
+ public CallRet CallWithBinary(string url, string contentType, Stream body)
{
Console.WriteLine("URL: " + url);
try
@@ -40,7 +40,7 @@ public CallRet CallWithBinary(string url, string contentType, byte[] body)
SetAuth(request, body);
using (Stream requestStream = request.GetRequestStream())
{
- requestStream.Write(body, 0, body.Length);
+ body.CopyTo(requestStream);
}
using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
{
diff --git a/QBox/RS/Config.cs b/QBox/RS/Config.cs
new file mode 100755
index 00000000..b5936da2
--- /dev/null
+++ b/QBox/RS/Config.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace QBox.RS
+{
+ public class Config
+ {
+ public static string ACCESS_KEY = "";
+ public static string SECRET_KEY = "";
+
+ public static string IO_HOST = "http://iovip.qbox.me";
+ public static string RS_HOST = "http://rs.qbox.me:10100";
+ public static string UP_HOST = "http://up.qbox.me";
+ }
+}
diff --git a/QBox/FileParameter.cs b/QBox/RS/FileParameter.cs
similarity index 89%
rename from QBox/FileParameter.cs
rename to QBox/RS/FileParameter.cs
index 7c3b7583..5de705ce 100755
--- a/QBox/FileParameter.cs
+++ b/QBox/RS/FileParameter.cs
@@ -1,6 +1,6 @@
using System;
-namespace QBox
+namespace QBox.RS
{
public class FileParameter
{
diff --git a/QBox/GetRet.cs b/QBox/RS/GetRet.cs
similarity index 94%
rename from QBox/GetRet.cs
rename to QBox/RS/GetRet.cs
index ade6c865..16c978ff 100755
--- a/QBox/GetRet.cs
+++ b/QBox/RS/GetRet.cs
@@ -2,7 +2,7 @@
using System.Net;
using LitJson;
-namespace QBox
+namespace QBox.RS
{
public class GetRet : CallRet
{
diff --git a/QBox/RS/MultiPartFormDataPost.cs b/QBox/RS/MultiPartFormDataPost.cs
new file mode 100755
index 00000000..1acbf273
--- /dev/null
+++ b/QBox/RS/MultiPartFormDataPost.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Net;
+
+namespace QBox.RS
+{
+ public static class MultiPartFormDataPost
+ {
+ public static Encoding encoding = Encoding.ASCII;
+
+ private static long GetContentLength(Dictionary postParams, string boundary)
+ {
+ long length = 0;
+ bool needsCLRF = false;
+ foreach (var param in postParams)
+ {
+ if (needsCLRF)
+ length += encoding.GetByteCount("\r\n");
+
+ needsCLRF = true;
+
+ if (param.Value is FileParameter)
+ {
+ FileParameter fileToUpload = (FileParameter)param.Value;
+
+ string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
+ string header = string.Format(headfmt, boundary, param.Key,
+ fileToUpload.FileName ?? param.Key,
+ fileToUpload.MimeType ?? "application/octet-stream");
+
+ length += encoding.GetByteCount(header);
+ using (FileStream fs = File.OpenRead(fileToUpload.FileName))
+ {
+ length += fs.Length;
+ }
+ }
+ else
+ {
+ string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
+ string partData = string.Format(headfmt, boundary, param.Key, param.Value);
+ length += encoding.GetByteCount(partData);
+ }
+ }
+
+ string footer = "\r\n--" + boundary + "--\r\n";
+ length += encoding.GetByteCount(footer);
+ return length;
+ }
+
+ private static void WriteBody(Dictionary postParams, string boundary, Stream body)
+ {
+ bool needsCLRF = false;
+ foreach (var param in postParams)
+ {
+ if (needsCLRF)
+ body.Write(encoding.GetBytes("\r\n"), 0, encoding.GetByteCount("\r\n"));
+
+ needsCLRF = true;
+
+ if (param.Value is FileParameter)
+ {
+ FileParameter fileToUpload = (FileParameter)param.Value;
+
+ string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{2}\";\r\nContent-Type: {3}\r\n\r\n";
+ string header = string.Format(headfmt, boundary, param.Key,
+ fileToUpload.FileName ?? param.Key,
+ fileToUpload.MimeType ?? "application/octet-stream");
+
+ body.Write(encoding.GetBytes(header), 0, encoding.GetByteCount(header));
+ using (FileStream fs = File.OpenRead(fileToUpload.FileName))
+ {
+ fs.CopyTo(body);
+ }
+ }
+ else
+ {
+ string headfmt = "--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}";
+ string partData = string.Format(headfmt, boundary, param.Key, param.Value);
+ body.Write(encoding.GetBytes(partData), 0, encoding.GetByteCount(partData));
+ }
+ }
+
+ string footer = "\r\n--" + boundary + "--\r\n";
+ body.Write(encoding.GetBytes(footer), 0, encoding.GetByteCount(footer));
+ }
+
+ public static CallRet Post(string url, Dictionary postParams)
+ {
+ Console.WriteLine("URL: " + url);
+ string boundary = String.Format("----------{0:N}", Guid.NewGuid());
+ string contentType = "multipart/form-data; boundary=" + boundary;
+
+ Stream requestStream = null;
+ HttpWebResponse response = null;
+ try
+ {
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+ request.Method = "POST";
+ request.ContentType = contentType;
+ request.ContentLength = GetContentLength(postParams, boundary);
+ requestStream = request.GetRequestStream();
+ WriteBody(postParams, boundary, requestStream);
+ response = request.GetResponse() as HttpWebResponse;
+ return Client.HandleResult(response);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.ToString());
+ return new CallRet(HttpStatusCode.BadRequest, e);
+ }
+ finally
+ {
+ requestStream.Close();
+ response.Close();
+ }
+ }
+ }
+}
diff --git a/QBox/PutAuthRet.cs b/QBox/RS/PutAuthRet.cs
similarity index 93%
rename from QBox/PutAuthRet.cs
rename to QBox/RS/PutAuthRet.cs
index ec4e1e1e..2158a1a1 100755
--- a/QBox/PutAuthRet.cs
+++ b/QBox/RS/PutAuthRet.cs
@@ -1,7 +1,7 @@
using System;
using LitJson;
-namespace QBox
+namespace QBox.RS
{
public class PutAuthRet : CallRet
{
diff --git a/QBox/PutFileRet.cs b/QBox/RS/PutFileRet.cs
similarity index 93%
rename from QBox/PutFileRet.cs
rename to QBox/RS/PutFileRet.cs
index dd46ba3a..64a5a0fa 100755
--- a/QBox/PutFileRet.cs
+++ b/QBox/RS/PutFileRet.cs
@@ -1,7 +1,7 @@
using System;
using LitJson;
-namespace QBox
+namespace QBox.RS
{
public class PutFileRet : CallRet
{
diff --git a/QBox/RS/RSClient.cs b/QBox/RS/RSClient.cs
new file mode 100755
index 00000000..a7a2ac10
--- /dev/null
+++ b/QBox/RS/RSClient.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+
+namespace QBox.RS
+{
+ public class RSClient
+ {
+ public static PutFileRet PutFile(
+ string url, string bucketName, string key, string mimeType,
+ string localFile, string customMeta, string callbackParam)
+ {
+ string entryURI = bucketName + ":" + key;
+ if (String.IsNullOrEmpty(mimeType))
+ {
+ mimeType = "application/octet-stream";
+ }
+ string action = "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
+ "/mimeType/" + Base64UrlSafe.Encode(mimeType);
+ if (!String.IsNullOrEmpty(customMeta))
+ {
+ action += "/meta/" + Base64UrlSafe.Encode(customMeta);
+ }
+
+ try
+ {
+ var postParams = new Dictionary();
+ postParams["action"] = action;
+ postParams["file"] = new FileParameter(localFile, mimeType);
+ if (!String.IsNullOrEmpty(callbackParam))
+ postParams["params"] = callbackParam;
+ CallRet callRet = MultiPartFormDataPost.Post(url, postParams);
+ return new PutFileRet(callRet);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.ToString());
+ return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
+ }
+ }
+
+ public static PutFileRet PutFileWithUpToken(
+ string upToken, string tableName, string key, string mimeType,
+ string localFile, string customMeta, string callbackParam)
+ {
+ string entryURI = tableName + ":" + key;
+ if (String.IsNullOrEmpty(mimeType))
+ {
+ mimeType = "application/octet-stream";
+ }
+ string action = "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
+ "/mimeType/" + Base64UrlSafe.Encode(mimeType);
+ if (!String.IsNullOrEmpty(customMeta))
+ {
+ action += "/meta/" + Base64UrlSafe.Encode(customMeta);
+ }
+
+ try
+ {
+ var postParams = new Dictionary();
+ postParams["auth"] = upToken;
+ postParams["action"] = action;
+ postParams["file"] = new FileParameter(localFile, mimeType);
+ if (!String.IsNullOrEmpty(callbackParam))
+ postParams["params"] = callbackParam;
+ CallRet callRet = MultiPartFormDataPost.Post(Config.UP_HOST + "/upload", postParams);
+ return new PutFileRet(callRet);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.ToString());
+ return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
+ }
+ }
+ }
+}
diff --git a/QBox/RSService.cs b/QBox/RS/RSService.cs
similarity index 60%
rename from QBox/RSService.cs
rename to QBox/RS/RSService.cs
index f797a084..6e3a0950 100755
--- a/QBox/RSService.cs
+++ b/QBox/RS/RSService.cs
@@ -2,17 +2,23 @@
using System.IO;
using System.Net;
-namespace QBox
+namespace QBox.RS
{
public class RSService
{
public Client Conn { get; private set; }
- public string TableName { get; private set; }
+ public string BucketName { get; private set; }
- public RSService(Client conn, string tableName)
+ public RSService(Client conn, string bucketName)
{
Conn = conn;
- TableName = tableName;
+ BucketName = bucketName;
+ }
+
+ public CallRet MkBucket()
+ {
+ string url = Config.RS_HOST + "/mkbucket/" + BucketName;
+ return Conn.Call(url);
}
public PutAuthRet PutAuth()
@@ -21,9 +27,9 @@ public PutAuthRet PutAuth()
return new PutAuthRet(callRet);
}
- public PutFileRet Put(string key, string mimeType, byte[] body, string customMeta)
+ public PutFileRet PutFile(string key, string mimeType, string localFile, string customMeta)
{
- string entryURI = TableName + ":" + key;
+ string entryURI = BucketName + ":" + key;
if (String.IsNullOrEmpty(mimeType))
{
mimeType = "application/octet-stream";
@@ -35,19 +41,12 @@ public PutFileRet Put(string key, string mimeType, byte[] body, string customMet
url += "/meta/" + Base64UrlSafe.Encode(customMeta);
}
- CallRet callRet = Conn.CallWithBinary(url, mimeType, body);
- return new PutFileRet(callRet);
- }
-
- public PutFileRet PutFile(string key, string mimeType, string localFile, string customMeta)
- {
- byte[] bs = null;
try
{
using (FileStream fs = File.OpenRead(localFile))
{
- bs = new byte[fs.Length];
- fs.Read(bs, 0, bs.Length);
+ CallRet callRet = Conn.CallWithBinary(url, mimeType, fs);
+ return new PutFileRet(callRet);
}
}
catch (Exception e)
@@ -55,13 +54,11 @@ public PutFileRet PutFile(string key, string mimeType, string localFile, string
Console.WriteLine(e.ToString());
return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
}
-
- return Put(key, mimeType, bs, customMeta);
}
public GetRet Get(string key, string attName)
{
- string entryURI = TableName + ":" + key;
+ string entryURI = BucketName + ":" + key;
string url = Config.RS_HOST + "/get/" + Base64UrlSafe.Encode(entryURI) + "/attName/"
+ Base64UrlSafe.Encode(attName);
CallRet callRet = Conn.Call(url);
@@ -70,7 +67,7 @@ public GetRet Get(string key, string attName)
public GetRet GetIfNotModified(string key, string attName, string hash)
{
- string entryURI = TableName + ":" + key;
+ string entryURI = BucketName + ":" + key;
string url = Config.RS_HOST + "/get/" + Base64UrlSafe.Encode(entryURI) + "/attName/"
+ Base64UrlSafe.Encode(attName) + "/base/" + hash;
CallRet callRet = Conn.Call(url);
@@ -79,40 +76,35 @@ public GetRet GetIfNotModified(string key, string attName, string hash)
public StatRet Stat(string key)
{
- String entryURI = TableName + ":" + key;
+ String entryURI = BucketName + ":" + key;
String url = Config.RS_HOST + "/stat/" + Base64UrlSafe.Encode(entryURI);
CallRet callRet = Conn.Call(url);
return new StatRet(callRet);
}
- public PublishRet Publish(string domain)
+ public CallRet Publish(string domain)
{
- String url = Config.RS_HOST + "/publish/" + Base64UrlSafe.Encode(domain) +
- "/from/" + TableName;
- CallRet callRet = Conn.Call(url);
- return new PublishRet(callRet);
+ String url = Config.RS_HOST + "/publish/" + Base64UrlSafe.Encode(domain) + "/from/" + BucketName;
+ return Conn.Call(url);
}
- public PublishRet Unpublish(string domain)
+ public CallRet Unpublish(string domain)
{
string url = Config.RS_HOST + "/unpublish/" + Base64UrlSafe.Encode(domain);
- CallRet callRet = Conn.Call(url);
- return new PublishRet(callRet);
+ return Conn.Call(url);
}
- public DeleteRet Delete(string key)
+ public CallRet Delete(string key)
{
- string entryURI = TableName + ":" + key;
+ string entryURI = BucketName + ":" + key;
string url = Config.RS_HOST + "/delete/" + Base64UrlSafe.Encode(entryURI);
- CallRet callRet = Conn.Call(url);
- return new DeleteRet(callRet);
+ return Conn.Call(url);
}
- public DropRet Drop()
+ public CallRet Drop()
{
- string url = Config.RS_HOST + "/drop/" + TableName;
- CallRet callRet = Conn.Call(url);
- return new DropRet(callRet);
+ string url = Config.RS_HOST + "/drop/" + BucketName;
+ return Conn.Call(url);
}
}
}
diff --git a/QBox/StatRet.cs b/QBox/RS/StatRet.cs
similarity index 95%
rename from QBox/StatRet.cs
rename to QBox/RS/StatRet.cs
index 99c0365d..89b91647 100755
--- a/QBox/StatRet.cs
+++ b/QBox/RS/StatRet.cs
@@ -1,7 +1,7 @@
using System;
using LitJson;
-namespace QBox
+namespace QBox.RS
{
public class StatRet : CallRet
{
diff --git a/QBox/RSClient.cs b/QBox/RSClient.cs
deleted file mode 100755
index b2c87912..00000000
--- a/QBox/RSClient.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-
-namespace QBox
-{
- public class RSClient
- {
- public static PutFileRet PutFile(
- string url, string tableName, string key, string mimeType,
- string localFile, string customMeta, string callbackParam)
- {
- string entryURI = tableName + ":" + key;
- if (String.IsNullOrEmpty(mimeType))
- {
- mimeType = "application/octet-stream";
- }
- string action = "/rs-put/" + Base64UrlSafe.Encode(entryURI) +
- "/mimeType/" + Base64UrlSafe.Encode(mimeType);
- if (!String.IsNullOrEmpty(customMeta))
- {
- action += "/meta/" + Base64UrlSafe.Encode(customMeta);
- }
-
- try
- {
- var postParams = new Dictionary();
- postParams["action"] = action;
- postParams["file"] = new FileParameter(localFile, mimeType);
- if (!String.IsNullOrEmpty(callbackParam))
- postParams["params"] = callbackParam;
- CallRet callRet = MultiPartFormDataPost.DoPost(url, postParams);
- return new PutFileRet(callRet);
- }
- catch (Exception e)
- {
- Console.WriteLine(e.ToString());
- return new PutFileRet(new CallRet(HttpStatusCode.BadRequest, e));
- }
- }
-
- }
-}