Editorial: Update to the latest ECMA-402 GetOption and move it into ECMA-262

Author: gibson042

spec/abstractops.html

@@ -45,25 +45,25 @@ <h1>GetOptionsObject ( _options_ )</h1>
     </emu-alg>
   </emu-clause>
 
-  <emu-clause id="sec-getoption" aoid="GetOption">
-    <h1>GetOption ( _options_, _property_, _type_, _values_, _fallback_ )</h1>
-
-    <emu-note type="editor">
-      <p>
-        This operation extends ECMA-402 <a href="https://tc39.es/ecma402/#sec-getoption">GetOption</a> to support a *"number"* type.
-        Once it is added to ECMA-262, the ECMA-402 version can be removed.
-      </p>
-    </emu-note>
-
-    <p>
-      The abstract operation GetOption extracts the value of the property named _property_ from the provided _options_ object, converts it to the required _type_, checks whether it is one of a List of allowed _values_, and fills in a _fallback_ value if necessary. If _values_ is *undefined*, there is no fixed set of values and any is permitted.
-    </p>
-
+  <emu-clause id="sec-getoption" type="abstract operation">
+    <h1>
+      GetOption (
+        _options_: an Object,
+        _property_: a property key,
+        _type_: *"boolean"*, *"number"*, or *"string"*,
+        _values_: *undefined* or a List of ECMAScript language values,
+        _default_: ~required~ or an ECMAScript language value,
+      )
+    </h1>
+    <dl class="header">
+      <dt>description</dt>
+      <dd>It extracts the value of the specified property of _options_, converts it to the required _type_, checks whether it is allowed by _values_ if _values_ is not *undefined*, and substitutes _default_ if the value is *undefined*.</dd>
+    </dl>
     <emu-alg>
-      1. Assert: Type(_options_) is Object.
       1. Let _value_ be ? Get(_options_, _property_).
-      1. If _value_ is *undefined*, return _fallback_.
-      1. Assert: _type_ is *"boolean"* or *"string"* or *"number"*.
+      1. If _value_ is *undefined*, then
+        1. If _default_ is ~required~, throw a *RangeError* exception.
+        1. Return _default_.
       1. If _type_ is *"boolean"*, then
         1. Set _value_ to ToBoolean(_value_).
       1. Else if _type_ is *"number"*, then

spec/intl.html

@@ -136,6 +136,43 @@ <h1><a href="https://tc39.es/ecma402/#sec-getoptionsobject">GetOptionsObject</a>
         </emu-alg>
       </emu-clause>
     </del>
+
+    <del class="block">
+      <!-- https://tc39.es/ecma402/#sec-getoption -->
+      <emu-clause id="sec-getoption-deleted" type="abstract operation">
+        <h1>
+          GetOption (
+            _options_: an Object,
+            _property_: a property key,
+            _type_: *"boolean"*, *"number"*, or *"string"*,
+            _values_: *undefined* or a List of ECMAScript language values,
+            _default_: ~required~ or an ECMAScript language value,
+          )
+        </h1>
+        <dl class="header">
+          <dt>description</dt>
+          <dd>It extracts the value of the specified property of _options_, converts it to the required _type_, checks whether it is allowed by _values_ if _values_ is not *undefined*, and substitutes _default_ if the value is *undefined*.</dd>
+          <dt>redefinition</dt>
+          <dd>true</dd>
+        </dl>
+        <emu-alg>
+          1. Let _value_ be ? Get(_options_, _property_).
+          1. If _value_ is *undefined*, then
+            1. If _default_ is ~required~, throw a *RangeError* exception.
+            1. Return _default_.
+          1. If _type_ is *"boolean"*, then
+            1. Set _value_ to ToBoolean(_value_).
+          1. Else if _type_ is *"number"*, then
+            1. Set _value_ to ? ToNumber(_value_).
+            1. If _value_ is *NaN*, throw a *RangeError* exception.
+          1. Else,
+            1. Assert: _type_ is *"string"*.
+            1. Set _value_ to ? ToString(_value_).
+          1. If _values_ is not *undefined* and _values_ does not contain an element equal to _value_, throw a *RangeError* exception.
+          1. Return _value_.
+        </emu-alg>
+      </emu-clause>
+    </del>
   </emu-clause>
 
   <emu-clause id="sec-datetimeformat-abstracts">