tweaks

lahma · lahma · commit 2a6cabb14de7 · 2021-10-31T13:25:40.000+02:00
diff --git a/Jint.Tests.Test262/BuiltIns/GeneratorTests.cs b/Jint.Tests.Test262/BuiltIns/GeneratorTests.cs
@@ -4,7 +4,7 @@ namespace Jint.Tests.Test262.BuiltIns
 {
     public class GeneratorTests : Test262Test
     {
-        [Theory(DisplayName = "built-ins\\GeneratorFunction", Skip = "TODO")]
+        [Theory(DisplayName = "built-ins\\GeneratorFunction")]
         [MemberData(nameof(SourceFiles), "built-ins\\GeneratorFunction", false)]
         [MemberData(nameof(SourceFiles), "built-ins\\GeneratorFunction", true, Skip = "Skipped")]
         protected void GeneratorFunction(SourceFile sourceFile)
diff --git a/Jint/Native/Function/FunctionConstructor.cs b/Jint/Native/Function/FunctionConstructor.cs
@@ -54,12 +54,12 @@ internal FunctionInstance CreateDynamicFunction(
             FunctionKind kind,
             JsValue[] args)
         {
-            /* TODO
-            var callerContext = _engine.GetExecutionContext(1);
+            // TODO var callerContext = _engine.GetExecutionContext(1);
+            var callerContext = _engine.ExecutionContext;
             var callerRealm = callerContext.Realm;
-            var calleeRealm = engine.ExecutionContext.Realm;
+            var calleeRealm = _engine.ExecutionContext.Realm;
+
             _engine._host.EnsureCanCompileStrings(callerRealm, calleeRealm);
-            */
 
             if (newTarget.IsUndefined())
             {
@@ -191,7 +191,7 @@ internal FunctionInstance CreateDynamicFunction(
 
             if (kind == FunctionKind.Generator)
             {
-                var prototype = OrdinaryObjectCreate(_realm.Intrinsics.GeneratorFunction.PrototypeObject.Prototype);
+                var prototype = OrdinaryObjectCreate(_realm.Intrinsics.GeneratorFunction.PrototypeObject.PrototypeObject);
                 F.DefinePropertyOrThrow(CommonProperties.Prototype, new PropertyDescriptor(prototype, PropertyFlag.Writable));
             }
             else if (kind == FunctionKind.AsyncGenerator)
diff --git a/Jint/Native/Function/ScriptFunctionInstance.cs b/Jint/Native/Function/ScriptFunctionInstance.cs
@@ -41,7 +41,10 @@ internal ScriptFunctionInstance(
             _prototype = proto ?? _engine.Realm.Intrinsics.Function.PrototypeObject;
             _length = new LazyPropertyDescriptor(null, _ => JsNumber.Create(function.Initialize(this).Length), PropertyFlag.Configurable);
 
-            if (!function.Strict && !engine._isStrict && function.Function is not ArrowFunctionExpression)
+            if (!function.Strict
+                && !engine._isStrict
+                && function.Function is not ArrowFunctionExpression
+                && !function.Function.Generator)
             {
                 DefineOwnProperty(CommonProperties.Arguments, engine._callerCalleeArgumentsThrowerConfigurable);
                 DefineOwnProperty(CommonProperties.Caller, new PropertyDescriptor(Undefined, PropertyFlag.Configurable));
@@ -103,7 +106,8 @@ public override JsValue Call(JsValue thisArgument, JsValue[] arguments)
 
         internal override bool IsConstructor =>
             (_homeObject.IsUndefined() || _isClassConstructor)
-            && _functionDefinition?.Function is not ArrowFunctionExpression;
+            && _functionDefinition?.Function is not ArrowFunctionExpression
+            && _functionDefinition?.Function.Generator != true;
 
         /// <summary>
         /// https://tc39.es/ecma262/#sec-ecmascript-function-objects-construct-argumentslist-newtarget
diff --git a/Jint/Native/Generator/GeneratorFunctionPrototype.cs b/Jint/Native/Generator/GeneratorFunctionPrototype.cs
@@ -14,7 +14,8 @@ public sealed class GeneratorFunctionPrototype : ObjectInstance
     {
         private readonly GeneratorFunctionConstructor _constructor;
 
-        internal GeneratorFunctionPrototype(Engine engine,
+        internal GeneratorFunctionPrototype(
+            Engine engine,
             GeneratorFunctionConstructor constructor,
             FunctionPrototype prototype,
             IteratorPrototype iteratorPrototype) : base(engine)
@@ -30,7 +31,7 @@ protected override void Initialize()
         {
             var properties = new PropertyDictionary(2, checkExistingKeys: false)
             {
-                ["constructor"] = new PropertyDescriptor(_constructor, PropertyFlag.NonEnumerable),
+                ["constructor"] = new PropertyDescriptor(_constructor, PropertyFlag.Configurable),
                 ["prototype"] = new PropertyDescriptor(PrototypeObject, PropertyFlag.Configurable)
             };
             SetProperties(properties);
diff --git a/Jint/Native/Generator/GeneratorInstance.cs b/Jint/Native/Generator/GeneratorInstance.cs
@@ -100,11 +100,10 @@ private JsValue ResumeExecution(ExecutionContext genContext, EvaluationContext c
             }
             else if (result.Type == CompletionType.Return)
             {
-                resultValue = new IteratorInstance.ValueIteratorPosition(_engine, result.Value, _generatorBody.Completed);
+                resultValue = new IteratorInstance.ValueIteratorPosition(_engine, result.Value, false);
                 if (_generatorBody.Completed)
                 {
                     _generatorState = GeneratorState.Completed;
-                    resultValue.Set(CommonProperties.Done, JsBoolean.True);
                 }
             }
 
diff --git a/Jint/Native/Global/GlobalObject.cs b/Jint/Native/Global/GlobalObject.cs
@@ -33,7 +33,7 @@ protected override void Initialize()
             const PropertyFlag lengthFlags = PropertyFlag.Configurable;
             const PropertyFlag propertyFlags = PropertyFlag.Configurable | PropertyFlag.Writable;
 
-            var properties = new PropertyDictionary(54, checkExistingKeys: false)
+            var properties = new PropertyDictionary(55, checkExistingKeys: false)
             {
                 ["Object"] = new PropertyDescriptor(_realm.Intrinsics.Object, propertyFlags),
                 ["Function"] = new PropertyDescriptor(_realm.Intrinsics.Function, propertyFlags),
@@ -53,6 +53,7 @@ protected override void Initialize()
                 ["BigUint64Array"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.BigUint64Array, propertyFlags),
                 ["Float32Array"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.Float32Array, propertyFlags),
                 ["Float64Array"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.Float64Array, propertyFlags),
+                ["GeneratorFunction"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.GeneratorFunction, propertyFlags),
                 ["Map"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.Map, propertyFlags),
                 ["Set"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.Set, propertyFlags),
                 ["WeakMap"] = new LazyPropertyDescriptor(this, static state => ((GlobalObject) state)._realm.Intrinsics.WeakMap, propertyFlags),
diff --git a/Jint/Runtime/Interpreter/Expressions/JintAssignmentExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintAssignmentExpression.cs
@@ -28,11 +28,6 @@ internal static JintExpression Build(Engine engine, AssignmentExpression express
                     return new BindingPatternAssignmentExpression(expression);
                 }
 
-                if (expression.Right is YieldExpression)
-                {
-                    return new YieldAssignmentExpression(expression);
-                }
-
                 return new SimpleAssignmentExpression(expression);
             }
 
@@ -385,19 +380,5 @@ private ExpressionResult SetValue(EvaluationContext context)
                 return null;
             }
         }
-
-        private sealed class YieldAssignmentExpression : JintExpression
-        {
-            public YieldAssignmentExpression(AssignmentExpression expression) : base(expression)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            protected override ExpressionResult EvaluateInternal(EvaluationContext context)
-            {
-                ExceptionHelper.ThrowNotImplementedException();
-                return default;
-            }
-        }
     }
 }
diff --git a/Jint/Runtime/Interpreter/Expressions/JintYieldExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintYieldExpression.cs
@@ -1,7 +1,6 @@
 using Esprima.Ast;
 using Jint.Native;
 using Jint.Native.Generator;
-using Jint.Native.Iterator;
 using Jint.Native.Object;
 
 namespace Jint.Runtime.Interpreter.Expressions
@@ -38,7 +37,7 @@ protected override ExpressionResult EvaluateInternal(EvaluationContext context)
                 // TODO return YieldDelegate(value);
             }
 
-            return new Completion(CompletionType.Return, Yield(new IteratorResult(engine, value, JsBoolean.False)), _expression.Location);
+            return new ExpressionResult(ExpressionCompletionType.Return, Yield(value), _expression.Location);
         }
 
         /*

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace Jint.Tests.Test262.BuiltIns`
`4`	`4`	`{`
`5`	`5`	`public class GeneratorTests : Test262Test`
`6`	`6`	`{`
`7`		`- [Theory(DisplayName = "built-ins\\GeneratorFunction", Skip = "TODO")]`
	`7`	`+ [Theory(DisplayName = "built-ins\\GeneratorFunction")]`
`8`	`8`	`[MemberData(nameof(SourceFiles), "built-ins\\GeneratorFunction", false)]`
`9`	`9`	`[MemberData(nameof(SourceFiles), "built-ins\\GeneratorFunction", true, Skip = "Skipped")]`
`10`	`10`	`protected void GeneratorFunction(SourceFile sourceFile)`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ internal FunctionInstance CreateDynamicFunction(`
`54`	`54`	`FunctionKind kind,`
`55`	`55`	`JsValue[] args)`
`56`	`56`	`{`
`57`		`- /* TODO`
`58`		`- var callerContext = _engine.GetExecutionContext(1);`
	`57`	`+ // TODO var callerContext = _engine.GetExecutionContext(1);`
	`58`	`+ var callerContext = _engine.ExecutionContext;`
`59`	`59`	`var callerRealm = callerContext.Realm;`
`60`		`- var calleeRealm = engine.ExecutionContext.Realm;`
	`60`	`+ var calleeRealm = _engine.ExecutionContext.Realm;`
	`61`	`+`
`61`	`62`	`_engine._host.EnsureCanCompileStrings(callerRealm, calleeRealm);`
`62`		`- */`
`63`	`63`
`64`	`64`	`if (newTarget.IsUndefined())`
`65`	`65`	`{`
`@@ -191,7 +191,7 @@ internal FunctionInstance CreateDynamicFunction(`
`191`	`191`
`192`	`192`	`if (kind == FunctionKind.Generator)`
`193`	`193`	`{`
`194`		`- var prototype = OrdinaryObjectCreate(_realm.Intrinsics.GeneratorFunction.PrototypeObject.Prototype);`
	`194`	`+ var prototype = OrdinaryObjectCreate(_realm.Intrinsics.GeneratorFunction.PrototypeObject.PrototypeObject);`
`195`	`195`	`F.DefinePropertyOrThrow(CommonProperties.Prototype, new PropertyDescriptor(prototype, PropertyFlag.Writable));`
`196`	`196`	`}`
`197`	`197`	`else if (kind == FunctionKind.AsyncGenerator)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ public sealed class GeneratorFunctionPrototype : ObjectInstance`
`14`	`14`	`{`
`15`	`15`	`private readonly GeneratorFunctionConstructor _constructor;`
`16`	`16`
`17`		`- internal GeneratorFunctionPrototype(Engine engine,`
	`17`	`+ internal GeneratorFunctionPrototype(`
	`18`	`+ Engine engine,`
`18`	`19`	`GeneratorFunctionConstructor constructor,`
`19`	`20`	`FunctionPrototype prototype,`
`20`	`21`	`IteratorPrototype iteratorPrototype) : base(engine)`
`@@ -30,7 +31,7 @@ protected override void Initialize()`
`30`	`31`	`{`
`31`	`32`	`var properties = new PropertyDictionary(2, checkExistingKeys: false)`
`32`	`33`	`{`
`33`		`- ["constructor"] = new PropertyDescriptor(_constructor, PropertyFlag.NonEnumerable),`
	`34`	`+ ["constructor"] = new PropertyDescriptor(_constructor, PropertyFlag.Configurable),`
`34`	`35`	`["prototype"] = new PropertyDescriptor(PrototypeObject, PropertyFlag.Configurable)`
`35`	`36`	`};`
`36`	`37`	`SetProperties(properties);`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,10 @@ private JsValue ResumeExecution(ExecutionContext genContext, EvaluationContext c`
`100`	`100`	`}`
`101`	`101`	`else if (result.Type == CompletionType.Return)`
`102`	`102`	`{`
`103`		`- resultValue = new IteratorInstance.ValueIteratorPosition(_engine, result.Value, _generatorBody.Completed);`
	`103`	`+ resultValue = new IteratorInstance.ValueIteratorPosition(_engine, result.Value, false);`
`104`	`104`	`if (_generatorBody.Completed)`
`105`	`105`	`{`
`106`	`106`	`_generatorState = GeneratorState.Completed;`
`107`		`- resultValue.Set(CommonProperties.Done, JsBoolean.True);`
`108`	`107`	`}`
`109`	`108`	`}`
`110`	`109`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,6 @@ internal static JintExpression Build(Engine engine, AssignmentExpression express`
`28`	`28`	`return new BindingPatternAssignmentExpression(expression);`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (expression.Right is YieldExpression)`
`32`		`- {`
`33`		`- return new YieldAssignmentExpression(expression);`
`34`		`- }`
`35`		`-`
`36`	`31`	`return new SimpleAssignmentExpression(expression);`
`37`	`32`	`}`
`38`	`33`
`@@ -385,19 +380,5 @@ private ExpressionResult SetValue(EvaluationContext context)`
`385`	`380`	`return null;`
`386`	`381`	`}`
`387`	`382`	`}`
`388`		`-`
`389`		`- private sealed class YieldAssignmentExpression : JintExpression`
`390`		`- {`
`391`		`- public YieldAssignmentExpression(AssignmentExpression expression) : base(expression)`
`392`		`- {`
`393`		`- throw new System.NotImplementedException();`
`394`		`- }`
`395`		`-`
`396`		`- protected override ExpressionResult EvaluateInternal(EvaluationContext context)`
`397`		`- {`
`398`		`- ExceptionHelper.ThrowNotImplementedException();`
`399`		`- return default;`
`400`		`- }`
`401`		`- }`
`402`	`383`	`}`
`403`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using Esprima.Ast;`
`2`	`2`	`using Jint.Native;`
`3`	`3`	`using Jint.Native.Generator;`
`4`		`-using Jint.Native.Iterator;`
`5`	`4`	`using Jint.Native.Object;`
`6`	`5`
`7`	`6`	`namespace Jint.Runtime.Interpreter.Expressions`
`@@ -38,7 +37,7 @@ protected override ExpressionResult EvaluateInternal(EvaluationContext context)`
`38`	`37`	`// TODO return YieldDelegate(value);`
`39`	`38`	`}`
`40`	`39`
`41`		`- return new Completion(CompletionType.Return, Yield(new IteratorResult(engine, value, JsBoolean.False)), _expression.Location);`
	`40`	`+ return new ExpressionResult(ExpressionCompletionType.Return, Yield(value), _expression.Location);`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`/*`