summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix SI-3836 not-really-ambiguous import detection.Paul Phillips2012-07-054-3/+81
| | | | | Normalize types before declaring that two imports are ambiguous, because they might be the same thing. Review by @moors.
* Merge pull request #831 from dgruntz/issue/6033Josh Suereth2012-07-052-1/+15
|\ | | | | SI-6033 Closed. Provides implicit conversion from BigInteger to BigInt
| * SI-6033 Closed. Provides implicit conversion from java.math.BigInteger to BigIntDominik Gruntz2012-07-052-1/+15
|/
* Merge pull request #821 from adriaanm/64acb46ab7Adriaan Moors2012-07-0510-86/+308
|\ | | | | SI-5830 switches: support guards, unreachability
| * SI-5830 switches: support guards, unreachabilityAdriaan Moors2012-07-0310-86/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turn switches with guards into guard-free switches by collecting all cases that are (possibly) guarded by different guards but that switch on the same constant, and pushing the implied if-then-else into the collapsed case body ``` case C if G1 => B1 case C if Gi => Bi case C if GN => BN ``` becomes ``` case C => if (G1) B1 else if (Gi) Bi else if (GN) BN else default() // not necessary if GN == EmptyTree ``` default() is a jump to the default case; to enable this, we wrap a default() { } labeldef around the last case's body (the user-defined default or the synthetic case that throws the matcherror) so we can jump to the default case after the last guard is checked (assuming unreachability is checked, once we ended up in a non-default case, one of the guards either matches or we go to the default case) the unreachability analysis is minimal -- we simply check (after rewriting to guard-free form) that: - there are no duplicate cases - the default case comes last misc notes: - can't jump in exception handlers (TODO: a more fine-grained analysis on when we need to jump) - work around SI-6015 (test file run/t5830.scala crashed the inliner) - propagate type of case body to label def of default case (needed for existentials, see e.g., t2683) - the default(){} LabelDef breaks SelectiveANFTransform -- workaround: don't write guarded switches in CPS code (do the above transformation manually)
* | Merge pull request #803 from magarciaEPFL/offload-classfile-writing-BAdriaan Moors2012-07-054-280/+444
|\ \ | | | | | | performance improvements (10% to 20% depending on HDD vs SSD) in GenASM
| * | GenASM gets a 10% performance boost via switchMiguel Garcia2012-07-012-245/+353
| | |
| * | GenASM: pipeline disk-write with building of classfilesMiguel Garcia2012-07-013-35/+91
| | |
* | | Merge pull request #777 from retronym/ticket/2796Adriaan Moors2012-07-044-0/+39
|\ \ \ | | | | | | | | SI-2796 Warn if early definitions are used with a trait.
| * | | SI-2796 Warn if early definitions are used with a trait.Jason Zaugg2012-06-264-0/+39
| | | | | | | | | | | | | | | | For which they (currently) have no special meaning.
* | | | Merge pull request #818 from scalamacros/topic/tags-for-anyval-and-anyrefAdriaan Moors2012-07-049-54/+88
|\ \ \ \ | | | | | | | | | | tags for AnyVal and AnyRef
| * | | | tags for AnyVal and AnyRefEugene Burmako2012-07-049-54/+88
| | | | |
* | | | | Merge pull request #820 from retronym/ticket/6013Adriaan Moors2012-07-045-1/+32
|\ \ \ \ \ | | | | | | | | | | | | SI-6013 Disallow deferred members from intermediate java parents.
| * | | | | SI-6013 Disallow deferred members from intermediate java parents.Jason Zaugg2012-07-045-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76c76b28f allowed for the fact that a Java method can override a super class method without matching its type in a Scala sense; it need only match its type after erasure. However that change went too far, and considered a concrete method in a base class to override a deferred method in a subclass.
* | | | | | Merge pull request #814 from hubertp/issue/5969Adriaan Moors2012-07-044-2/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Closes SI-5969.
| * | | | | | Better explanation for SI-5969.Hubert Plociniczak2012-07-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment should now better reflect the joys of tryTwice as discussed during the code review.
| * | | | | | Closes SI-5969.Hubert Plociniczak2012-07-024-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assumption that we enter tryTwice when inferring the right alternative with an empty buffer is wrong. In this particular bug it manifested itself on if/then/else which share the same context and 'else' branch was simply flushing the buffer with an error from the 'then' branch.
* | | | | | | Merge pull request #809 from dragos/issue/fix-5929Adriaan Moors2012-07-042-11/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix SI-5929 - Verify error with finally and pattern match
| * | | | | | | Fix SI-5929 - Verify error with finally and pattern matchIulian Dragos2012-07-022-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't enter all labels in a method when emitting a forward jump, since some labels will be duplicated (if defined inside finally blocks). For each forward jump, enter only the label that is needed for that jump.
* | | | | | | | Merge pull request #772 from magarciaEPFL/recoveringOptimizedStabilityCAdriaan Moors2012-07-044-355/+445
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | recovering optimized stability
| * | | | | | | readability of MethodTFA.mutatingInterpret()Miguel Garcia2012-07-011-106/+37
| | | | | | | |
| * | | | | | | refactoring to functional style Inliner's isStampedForInlining()Miguel Garcia2012-06-263-138/+223
| | | | | | | |
| * | | | | | | inliner makes fields public only when actually inliningMiguel Garcia2012-06-253-148/+222
| | | | | | | |
* | | | | | | | Merge pull request #815 from scalamacros/ticket/5990Adriaan Moors2012-07-034-12/+46
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | u.build now correctly invokes missing symbol hooks
| * | | | | | | SI-5990 u.build now correctly invokes missing symbol hooksEugene Burmako2012-07-034-12/+46
|/ / / / / / /
* | | | | | | Merge pull request #810 from scalamacros/pullrequest/manifests-and-ticket6005Adriaan Moors2012-07-03101-431/+675
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | two pullrequests from this morning, combined to merge changes to starrs
| * | | | | | | reify no longer dealiases symbols and typesEugene Burmako2012-07-0240-125/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this uncovers a bug in toolboxes: https://issues.scala-lang.org/browse/SI-6007 however that bug is not critical, so it will be dealt with later
| * | | | | | | miscellaneous cleanupEugene Burmako2012-07-023-4/+7
| | | | | | | |
| * | | | | | | removes ClassTag.String and TypeTag.StringEugene Burmako2012-07-0219-67/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypeTag.String is removed because it's unclear whether it should point to scala.Predef.String or to java.lang.String. ClassTag.String is removed to be consistent with TypeTag.String. This requires re-bootstrapping, because Definitions.scala in locker expects classTag[String] being automatically generated, whereas starr disagrees with locker on how to generate that class tag.
| * | | | | | | further improves reflection printersEugene Burmako2012-07-0214-93/+125
| | | | | | | |
| * | | | | | | Improves backward compatibility of manifestsEugene Burmako2012-07-0232-145/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) type ClassManifest[T] = ClassTag[T] (solves a problem with toArray[T: ClassManifest] defined on most of the collections; if these types weren't aliases, then we won't be able to change the signature of that method to toArray[T: ClassTag], because that would break source compatibility for those who override toArray in their custom collections) 2) Compiler-generated manifests no longer trigger deprecation warnings (this is implemented by using ClassManifestFactory instead of ClassManifest and ManifestFactory instead of Manifest) 3) Deprecation messages got improved to reflect the changes that were introduced in 2.10.0-M4.
* | | | | | | | Merge pull request #808 from scalamacros/topic/moduleclassAdriaan Moors2012-07-034-6/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | better module classes support in the reflection API
| * | | | | | | | better module classes support in the reflection APIEugene Burmako2012-07-024-6/+23
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #801 from paulp/issue/exponential-specAdriaan Moors2012-07-032-2/+52
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix for exponential compile time in specialization.
| * | | | | | | Fix for exponential compile time in specialization.Paul Phillips2012-06-302-2/+52
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Review by @prokopec.
* | | | | | | Merge pull request #812 from dragos/new-eclipse-project-filesAdriaan Moors2012-07-024-24/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improved Eclipse project files and documentation
| * | | | | | | Update README for Eclipse project files.Iulian Dragos2012-07-021-2/+31
| | | | | | | |
| * | | | | | | The `reflect` project now depends on the `scala-library` project.Iulian Dragos2012-07-023-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the reflect project before the default library in the `scala-compiler` project, so that hyperlinks are resolved against the project sources, instead of the default binary library. README is now in markdown format.
* | | | | | | | Merge pull request #798 from retronym/ticket/2807-4Adriaan Moors2012-07-023-17/+30
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | SI-2807 Avoid catch all warning for Stable Id patterns
| * | | | | | | SI-2807 Avoid catch all warning for Stable Id patternsJason Zaugg2012-06-303-17/+30
| | | | | | | |
* | | | | | | | Merge pull request #802 from retronym/ticket/5489Adriaan Moors2012-07-024-17/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-5489 Avoid accidentally adding members to Object in erasure.
| * | | | | | | | SI-5489 Avoid accidentally adding members to Object in erasure.Jason Zaugg2012-07-014-17/+41
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Symbol#classBound` assumed that `refinedType` would return a a type based on new refinement class symbol; but that isn't so during erasure. Instead, it returns the first super class, into which we entered new members. Needless to say, the next run of the resident compiler didn't take kindly to these hijinks. To remedy the situation, I've added (yet another) condition on `phase.erasedTypes`.
* | | | | | | | Merge pull request #771 from retronym/ticket/4176-2Adriaan Moors2012-07-025-15/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-4176 A repeat dose of repeated parameter type sanitization.
| * | | | | | | | SI-4176 A repeat dose of repeated parameter type sanitization.Jason Zaugg2012-06-305-15/+35
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - During eta expansion, treat parameters of type A* as Seq[A] - Do the same for method/class parameters as referred to by an Ident. Also fixes SI-5967, which shows up during pattern matching.
* | | | | | | | Merge pull request #800 from retronym/ticket/5932Adriaan Moors2012-07-023-1/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-5932 Tone down non-sensible == warning with refinements.
| * | | | | | | | SI-5932 Tone down non-sensible == warning with refinements.Jason Zaugg2012-07-013-1/+17
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Errs on the side of avoiding false positives.
* | | | | | | | Merge pull request #804 from scalamacros/topic/reflectglobalAdriaan Moors2012-07-025-11/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | moves reflective compiler into scala.tools.reflect
| * | | | | | | moves reflective compiler into scala.tools.reflectEugene Burmako2012-07-025-11/+20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #792 from jsuereth/fixup/from-reprJosh Suereth2012-06-296-55/+145
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...
| * | | | | | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike type ↵Josh Suereth2012-06-276-55/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | class-ish things.