Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Side by Side Diff: runtime/lib/growable_array.cc

Issue 1318943005: Update range errors to agree on the numbers. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: More tests Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "platform/assert.h" 5 #include "platform/assert.h"
6 6
7 #include "vm/assembler.h" 7 #include "vm/assembler.h"
8 #include "vm/bootstrap_natives.h" 8 #include "vm/bootstrap_natives.h"
9 #include "vm/exceptions.h" 9 #include "vm/exceptions.h"
10 #include "vm/native_entry.h" 10 #include "vm/native_entry.h"
11 #include "vm/object.h" 11 #include "vm/object.h"
12 12
13 namespace dart { 13 namespace dart {
14 14
15 DEFINE_NATIVE_ENTRY(GrowableList_allocate, 2) { 15 DEFINE_NATIVE_ENTRY(GrowableList_allocate, 2) {
16 const TypeArguments& type_arguments = 16 const TypeArguments& type_arguments =
17 TypeArguments::CheckedHandle(arguments->NativeArgAt(0)); 17 TypeArguments::CheckedHandle(arguments->NativeArgAt(0));
18 GET_NON_NULL_NATIVE_ARGUMENT(Array, data, arguments->NativeArgAt(1)); 18 GET_NON_NULL_NATIVE_ARGUMENT(Array, data, arguments->NativeArgAt(1));
19 if (data.Length() <= 0) { 19 if (data.Length() <= 0) {
20 Exceptions::ThrowRangeError( 20 Exceptions::ThrowRangeError(
21 "length", 21 "length",
22 Integer::Handle(Integer::New(data.Length())), 22 Integer::Handle(Integer::New(data.Length())),
23 1, 23 0, // This is the limit the user sees.
24 Array::kMaxElements); 24 Array::kMaxElements);
25 } 25 }
26 const GrowableObjectArray& new_array = 26 const GrowableObjectArray& new_array =
27 GrowableObjectArray::Handle(GrowableObjectArray::New(data)); 27 GrowableObjectArray::Handle(GrowableObjectArray::New(data));
28 new_array.SetTypeArguments(type_arguments); 28 new_array.SetTypeArguments(type_arguments);
29 return new_array.raw(); 29 return new_array.raw();
30 } 30 }
31 31
32 32
33 DEFINE_NATIVE_ENTRY(GrowableList_getIndexed, 2) { 33 DEFINE_NATIVE_ENTRY(GrowableList_getIndexed, 2) {
34 const GrowableObjectArray& array = 34 const GrowableObjectArray& array =
35 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0)); 35 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0));
36 GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1)); 36 GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1));
37 if ((index.Value() < 0) || (index.Value() >= array.Length())) { 37 if ((index.Value() < 0) || (index.Value() >= array.Length())) {
38 Exceptions::ThrowRangeError("index", index, 0, array.Length()); 38 Exceptions::ThrowRangeError("index", index, 0, array.Length() - 1);
39 } 39 }
40 const Instance& obj = Instance::CheckedHandle(array.At(index.Value())); 40 const Instance& obj = Instance::CheckedHandle(array.At(index.Value()));
41 return obj.raw(); 41 return obj.raw();
42 } 42 }
43 43
44 44
45 DEFINE_NATIVE_ENTRY(GrowableList_setIndexed, 3) { 45 DEFINE_NATIVE_ENTRY(GrowableList_setIndexed, 3) {
46 const GrowableObjectArray& array = 46 const GrowableObjectArray& array =
47 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0)); 47 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0));
48 GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1)); 48 GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1));
49 if ((index.Value() < 0) || (index.Value() >= array.Length())) { 49 if ((index.Value() < 0) || (index.Value() >= array.Length())) {
50 Exceptions::ThrowRangeError("index", index, 0, array.Length()); 50 Exceptions::ThrowRangeError("index", index, 0, array.Length() - 1);
51 } 51 }
52 GET_NON_NULL_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(2)); 52 GET_NON_NULL_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(2));
53 array.SetAt(index.Value(), value); 53 array.SetAt(index.Value(), value);
54 return Object::null(); 54 return Object::null();
55 } 55 }
56 56
57 57
58 DEFINE_NATIVE_ENTRY(GrowableList_getLength, 1) { 58 DEFINE_NATIVE_ENTRY(GrowableList_getLength, 1) {
59 const GrowableObjectArray& array = 59 const GrowableObjectArray& array =
60 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0)); 60 GrowableObjectArray::CheckedHandle(arguments->NativeArgAt(0));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 97
98 98
99 DEFINE_NATIVE_ENTRY(Internal_makeFixedListUnmodifiable, 1) { 99 DEFINE_NATIVE_ENTRY(Internal_makeFixedListUnmodifiable, 1) {
100 GET_NON_NULL_NATIVE_ARGUMENT(Array, array, arguments->NativeArgAt(0)); 100 GET_NON_NULL_NATIVE_ARGUMENT(Array, array, arguments->NativeArgAt(0));
101 array.MakeImmutable(); 101 array.MakeImmutable();
102 return array.raw(); 102 return array.raw();
103 } 103 }
104 104
105 } // namespace dart 105 } // namespace dart
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698