Update samples

Author: julienrf

chat/aspects/build.sbt

@@ -12,8 +12,8 @@ sourceGenerators in Compile <+= (sourceDirectory in Compile, sourceManaged in Co
   forest.compiler.Compiler.compile(
     scalax.file.Path(sourceDir / "forest" / "Chat"),
     scalax.file.Path(targetDir),
-    Seq("aspects._", "scala.virtualization.lms.common.{LiftAll, Structs, StringOps}"),
-    Seq("Models", "LiftAll", "Structs", "StringOps")
+    Seq("aspects._", "scala.virtualization.lms.common._", "scala.js._"),
+    Seq("Models", "LiftJsScala")
   )
   (targetDir / "Chat.scala").get.map(_.getAbsoluteFile)
 }

chat/aspects/src/main/scala/aspects/Compiler.scala

@@ -3,11 +3,11 @@ import forest._
 import js._
 
 object Compiler extends App {
-  new aspects.ChatUpdate with ForestPkgExp with TreeManipulationExp with StructExp with StringOpsExp { Ir =>
+  new aspects.ChatUpdate with JsScalaExp with ForestExp with TreeManipulationExp { Ir =>
     context = Nil
     val out = new java.io.PrintWriter("../app/Chat-generated.scala") // That’s very bad.
     out.println("package generated {")
-    val scalaCodegen = new ScalaGenForestPkg with ScalaGenTreeManipulation with ScalaGenStruct with ScalaGenStringOps { val IR: Ir.type = Ir; stream = null }
+    val scalaCodegen = new ScalaGenJsScala with ScalaGenForest with ScalaGenTreeManipulation { val IR: Ir.type = Ir; stream = null }
     val irChat = new ChatUpdate {}
     scalaCodegen.emitSource(irChat.connectedUser, "ConnectedUser", out)
     scalaCodegen.emitSource(irChat.chatRoom, "ChatRoom", out)
@@ -35,7 +35,7 @@ object Compiler extends App {
     out.close()
 
     val outJs = new java.io.PrintWriter("../app/assets/javascripts/views.js") // Very bad, too.
-    val jsCodegen = new JSGenForestPkg with JSGenTreeManipulation with JSGenStruct with JSGenStringOps { val IR: Ir.type = Ir; stream = null }
+    val jsCodegen = new JSGenJsScala with JSGenForest with JSGenTreeManipulation { val IR: Ir.type = Ir; stream = null }
     outJs.println(";(function(){")
     jsCodegen.emitSource(irChat.connectedUser, "connectedUser", outJs)
     jsCodegen.emitSource((_: Exp[Unit]) => irChat.login, "login", outJs)

mindmap/aspects/build.sbt

@@ -10,8 +10,8 @@ sourceGenerators in Compile <+= (sourceDirectory in Compile, sourceManaged in Co
   forest.compiler.Compiler.compile(
       scalax.file.Path(sourceDir / "forest" / "Templates"),
       scalax.file.Path(targetDir),
-      Seq("models._", "scala.xml.Node", "scala.virtualization.lms.common._"),
-      Seq("Models", "ScalaOpsPkg", "LiftScala")
+      Seq("models._", "scala.xml.Node", "scala.virtualization.lms.common._", "scala.js._"),
+      Seq("Models", "LiftJsScala")
   )
   (targetDir / "Templates.scala").get.map(_.getAbsoluteFile)
 }

mindmap/aspects/src/main/scala/CodeGenerator.scala

@@ -6,12 +6,12 @@ import js._
 object CodeGenerator extends App {
 
   trait Prog extends ir.Templates with views.Workspace with models.Models
-  val prog = new Prog with ForestPkgExp with ScalaOpsPkgExp with StructExp with TupledFunctionsExp { context = Nil }
+  val prog = new Prog with JsScalaExp with ForestExp { context = Nil }
   val templates = new prog.Templates {}
   val jsProg = new javascripts.BuildMap with models.Models with JSExp with ListOpsExp with StructExp { context = Nil }
   val jsProg2 = new javascripts.Exploration with JSExp with javascripts.ExtraJSExp { context = Nil }
 
-  val scalaGen = new ScalaGenForestPkg with ScalaCodeGenPkg with ScalaGenStruct { val IR: prog.type = prog; stream = null }
+  val scalaGen = new ScalaGenJsScala with ScalaGenForest { val IR: prog.type = prog; stream = null }
   val scalaOut = new java.io.PrintWriter("../app/MindMap-generated.scala")
   scalaOut.println("package generated {")
   scalaGen.emitSource(templates.listMaps, "ListMaps", scalaOut)
@@ -43,10 +43,9 @@ object CodeGenerator extends App {
           scalaGen.remap(manifest[prog.Edge])))
   scalaOut.close()
 
-  val jsGen = new JSGenForestPkg with JSCodeGenPkg with JSGenStruct { val IR: prog.type = prog; stream = null }
+  val jsGen = new JSGenJsScala with JSGenForest { val IR: prog.type = prog; stream = null }
   val jsGen2 = new JSGen with JSGenListOps with JSGenStruct {
     val IR: jsProg.type = jsProg; stream = null
-    import IR._
   }
   val jsGen3 = new JSGen with javascripts.JSGenExtra { val IR: jsProg2.type = jsProg2; stream = null }
   val jsOut = new java.io.PrintWriter("../app/assets/javascripts/mindmap-generated.js")

mindmap/aspects/src/main/scala/views/Workspace.scala

@@ -4,8 +4,9 @@ import forest._
 import scala.xml.Node
 import scala.virtualization.lms.common._
 import models._
+import scala.js._
 
-trait Workspace extends ForestPkg with ScalaOpsPkg with LiftScala { this: Models =>
+trait Workspace extends JsScala with Forest with LiftJsScala { this: Models =>
 
   def showMap(map: Rep[MindMap]): Rep[List[Node]] = {
     val defs = el('defs)(