Skip to content

Commit ad3b9f9

Browse files
Rename 'array key' to 'composite key'. For #360
1 parent 1b311f3 commit ad3b9f9

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

index.bs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -594,14 +594,14 @@ A [=/key=] has an associated <dfn>type</dfn> which is one of:
594594
*string*,
595595
*binary*,
596596
or
597-
*array*.
597+
*composite*.
598598

599599
A [=/key=] also has an associated <dfn>value</dfn>, which will
600600
be either:
601601
an {{unrestricted double}} if type is *number* or *date*,
602602
a {{DOMString}} if type is *string*,
603603
a [=byte sequence=] if type is *binary*,
604-
or a [=/list=] of other [=/keys=] if type is *array*.
604+
or a [=/list=] of other [=/keys=] if type is *composite*.
605605

606606
</div>
607607

@@ -627,9 +627,9 @@ following the steps to [=convert a value to a key=].
627627
will fail.
628628
</div>
629629

630-
An <dfn>array key</dfn> is a [=/key=] with [=key/type=] *array*.
631-
The <dfn>subkeys</dfn> of an [=array key=] are the [=list/items=] of the
632-
[=array key=]'s [=key/value=].
630+
An <dfn>composite key</dfn> is a [=/key=] with [=key/type=] *composite*.
631+
The <dfn>subkeys</dfn> of an [=composite key=] are the [=list/items=] of the
632+
[=composite key=]'s [=key/value=].
633633

634634
<div algorithm>
635635

@@ -641,8 +641,8 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
641641

642642
1. If |ta| does not equal |tb|, then run these steps:
643643

644-
1. If |ta| is *array*, then return 1.
645-
1. If |tb| is *array*, then return -1.
644+
1. If |ta| is *composite*, then return 1.
645+
1. If |tb| is *composite*, then return -1.
646646
1. If |ta| is *binary*, then return 1.
647647
1. If |tb| is *binary*, then return -1.
648648
1. If |ta| is *string*, then return 1.
@@ -677,7 +677,7 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
677677
1. If |vb| is [=byte less than=] |va|, then return 1.
678678
1. Return 0.
679679

680-
: *array*
680+
: *composite*
681681
::
682682
1. Let |length| be the lesser of |va|'s [=list/size=] and |vb|'s [=list/size=].
683683
1. Let |i| be 0.
@@ -712,9 +712,9 @@ NOTE:
712712
*Number* keys are less than *date* keys.
713713
*Date* keys are less than *string* keys.
714714
*String* keys are less than *binary* keys.
715-
*Binary* keys are less than *array* keys.
715+
*Binary* keys are less than *composite* keys.
716716
There is no highest possible [=/key=] value.
717-
This is because an array of any candidate highest [=/key=]
717+
This is because a *composite* key of any candidate highest [=/key=]
718718
followed by another [=/key=] is even higher.
719719

720720
NOTE:
@@ -834,8 +834,8 @@ object store fails.
834834

835835
An [=/index=] has a <dfn>multiEntry flag</dfn>. This flag affects how
836836
the index behaves when the result of evaluating the index's
837-
[=index/key path=] yields an [=array key=]. If its [=index/multiEntry flag=]
838-
is false, then a single [=object-store/record=] whose [=/key=] is an [=array key=]
837+
[=index/key path=] yields an [=composite key=]. If its [=index/multiEntry flag=]
838+
is false, then a single [=object-store/record=] whose [=/key=] is an [=composite key=]
839839
is added to the index. If its [=index/multiEntry flag=] is true, then
840840
one [=object-store/record=] is added to the index for each of the [=subkeys=].
841841

@@ -1582,7 +1582,7 @@ be updated.
15821582

15831583
Only specified keys of [=key/type=] *number* can affect the
15841584
[=key generator/current number=] of the key generator. Keys of [=key/type=]
1585-
*date*, *array* (regardless of the other keys they
1585+
*date*, *composite* (regardless of the other keys they
15861586
contain), *binary*, or *string* (regardless of whether
15871587
they could be parsed as numbers) have no effect on the [=key generator/current
15881588
number=] of the key generator. Keys of [=key/type=]
@@ -5583,29 +5583,29 @@ To <dfn>store a record into an object store</dfn> with
55835583
An exception thrown in this step is not rethrown.
55845584

55855585
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5586-
is not an [=array key=], and if |index| already contains a
5586+
is not an [=composite key=], and if |index| already contains a
55875587
[=object-store/record=] with [=/key=] [=equal to=] |index
55885588
key|, and |index|'s [=index/unique flag=] is true, then this
55895589
operation failed with a "{{ConstraintError}}" {{DOMException}}. Abort this
55905590
algorithm without taking any further steps.
55915591

55925592
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5593-
an [=array key=], and if |index| already contains a
5593+
an [=composite key=], and if |index| already contains a
55945594
[=object-store/record=] with [=/key=] [=equal to=] any of the
55955595
[=subkeys=] of |index key|, and |index|'s [=index/unique
55965596
flag=] is true, then this operation failed with a
55975597
"{{ConstraintError}}" {{DOMException}}. Abort this algorithm without taking any
55985598
further steps.
55995599

56005600
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5601-
is not an [=array key=] then store a record in |index|
5601+
is not an [=composite key=] then store a record in |index|
56025602
containing |index key| as its key and |key| as its value. The
56035603
record is stored in |index|'s [=index/list of records=]
56045604
such that the list is sorted primarily on the records keys,
56055605
and secondarily on the records values, in [=ascending=] order.
56065606

56075607
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5608-
an [=array key=], then for each |subkey| of the
5608+
an [=composite key=], then for each |subkey| of the
56095609
[=subkeys=] of |index key| store a record in |index|
56105610
containing |subkey| as its key and |key| as its value. The
56115611
records are stored in |index|'s [=index/list of
@@ -5618,10 +5618,10 @@ To <dfn>store a record into an object store</dfn> with
56185618
no records are added to the index.
56195619

56205620
NOTE:
5621-
Even if any member of [=subkeys=] is itself an [=array key=],
5621+
Even if any member of [=subkeys=] is itself an [=composite key=],
56225622
the member is used directly as the key for the index record.
5623-
Nested [=array keys=] are not flattened or "unpacked" to
5624-
produce multiple rows; only the outer-most [=array key=] is.
5623+
Nested [=composite keys=] are not flattened or "unpacked" to
5624+
produce multiple rows; only the outer-most [=composite key=] is.
56255625

56265626
1. Return |key|.
56275627

@@ -6290,7 +6290,7 @@ The steps return an ECMAScript value.
62906290
in |value|.
62916291
1. Return |buffer|.
62926292

6293-
: *array*
6293+
: *composite*
62946294
::
62956295
1. Let |array| be the result of executing the ECMAScript Array
62966296
constructor with no arguments.
@@ -6370,7 +6370,7 @@ steps may throw an exception.
63706370
1. Return a new [=/key=] with [=key/type=]
63716371
*binary* and [=key/value=] |bytes|.
63726372

6373-
<!-- Array -->
6373+
<!-- Composite (Array) -->
63746374
: If |input| is an [=ECMAScript/Array exotic object=]
63756375
::
63766376
1. Let |len| be [=ECMAScript/?=] [$ToLength$]( [=ECMAScript/?=] [$Get$](|input|,
@@ -6399,7 +6399,7 @@ steps may throw an exception.
63996399

64006400
1. Increase |index| by 1.
64016401

6402-
1. Return a new [=array key=] with [=key/value=]
6402+
1. Return a new [=composite key=] with [=key/value=]
64036403
|keys|.
64046404

64056405

@@ -6443,7 +6443,7 @@ steps may throw an exception.
64436443

64446444
1. Increase |index| by 1.
64456445

6446-
1. Return a new [=array key=] with [=key/value=] set to |keys|.
6446+
1. Return a new [=composite key=] with [=key/value=] set to |keys|.
64476447

64486448
1. Otherwise, return the result of [=/converting a
64496449
value to a key=] with argument |input|.
@@ -6457,7 +6457,7 @@ NOTE:
64576457
not be converted to keys are ignored, and duplicates are removed.
64586458

64596459
For example, the value `[10, 20, null, 30, 20]` is
6460-
converted to an [=array key=] with [=subkeys=] 10, 20, 30.
6460+
converted to an [=composite key=] with [=subkeys=] 10, 20, 30.
64616461

64626462

64636463
<!-- ============================================================ -->

0 commit comments

Comments
 (0)