summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3589 from xeno-by/topic/whitebox-typecheck-expecting-unitv2.11.0-RC1Adriaan Moors2014-02-273-0/+12
|\ | | | | test case that verifies SI-8352
| * test case that verifies SI-8352Eugene Burmako2014-02-273-0/+12
| |
* | Update ant build's update.versions mechanism.Adriaan Moors2014-02-271-12/+22
|/
* Bump akka-actor version to 2.3.0-RC4Adriaan Moors2014-02-271-1/+1
|
* Merge pull request #3588 from adriaanm/rebase-3587Adriaan Moors2014-02-2626-83/+163
|\ | | | | Revert "SI-7624 Fix -feature warnings in scala/tools/scalap"
| * Revert "SI-7624 Fix -feature warnings in scala/tools/scalap"Grzegorz Kossakowski2014-02-2626-83/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2de2c4ec43180351ef1f306bcc5f24643ba5477 because it broke both lift-json and json4s libraries that depend on scalap's APIs. Arguably, those libraries shouldn't depend on unofficial APIs but they do because they had no better alternative at the time (no Scala reflection). The cost of breaking them is not worth minor change of the package. The f2de2c4ec43180351ef1f306bcc5f24643ba5477 mixed two things: 1. Fixing feature warnings 2. Changing package name When reverting (and resolving conflicts) I tried to keep 1. and revert just 2. However, there were also some questionable changes related to 1. that got reverted. In particular, a package object with implicit members that enable language features is an anti-pattern because members of package object are visible both _within_ and _outside_ of the package. Therefore, user could use wildcard import for importing everything from scalap package and enabled postfixOps language feature unknowingly. I went for just adding imports in just those few files where they were needed. Amended by Adriaan: To allow faster turn around, I re-enabled resolving partest from sonatype, as its version needs to be bumped and I don't want to wait for maven central synch. Conflicts: src/partest/scala/tools/partest/nest/Runner.scala src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala src/scalap/scala/tools/scalap/scalax/rules/Rule.scala src/scalap/scala/tools/scalap/scalax/rules/Rules.scala src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
* | Merge pull request #3586 from adriaanm/windows-opt-fail-revertGrzegorz Kossakowski2014-02-261-2/+4
|\ \ | |/ |/| Revert "SI-8315 Better debugging facility for ICode"
| * Selectively revert "SI-8315 Better debugging facility for ICode"Adriaan Moors2014-02-261-2/+4
| | | | | | | | | | | | This reverts commit 0561dd084b5f3c2678eb032a40b85cb25bb6d589, because appending the phase name to the icode filename breaks the windows build. Only doing it under -Ydebug.
* | Merge pull request #3585 from lrytz/t4728Adriaan Moors2014-02-263-2/+7
|\ \ | |/ |/| SI-4728 test case
| * SI-4728 test caseLukas Rytz2014-02-263-2/+7
|/
* Merge pull request #3583 from adriaanm/t8197Adriaan Moors2014-02-253-17/+53
|\ | | | | SI-8197 clarify overloading resolution with default args
| * SI-8197 clarify overloading resolution with default argsAdriaan Moors2014-02-253-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit was co-authored with Lukas. His analysis is below. If there are multiple applicable alternatives, drop those that use default arguments. This is done indirectly by checking applicability based on arity. TODO: this `namesMatch` business is not spec'ed, and is the wrong fix for SI-4592. We should instead clarify what the spec means by "typing each argument with an undefined expected type". What does typing a named argument entail when we don't know what the valid parameter names are? (Since we're doing overload resolution, there are multiple alternatives that can define different names.) Luckily, the next step checks applicability to the individual alternatives, so it knows whether an assignment is: - a valid named argument - a well-typed assignment (which doesn't necessarily have type `Unit`!) - an error (e.g., rhs does not refer to a variable) I propose the following solution (as a TODO): check whether a named argument (when typing it in `doTypedApply`) could be interpreted as an assign; `infer.checkNames` should use the type of the well-typed assignment instead of `Unit`. Lukas's analysis: 990fa04 misunderstood the spec of overloading resolution with defaults. it should not discard applicable alternatives that define defaults, but only those that use defaults in the given invocation. bugs were shadowed because the refactoring used `alt.hasDefault` to check whether the alternative has some parameters with defaults, but this never worked. d5bb19f fixed that part by checking the flags of parameters, which fixed some but but un-shadowed others: ``` object t { def f(x: String = "") = 1; def f(x: Object) = 2 } scala> t.f("") // should return 1, but returns 2 after d5bb19f ``` The commit message of d5bb19f also mentions that its test "should fail to compile according to SI-4728", which is another misunderstanding. ``` class A; class B extends A object t { def f(x: A = null) = 1; def f(x: B*) = 2 } t.f() ``` This should return `2`: both alternatives are applicable, so the one that uses a default is eliminated, and we're left with the vararg one. SI-4728 is different in that it uses explicit parameters, `t.f(new B)` is ambiguous.
* | Merge pull request #3581 from Ichoran/issue/3235-minimalAdriaan Moors2014-02-256-3/+42
|\ \ | | | | | | SI-3235 math.round() returns wrong results for Int and Long
| * | SI-3235 math.round() returns wrong results for Int and LongRex Kerr2014-02-256-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | Minimal fix for SI-3235. This minimal fix includes deprecation messages to aid detection of probable errors. Test verifies behavior: the correct values are returned, and deprecation messages are emitted.
* | | Merge pull request #3498 from Ichoran/issue/8240Grzegorz Kossakowski2014-02-253-9/+114
|\ \ \ | | | | | | | | SI-8240 Consider rolling back optimizations for List
| * | | SI-8240 Consider rolling back optimizations for ListRex Kerr2014-02-253-9/+114
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compiler-specific optimizations turn out to be very helpful for Lists in general. * List map can be a lot faster (up to 5x!) * List collect can be considerably faster (up to 3x) * List flatMap can be a bit faster (2x) * List take can be slightly faster (1.1x) and have better structural sharing These appear to be unqualified wins (tested), even in a scenario with mixed collections. This is expected: detecting the builder is faster than the otherwise mandatory object creation, and multiple dispatch is mostly a wash since it was already multiple dispatch in getting to the builder. With -optimize, map is not always such a big win, but is never slower. Also added @noinline to map to work around an optimizer bug (SI-8334) and added a test to check that the pattern that triggers the optimizer bug does not affect any of the map-like methods.
* | | Merge pull request #3579 from densh/topic/quasiquotes-scaladocEugene Burmako2014-02-252-7/+58
|\ \ \ | | | | | | | | Add ScalaDoc to Quasiquotes and Liftables parts of api
| * | | Address pull request feedbackDenys Shabalin2014-02-242-3/+3
| | | |
| * | | Add ScalaDoc to Quasiquotes and Liftables parts of apiDenys Shabalin2014-02-242-7/+58
| | | |
* | | | Merge pull request #3582 from adriaanm/t8251Grzegorz Kossakowski2014-02-254-17/+8
|\ \ \ \ | |_|/ / |/| | | SI-8251 deprecate `ListBuffer::readOnly`
| * | | SI-8251 deprecate `ListBuffer::readOnly`Pavel Pavlov2014-02-244-17/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step towards fixing the unexpected behavior of `ListBuffer`. Many of `ListBuffer`'s operations are forwarded to the underlying `List`, essentially leaking that abstraction to clients that call e.g., `toIterable`. When the buffer changes, the `Iterable` obtained through `toIterable` will reflect that change. To avoid this exposure, call `toList` to obtain an immutable copy. See also: https://groups.google.com/d/msg/scala-internals/g_-gIWgB8Os/kWazrALbLKEJ https://gist.github.com/paulp/9081797
* | | Merge pull request #3566 from adriaanm/t6455Grzegorz Kossakowski2014-02-257-2/+77
|\ \ \ | |/ / |/| | SI-6455 no longer rewrite .withFilter to .filter
| * | SI-6455 util.Try supports withFilterAdriaan Moors2014-02-242-0/+64
| | |
| * | SI-6455 under -Xfuture, don't rewrite .withFilter to .filterAdriaan Moors2014-02-245-2/+13
| | | | | | | | | | | | | | | This has been deprecated for two major releases now, but `filter`'s still preferred over `withFilter` in the wild.
* | | Merge pull request #3580 from gkossakowski/issue/SI-8330Grzegorz Kossakowski2014-02-243-3/+30
|\ \ \ | |_|/ |/| | SI-8330: Mismatch in stack heights
| * | SI-8330: Mismatch in stack heightsGrzegorz Kossakowski2014-02-243-3/+30
|/ / | | | | | | | | | | | | | | | | | | | | | | The SI-8233 / 9506d52 missed one case when we need to DROP a null from a stack: when unboxed Unit is an expected type. If we forgot to do that in a context where two branches were involved we could end up with unbalanced stack sizes. Let's fix that omission and a test covering that specific case to the original test for SI-8233. Fixes SI-8330.
* | Merge pull request #3577 from adriaanm/pr3573-fixupAdriaan Moors2014-02-231-0/+0
|\ \ | | | | | | SI-8324 fix permutation in test filename
| * | SI-8324 fix permutation in test filenameAdriaan Moors2014-02-231-0/+0
| | |
* | | Merge pull request #3559 from adriaanm/t1503Grzegorz Kossakowski2014-02-2310-4/+111
|\ \ \ | | | | | | | | SI-1503 don't assume unsound type for ident/literal patterns
| * | | SI-1503 don't assume unsound type for ident/literal patternsAdriaan Moors2014-02-1910-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix only kicks in under -Xfuture. We also warn under -Xlint. What type should a variable bound to the value matched by a pattern have? To avoid CCEs, it should be a type that's implied by the matching semantics of the pattern. Usually, the type implied by a pattern matching a certain value is the pattern's type, because pattern matching implies instance-of checks. However, Stable Identifier and Literal patterns are matched using `==`, which does not imply a type for the binder that binds the matched value. The change in type checking due to this fix is that programs that used to crash with a CCE (because we blindly cast to the type of the pattern, which a `==` check does not imply) now get a weaker type instead (and no cast). They may still type check, or they may not. To compensate for this fix, change `case x@Foo => x` to `case x: Foo.type => x`, if it's important that `x` have type `Foo.type`. See also: - SI-4577: matching of singleton type patterns uses `eq`, not `==` (so that the types are not a lie). - SI-5024: patmat strips unused bindings, but affects semantics
* | | | Merge pull request #3571 from xeno-by/ticket/8321Adriaan Moors2014-02-2344-22/+844
|\ \ \ \ | | | | | | | | | | SI-8321 bundles can't be whitebox
| * | | | more clean up in the macro engineEugene Burmako2014-02-211-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Now when SI-7507 is fixed in starr, we can actually remove a workaround and make a 10 line reduction in the size of Resolvers.scala.
| * | | | more tests for macro bundlesEugene Burmako2014-02-2126-0/+443
| | | | | | | | | | | | | | | | | | | | | | | | | Given the recent glaring oversight in macro bundles, I have to have more tests in order to make sure that things are going to work as they should.
| * | | | more helpful bundle error messagesEugene Burmako2014-02-214-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, bundle selection mechanism is pretty picky. If a candidate bundle's parameter isn't either blackbox.Context, whitebox.Context or PrefixType refinement thereof, then it's not a bundle and the user will get a generic error. However we can be a bit more helpful and admit classes that are almost like bundles (looksLikeMacroBundleType), have them fail isMacroBundleType, and then emit a much prettier error message to the user that would tell them that bundles must be monomorphic and their sole parameter should not just be any subtype of blackbox.Context or whitebox.Context.
| * | | | prohibits polymorphic bundlesEugene Burmako2014-02-216-4/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not like they were inducing bugs, but I can't see how polymorphism can be useful for macro bundles, hence imho it's better to reduce the number of degrees of freedom of the system.
| * | | | bundles now reject invalid context typesEugene Burmako2014-02-215-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Vanilla macros only allow blackbox.Context, whitebox.Context and PrefixType refinements thereof. Bundles should behave in the same way.
| * | | | SI-8321 whitebox bundles are now recognized as suchEugene Burmako2014-02-2113-2/+297
| | | | | | | | | | | | | | | | | | | | | | | | | whitebox.Context <: blackbox.Context, so in order to check for blackboxity it's not enough to check whether the context used is <: blackbox.Context.
| * | | | minor code cleanup in the macro engineEugene Burmako2014-02-212-3/+3
| | | | |
* | | | | Merge pull request #3574 from greenrd/SI-7962Adriaan Moors2014-02-231-3/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-7962 Scalac runner does not work within Emacs's terminal
| * | | | SI-7962 Scalac runner does not work within Emacs's terminalRobin Green2014-02-221-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | - Always set the env.emacs system property - scalac only cares about whether the system property has a non-empty value, not whether it is set or not. Fixes 7962
* | | | Merge pull request #3575 from retronym/ticket/scaladoc-qbinGrzegorz Kossakowski2014-02-221-0/+1
|\ \ \ \ | | | | | | | | | | Fix ./build/<stage>/bin/scaladoc
| * | | | Fix ./build/<stage>/bin/scaladocJason Zaugg2014-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was: ./build/quick/bin/scaladoc -version Exception in thread "main" java.lang.NoClassDefFoundError: scala/tools/nsc/ScalaDoc Caused by: java.lang.ClassNotFoundException: scala.tools.nsc.ScalaDoc Now: % for tool in ./build/quick/bin/{fsc,scala,scalac,scaladoc,scalap}; do $tool -version; done Fast Scala compiler version 2.11.0-20140222-144307-b0dcf79875 -- Copyright 2002-2013, LAMP/EPFL Scala code runner version 2.11.0-20140222-144307-b0dcf79875 -- Copyright 2002-2013, LAMP/EPFL Scala compiler version 2.11.0-20140222-144307-b0dcf79875 -- Copyright 2002-2013, LAMP/EPFL Scaladoc version 2.11.0-20140222-144307-b0dcf79875 -- Copyright 2002-2013, LAMP/EPFL Scala classfile decoder version 2.0.1 -- (c) 2002-2013 LAMP/EPFL
* | | | | Merge pull request #3573 from retronym/ticket/8324Grzegorz Kossakowski2014-02-227-13/+30
|\ \ \ \ \ | | | | | | | | | | | | SI-8324 Fix regression in override checks for sealed classes
| * | | | | SI-8324 Fix regression in override checks for sealed classesJason Zaugg2014-02-227-13/+30
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adeffda25 changed `Symbol#isEffectivelyFinal` to help the optimizer by inferring finality within sealed class hierarchies. However, this change wasn't neccesarily welcome for other clients of that method. In the enclosed test case, we see that overriding checks in `RefChecks` regressed. This commit moves the enhanced version into a new method and selectively uses it in the optimizer (and the tail call optimizer).
* | | | | Merge pull request #3572 from retronym/ticket/8197Adriaan Moors2014-02-222-1/+10
|\ \ \ \ \ | |_|/ / / |/| | | | SI-8197 Only consider immediate params for defaults, overloading
| * | | | SI-8197 Only consider immediate params for defaults, overloadingJason Zaugg2014-02-222-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent commit fixed the behaviour of overloading with regards to discarding candiates that include default arguments. The old check was checking the wrong flag. But, the new code is actually checking all parameter lists for defaults, which led to a regression in scala-io, which is distilled in the enclosed test case. Applications are typechecked one parameter list at a time, so a holistic check for defaults doesn't seem to make sense; only defaults in the first parameter list ought to count.
* | | | Merge pull request #3563 from adriaanm/t5479Grzegorz Kossakowski2014-02-228-2/+16
|\ \ \ \ | | | | | | | | | | SI-5479 deprecate DelayedInit outside of App
| * | | | SI-5479 link to release notes instead of jira queryAdriaan Moors2014-02-202-3/+3
| | | | |
| * | | | SI-5479 deprecate DelayedInit outside of AppAdriaan Moors2014-02-198-2/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DelayedInit's semantics are way too surprising. For example, it delays initialization of fields, so that fields on objects that extend `App` (which `extends DelayedInit`) are not initialized until the `main` method is called. For more details and a proposed alternative, see https://issues.scala-lang.org/browse/SI-4330?jql=labels%20%3D%20delayedinit%20AND%20resolution%20%3D%20unresolved. Support for `App` will continue -- we'll special case it.
* | | | Merge pull request #3567 from retronym/ticket/8315Jason Zaugg2014-02-226-3/+28
|\ \ \ \ | |_|/ / |/| | | SI-8315 Fix crash in dead code elimination
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 01:19:01 +0000