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" |
(...skipping 21 matching lines...) Expand all Loading... |
32 BasicJsonStringifier stringifier(isolate); | 32 BasicJsonStringifier stringifier(isolate); |
33 Handle<Object> result; | 33 Handle<Object> result; |
34 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, | 34 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, |
35 stringifier.Stringify(object)); | 35 stringifier.Stringify(object)); |
36 return *result; | 36 return *result; |
37 } | 37 } |
38 | 38 |
39 | 39 |
40 RUNTIME_FUNCTION(Runtime_ParseJson) { | 40 RUNTIME_FUNCTION(Runtime_ParseJson) { |
41 HandleScope scope(isolate); | 41 HandleScope scope(isolate); |
42 DCHECK(args.length() == 1); | 42 DCHECK_EQ(1, args.length()); |
43 CONVERT_ARG_HANDLE_CHECKED(String, source, 0); | 43 CONVERT_ARG_HANDLE_CHECKED(Object, object, 0); |
44 | 44 Handle<String> source; |
| 45 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, source, |
| 46 Object::ToString(isolate, object)); |
45 source = String::Flatten(source); | 47 source = String::Flatten(source); |
46 // Optimized fast case where we only have Latin1 characters. | 48 // Optimized fast case where we only have Latin1 characters. |
47 Handle<Object> result; | 49 Handle<Object> result; |
48 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, | 50 ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, |
49 source->IsSeqOneByteString() | 51 source->IsSeqOneByteString() |
50 ? JsonParser<true>::Parse(source) | 52 ? JsonParser<true>::Parse(source) |
51 : JsonParser<false>::Parse(source)); | 53 : JsonParser<false>::Parse(source)); |
52 return *result; | 54 return *result; |
53 } | 55 } |
| 56 |
54 } // namespace internal | 57 } // namespace internal |
55 } // namespace v8 | 58 } // namespace v8 |
OLD | NEW |