Skip to content

Commit 57fcda5

Browse files
committed
Merge pull request scala#1039 from scalamacros/topic/ultimate-reflection-pull-request
Ultimate reflection pull request
2 parents 937da62 + a354ec2 commit 57fcda5

File tree

311 files changed

+1330
-997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+1330
-997
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6a03de33fb670e1b1a9930234adb6d1d6435323d ?scala-compiler-src.jar
1+
67257bb7ce010e2ceac800d737e202cfbfc2a1f6 ?scala-compiler-src.jar
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cf6aab754bcf77ab433e2b05d1f452e13f24cedc ?scala-compiler.jar
1+
c52277de9e76187f34a5ae073e5d2aacc592ac50 ?scala-compiler.jar
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
02dcd8656f99eabbad8d9dce06a33d4f6f8d7c38 ?scala-library-src.jar
1+
40b9c97e0c3abea4c460b73ca178f60a3bfea242 ?scala-library-src.jar

lib/scala-library.jar.desired.sha1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6a035e798a94c6ca051e6a7663293cfee3d7136f ?scala-library.jar
1+
0a8e0e39e1e6713323a2e659aab743ccfa57c071 ?scala-library.jar
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ecb9dd737935812a6399a3426e9126908ef870b2 ?scala-reflect-src.jar
1+
d1abf389fbf5dfc95889a181d28f94a6779c6165 ?scala-reflect-src.jar

lib/scala-reflect.jar.desired.sha1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
344f3feafa4bd155b13ba7a6ab3efd605f8f8388 ?scala-reflect.jar
1+
02b44e860b9b9abd1353bbaa1004b3f0004dd0b3 ?scala-reflect.jar

src/compiler/scala/reflect/makro/runtime/AbortMacroException.scala renamed to src/compiler/scala/reflect/macros/runtime/AbortMacroException.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.reflect.makro
1+
package scala.reflect.macros
22
package runtime
33

44
import scala.reflect.internal.util.Position

src/compiler/scala/reflect/makro/runtime/Aliases.scala renamed to src/compiler/scala/reflect/macros/runtime/Aliases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.reflect.makro
1+
package scala.reflect.macros
22
package runtime
33

44
trait Aliases {

src/compiler/scala/reflect/makro/runtime/CapturedVariables.scala renamed to src/compiler/scala/reflect/macros/runtime/CapturedVariables.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.reflect.makro
1+
package scala.reflect.macros
22
package runtime
33

44
trait CapturedVariables {

src/compiler/scala/reflect/makro/runtime/Context.scala renamed to src/compiler/scala/reflect/macros/runtime/Context.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package scala.reflect.makro
1+
package scala.reflect.macros
22
package runtime
33

44
import scala.tools.nsc.Global
55

6-
abstract class Context extends scala.reflect.makro.Context
6+
abstract class Context extends scala.reflect.macros.Context
77
with Aliases
88
with CapturedVariables
99
with Infrastructure

0 commit comments

Comments
 (0)