浏览代码

Clean code before pull request

Frederic Torres 11 年之前
父节点
当前提交
769b0fbc66
共有 2 个文件被更改,包括 8 次插入10 次删除
  1. 1 2
      Jint/Native/Json/JsonInstance.cs
  2. 7 8
      Jint/Native/Json/JsonSerializer.cs

+ 1 - 2
Jint/Native/Json/JsonInstance.cs

@@ -32,7 +32,6 @@ namespace Jint.Native.Json
         public void Configure()
         {
             FastAddProperty("parse", new ClrFunctionInstance(Engine, Parse, 2), true, false, true);
-            // 15.12.3-0-2
             FastAddProperty("stringify", new ClrFunctionInstance(Engine, Stringify, 3), true, false, true);
         }
 
@@ -67,7 +66,7 @@ namespace Jint.Native.Json
 
             var serializer = new JsonSerializer(_engine);
             if (value == Undefined.Instance) {
-                return Undefined.Instance; // Unit test 5.12.3-11-1
+                return Undefined.Instance;
             }
             else {
                 return serializer.Serialize(value, replacer, space);

+ 7 - 8
Jint/Native/Json/JsonSerializer.cs

@@ -125,7 +125,7 @@ namespace Jint.Native.Json
             if (_replacerFunction != Undefined.Instance)
             {
                 var replacerFunctionCallable = (ICallable)_replacerFunction.AsObject();
-                value = replacerFunctionCallable.Call(holder, Arguments.From(key, value)); // 15.12.3-11-12 added missing value parameter
+                value = replacerFunctionCallable.Call(holder, Arguments.From(key, value));
             }
 
             
@@ -143,19 +143,18 @@ namespace Jint.Native.Json
                     case "Boolean":
                         value = TypeConverter.ToPrimitive(value);
                         break;
-                    case "Array":  // 15.12.3-11-12 added missing serialization of array           
+                    case "Array": 
                         value = SerializeArray(value.As<ArrayInstance>());
                         return value;
-                        break;
-                    case "Object":  // 15.12.3-11-13
+                    case "Object":
                         value = SerializeObject(value.ToObject() as ObjectInstance);
                         return value;
-                        break;
                 }
             }
             
-            if (value == Undefined.Instance) {
-                return Undefined.Instance; // 15.12.3-11-10 
+            if (value == Undefined.Instance) 
+            {
+                return Undefined.Instance;
             }
 
             if (value == Null.Instance)
@@ -261,7 +260,7 @@ namespace Jint.Native.Json
             for (int i = 0; i < len; i++)
             {
                 var strP = Str(TypeConverter.ToString(i), value);
-                partial.Add(strP.AsString()); // 15.12.3-11-12
+                partial.Add(strP.AsString());
             }
             if (partial.Count == 0)
             {