| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | 27 |
| 28 #include <stdarg.h> | 28 #include <stdarg.h> |
| 29 #include <limits.h> | 29 #include <limits.h> |
| 30 | 30 |
| 31 #include "v8.h" | 31 #include "v8.h" |
| 32 | 32 |
| 33 #include "assert-scope.h" |
| 33 #include "conversions-inl.h" | 34 #include "conversions-inl.h" |
| 34 #include "v8conversions.h" | 35 #include "v8conversions.h" |
| 35 #include "dtoa.h" | 36 #include "dtoa.h" |
| 36 #include "factory.h" | 37 #include "factory.h" |
| 37 #include "strtod.h" | 38 #include "strtod.h" |
| 38 | 39 |
| 39 namespace v8 { | 40 namespace v8 { |
| 40 namespace internal { | 41 namespace internal { |
| 41 | 42 |
| 42 namespace { | 43 namespace { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 void StringCharacterStreamIterator::operator++() { | 75 void StringCharacterStreamIterator::operator++() { |
| 75 end_ = !stream_->HasMore(); | 76 end_ = !stream_->HasMore(); |
| 76 if (!end_) { | 77 if (!end_) { |
| 77 current_ = stream_->GetNext(); | 78 current_ = stream_->GetNext(); |
| 78 } | 79 } |
| 79 } | 80 } |
| 80 } // End anonymous namespace. | 81 } // End anonymous namespace. |
| 81 | 82 |
| 82 | 83 |
| 83 double StringToDouble(UnicodeCache* unicode_cache, | 84 double StringToDouble(UnicodeCache* unicode_cache, |
| 84 String* str, int flags, double empty_string_val) { | 85 String* string, |
| 85 StringShape shape(str); | 86 int flags, |
| 86 // TODO(dcarney): Use a Visitor here. | 87 double empty_string_val) { |
| 87 if (shape.IsSequentialAscii()) { | 88 DisallowHeapAllocation no_gc; |
| 88 const uint8_t* begin = SeqOneByteString::cast(str)->GetChars(); | 89 String::FlatContent flat = string->GetFlatContent(); |
| 89 const uint8_t* end = begin + str->length(); | 90 // ECMA-262 section 15.1.2.3, empty string is NaN |
| 90 return InternalStringToDouble(unicode_cache, begin, end, flags, | 91 if (flat.IsAscii()) { |
| 91 empty_string_val); | 92 return StringToDouble( |
| 92 } else if (shape.IsSequentialTwoByte()) { | 93 unicode_cache, flat.ToOneByteVector(), flags, empty_string_val); |
| 93 const uc16* begin = SeqTwoByteString::cast(str)->GetChars(); | |
| 94 const uc16* end = begin + str->length(); | |
| 95 return InternalStringToDouble(unicode_cache, begin, end, flags, | |
| 96 empty_string_val); | |
| 97 } else { | 94 } else { |
| 98 ConsStringIteratorOp op; | 95 return StringToDouble( |
| 99 StringCharacterStream stream(str, &op); | 96 unicode_cache, flat.ToUC16Vector(), flags, empty_string_val); |
| 100 return InternalStringToDouble(unicode_cache, | |
| 101 StringCharacterStreamIterator(&stream), | |
| 102 StringCharacterStreamIterator::EndMarker(), | |
| 103 flags, | |
| 104 empty_string_val); | |
| 105 } | 97 } |
| 106 } | 98 } |
| 107 | 99 |
| 108 | |
| 109 double StringToInt(UnicodeCache* unicode_cache, | |
| 110 String* str, | |
| 111 int radix) { | |
| 112 StringShape shape(str); | |
| 113 // TODO(dcarney): Use a Visitor here. | |
| 114 if (shape.IsSequentialAscii()) { | |
| 115 const uint8_t* begin = SeqOneByteString::cast(str)->GetChars(); | |
| 116 const uint8_t* end = begin + str->length(); | |
| 117 return InternalStringToInt(unicode_cache, begin, end, radix); | |
| 118 } else if (shape.IsSequentialTwoByte()) { | |
| 119 const uc16* begin = SeqTwoByteString::cast(str)->GetChars(); | |
| 120 const uc16* end = begin + str->length(); | |
| 121 return InternalStringToInt(unicode_cache, begin, end, radix); | |
| 122 } else { | |
| 123 ConsStringIteratorOp op; | |
| 124 StringCharacterStream stream(str, &op); | |
| 125 return InternalStringToInt(unicode_cache, | |
| 126 StringCharacterStreamIterator(&stream), | |
| 127 StringCharacterStreamIterator::EndMarker(), | |
| 128 radix); | |
| 129 } | |
| 130 } | |
| 131 | |
| 132 } } // namespace v8::internal | 100 } } // namespace v8::internal |
| OLD | NEW |