PR #3459 has been merged

Author: jmdyck

Pseudocode.py

@@ -1096,7 +1096,7 @@ def looks_runtimey(anode):
                     'a newly created object',
                     'a new built-in function object',
                     'an ECMAScript function object',
-                    'an Iterator object',
+                    'an iterator object',
                     'internal slot',
                     'own property',
                     'the property named',

Section.py

@@ -1144,7 +1144,7 @@ def is_a_sub_of(subnature, vd):
             if mo:
                 (pre, verb, post) = mo.groups()
                 if (
-                    pre.endswith('whose `next` method')
+                    pre.endswith('whose [[NextMethod]]')
                     # CreateListIteratorRecord
                     or
                     pre == 'It does not enforce that the constructor function'
@@ -2910,9 +2910,9 @@ def extract_intrinsic_info_from_p_ul_section(section):
 
         elif mo := re.fullmatch(r'has properties that are indirectly inherited by all \w+ instances\.', li_ist):
             pass
-        elif mo := re.fullmatch(r'has properties that are inherited by all (.+) Iterator Objects\.', li_ist):
+        elif mo := re.fullmatch(r'has properties that are inherited by all (.+) Iterator objects\.', li_ist):
             pass
-        elif li_ist == 'has properties that are inherited by all Iterator Helper Objects.':
+        elif li_ist == 'has properties that are inherited by all Iterator Helper objects.':
             pass
         elif li_ist == 'along with its corresponding prototype object, provides common properties that are inherited by all _TypedArray_ constructors and their instances.':
             pass

analyze_spec.py

@@ -605,7 +605,7 @@ def check_value_descriptions_in_column(col_index):
                 assert 0
 
         elif 'Properties' in caption:
-            assert re.fullmatch(r'<i>\w+</i> Interface( (Required|Optional))? Properties', caption)
+            assert re.fullmatch(r'[\w ]+ Interface( (Required|Optional))? Properties', caption)
             assert header_line == 'Property; Value; Requirements'
             check_value_descriptions_in_column(1)
 

function_preambles.py

@@ -158,13 +158,10 @@ def check_header_against_prose(alg_header, preamble_nodes):
         retn=\2 \3
         v=\1
 
-        (.+ returns (?P<retn>an Iterator object) .+)
-        v=\1
-
         (.+ returns (?P<retn>an array) .+)
         v=\1
 
-        (.+ returns (?P<retn>an Iterator object) .+)
+        (.+ returns (?P<retn>an iterator object) .+)
         v=\1
 
         (.+ returns either a new promise .+ or the argument itself if the argument is a promise .+)

intrinsics.py

@@ -49,8 +49,8 @@ def pc(s): return f"%{s}%"
         'the constructor of async generator function objects': '%AsyncGeneratorFunction%',
         'the constructor of generator function objects': '%GeneratorFunction%',
         'the super class of all typed Array constructors': '%TypedArray%',
-        'the prototype of Iterator Helper Objects': '%IteratorHelperPrototype%',
-        'the prototype of wrapped Iterator objects returned by Iterator.from': '%WrapForValidIteratorPrototype%',
+        'the prototype of Iterator Helper objects': '%IteratorHelperPrototype%',
+        'the prototype of wrapped iterator objects returned by Iterator.from': '%WrapForValidIteratorPrototype%',
     }.get(phrase)
     if result: return result
 

pseudocode.grammar

@@ -721,7 +721,6 @@
     a newly created Property Descriptor with no fields
     a newly created object with an internal slot for each name in {var}
     a one-element CharSet containing {EX}
-    an Iterator object ({h_emu_xref}) whose `next` method iterates over all the String-valued keys of enumerable properties of {var}. The iterator object is never directly accessible to ECMAScript code. The mechanics and order of enumerating the properties is not specified but must conform to the rules specified below
     an empty List of Matchers
     an empty Set
     an empty sequence of characters
@@ -732,6 +731,7 @@
     an implementation-defined non-negative mathematical value
     an implementation-defined string that is either {EX} or {EXPR}
     an instance of the production {h_emu_grammar}
+    an iterator object whose `next` method iterates over all the String-valued keys of enumerable properties of {var}. The iterator object is never directly accessible to ECMAScript code. The mechanics and order of enumerating the properties is not specified but must conform to the rules specified below
     reads-bytes-from({var}) in {var}
     such an object created in a host-defined manner
     that Record
@@ -1353,10 +1353,10 @@
     a finite time value
     a fully populated Property Descriptor
     a function object
-    a function that returns a promise for an <i>IteratorResult</i> object
-    a function that returns an <i>AsyncIterator</i> object
-    a function that returns an <i>Iterator</i> object
-    a function that returns an <i>IteratorResult</i> object
+    a function that returns a promise for an IteratorResult object
+    a function that returns an IteratorResult object
+    a function that returns an async iterator object
+    a function that returns an iterator object
     a grammar symbol
     a leading surrogate
     a mathematical value
@@ -1401,10 +1401,9 @@
     an Environment Record
     an IEEE 754-2019 binary32 NaN value
     an IEEE 754-2019 binary64 NaN value
-    an Iterator
     an Iterator Record
     an Object
-    an Object that conforms to the <i>IteratorResult</i> interface
+    an Object that conforms to the IteratorResult interface
     an Object that has a {dsb_word} internal slot
     an Object that is defined by either an {nonterminal} or an {nonterminal}
     an abrupt completion
@@ -1428,6 +1427,7 @@
     an integral Number
     an integral Number in {INTERVAL}
     an internal slot name
+    an iterator object
     an odd integral Number
     an ordinary object
     an ordinary, extensible object

pseudocode_semantics.py

@@ -9541,10 +9541,10 @@ def s_expr(expr, env0, _):
             assert 0
         return (result_type, env0)
 
-@P("{EXPR} : an Iterator object ({h_emu_xref}) whose `next` method iterates over all the String-valued keys of enumerable properties of {var}. The iterator object is never directly accessible to ECMAScript code. The mechanics and order of enumerating the properties is not specified but must conform to the rules specified below")
+@P("{EXPR} : an iterator object whose `next` method iterates over all the String-valued keys of enumerable properties of {var}. The iterator object is never directly accessible to ECMAScript code. The mechanics and order of enumerating the properties is not specified but must conform to the rules specified below")
 class _:
     def s_expr(expr, env0, _):
-        [emu_xref, var] = expr.children
+        [var] = expr.children
         env1 = env0.ensure_expr_is_of_type(var, T_Object)
         return (T_Iterator_object_, env1)
 
@@ -14673,7 +14673,7 @@ class _:
 # ==============================================================================
 #@ 27.1 Iteration
 
-@P("{VAL_DESC} : an Iterator")
+@P("{VAL_DESC} : an iterator object")
 class _:
     s_tb = T_Iterator_object_
 
@@ -14695,9 +14695,9 @@ class _:
 declare_isom(T_Generator_object_, 'might have', 'slot', '[[UnderlyingIterator]]', T_Iterator_Record)
 
 # ==============================================================================
-#@ 27.1.1.5 The <i>IteratorResult</i> Interface
+#@ 27.1.1.5 The IteratorResult Interface
 
-@P("{VAL_DESC} : an Object that conforms to the <i>IteratorResult</i> interface")
+@P("{VAL_DESC} : an Object that conforms to the IteratorResult interface")
 class _:
     s_tb = a_subset_of(T_Object)