+= operator for event+= callable

ref #1141
peachpiecompiler · May 6, 2024 · 6761242 · 6761242
1 parent 9df0cb0
commit 6761242
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/src/Peachpie.Runtime/ClrEvent.cs b/src/Peachpie.Runtime/ClrEvent.cs
@@ -7,7 +7,12 @@
 
 namespace Pchp.Core
 {
-    public class ClrEvent<TDelegate> : IPhpCallable where TDelegate : Delegate
+    internal interface IClrEvent
+    {
+        IDisposable Add(IPhpCallable callable);
+    }
+
+    public class ClrEvent<TDelegate> : IPhpConvertible, IClrEvent, IPhpCallable where TDelegate : Delegate
     {
         sealed class Hook : IDisposable
         {
@@ -39,6 +44,9 @@ public void Dispose()
             }
         }
 
+        [PhpHidden]
+        protected readonly Context _ctx;
+
         [PhpHidden]
         public EventInfo EventInfo { get; }
 
@@ -57,6 +65,8 @@ public void Dispose()
 
         internal ClrEvent(Context ctx, object target, EventInfo eventInfo)
         {
+            _ctx = ctx;
+
             this.Target = target;
             this.EventInfo = eventInfo ?? throw new ArgumentNullException(nameof(eventInfo));
         }
@@ -79,6 +89,15 @@ public void remove(TDelegate callback)
             throw new NotSupportedException();
         }
 
+        #region IClrEvent
+
+        IDisposable/*!*/IClrEvent.Add(IPhpCallable callable) =>
+            this.add(
+                callback: PhpCallableToDelegate<TDelegate>.Get(callable, _ctx)
+            );
+
+        #endregion
+
         #region IPhpCallable
 
         PhpValue IPhpCallable.Invoke(Context ctx, params PhpValue[] arguments)
@@ -89,15 +108,27 @@ PhpValue IPhpCallable.Invoke(Context ctx, params PhpValue[] arguments)
 
         PhpValue IPhpCallable.ToPhpValue() => PhpValue.FromClr(this);
 
-        //public PhpValue __invoke([ImportValue(ImportValueAttribute.ValueSpec.CallerClass)] RuntimeTypeHandle caller, params PhpValue[] arguments)
-        //{
-        //    if (caller.Equals(default(RuntimeTypeHandle)))
-        //    {
-        //        return false;
-        //    }
+        #endregion
+
+        #region IPhpConvertible
+
+        double IPhpConvertible.ToDouble() => throw new NotSupportedException();
+
+        long IPhpConvertible.ToLong() => throw new NotSupportedException();
+
+        bool IPhpConvertible.ToBoolean() => throw new NotSupportedException();
+
+        Convert.NumberInfo IPhpConvertible.ToNumber(out PhpNumber number)
+        {
+            number = 0;
+            return Convert.NumberInfo.Unconvertible;
+        }
+
+        string IPhpConvertible.ToString() => name;
+
+        object IPhpConvertible.ToClass() => this;
 
-        //    return PhpValue.Null;
-        //}
+        PhpArray IPhpConvertible.ToArray() => throw new NotSupportedException();
 
         #endregion
     }

diff --git a/src/Peachpie.Runtime/Dynamic/BinderHelpers.cs b/src/Peachpie.Runtime/Dynamic/BinderHelpers.cs
@@ -644,6 +644,14 @@ public static Expression BindAccess(Expression expr, Expression ctx, AccessMask
                     // Template: Operators.SetValue(ref fld, (PhpValue)value)
                     expr = Expression.Call(Cache.Operators.SetValue_PhpValueRef_PhpValue, expr, ConvertExpression.Bind(rvalue, typeof(PhpValue), ctx));
                 }
+                else if (expr.Type.GetGenericTypeDefinition() == typeof(ClrEvent<>))
+                {
+                    // Template: $object->eventHandler += rvalue; return rvalue;
+                    // rvalue is (eventHadler + callable)
+                    expr = Expression.Block(
+                        rvalue
+                    );
+                }
                 else
                 {
                     // Template: fld = value
@@ -859,7 +867,7 @@ public static Expression BindField(PhpTypeInfo type, Type classCtx, Expression t
             // lookup a declared field
             if (TryResolveDeclaredProperty(type, classCtx, target == null, field, out var prop))
             {
-                if (access.Write() && prop.IsReadOnly)
+                if (access.Write() && prop.IsReadOnly && !(prop is PhpPropertyInfo.ClrEvent))
                 {
                     return BindInvalidPropertyAccess(type.Name, field, classCtx, prop);
                 }

diff --git a/src/Peachpie.Runtime/PhpCallback.cs b/src/Peachpie.Runtime/PhpCallback.cs
@@ -569,6 +569,7 @@ public static TFunc Get(IPhpCallable callable, Context ctx)
             if (typeof(TFunc) == typeof(Action)) return (TFunc)(object)new Action(() => callable.Invoke(ctx));
             if (typeof(TFunc) == typeof(Func<bool>)) return (TFunc)(object)new Func<bool>(() => (bool)callable.Invoke(ctx));
             if (typeof(TFunc) == typeof(Func<long, long>)) return (TFunc)(object)new Func<long, long>((p1) => (long)callable.Invoke(ctx, p1));
+            if (typeof(TFunc) == typeof(EventHandler)) return (TFunc)(object)new EventHandler((s, a) => callable.Invoke(ctx, PhpValue.FromClass(s), PhpValue.FromClass(a)));
 
             //
             return Dynamic.BinderHelpers.CreateDelegate<TFunc>(callable, ctx);

diff --git a/src/Peachpie.Runtime/PhpNumber.cs b/src/Peachpie.Runtime/PhpNumber.cs
@@ -491,6 +491,12 @@ static PhpValue AddNonNumbers(ref PhpValue x, ref PhpValue y)
             {
                 return (PhpValue)PhpArray.Union(arr_x, arr_y);
             }
+            else if (x.AsObject() is IClrEvent clrEvent)
+            {
+                // event += function
+                clrEvent.Add(y.AsCallable());
+                return x; // returns itself
+            }
 
             //PhpException.UnsupportedOperandTypes();
             //return 0;