summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* moves Expr from api to baseEugene Burmako2012-08-0210-88/+69
| | | | | | | | | | | | | | | | This is the first step in supporting serialization for exprs and type tags. Generally speaking universes and mirrors cannot be serialized (even not taking into account all the amount of scalac-specific transient stuff, java mirrors use classloaders, which are not serializable). Hence we can only serialize tree and type creators, and deserialize them into the mirror we surely know will be there - the scala.reflect.basis.rootMirror. To do that we need to have exprs in scala.reflect.base. Luckily all the trees are already in base, we only need to move a single file to scala-library.jar. Another good news is that reification logic is simplified, because we don't have to special case exprs as being defined in ApiUniverseClass.
* evicts last traces of makro from our codebaseEugene Burmako2012-08-022-16/+0
| | | | Removes the stubs left out to appease the old starr, fixes macro tests.
* reflect.makro => reflect.macros (Step I)Eugene Burmako2012-08-0254-72/+88
| | | | | | | | | Builds a starr that uses stuff from scala.reflect.macros for macro activities. Crucial makro thingies (such as makro.Context or makro.internal.macroImpl) are temporarily left in place, because they are necessary for previous starr. Macro tests will be fixed in a dedicated commit, so that they don't pollute meaningful commits, making the life easy for reviewers and spelunkers.
* removes -Xmacro-(.*)-classpath compiler optionsEugene Burmako2012-08-023-67/+19
| | | | | | | | | | | | | | These options were meant to be used to bootstrap macros defined in our codebase However we can bootstrap perfectly without any additional effort, because library classpath classloader can delegate to tool classpath classloader to load macro implementations from starr. Since then (for several months) this functionality hasn't proven to be useful, neither anyone on the mailing list or stackoverflow asked questions about it (even despite it was explicitly mentioned in the "cannot load macro impl" error message). Hence I suggest that it is totally unnecessary and should be removed.
* prepares our macro defs for refactoring (Step II)Eugene Burmako2012-08-027-17/+7
| | | | | | | | | | 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.
* prepares our macro defs for refactoring (Step I)Eugene Burmako2012-08-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | | 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.
* more refinements of reflection APIEugene Burmako2012-08-027-86/+129
| | | | | | | | | | | | | | Added a bunch of test methods to symbols to cover public flags: (e.g. isPrivate, isFinal, isOverride, isImplicit, etc). I'd argue that the API duplication w.r.t flag sets is trumped by unified interface to tests and better encapsulation. Also updated the API to be easier to understand after prior exposure to Java or .NET reflection APIs: 1) Added typeParams to TypeSymbol and ClassSymbol. 2) Renamed MethodSymbol.resultType to returnType. 3) Removed the distinction between MethodSymbol.params vs MethodSymbol.allParams now we just have MethodSymbol.params: List[List[Symbol]].
* SI-5888 Mirrors now have sane toStringsEugene Burmako2012-08-021-1/+31
| | | | | | | | Adds informative toString for InstanceMirror, FieldMirror, MethodMirror (for methods and constructors), ClassMirror and ModuleMirror. Universe mirrors (e.g. JavaMirrors or compiler mirrors) already have good toString methods that show their affiliation and/or classpaths.
* renames asType to toType and asXXXSymbol to asXXXEugene Burmako2012-08-0221-116/+117
| | | | | | | This renaming arguably makes the intent of `asType` more clear, but more importantly it shaves 6 symbols off pervasive casts that are required to anything meaningful with reflection API (as in mirror.reflectMethod(tpe.member(newTermName("x")).asMethodSymbol)).
* miscellaneous refinements of reflection APIEugene Burmako2012-08-027-101/+111
| | | | | | | 1) Removed unnecessary (i.e. implementable with pattern matching) type APIs. 2) Renamed isHigherKinded to takesTypeArgs making it easier to understand. 2) typeParams and resultType have been moved from MethodType to MethodSymbol Strictly speaking they are superfluous, but they are used very often.
* navigation between fields and accessorsEugene Burmako2012-08-023-1/+15
| | | | | | This works around SI-5736 that's been deemed too risky to be fixed in 2.10.0. A reflection newbie will be unlikely to acquire a field symbol from its name, but the `accessed` method provides an easy way to navigate to it from a getter.
* moves most of symbol tests in API to descendantsEugene Burmako2012-08-021-73/+61
| | | | Things like tpe.member("foo").isSkolem don't make much sense.
* simplifies flag APIEugene Burmako2012-08-028-42/+14
| | | | | | | | Flag ops now only include | and hasFlag, flag bearer ops now only include flags and hasFlag. These abstractions are enough to implement everything else, so let's stick to them for the sake of minimalism.
* SI-5732 members and derivatives now return ScopeEugene Burmako2012-08-0216-64/+118
| | | | | | | | | | | | | Firstly this unifies the reflection API - now both decls and members return Scope (not Scope and List[Symbol] as it were before). Secondly this fixes SI-5732 without having to sort the result of members. Type.members now returns Scope, a distinguished type, which has the `sorted` method, which does the required sorting if necessary. Also removes nonPrivateMembers and nonPrivateDeclarations to keep the API minimalistic (as can be seen from their implementation in internal.Types they are just members and decls with bridges and private members removed).
* Merge pull request #1030 from scalamacros/ticket/5751Josh Suereth2012-08-026-112/+137
|\ | | | | SI-5751 cleans up toolboxes for the release
| * SI-5751 cleans up toolboxes for the releaseEugene Burmako2012-07-316-112/+137
| | | | | | | | | | | | | | | | Removes the `freeTypes` parameters on `typeCheckExpr` and `runExpr`, since we now have public `substituteTypes` on both trees and types. Also implements long-awaited `inferImplicitValue` and `inferImplicitView` (thanks to Miles Sabin for nudging me!)
* | Merge pull request #1032 from hubertp/issue/asm-long-signaturesJosh Suereth2012-08-011-2/+7
|\ \ | | | | | | I actually managed to hit the limit of Scala signature annotation not fi...
| * | I actually managed to hit the limit of Scala signature annotation not ↵Hubert Plociniczak2012-07-311-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | fitting into a single string (high five everyone) and entered the undisovered region of arrEncode in GenASM. arrEncode returns Array[String] so asm.AnnotationWriter is not going to like it. Already discussed with @magarciaEPFL but please review again.
* | | Merge pull request #1029 from odersky/ide/getlinkposJosh Suereth2012-08-011-4/+15
|\ \ \ | |/ / |/| | Added more variants to achieve getLinkPos
| * | Added more variants to achieve getLinkPosMartin Odersky2012-07-311-4/+15
| |/ | | | | | | getLinkPos is known to be flakey. This commit tries some variants and logs what failed.
* | Merge pull request #1024 from paulp/topic/type-printingJosh Suereth2012-07-311-2/+8
|\ \ | |/ |/| Fixed maddening "..." lately in printed types.
| * Fixed maddening "..." lately in printed types.Paul Phillips2012-07-301-2/+8
| | | | | | | | | | | | This must have been me when I eliminated some of the remaining distinction between TypeRef(_, moduleClass, Nil) and SingleType(_, moduleClass). Sorry I didn't track it down sooner. Review by anyone who is around because this is overdue.
* | Merge pull request #1020 from odersky/ticket/5866Josh Suereth2012-07-301-2/+10
|\ \ | | | | | | SI-5866 Support casting null to value classes
| * | SI-5866 Support casting null to value classesMartin Odersky2012-07-301-2/+10
| | | | | | | | | | | | The fix now supports null.asInstanceOf[C] where C is a value class that wraps a primitive type.
* | | Merge pull request #1018 from scalamacros/topic/classtag-of-nothingJosh Suereth2012-07-301-2/+7
|\ \ \ | | | | | | | | ClassTag.Nothing now throws an exception
| * | | ClassTag.Nothing now throws an exceptionEugene Burmako2012-07-301-2/+7
| |/ / | | | | | | | | | | | | Nothing is a bottom type, so it doesn't make much sense for it to have a meaningful erasure (ClassTag.Nothing.runtimeClass).
* | | Merge pull request #1016 from hubertp/2.10.x-issue/5031Josh Suereth2012-07-302-5/+2
|\ \ \ | | | | | | | | Fixed SI-5031. Only consider classes when looking for companion class.
| * | | Fixed SI-5031. Only consider classes when looking for companion class.Hubert Plociniczak2012-07-302-5/+2
| |/ / | | | | | | | | | | | | | | | | | | sym.effectiveOwner revealed this piece of inconsistency. companionModule is fine because similar check is there already. Review by @paulp.
* | | Merge pull request #1011 from odersky/ticket/5882Josh Suereth2012-07-301-0/+9
|\ \ \ | | | | | | | | Closes SI-5882
| * | | SI-5799 Secondary constructors in value classes not allowedMartin Odersky2012-07-291-2/+6
| | | | | | | | | | | | | | | | I changed the SIP and added a test.
| * | | Closes SI-5882Martin Odersky2012-07-281-1/+6
| | | | | | | | | | | | | | | | I have added a restriction that value classes may not contain inner classes or objects. This makes sense as the "outer" field of any such classes or objects would be ephemeral, with surprising results. SIP-15 has been changed accordingly.
* | | | Merge pull request #981 from adriaanm/ticket-2038Josh Suereth2012-07-301-1/+3
|\ \ \ \ | | | | | | | | | | SI-2038 make pt fully-defined when typing Typed
| * | | | SI-2038 make pt fully-defined when typing TypedAdriaan Moors2012-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropExistential turns existentials in the expected type (pt) that's passed to `typed` into `BoundedWildcardType`s, but those should not end up in trees when typing a `Typed` node, we didn't check for the type being fully defined (`isFullyDefined`) (and thus did not make it fully defined by turning these BWTs into existentials again using `makeFullyDefined`)
* | | | | Merge pull request #960 from clhodapp/remove-resolve-overloadedJosh Suereth2012-07-302-300/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove resolveOverloaded
| * | | | | Removed resolveOverloadedclhodapp2012-07-302-300/+0
| | |_|_|/ | |/| | | | | | | | | | | | | It was decided to remove it until the next release
* | | | | Merge pull request #1015 from hubertp/2.10.x-issue/5603Josh Suereth2012-07-303-39/+36
|\ \ \ \ \ | |/ / / / |/| | | | Fixed SI-5603. Early definitions now get transparent positions.
| * | | | Fixed SI-5603. Early definitions now get transparent positions.Hubert Plociniczak2012-07-303-39/+36
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This includes a fix for a minor problem described in #594 - ensureNonOverlapping still focuses on default position when outside of early defs. Review by @dragos, @odersky.
* | | | Merge pull request #998 from odersky/topic/bootpackagesJosh Suereth2012-07-301-1/+13
|\ \ \ \ | | | | | | | | | | Avoids loading scala.package and scala.reflect.package from source if a ...
| * | | | Avoids loading scala.package and scala.reflect.package from source if a ↵Martin Odersky2012-07-261-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classfile exists. We know that loading these packages from source leads to compilation errors. To reproduce: Update scala.reflect.package, make sure it is on the source path and recompile anything using it. You will get a number of errors having to do with ClassTags and macro expansions. With the patch, these errors go away because the package is not loaded as long as a classfile exists.
* | | | | Merge pull request #1013 from odersky/ticket/5878odersky2012-07-301-2/+11
|\ \ \ \ \ | | | | | | | | | | | | Closes SI-5878
| * | | | | Closes SI-5878Martin Odersky2012-07-291-2/+11
| | |_|_|/ | |/| | | | | | | | | | | | | We need to impose an additional rule on value classes: They may not unbox directly or indirectly to themselves.
* | | | | Merge pull request #1005 from odersky/topic/worksheetodersky2012-07-3010-72/+262
|\ \ \ \ \ | |_|_|/ / |/| | | | IDE improvements, with particular focus on making worksheets work.
| * | | | New Worksheet mixing schemeMartin Odersky2012-07-275-100/+196
| | | | | | | | | | | | | | | | | | | | Debug changes
| * | | | Raw string interpolatorMartin Odersky2012-07-271-4/+20
| | | | | | | | | | | | | | | | | | | | Adds a raw string interpolator raw"..." which does not do any escape sequence processing.
| * | | | Adds method askForResponseMartin Odersky2012-07-273-2/+31
| | | | | | | | | | | | | | | | | | | | Adds method askForResponse which returns a response immediately instead of waiting for a result. That way, one can wait for an ask's result using a timeout.
| * | | | Disable interrupts during code instrumentationMartin Odersky2012-07-271-4/+8
| | | | | | | | | | | | | | | | | | | | Code instrumentation needs to see a consistent snapshot of a source file. To achieve that we disable interrupts during getInstrumented.
| * | | | New Executor.Martin Odersky2012-07-273-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To try it out: run "instrument worksheet" as usual in the REPL. Worksheet needs to have enclosing object definition. Say it is named "Obj". This will generate a file Obj$instrumented. You can compile that file separately and run it using Java. It should reproduce itself.
* | | | | Merge pull request #997 from dragos/ide/range-positions-in-script-sourcesJosh Suereth2012-07-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | `ScriptSourceFile` should not hard-code `OffsetPosition`.
| * | | | | `ScriptSourceFile` should not hard-code `OffsetPosition`.Iulian Dragos2012-07-261-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | The presentation compiler should support script source files as well, but it needs range positions. This commit fixes an oversight when `RangePosition` was introduced.
* | | | | Merge pull request #996 from gkossakowski/instrumentation-fixesJosh Suereth2012-07-293-3/+15
|\ \ \ \ \ | | | | | | | | | | | | Partest instrumentation fixes