OLD | NEW |
1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/runtime/runtime-utils.h" | 5 #include "src/runtime/runtime-utils.h" |
6 | 6 |
7 #include "src/arguments.h" | 7 #include "src/arguments.h" |
8 #include "src/char-predicates-inl.h" | 8 #include "src/char-predicates-inl.h" |
9 #include "src/isolate-inl.h" | 9 #include "src/isolate-inl.h" |
10 #include "src/json-parser.h" | 10 #include "src/json-parser.h" |
| 11 #include "src/json-stringifier.h" |
11 #include "src/objects-inl.h" | 12 #include "src/objects-inl.h" |
12 | 13 |
13 namespace v8 { | 14 namespace v8 { |
14 namespace internal { | 15 namespace internal { |
15 | 16 |
16 RUNTIME_FUNCTION(Runtime_QuoteJSONString) { | 17 RUNTIME_FUNCTION(Runtime_QuoteJSONString) { |
17 HandleScope scope(isolate); | 18 HandleScope scope(isolate); |
18 CONVERT_ARG_HANDLE_CHECKED(String, string, 0); | 19 CONVERT_ARG_HANDLE_CHECKED(String, string, 0); |
19 DCHECK(args.length() == 1); | 20 DCHECK(args.length() == 1); |
20 Handle<Object> result; | 21 Handle<Object> result; |
21 ASSIGN_RETURN_FAILURE_ON_EXCEPTION( | 22 ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
22 isolate, result, Runtime::BasicJsonStringifyString(isolate, string)); | 23 isolate, result, BasicJsonStringifier::StringifyString(isolate, string)); |
23 return *result; | 24 return *result; |
24 } | 25 } |
25 | 26 |
26 RUNTIME_FUNCTION(Runtime_BasicJSONStringify) { | 27 RUNTIME_FUNCTION(Runtime_BasicJSONStringify) { |
27 HandleScope scope(isolate); | 28 HandleScope scope(isolate); |
28 DCHECK(args.length() == 2); | 29 DCHECK(args.length() == 2); |
29 CONVERT_ARG_HANDLE_CHECKED(Object, object, 0); | 30 CONVERT_ARG_HANDLE_CHECKED(Object, object, 0); |
30 CONVERT_ARG_HANDLE_CHECKED(String, gap, 1); | 31 CONVERT_ARG_HANDLE_CHECKED(String, gap, 1); |
31 Handle<Object> result; | 32 Handle<Object> result; |
32 ASSIGN_RETURN_FAILURE_ON_EXCEPTION( | 33 ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
33 isolate, result, Runtime::BasicJsonStringify(isolate, object, gap)); | 34 isolate, result, BasicJsonStringifier(isolate, gap).Stringify(object)); |
34 return *result; | 35 return *result; |
35 } | 36 } |
36 | 37 |
37 RUNTIME_FUNCTION(Runtime_ParseJson) { | 38 RUNTIME_FUNCTION(Runtime_ParseJson) { |
38 HandleScope scope(isolate); | 39 HandleScope scope(isolate); |
39 DCHECK_EQ(1, args.length()); | 40 DCHECK_EQ(1, args.length()); |
40 CONVERT_ARG_HANDLE_CHECKED(Object, object, 0); | 41 CONVERT_ARG_HANDLE_CHECKED(Object, object, 0); |
41 Handle<String> source; | 42 Handle<String> source; |
42 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, source, | 43 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, source, |
43 Object::ToString(isolate, object)); | 44 Object::ToString(isolate, object)); |
44 source = String::Flatten(source); | 45 source = String::Flatten(source); |
45 // Optimized fast case where we only have Latin1 characters. | 46 // Optimized fast case where we only have Latin1 characters. |
46 Handle<Object> result; | 47 Handle<Object> result; |
47 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, | 48 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, |
48 source->IsSeqOneByteString() | 49 source->IsSeqOneByteString() |
49 ? JsonParser<true>::Parse(source) | 50 ? JsonParser<true>::Parse(source) |
50 : JsonParser<false>::Parse(source)); | 51 : JsonParser<false>::Parse(source)); |
51 return *result; | 52 return *result; |
52 } | 53 } |
53 | 54 |
54 } // namespace internal | 55 } // namespace internal |
55 } // namespace v8 | 56 } // namespace v8 |
OLD | NEW |