summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-07-24 12:04:57 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-08-02 15:50:59 +0200
commit280c4906d18fd827e2c934af49e253064ac753ef (patch)
tree3e109d6967d21ba934c8bc6e0d5cca071b09a9b4 /lib
parent027b00171c0d92ec669deaa471966e6468c6b8cf (diff)
downloadscala-280c4906d18fd827e2c934af49e253064ac753ef.tar.gz
scala-280c4906d18fd827e2c934af49e253064ac753ef.tar.bz2
scala-280c4906d18fd827e2c934af49e253064ac753ef.zip
prepares our macro defs for refactoring (Step I)
In our codebase we have a bunch of macros, and some of those macros (namely, tag materialization macros and string context "f" formatter) are used inside the compiler itself. The logic of those macros is hardwired into starr's fast track, so it doesn't rely on any of the subsystems of the macro engine to be located, bound and executed. But to trigger this logic we need to color these macros as macros, i.e. as term symbols having the MACRO flag. Currently this works automatically, because fast track macros (the same as regular macros) have their rhs in the "macro ???" form. Having seen the "macro" keyword, the compiler knows that the corresponding def declares a macro and sets the MACRO flag. As the latest refactoring attempt has shown, the "macro" in "macro ???" is unnecessary and might stand in the way of macro refactorings. After all if some symbol is in the fast track registry, then it's definitely a macro. Hence I'm changing the compiler to not need the "macro" keyword in declarations of fast track macros anymore.
Diffstat (limited to 'lib')
-rw-r--r--lib/scala-compiler-src.jar.desired.sha12
-rw-r--r--lib/scala-compiler.jar.desired.sha12
-rw-r--r--lib/scala-library-src.jar.desired.sha12
-rw-r--r--lib/scala-library.jar.desired.sha12
-rw-r--r--lib/scala-reflect-src.jar.desired.sha12
-rw-r--r--lib/scala-reflect.jar.desired.sha12
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/scala-compiler-src.jar.desired.sha1 b/lib/scala-compiler-src.jar.desired.sha1
index 6840b60528..91e1cab75e 100644
--- a/lib/scala-compiler-src.jar.desired.sha1
+++ b/lib/scala-compiler-src.jar.desired.sha1
@@ -1 +1 @@
-6a03de33fb670e1b1a9930234adb6d1d6435323d ?scala-compiler-src.jar
+86ef964dd57de5e52783afd5a2f44df36eab5bf7 ?scala-compiler-src.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 393820f481..99ef1d01f4 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-cf6aab754bcf77ab433e2b05d1f452e13f24cedc ?scala-compiler.jar
+517e3b70161190ba079e172d6d0dd388eb3d04e8 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index cefff7eec9..32639184cb 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-02dcd8656f99eabbad8d9dce06a33d4f6f8d7c38 ?scala-library-src.jar
+d131ccb45a18edbec545c37cccd22872d02d1133 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index f7f2321177..293ce830e7 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-6a035e798a94c6ca051e6a7663293cfee3d7136f ?scala-library.jar
+9e7f92776e0f7a89aef3613da79c6ee6bf544b60 ?scala-library.jar
diff --git a/lib/scala-reflect-src.jar.desired.sha1 b/lib/scala-reflect-src.jar.desired.sha1
index fb09e9d585..47285a18ff 100644
--- a/lib/scala-reflect-src.jar.desired.sha1
+++ b/lib/scala-reflect-src.jar.desired.sha1
@@ -1 +1 @@
-ecb9dd737935812a6399a3426e9126908ef870b2 ?scala-reflect-src.jar
+cf388008bc4a3e387cbe193019f6d780d71746d1 ?scala-reflect-src.jar
diff --git a/lib/scala-reflect.jar.desired.sha1 b/lib/scala-reflect.jar.desired.sha1
index dc5b7abd0e..efa6bd01e6 100644
--- a/lib/scala-reflect.jar.desired.sha1
+++ b/lib/scala-reflect.jar.desired.sha1
@@ -1 +1 @@
-344f3feafa4bd155b13ba7a6ab3efd605f8f8388 ?scala-reflect.jar
+2fa8739de9cbc52198d88164d85185f4ae9d153c ?scala-reflect.jar