summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | repairs the tests after the refactoring spreeEugene Burmako2012-06-08559-1733/+2611
| | | | |
| * | | | moves positions to scala.reflect.internal.utilEugene Burmako2012-06-0892-111/+188
| | | | | | | | | | | | | | | | | | | | This is the first step of factoring out scala-reflect.jar.
| * | | | miscellaneous cleanup, mostly fighting with feature warningsEugene Burmako2012-06-0859-110/+144
| | | | |
| * | | | brings reification up to speedEugene Burmako2012-06-0844-970/+1707
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Along with recovering from reflection refactoring, I implemented some new features (e.g. rollback of macro expansions), and did some stabilizing refactorings (e.g. moved mutable state into a ghetto). Also used the refactoring as a chance to fix free and aux symbols. Encapsulated this notion in a symbol table class, which allowed me to address outstanding issues with symbol table inheritance and inlining.
| * | | | brings macros up to speedEugene Burmako2012-06-0830-119/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before reflection refactoring, macro contexts only exposed a mirror. Now it's time to expose both a universe (the compiler instance) and a mirror (a macro-specific symbol resolver). By the way, speaking of mirrors. Macro contexts have their own mirror, which is different from compiler's rootMirror. This is done because macros need to be able to resolve stuff from empty package. Reflection refactoring brought major changes to runtime evaluation, which got dropped from universes and now requires scala-compiler.jar. However there are macro users, who would like to do eval inside macros. To help them we expose `libraryClassLoader` to manually build toolboxes, and also a simple-to-use `c.eval` method. I've also sneakily introduced `c.parse`, because it's something that has also been frequently requested. Moreover, it might help Scaladoc. So I decided that it might be worth it to add this new functionality.
| * | | | removes tags and their incantations from PredefEugene Burmako2012-06-0843-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All tags and reflection-related stuff requires a prefix, be it scala.reflect for simple tags (ArrayTags and ClassTags), or scala.reflect.basis/scala.reflect.runtime.universe for type tags.
| * | | | ClassTag.erasure => ClassTag.runtimeClassEugene Burmako2012-06-0829-84/+85
| | | | | | | | | | | | | | | | | | | | | | | | | This change is made to be consistent with JavaMirrors. And, in my opinion, a technology-neutral term is better here.
| * | | | The new reflectionEugene Burmako2012-06-08190-6403/+9001
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A must read: "SIP: Scala Reflection": https://docs.google.com/document/d/1Z1VhhNPplbUpaZPIYdc0_EUv5RiGQ2X4oqp0i-vz1qw/edit Highlights: * Architecture has undergone a dramatic rehash. * Universes and mirrors are now separate entities: universes host reflection artifacts (trees, symbols, types, etc), mirrors abstract loading of those artifacts (e.g. JavaMirror loads stuff using a classloader and annotation unpickler, while GlobalMirror uses internal compiler classreader to achieve the same goal). * No static reflection mirror is imposed on the user. One is free to choose between lightweight mirrors and full-blown classloader-based mirror (read below). * Public reflection API is split into scala.reflect.base and scala.reflect.api. The former represents a minimalistic snapshot that is exactly enough to build reified trees and types. To build, but not to analyze - everything smart (for example, getting a type signature) is implemented in scala.reflect.api. * Both reflection domains have their own universe: scala.reflect.basis and scala.reflect.runtime.universe. The former is super lightweight and doesn't involve any classloaders, while the latter represents a stripped down compiler. * Classloader problems from 2.10.0-M3 are solved. * Exprs and type tags are now bound to a mirror upon creation. * However there is an easy way to migrate exprs and type tags between mirrors and even between universes. * This means that no classloader is imposed on the user of type tags and exprs. If one doesn't like a classloader that's there (associated with tag's mirror), one can create a custom mirror and migrate the tag or the expr to it. * There is a shortcut that works in most cases. Requesting a type tag from a full-blown universe will create that tag in a mirror that corresponds to the callsite classloader aka `getClass.getClassLoader`. This imposes no obligations on the programmer, since Type construction is lazy, so one can always migrate a tag into a different mirror. Migration notes for 2.10.0-M3 users: * Incantations in Predef are gone, some of them have moved to scala.reflect. * Everything path-dependent requires implicit prefix (for example, to refer to a type tag, you need to explicitly specify the universe it belongs to, e.g. reflect.basis.TypeTag or reflect.runtime.universe.TypeTag). * ArrayTags have been removed, ConcreteTypeTag have been renamed to TypeTags, TypeTags have been renamed to AbsTypeTags. Look for the reasoning in the nearby children of this commit. Why not in this commit? Scroll this message to the very bottom to find out the reason. * Some of the functions have been renamed or moved around. The rule of thumb is to look for anything non-trivial in scala.reflect.api. Some of tree build utils have been moved to Universe.build. * staticModule and staticClass have been moved from universes to mirrors * ClassTag.erasure => ClassTag.runtimeClass * For the sake of purity, type tags no longer have erasures. Use multiple context bounds (e.g. def foo[T: ru.TypeTag : ClassTag](...) = ...) if you're interested in having both erasures and types for type parameters. * reify now rolls back macro applications. * Runtime evaluation is now explicit, requires import scala.tools.reflect.Eval and scala-compiler.jar on the classpath. * Macro context now has separate universe and mirror fields. * Most of the useful stuff is declared in c.universe, so be sure to change your "import c.universe._" to "import c.mirror._". * Due to the changes in expressions and type tags, their regular factories are now really difficult to use. We acknowledge that macro users need to frequently create exprs and tags, so we added old-style factories to context. Bottom line: almost always prepend Expr(...)/TypeTag(...) with "c.". * Expr.eval has been renamed to Expr.splice. * Expr.value no longer splices (it can still be used to express cross-stage path-dependent types as specified in SIP-16). * c.reifyTree now has a mirror parameter that lets one customize the initial mirror the resulting Expr will be bound to. If you provide EmptyTree, then the reifier will automatically pick a reasonable mirror (callsite classloader mirror for a full-blown universe and rootMirror for a basis universe). Bottom line: this parameter should be EmptyTree in 99% of cases. * c.reifyErasure => c.reifyRuntimeClass. Known issues: * API is really raw, need your feedback. * All reflection artifacts are now represented by abstract types. This means that pattern matching against them will emit unchecked warnings. Adriaan is working on a patch that will fix that. WARNING, FELLOW CODE EXPLORER! You have entered a turbulence zone. For this commit and its nearby parents and children tests are not guaranteed to work. Things get back to normal only after the "repairs the tests after the refactoring spree" commit. Why so weird? These twentish changesets were once parts of a humongous blob, which spanned 1200 files and 15 kLOC. I did my best to split up the blob, so that the individual parts of the code compile and make sense in isolation. However doing the same for tests would be too much work.
| * | | | preparations: always explicitly provide type tagsEugene Burmako2012-06-084-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | In our codebase we now explicitly provide type tags even if they can be materialized. This is necessary to ease the upcoming reflection refactoring (or refactorings :)).
| * | | | preparations: removes DynamicProxyEugene Burmako2012-06-084-167/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because toolboxes will no longer be available from the library. Christopher Vogt will take care of the second reincarnation of DynamicRef.
| * | | | macros: refactoring of fast track infrastructureEugene Burmako2012-06-0819-311/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result, hardwired macros don't need implementation stubs. This is very important, because in a few commits scala.reflect.makro.Context will move out from scala-library.jar. Also adding fast track entries doesn't require jumping through hoops with PDTs. It's as simple as defining PartialFunction[Tree, Any].
| * | | | macros: now use Java reflectionEugene Burmako2012-06-081-81/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to some voodoo magic creating a new instance of a compiler cake, immediately degrades performance of the compiler. Out guess is that it makes HotSpot treat calls to cake methods as polymorphic. However we didn't do any performance testing, it just works, and that's enough. Enough for now.
| * | | | macros: -Xmacros is now retiredEugene Burmako2012-06-0814-15/+13
| | | | |
| * | | | improves traces and error messagesEugene Burmako2012-06-089-51/+70
| | | | |
| * | | | REPL bells and whistles: -Dscala.repl.maxprintstring=<Integer>Eugene Burmako2012-06-083-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Makes `maxPrintString` configurable and fixes its treatment at zero. Quite useful for debugging elaborate classloaders with long classpaths.
| * | | | REPL bells and whistles: -Dscala.repl.vids=<Boolean>Eugene Burmako2012-06-082-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Displays identity hashcodes next to `res` values printed by REPL. This proved quite useful in detecting reflection artifacts that look the same, but are, in fact, different.
| * | | | REPL bells and whistles: -Dscala.repl.autoruncode=<JFile>Eugene Burmako2012-06-082-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for the upcoming reflection refactoring. Previously it was more or less okay to type "import scala.reflect.mirror._", but soon we'll have multiple universes and mirrors.
| * | | | REPL no longer hangs after initialization crashesEugene Burmako2012-06-083-8/+27
| | | | |
| * | | | typers: simplifies original calculation in typedAnnotatedEugene Burmako2012-06-081-4/+3
| | | | |
| * | | | typers: dubious line in adaptTypeEugene Burmako2012-06-081-0/+4
| | | | |
| * | | | typers: fixes error handling in checkStableEugene Burmako2012-06-081-1/+3
|/ / / /
* | | | Merge pull request #672 from axel22/issue/5857Adriaan Moors2012-06-083-2/+87
|\ \ \ \ | | | | | | | | | | Fixes SI-5857. More efficient min and max in Range and NumericRange
| * | | | Fixes SI-5857.Aleksandar Prokopec2012-06-063-2/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override `min` and `max` in `Range` and `NumericRange` to check if a default `Ordering` for the numeric type in question is used. If so, bypass traversal and compute the minimum or maximum element.
* | | | | Merge pull request #654 from magarciaEPFL/ticket-SI-4804Adriaan Moors2012-06-081-21/+13
|\ \ \ \ \ | | | | | | | | | | | | GenASM-based fix for SI-4804. Fix of the same for GenJVM pending.
| * | | | | GenASM-based fix for SI-4804. Fix of the same for GenJVM pending.Miguel Garcia2012-06-011-21/+13
| | | | | |
* | | | | | Merge pull request #678 from magarciaEPFL/fixesJosh Suereth2012-06-081-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | counterpart in GenASM to 241c7606d0bf5f3209b9d549fb75
| * | | | | | counterpart in GenASM to 241c7606d0bf5f3209b9d549fb75Miguel Garcia2012-06-071-1/+5
| | | | | | |
* | | | | | | Merge pull request #677 from axel22/feature/util-hashing2Josh Suereth2012-06-0719-58/+145
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add the first iteration of the `util.hashing` package.
| * | | | | | Add the first iteration of the `util.hashing` package.Aleksandar Prokopec2012-06-0719-58/+145
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `MurmurHash3` to `util.hashing`. Make the `class` private and retain a public companion `object`, and put the `MurmurHash3.Hashing` implementations for various types in the companion. Add a method which composes `ByteswapHashing` with some other hashing. Rename `hashOf` to `hash`. Fix chi-square test in a test-case. Review by @jsuereth. Moved a failing test that seems to use some other library version to pending.
* | | | | | Merge pull request #674 from paulp/checkin-jun6Josh Suereth2012-06-0723-857/+896
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Updates to primitive classes and classpath scripts.
| * | | | | Generate abstract methods in scala.Byte and friends.Paul Phillips2012-06-0616-815/+863
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than stub implementations. This saves over 50K of bytecode. I also added the necessary imports to silence the feature warnings.
| * | | | | Updated tools/*cp scripts.Paul Phillips2012-06-067-42/+33
|/ / / / / | | | | | | | | | | | | | | | | | | | | To include the asm classes in some cases, and also to improve with my sadly now-greater knowledge of shell scripting.
* | | | | Merge pull request #669 from dgruntz/masterJosh Suereth2012-06-061-5/+6
|\ \ \ \ \ | | | | | | | | | | | | Fixes typos in scaladoc of Orderes.scala
| * | | | | fixes typos in scaladoc of Orderes.calaDominik Gruntz2012-06-051-5/+6
| | | | | |
* | | | | | Merge pull request #673 from axel22/issue/5880Josh Suereth2012-06-062-2/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5880.
| * | | | | | Fix SI-5880.Aleksandar Prokopec2012-06-062-2/+49
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Add a ChiSquare test for the new hash code.
* | | | | | Merge pull request #671 from axel22/issue/5867Josh Suereth2012-06-063-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5867.
| * | | | | | Fix SI-5867.Aleksandar Prokopec2012-06-063-0/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | Override clone for unrolled buffer.
* | | | | | Merge pull request #670 from axel22/issue/5879Josh Suereth2012-06-063-15/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5879.
| * | | | | | Fix SI-5879.Aleksandar Prokopec2012-06-063-15/+142
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where a key in an immutable hash map have the corresponding value different in the iteration than when doing lookup. This use to happen after calling `merge`. Fix the order in which a key-value pair appears in the collision resolution function - the first argument always comes from the `this` hash map. Deprecate `merge` in favour of `merged`, as this is a pure method. As an added benefit, the syntax for invoking `merge` is now nicer.
* | | | | | Merge pull request #667 from phaller/wip-sip14-ec-configJosh Suereth2012-06-061-7/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add configuration for ExecutionContext
| * | | | | Add configuration for ExecutionContextphaller2012-06-051-7/+21
| |/ / / /
* | | | | Merge pull request #668 from viktorklang/masterJosh Suereth2012-06-053-54/+3
|\ \ \ \ \ | |/ / / / |/| | | | Switching to the Akka-provided Unsafe detection
| * | | | Switching the the Akka-contributed Unsafe detection to support more ↵Viktor Klang2012-06-053-54/+3
| | | | | | | | | | | | | | | | | | | | platforms, like Android
* | | | | Merge pull request #655 from axel22/feature/hasherJosh Suereth2012-06-045-29/+145
|\ \ \ \ \ | | | | | | | | | | | | Implementing Hashing typeclass
| * | | | | Fix `Hashing`.Aleksandar Prokopec2012-06-014-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `Hashing` to `scala.util.hashing`. Adde `Hashing.Default` to `Hashing` companion object. Change `TrieMap` to autoswitch from `Hashing.Default` to `TrieMap.MangledHashing`.
| * | | | | Remove Equality in favour of Equiv.Aleksandar Prokopec2012-06-015-48/+11
| | | | | | | | | | | | | | | | | | | | | | | | Make Equiv serializable.
| * | | | | Add Hashing and Equality typeclasses.Aleksandar Prokopec2012-06-014-27/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify TrieMap to use hashing and equality. Modify serialization in TrieMap appropriately.
* | | | | | Merge pull request #665 from retronym/ticket/5213Adriaan Moors2012-06-042-11/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-5313 Revert to two traversals in substThisAndSym.
| * | | | | | SI-5313 Revert to two traversals in substThisAndSym.Jason Zaugg2012-06-032-11/+40
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Partially reverts 334872e.