From ffb65f00615ba524298b39e676debf45af4a13cb Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 24 Oct 2011 16:34:55 +0000 Subject: First end-to-end implementation of a runtime re... First end-to-end implementation of a runtime reflexive compiler that generates and loads bytecodes. Review by szeiger. --- test/disabled/run/code.scala | 52 -------------------------------------- test/files/run/code.check | 29 +++++++++++++++++++++ test/files/run/code.scala | 60 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 52 deletions(-) delete mode 100644 test/disabled/run/code.scala create mode 100644 test/files/run/code.check create mode 100644 test/files/run/code.scala (limited to 'test') diff --git a/test/disabled/run/code.scala b/test/disabled/run/code.scala deleted file mode 100644 index 8881c2eda8..0000000000 --- a/test/disabled/run/code.scala +++ /dev/null @@ -1,52 +0,0 @@ -import scala.tools.partest.utils.CodeTest - -case class Element(name: String) - -object Test extends App { - case class InnerElement(name: String) - def foo[T](ys: List[T]) = { - val fun: reflect.Code[Int => Int] = x => x + ys.length - fun - } - CodeTest(foo(List(2)), args) - CodeTest({() => val e = Element("someName"); e}, args) -// CodeTest({() => val e = InnerElement("someName"); e}, args) // (does not work yet) - def titi() = { - var truc = 0 - CodeTest(() => { - truc = 6 - }, args) - } - def tata(): Unit = { - var truc = 0 - CodeTest(() => { - truc = truc + 6 - }, args) - } - titi() - tata() - new baz.A(args) - - def show() { - def foo[T](ys: List[T]) = { - val fun: reflect.Code[Int => Int] = x => x + ys.length - CodeTest(fun, args) - } - foo(List(1, 2, 3)) - } - - show() -} - -package baz { - - case class BazElement(name: String) { } - - class A(args: Array[String]) { - CodeTest(() => new baz.BazElement("someName"), args) - } - -} - - - diff --git a/test/files/run/code.check b/test/files/run/code.check new file mode 100644 index 0000000000..b946554fda --- /dev/null +++ b/test/files/run/code.check @@ -0,0 +1,29 @@ +testing: ((x: Int) => x.$plus(ys.length)) +result = ((x: Int) => x.+{(x: )Int}(ys.length{Int}){Int}){Int => Int} +evaluated = +testing: (() => { + val e: Element = new Element("someName"); + e +}) +result = (() => { + val e: Element = new Element{Element}{(name: )Element}("someName"{String("someName")}){Element}; + e{Element} +}{Element}){() => Element} +evaluated = Element(someName) +testing: (() => truc.elem = 6) +result = (() => truc.elem{Int} = 6{Int(6)}{Unit}){() => Unit} +evaluated = null +testing: (() => truc.elem = truc.elem.$plus(6)) +result = (() => truc.elem{Int} = truc.elem.+{(x: )Int}(6{Int(6)}){Int}{Unit}){() => Unit} +evaluated = null +testing: (() => new baz.BazElement("someName")) +result = (() => new baz.BazElement{baz.BazElement}{(name: )baz.BazElement}("someName"{String("someName")}){baz.BazElement}){() => baz.BazElement} +evaluated = BazElement(someName) +testing: ((x: Int) => x.$plus(ys.length)) +result = ((x: Int) => x.+{(x: )Int}(ys.length{Int}){Int}){Int => Int} +evaluated = +static: 2 +testing: (() => x.$plus(1)) +result = (() => x.+{(x: )Int}(1{Int(1)}){Int}){() => Int} +evaluated = 2 +1+1 = 2 diff --git a/test/files/run/code.scala b/test/files/run/code.scala new file mode 100644 index 0000000000..e26f97b2a4 --- /dev/null +++ b/test/files/run/code.scala @@ -0,0 +1,60 @@ +import scala.tools.partest.utils.CodeTest + +case class Element(name: String) + +object Test extends App { + case class InnerElement(name: String) + def foo[T](ys: List[T]) = { + val fun: reflect.Code[Int => Int] = x => x + ys.length + fun + } + CodeTest(foo(List(2)), args) + CodeTest({() => val e = Element("someName"); e}, args) +// CodeTest({() => val e = InnerElement("someName"); e}, args) // (does not work yet) + def titi() = { + var truc = 0 + CodeTest(() => { + truc = 6 + }, args) + } + def tata(): Unit = { + var truc = 0 + CodeTest(() => { + truc = truc + 6 + }, args) + } + titi() + tata() + new baz.A(args) + + def show() { + def foo[T](ys: List[T]) = { + val fun: reflect.Code[Int => Int] = x => x + ys.length + CodeTest(fun, args) + } + foo(List(1, 2, 3)) + } + + show() + + def evaltest(x: Int) = { + CodeTest.static(() => x + 1, args) + CodeTest(() => x + 1, args) + } + + println("1+1 = "+evaltest(1)) +} + + +package baz { + + case class BazElement(name: String) { } + + class A(args: Array[String]) { + CodeTest(() => new baz.BazElement("someName"), args) + } + +} + + + -- cgit v1.2.3