yield* in progress

yantrajs · Feb 7, 2025 · 3b62b98 · 3b62b98
1 parent 1b40fe8
commit 3b62b98
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/YantraJS.Core/LinqExpressions/CallStackItemBuilder.cs b/YantraJS.Core/LinqExpressions/CallStackItemBuilder.cs
@@ -11,21 +11,6 @@ namespace YantraJS.Core.LinqExpressions
     internal static class CallStackItemBuilder
     {
 
-        static Type type = typeof(CallStackItem);
-
-        //static ConstructorInfo _new =
-        //    type.GetConstructor(new Type[] { 
-        //        typeof(JSContext),
-        //        typeof(ScriptInfo),
-        //        typeof(int),
-        //        typeof(int),
-        //        typeof(int),
-        //        typeof(int)
-        //    });
-
-        static MethodInfo _step =
-            type.PublicMethod(nameof(CallStackItem.Step), typeof(int), typeof(int));
-
         public static YExpression New(
             YExpression context,
             YExpression scriptInfo,
@@ -48,10 +33,10 @@ public static YExpression New(
 
         public static YExpression Step(YExpression target, int line, int column)
         {
-            return YExpression.Call(target,
-                _step,
+            return target.CallExpression<CallStackItem, int, int>(() => (x, a, b) => x.Step(a, b),
                 YExpression.Constant(line),
-                YExpression.Constant(column));
+                YExpression.Constant(column)
+                );
         }
 
     }

diff --git a/YantraJS.ExpressionCompiler/Expressions/YExpression.cs b/YantraJS.ExpressionCompiler/Expressions/YExpression.cs
@@ -861,9 +861,9 @@ public static YSwitchCaseExpression SwitchCase(YExpression body, IEnumerable<YEx
         }
 
 
-        public static YYieldExpression Yield(YExpression arg)
+        public static YYieldExpression Yield(YExpression arg, bool @delegate = false)
         {
-            return new YYieldExpression(arg);
+            return new YYieldExpression(arg, @delegate);
         }
     }
 }
diff --git a/YantraJS.ExpressionCompiler/Expressions/YYieldExpression.cs b/YantraJS.ExpressionCompiler/Expressions/YYieldExpression.cs
@@ -5,16 +5,22 @@ namespace YantraJS.Expressions
     public class YYieldExpression: YExpression
     {
         public readonly YExpression Argument;
+        public readonly bool DelegateYield;
 
-        public YYieldExpression(YExpression arg): 
+        public YYieldExpression(YExpression arg, bool @delegate): 
             base(YExpressionType.Yield, arg.Type)
         {
             this.Argument = arg;
+            this.DelegateYield = @delegate;
         }
 
         public override void Print(IndentedTextWriter writer)
         {
             writer.Write("yield ");
+            if (DelegateYield)
+            {
+                writer.Write("*");
+            }
             Argument.Print(writer);
         }
     }