Better Rep[Events[_]]

Author: julienrf

src/main/scala/scala/js/React.scala

@@ -2,23 +2,23 @@ package scala.js
 
 import virtualization.lms.common.{Structs, Functions, Base}
 
-trait React { this: Base with Functions =>
+trait React { this: Base with Functions with Structs =>
 
-  type RepEvents[+A] = Rep[(A => Unit) => Unit]
+  type Events[+A] = Record { val onValue: (A => Unit) => Unit }
 
-  def Events[A : Manifest](es: Rep[(A => Unit)] => Rep[Unit]): RepEvents[A] = es
+  def Events[A : Manifest](es: Rep[(A => Unit)] => Rep[Unit]): Rep[Events[A]] = new Record { val onValue = fun(es) }
 
-  implicit class EventsOps[A : Manifest](es: RepEvents[A]) {
+  implicit class EventsOps[A : Manifest](es: Rep[Events[A]]) {
 
-    def foreach(f: Rep[A] => Rep[Unit]): Rep[Unit] = es(f)
+    def foreach(f: Rep[A] => Rep[Unit]): Rep[Unit] = es.onValue.apply(f)
 
-    def map[B : Manifest](f: Rep[A] => Rep[B]): RepEvents[B] = Events[B] { g =>
-      es((e: Rep[A]) => g(f(e)))
+    def map[B : Manifest](f: Rep[A] => Rep[B]): Rep[Events[B]] = Events[B] { g =>
+      es.onValue.apply((e: Rep[A]) => g(f(e)))
     }
 
-    def merge[B >: A : Manifest](bs: RepEvents[B]): RepEvents[B] = Events[B] { f =>
-      es((a: Rep[A]) => f(a))
-      bs((b: Rep[B]) => f(b))
+    def merge[B >: A : Manifest](bs: Rep[Events[B]]): Rep[Events[B]] = Events[B] { f =>
+      es.onValue.apply((a: Rep[A]) => f(a))
+      bs.onValue.apply((b: Rep[B]) => f(b))
     }
   }
 

src/test/scala/scala/js/TestReact.scala

@@ -9,7 +9,7 @@ class TestReact extends FileDiffSuite2("test-out/") with Suite {
 
     trait Prog { this: Base with FutureOps with React with JSDom with NumericOps with Functions with JSDebug =>
 
-      def domEvents[A : Manifest](event: EventName[A], e: Rep[EventTarget] = window): RepEvents[A] = Events[A] { f =>
+      def domEvents[A : Manifest](event: EventName[A], e: Rep[EventTarget] = window): Rep[Events[A]] = Events[A] { f =>
         e.on(event) { e => f(e) }
       }
 
@@ -35,10 +35,10 @@ class TestReact extends FileDiffSuite2("test-out/") with Suite {
       }
     }
 
-    /*testWithOutFile("events-foreach") { out =>
-      val prog = new Prog with EffectExp with FutureOpsExp with React with JSDomExp with NumericOpsExp with JSFunctionsExp with JSDebugExp
+    testWithOutFile("events-foreach") { out =>
+      val prog = new Prog with EffectExp with FutureOpsExp with React with JSDomExp with NumericOpsExp with JSFunctionsExp with IfThenElseExp with StructExp with JSDebugExp
       val codegen = new JSGenEffect with JSGenFutureOps with JSGenDom with JSGenNumericOps with JSGenFunctions with JSGenDebug { val IR: prog.type = prog }
       codegen.emitSource0(prog.main _, "main", out)
-    }*/
+    }
   }
 }