Skip to content

Editorial: tweak PropertyDefinitionEvaluation and ClassElementEvaluation #2470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ljharb merged 2 commits into from
Jul 28, 2021
Merged

Editorial: tweak PropertyDefinitionEvaluation and ClassElementEvaluation #2470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e5af6
Editorial: drop constant arguments for PropertyDefinitionEvaluation a…
bakkot Jul 28, 2021
99b36f0
Editorial: consolidate method cases of PropertyDefinitionEvaluation (…
bakkot Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions spec.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17845,7 +17845,7 @@ <h1>Runtime Semantics: Evaluation</h1>
</emu-grammar>
<emu-alg>
1. Let _obj_ be ! OrdinaryObjectCreate(%Object.prototype%).
1. Perform ? PropertyDefinitionEvaluation of |PropertyDefinitionList| with arguments _obj_ and *true*.
1. Perform ? PropertyDefinitionEvaluation of |PropertyDefinitionList| with argument _obj_.
1. Return _obj_.
</emu-alg>
<emu-grammar>LiteralPropertyName : IdentifierName</emu-grammar>
Expand All @@ -17870,11 +17870,11 @@ <h1>Runtime Semantics: Evaluation</h1>
</emu-clause>
<emu-clause id="sec-runtime-semantics-propertydefinitionevaluation" oldids="sec-object-initializer-runtime-semantics-propertydefinitionevaluation" type="sdo" aoid="PropertyDefinitionEvaluation">
<h1>Runtime Semantics: PropertyDefinitionEvaluation</h1>
<p>With parameters _object_ and _enumerable_.</p>
<p>With parameter _object_.</p>
<emu-grammar>PropertyDefinitionList : PropertyDefinitionList `,` PropertyDefinition</emu-grammar>
<emu-alg>
1. Perform ? PropertyDefinitionEvaluation of |PropertyDefinitionList| with arguments _object_ and _enumerable_.
1. Return the result of performing PropertyDefinitionEvaluation of |PropertyDefinition| with arguments _object_ and _enumerable_.
1. Perform ? PropertyDefinitionEvaluation of |PropertyDefinitionList| with argument _object_.
1. Return the result of performing PropertyDefinitionEvaluation of |PropertyDefinition| with argument _object_.
</emu-alg>
<emu-grammar>PropertyDefinition : `...` AssignmentExpression</emu-grammar>
<emu-alg>
Expand All @@ -17888,7 +17888,6 @@ <h1>Runtime Semantics: PropertyDefinitionEvaluation</h1>
1. Let _propName_ be StringValue of |IdentifierReference|.
1. Let _exprValue_ be the result of evaluating |IdentifierReference|.
1. Let _propValue_ be ? GetValue(_exprValue_).
1. Assert: _enumerable_ is *true*.
1. Assert: _object_ is an ordinary, extensible object with no non-configurable properties.
1. Return ! CreateDataPropertyOrThrow(_object_, _propName_, _propValue_).
</emu-alg>
Expand All @@ -17911,34 +17910,12 @@ <h1>Runtime Semantics: PropertyDefinitionEvaluation</h1>
1. If Type(_propValue_) is either Object or Null, then
1. Return ! _object_.[[SetPrototypeOf]](_propValue_).
1. Return NormalCompletion(~empty~).
1. Assert: _enumerable_ is *true*.
1. Assert: _object_ is an ordinary, extensible object with no non-configurable properties.
1. Return ! CreateDataPropertyOrThrow(_object_, _propKey_, _propValue_).
</emu-alg>
<emu-grammar>
MethodDefinition :
ClassElementName `(` UniqueFormalParameters `)` `{` FunctionBody `}`
`get` ClassElementName `(` `)` `{` FunctionBody `}`
`set` ClassElementName `(` PropertySetParameterList `)` `{` FunctionBody `}`
</emu-grammar>
<emu-alg>
1. Return ? MethodDefinitionEvaluation of |MethodDefinition| with arguments _object_ and _enumerable_.
</emu-alg>
<emu-grammar>GeneratorMethod : `*` ClassElementName `(` UniqueFormalParameters `)` `{` GeneratorBody `}`</emu-grammar>
<emu-alg>
1. Return ? MethodDefinitionEvaluation of |GeneratorMethod| with arguments _object_ and _enumerable_.
</emu-alg>
<emu-grammar>
AsyncGeneratorMethod : `async` `*` ClassElementName `(` UniqueFormalParameters `)` `{` AsyncGeneratorBody `}`
</emu-grammar>
<emu-alg>
1. Return ? MethodDefinitionEvaluation of |AsyncGeneratorMethod| with arguments _object_ and _enumerable_.
</emu-alg>
<emu-grammar>
AsyncMethod : `async` ClassElementName `(` UniqueFormalParameters `)` `{` AsyncFunctionBody `}`
</emu-grammar>
<emu-grammar>PropertyDefinition : MethodDefinition</emu-grammar>
<emu-alg>
1. Return ? MethodDefinitionEvaluation of |AsyncMethod| with arguments _object_ and _enumerable_.
1. Return ? MethodDefinitionEvaluation of |MethodDefinition| with arguments _object_ and *true*.
</emu-alg>
</emu-clause>
</emu-clause>
Expand Down Expand Up @@ -23916,7 +23893,7 @@ <h1>Runtime Semantics: ClassFieldDefinitionEvaluation</h1>

<emu-clause id="sec-static-semantics-classelementevaluation" type="sdo" aoid="ClassElementEvaluation">
<h1>Runtime Semantics: ClassElementEvaluation</h1>
<p>With parameters _object_ and _enumerable_.</p>
<p>With parameter _object_.</p>

<emu-grammar>
ClassElement : FieldDefinition `;`
Expand All @@ -23933,7 +23910,7 @@ <h1>Runtime Semantics: ClassElementEvaluation</h1>
ClassElement : `static` MethodDefinition
</emu-grammar>
<emu-alg>
1. Return MethodDefinitionEvaluation of |MethodDefinition| with arguments _object_ and _enumerable_.
1. Return MethodDefinitionEvaluation of |MethodDefinition| with arguments _object_ and *false*.
</emu-alg>

<emu-grammar>
Expand Down Expand Up @@ -24019,9 +23996,9 @@ <h1>Runtime Semantics: ClassDefinitionEvaluation</h1>
1. Let _staticFields_ be a new empty List.
1. For each |ClassElement| _e_ of _elements_, do
1. If IsStatic of _e_ is *false*, then
1. Let _field_ be ClassElementEvaluation of _e_ with arguments _proto_ and *false*.
1. Let _field_ be ClassElementEvaluation of _e_ with argument _proto_.
1. Else,
1. Let _field_ be ClassElementEvaluation of _e_ with arguments _F_ and *false*.
1. Let _field_ be ClassElementEvaluation of _e_ with argument _F_.
1. If _field_ is an abrupt completion, then
1. Set the running execution context's LexicalEnvironment to _env_.
1. Set the running execution context's PrivateEnvironment to _outerPrivateEnvironment_.
Expand Down