diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-07-21 10:04:56 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-08-02 15:51:04 +0200 |
| commit | f126f40b8c83be96404fc5fbd50b26b694bb9e86 (patch) | |
| tree | 077e33161c2a1152a9d7319d92e017dc7e443d2f /src/reflect | |
| parent | 280c4906d18fd827e2c934af49e253064ac753ef (diff) | |
| download | scala-f126f40b8c83be96404fc5fbd50b26b694bb9e86.tar.gz scala-f126f40b8c83be96404fc5fbd50b26b694bb9e86.tar.bz2 scala-f126f40b8c83be96404fc5fbd50b26b694bb9e86.zip | |
prepares our macro defs for refactoring (Step II)
Since the previous commit the compiler doesn't need any help
to find out that fast-tracked macros are macros. Hence I'm
replacing their RHSes with the universal ??? body.
This way macro definitions defined in scala (for example,
tag materialization macros or certain string formatters)
won't stand in the way of the changes to the macro system.
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/api/Universe.scala | 4 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Context.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/package.scala | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/reflect/scala/reflect/api/Universe.scala b/src/reflect/scala/reflect/api/Universe.scala index 85d8adc44f..da05b5ba46 100644 --- a/src/reflect/scala/reflect/api/Universe.scala +++ b/src/reflect/scala/reflect/api/Universe.scala @@ -1,8 +1,6 @@ package scala.reflect package api -import language.experimental.macros - abstract class Universe extends base.Universe with Symbols with Types @@ -64,5 +62,5 @@ abstract class Universe extends base.Universe * special measures are taken to ensure that all members accessed in the reifee remain visible */ // implementation is magically hardwired to `scala.reflect.reify.Taggers` - def reify[T](expr: T): Expr[T] = macro ??? + def reify[T](expr: T): Expr[T] = ??? // macro }
\ No newline at end of file diff --git a/src/reflect/scala/reflect/makro/Context.scala b/src/reflect/scala/reflect/makro/Context.scala index f093016a38..f3b1271a57 100644 --- a/src/reflect/scala/reflect/makro/Context.scala +++ b/src/reflect/scala/reflect/makro/Context.scala @@ -1,8 +1,6 @@ package scala.reflect package makro -import language.experimental.macros - // todo. introduce context hierarchy // the most lightweight context should just expose the stuff from the SIP // the full context should include all traits from scala.reflect.makro (and probably reside in scala-compiler.jar) diff --git a/src/reflect/scala/reflect/runtime/package.scala b/src/reflect/scala/reflect/runtime/package.scala index a5809a2629..2d48b9a5bf 100644 --- a/src/reflect/scala/reflect/runtime/package.scala +++ b/src/reflect/scala/reflect/runtime/package.scala @@ -1,7 +1,5 @@ package scala.reflect -import language.experimental.macros - package object runtime { // type is api.JavaUniverse because we only want to expose the `scala.reflect.api.*` subset of reflection @@ -9,7 +7,8 @@ package object runtime { // [Eugene++ to Martin] removed `mirrorOfLoader`, because one can use `universe.runtimeMirror` instead - def currentMirror: universe.Mirror = macro Macros.currentMirror + // implementation magically hardwired to the `currentMirror` method below + def currentMirror: universe.Mirror = ??? // macro } package runtime { |