summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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.
* | | | | | 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.