summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.
* | | | | Merge pull request #661 from retronym/ticket/5683Adriaan Moors2012-06-034-29/+77
|\ \ \ \ \ | | | | | | | | | | | | SI-5683 Fail gracefully when transposing a ragged type arg matrix.
| * | | | | SI-5683 Fail gracefully when transposing a ragged type arg matrix.Jason Zaugg2012-06-034-29/+77
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code used to do this, until `transpose` starting throwing IAE rather than AIOOBE. Symptomatic treatment only: The reported crasher now infers ill-kinded type args and reports an error.
* | | | | Merge pull request #664 from adriaanm/revert-653Adriaan Moors2012-06-034-24/+9
|\ \ \ \ \ | | | | | | | | | | | | Revert "#653 -- no lub for statement exprs' types"
| * | | | | Revert "#653 -- no lub for statement exprs' types"Adriaan Moors2012-06-034-24/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I should not have merged this pull request yet. I didn't notice we didn't have a full successful run of the test suite. It looks like it breaks test/files/continuations-neg/lazy.scala and given the pending amount of changes, I prefer to have a stable master. This reverts commit 037d3dcbc5896864aec0f9121eeda23fcc4cd610.
* | | | | Merge pull request #653 from dragos/issue/skip-lub-in-blocksAdriaan Moors2012-06-034-9/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't compute least upper bounds for if-like exprs in statement position
| * | | | | Don't compute least upper bounds for expressions in statement positions ↵Iulian Dragos2012-06-034-9/+24
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inside blocks. This may save huge amount of time (Fixes SI-5862) for complicated lubs. I had to remove the a check in adapt for the part that transforms <expr> into { <expr>; () } when the expected type is Unit. The reason is in the code. As a side effect, we get more warnings for pure expressions in statement positions (see the change in the test file).
* | | | | Merge pull request #650 from adriaanm/topic-virtpatmatAdriaan Moors2012-06-0313-365/+916
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unreachability analysis for pattern matches Thanks for reviewing, @retronym!
| * | | | | incorporate @retronym's review commentsAdriaan Moors2012-06-031-69/+39
| | | | | |
| * | | | | allow disabling patmat analyses: -Xno-patmat-analysisAdriaan Moors2012-06-014-8/+13
| | | | | |
| * | | | | fixing bug found by unreachabilityAdriaan Moors2012-06-011-3/+2
| | | | | |
| * | | | | Unreachability analysis for pattern matchesAdriaan Moors2012-06-0110-249/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analyze matches for unreachable cases. A case is unreachable if it implies its preceding cases. Call `C` the formula that is satisfiable if the considered case matches. Call `P` the formula that is satisfiable if the cases preceding it match. The case is reachable if there is a model for `-P /\ C`. Thus, the case is unreachable if there is no model for `-(-P /\ C)`, or, equivalently, `P \/ -C`, or `C => P`. Unreachability needs a more precise model for type and value tests than exhaustivity. Before, `{case _: Int => case 1 =>}` would be modeled as `X = Int \/ X = 1.type`, and thus, the second case would be reachable if we can satisfy `X != Int /\ X = 1.type`. Of course, the case isn't reachable, yet the formula is satisfiable, so we must augment our model to take into account that `X = 1.type => X = Int`. This is done by `removeVarEq`, which models the following axioms about equality. It does so to retain the meaning of equality after replacing `V = C` (variable = constant) by a literal (fresh symbol). For each variable: 1. a sealed type test must result in exactly one of its partitions being chosen (the core of exhaustivity) 2. when a type test is true, tests of super types must also be true, and unrelated type tests must be false For example, `V : X ::= A | B | C`, and `A => B` (since `A extends B`). Coverage (1) is formulated as: `A \/ B \/ C`, and the implications of (2) are simply `V=A => V=B /\ V=X`, `V=B => V=X`, `V=C => V=X`. Exclusion for unrelated types typically results from matches such as `{case SomeConst => case OtherConst => }`. Here, `V=SomeConst.type => !V=OtherConst.type`. This is a conservative approximation. If these constants happen to be the same value dynamically (but the types don't tell us this), the last case is actually unreachable. Of course we must err on the safe side. We simplify the equality axioms as follows (in principle this could be done by the solver, but it's easy to do before solving). If we've already excluded a pair of assignments of constants to a certain variable at some point, say `(-A \/ -B)`, then don't exclude the symmetric one `(-B \/ -A)`. (Nor the positive implications `-B \/ A`, or `-A \/ B`, which would entail the equality axioms falsifying the whole formula.) TODO: We should also model dependencies between variables: if `V1` corresponds to `x: List[_]` and `V2` is `x.hd`, `V2` cannot be assigned at all when `V1 = null` or `V1 = Nil`. Right now this is implemented hackily by pruning counter-examples in exhaustivity. Unreachability would also benefit from a more faithful representation. I had to refactor some of the framework, but most of it is shared with exhaustivity. We must allow approximating tree makers twice, sharing variables, but using different approximations for values not statically known. When considering reachability of a case, we must assume, for example, that its unknown guard succeeds (otherwise it would wrongly be considered unreachable), whereas unknown guards in the preceding cases must be considered to fail (otherwise we could never get to those case, and again, it would falsely be considered unreachable). Since this analysis is relatively expensive, you may opt-out using `-Xno-patmat-analysis` (or annotating the selector with @unchecked). We hope to improve the performance in the near future. -Ystatistics has also been extended to provide some numbers on time spent in the equality-rewrite, solving and analyzing.
| * | | | | support for repeated approximation of treemakersAdriaan Moors2012-06-011-38/+47
| | | | | |
| * | | | | patmatdebugAdriaan Moors2012-06-011-60/+57
| | | | | |
| * | | | | construct typed trees in TypeTestTMAdriaan Moors2012-06-011-3/+6
| | | | | |
| * | | | | all treemakers need positions for unreachable errorAdriaan Moors2012-06-011-6/+16
| |/ / / /
* | | | | Merge pull request #648 from pvlugter/issue/5792Adriaan Moors2012-06-031-13/+8
|\ \ \ \ \ | | | | | | | | | | | | More robust findScalaHome in bash scripts
| * | | | | More robust findScalaHome in bash scripts. See SI-5792Peter Vlugter2012-06-011-13/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | Allows multiple absolute or relative symlinks by jumping through the directories while following the links.
* | | | | Merge pull request #657 from paulp/parser-booleansAdriaan Moors2012-06-031-56/+57
|\ \ \ \ \ | | | | | | | | | | | | Made parser less hostile to inspection.
| * | | | | Made parser less hostile to inspection.Paul Phillips2012-06-021-56/+57
| | |/ / / | |/| | | | | | | | | | | | | By annotating all the boolean method arguments.
* | | | | Merge pull request #658 from odersky/ticket/5399Adriaan Moors2012-06-032-1/+46
|\ \ \ \ \ | |/ / / / |/| | | | Fix for SI-5399.
| * | | | Closes t5399. Review by adriaanmMartin Odersky2012-06-022-1/+46
|/ / / /
* | | | Merge pull request #649 from magarciaEPFL/icodeAfterAnyOptimizPhaseJosh Suereth2012-06-011-11/+19
|\ \ \ \ | | | | | | | | | | allows printing .icode files after any optimiz phase
| * | | | allows printing .icode files after any optimiz phaseMiguel Garcia2012-06-011-11/+19
| |/ / /
* | | | Merge pull request #646 from magarciaEPFL/fixesAdriaan Moors2012-06-011-5/+6
|\ \ \ \ | |/ / / |/| | | skipping unnecessary work in GenASM when emitting 1.5 classfiles
| * | | skipping unnecessary work in GenASM when emitting 1.5 classfilesMiguel Garcia2012-05-311-5/+6
|/ / /
* | | Merge pull request #645 from odersky/topic/inkling-consolidatedAdriaan Moors2012-05-306-81/+158
|\ \ \ | |/ / |/| | Partial redesign of incremental compiler invalidation.
| * | Partial redesign of incremental compiler invalidation.Martin Odersky2012-05-306-81/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now do the right thing when packages are either newly created or deleted. Previously there was a problem when a new package was created inside a system package (and, unofrtunately, root is a system package). That's fixed now. We also approximate more tightly now when packages are newly created (iei the newly created symbol gets rescanned, instead of its owner). Incremental class invalidation: dealing with empty package. The compiler can now also invalidate the empty package. Previously, no invalidation was done because empty was identified with root, which is considered a system package. (1) Fixed NPE when creating a new toplevel package in invalidation. (2) generalized interface to deal with multiple entries at a time.
* | | Merge pull request #638 from lrytz/wip/t5843Adriaan Moors2012-05-303-2/+26
|\ \ \ | | | | | | | | fix t5843
| * | | fix t5843Lukas Rytz2012-05-283-2/+26
| | | |
* | | | Merge pull request #634 from retronym/ticket/4579Adriaan Moors2012-05-302-0/+519
|\ \ \ \ | |_|/ / |/| | | SI-4579 Yoke the power of lisp.scala as a stress for the optimizer.
| * | | SI-4579 Yoke the power of lisp.scala as a stress for the optimizer.Jason Zaugg2012-05-272-0/+519
| | | | | | | | | | | | | | | | The reported bug was fixed between 2.10.0-M1 and 2.10.0-M2.
* | | | Merge pull request #640 from odersky/topic/inklingAdriaan Moors2012-05-287-6/+127
|\ \ \ \ | | | | | | | | | | Implemented functionality to invalidate classpath entries
| * | | | Implemented functionality to invalidate classpath entries, to enable ↵Martin Odersky2012-05-287-6/+127
| | | | | | | | | | | | | | | | | | | | incremental compiles.
* | | | | Merge pull request #636 from retronym/ticket/5845Adriaan Moors2012-05-283-1/+24
|\ \ \ \ \ | | | | | | | | | | | | SI-5845 Advances the example from a crasher to an inference failure.
| * | | | | SI-5845 Advances the example from a crasher to an inference failure.Jason Zaugg2012-05-283-1/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inference failure itself seems like an instance of of SI-3346. But dependent method types (which triggered the crash), can be employed to avoid inferring the type constructor CC. class Num[T] { def mkOps = new Ops class Ops { def +++(rhs: T) = () } } class A { implicit def infixOps[T](lhs: T)(implicit num: Num[T]): num.Ops = num.mkOps implicit val n1: Num[Int] = new Num[Int] { } 5 +++ 5 }
* | | | | Merge pull request #635 from adriaanm/topic/virtpatmatAdriaan Moors2012-05-283-7/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | fixes for exhaustivity
| * | | | handle approximating alternative of empty patternAdriaan Moors2012-05-281-1/+4
| | | | |
| * | | | don't check exhaustivity involving user-defined unapplySeqAdriaan Moors2012-05-283-6/+13
| |/ / /
* | | | Merge pull request #633 from retronym/topic/value-class-bridgeAdriaan Moors2012-05-274-2/+32
|\ \ \ \ | |/ / / |/| | | Fix a NSDNHAO in extension methods.
| * | | Fix a NSDNHAO in extension methods.Jason Zaugg2012-05-274-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bridge method, created when we override a method from a superclass and refine the return type, was appearing as an overloaded alternative. (`erasure` doesn't create new scopes, so the bridges it builds are visible at earlier phases.) The problem was masked when compiling with specialization, which *does* create a new scope, shielding the code in question from the artefacts of erasure. To fix the problem, we filter out bridge methods from the overloaded alternatives returned by `.decl`, as would happen internally in `.member`.
* | | | Handled some of our new exhaustiveness warnings.Paul Phillips2012-05-269-11/+17
| | | | | | | | | | | | | | | | Who could have suspected it would actually be right most of the time?
* | | | Orphan checkfile remover.Paul Phillips2012-05-2638-1013/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Are these -msil checkfiles used in some secret fashion? The level of activity suggest otherwise. Since scala-nightly-msil has been disabled for over a year, it's an easy rm unless someone speaks up. % tools/rm-orphan-checkfiles Scanning for orphan check files... rm 'test/disabled/run/code.check' rm 'test/files/jvm/t1652.check' rm 'test/files/neg/macro-argtype-mismatch.check' rm 'test/files/neg/macro-noncompilertree.check' rm 'test/files/neg/macro-nontree.check' rm 'test/files/run/Course-2002-01-msil.check' rm 'test/files/run/Course-2002-02-msil.check' rm 'test/files/run/Course-2002-03-msil.check' rm 'test/files/run/Course-2002-04-msil.check' rm 'test/files/run/Course-2002-08-msil.check' rm 'test/files/run/Course-2002-09-msil.check' rm 'test/files/run/Course-2002-10-msil.check' rm 'test/files/run/absoverride-msil.check' rm 'test/files/run/bitsets-msil.check' rm 'test/files/run/boolord-msil.check' rm 'test/files/run/bugs-msil.check' rm 'test/files/run/impconvtimes-msil.check' rm 'test/files/run/infix-msil.check' rm 'test/files/run/iq-msil.check' rm 'test/files/run/macro-invalidret-doesnt-conform-to-impl-rettype.check' rm 'test/files/run/macro-rettype-mismatch.check' rm 'test/files/run/misc-msil.check' rm 'test/files/run/promotion-msil.check' rm 'test/files/run/richs-msil.check' rm 'test/files/run/runtime-msil.check' rm 'test/files/run/tuples-msil.check' rm 'test/pending/jvm/t1464.check' rm 'test/pending/run/subarray.check' rm 'test/pending/run/t0446.check' rm 'test/pending/run/t5629.check' Scanning for orphan flags files... rm 'test/files/neg/macro-argtype-mismatch.flags' rm 'test/files/neg/macro-noncompilertree.flags' rm 'test/files/neg/macro-nontree.flags' rm 'test/files/pos/anyval-children.flags' rm 'test/files/pos/t3097.flags' rm 'test/files/run/macro-invalidret-doesnt-conform-to-impl-rettype.flags' rm 'test/files/run/macro-rettype-mismatch.flags'
* | | | Help our new exhaustiveness checker.Paul Phillips2012-05-261-6/+9
|/ / / | | | | | | | | | ...be a little less chatty.
* | | Merge pull request #612 from adriaanm/ticket/5829Adriaan Moors2012-05-262-2/+20
|\ \ \ | | | | | | | | fix SI-5829: refinement typeref has a prefix
| * | | fix SI-5829: refinement typeref has a prefixAdriaan Moors2012-05-242-2/+20
| |/ /