| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | |_|_|/ / / /
| |/| | | | | | |
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Merge 2.10.x into master
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | / / /
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
build.number
src/compiler/scala/tools/nsc/doc/base/MemberLookupBase.scala
src/compiler/scala/tools/nsc/typechecker/Macros.scala
test/files/presentation/doc/doc.scala
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
bump build number to 2.10.2
|
| | | |/ / / / / / |
|
| | | |\ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
Fix typing idempotency bug with Annotated trees
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Additional test case for Lukas' fix to annotated originals.
|
| | | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This was inspired by the regression that Mark encountered
when upgrading SBT from 2.10.0 to 2.10.1-RC1.
|
| | | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
typedAnnotated transforms an Annotated tree into a Typed tree. The
original field of the result is set to the Annotated tree.
The bug was that typedAnnotated was using the untyped Annotated tree
as original, but also set its type. When re-typing later on the same
Annotated tree, the typer would consider it as alreadyTyped. This
is incorrect, the typer needs to convert Annotated trees to Typed.
Also, the Annotated tree only had its type field set, but its children
were still untyped. This crashed the compiler lateron, non-typed trees
would get out of the typing phase.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
Fix SI-7130: Memory leaked caused by Statistics
|
| | | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
As described in the ticket, we were leaking memory by holding reference
to Global through by-name argument that was captured by an instance of
a class stored in global HashMap `qs`.
The fix is simple: do not register quantities in HashMap unless statistics
is enabled. This way, if Statistics is disabled we do not store any
references.
We still leak memory in case of statistics being enabled.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
SI-7143 Fix scanner docComment production.
|
| | | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
in different places and as a result can get out of sync and as a result
the invariant that docComment has a position is broken.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
SI-7134: don't require doc.Settings in base api of scaladoc.
|
| | | | |/ / / / |
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
huitseeker/issue/value-protected-in-inherited-1000567
SI-5013 / #1000567 : added presentation test for fixed bug
|
| | | | | | | | | |
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
Removing disabled, unneeded futures tests
|
| | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
make Future scaladoc examples up-to-date and compilable
|
| | | | | |/ / / /
| | | |/| | | | |
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
SI-5744 evidence params are now SYNTHETIC
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The macro def <-> macro impl correspondence check compares names of the
corresponding parameters in def and impl and reports an error if they
don't match. This was originally designed to avoid confusion w.r.t named
arguments (which ended up being never implemented as described in SI-5920).
Sometimes parameter names are generated by the compiler, which puts the
user in a tough position. Luckily, there's an escape hatch built it, which
omits the name correspondence check if one of the parameters is SYNTHETIC.
Everything went well until we realized that evidences generated by
context bounds aren't SYNTHETIC, which led to the bug at hand.
Marking auto-generated evidence parameters SYNTHETIC was only the first
step, as the correspondence checker uses parameter symbols, not parameter
trees. Why's that a problem? Because SYNTHETIC doesn't get propagated from def
trees to their underlying symbols (see ValueParameterFlags).
Unfortunately one cannot just change ValueParameterFlags, because that
would break printouts generated in TypeDiagnostics, which is designed to not
print synthetic symbols. Thus we modify methodTypeErrorString in
TypeDiagnostics to always print synthetic symbols.
Therefore now we propagate all paramSym.flags when doing correspondent sweeps
to keep them in sync between def trees and their underlying symbols. This
fixes the problem.
|
| | | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
SI-7091 Don't try to put a protected accessor in a package.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This shows up when a protected[pack] class has a constructor
with a default argument.
Regressed in f708b87 / SI-2296.
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
Fix and optimization in overriding logic.
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Given:
trait Foo { def f: Int = 5 }
trait Bar extends Foo { def f: Int }
I noticed allOverriddenSymbols for the abstract f defined in Bar
was returning the method from Foo, even though an abstract method
cannot override a concrete one. There were other bits of code
which accidentally depended on this outcome. Now allOverriddenSymbols
for Bar is empty.
The optimization is that whether or not a symbol overrides
any other symbols is known at creation time and does not change.
We now spend a lot less time looking for overridden symbols in
base classes by storing that value, "isOverridingSymbol".
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
Extracted abstract implicit vals from Types.
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These should be considered plumbing and not blended in with the
rest of the api.
|
| |\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
Boxing cleanup: erasure, post-erasure, value classes.
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Introduces extractors for value class trees. Puts them to
work to make the value class tree manipulations believable.
Eliminated some boxing code in erasure which had been
marked "maybe subsumed by posterasure?" after deciding
that it had been subsumed by posterasure.
Added some same-bytecode tests involving value class boxing
(actually the lack thereof.)
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
SI-6642 Adds iteratorFrom, keysIteratorFrom, and valuesIteratorFrom
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit is code cleanup from the review on
https://github.com/scala/scala/pull/2119
* Changes several instances of
def f[A, ]… to
def f[A]…
* Changes several instances of
def f[A](…)(implicit ordering : Ordering[A])… to
def f[A: Ordering](…)…
* Changes one instance of
x == null to
x eq null
* Changes two instances of
id + bottomid to
bottomid + id
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There was no reason to have mutable.TreeSet use AVLTree while
immutable.TreeSet and immutable.HashSet used RedBlackTree. In
particular that would have meant duplicating the iteratorFrom logic
unnecessarily. So this commit refactors mutable.TreeSet to use
RedBlackTree for everything, including iteratorFrom. It also adds
a test to make sure TreeSet works as expected.
AVLTree should be dead code since it's private[scala.collection.mutable]
and only used by mutable.TreeSet, but to be safe it's only deprecated
in this commit.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Adds the ability to efficiently create an iterator that starts at a
given key or element of a sorted set or map. Similar work is done for
key and value only iterators on maps.
The bulk of the work is in RedBlackTree. Most of the rest is pushing
the new api methods throughout the appropriate spots in the collection
API.
This commit leaves undone some similar work possible on mutable TreeSets
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In anticipation of some work needed to implement iteratorFrom, this
commit does some variable renaming and general code clean up on
RedBlackTree's TreeIterator.
|
| |\ \ \ \ \
| | | | | |
| | | | | | |
merge 2.10.x
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Implicits.scala
|
| | | |\ \ \ \
| | | | | | |
| | | | | | | |
silences t6323a
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Tag materialization notices enabled with -Xlog-implicits are now echoes
not printlns. Therefore, they go into stderr, not stdout, getting logged
by partest and not spamming stdout of partest.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
SI-6514 Avoid spurious dead code warnings
|
| | | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
`deadCode.expr` stores the method symbol most recently encountered
in `handleMonomorphicCall`, and uses this to avoid warnings
for arguments to label jumps and `Object#synchronized` (which
sneakily acts by-name without advertising the fact in its type.)
But this scheme was insufficient if the argument itself contains
another method call, such as `matchEnd(throw e(""))`.
This commit changes the single slot to a stack, and also
grants exemption to `LabelDef` trees. They were incorrectly
flagged in the enclosed test case after I made the the first change.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
Tolerate symbol sharing between accessor/field.
|
| | | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Recently, TreeCheckers (-Ycheck) was extended to
report on references to symbols that were not in
scope, which is often a sign that some substitution
or ownership changes have been omitted.
But, accessor methods directly use the type of the
underlying field, without cloning symbols defined
in that type, such as quantified types in existentials,
at the new owner.
My attempt to change this broke pos/existentials.scala.
Instead, I'll just look the other way in TreeCheckers.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | | |
SI-6225 Fix import of inherited package object implicits
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The prefix in the ImplicitInfo must be com.acme.`package`.type,
rather than com.acme.
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
SI-6935 Added readResolve in BoxedUnit
|
| | | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When deserializing Unit, it would return an instance of Object, but not a Scala Unit.
By adding readResolve, the deserialization of Unit will work.
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
SI-6370 changed ListMap apply0 method to produce correct error message
|
