summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Improve performance and behavior of ListMap and ListSetRui Gonçalves2016-05-172-62/+39
| | | | | | | | Makes the immutable `ListMap` and `ListSet` collections more alike one another, both in their semantics and in their performance. In terms of semantics, makes the `ListSet` iterator return the elements in their insertion order, as `ListMap` already does. While, as mentioned in SI-8985, `ListMap` and `ListSet` doesn't seem to make any guarantees in terms of iteration order, I believe users expect `ListSet` and `ListMap` to behave in the same way, particularly when they are implemented in the exact same way. In terms of performance, `ListSet` has a custom builder that avoids creation in O(N^2) time. However, this significantly reduces its performance in the creation of small sets, as its requires the instantiation and usage of an auxilliary HashSet. As `ListMap` and `ListSet` are only suitable for small sizes do to their performance characteristics, the builder is removed, the default `SetBuilder` being used instead.
* Merge pull request #5129 from retronym/ticket/9762Jason Zaugg2016-04-292-28/+10
|\ | | | | SI-9762 Update the REPL to use JLine 2.14.1
| * SI-9762 Remove workaround after upstream fix in jlineJason Zaugg2016-04-271-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | Now that we use a release of JLine that includes the fix for: https://github.com/jline/jline2/issues/208 We no longer need to the workaround introduced in 7719a3c. Screencast of the still-fixed behaviour: http://recordit.co/5pzh9OhlQv.gif
| * SI-9762 Update to JLine 2.14.1Jason Zaugg2016-04-272-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivated by the improvements to multi-byte character handling. Screencast showing the reported bug is fixed: http://g.recordit.co/ie1Z367NUl.gif Here's the changelog since JLine 2.12.1: https://github.com/jline/jline2/compare/jline-2.12.1...jline-2.14.1 I needed to disable a new, on-by-default feature in JLine so that it didn't add a " " after completing the token `equals` in `foo.equa<TAB>`.
* | Fix the Eclipse classpaths for 2.12.0-M4. (#5136)Performant Data2016-04-283-5/+5
| |
* | Merge pull request #5094 from lrytz/classOfUnitAdriaan Moors2016-04-271-2/+3
|\ \ | |/ |/| Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]
| * Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]Lukas Rytz2016-04-201-2/+3
| |
* | More efficient code for deciding if a mixin forwarder is needed (#5116)Lukas Rytz2016-04-254-16/+27
| | | | | | | | Also adds a warning on junit test methods that compile as default methods.
* | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-2511-34/+116
|\ \ | | | | | | Merge 2.11 to 2.12 apr 22
| * \ Merge commit '684c314' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-222-5/+13
| |\ \
| | * | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | Under `-Yrepl-class-based`, imports from historical `$read` instances must be singleton-typed so that path-dependent types remain so.
| | * | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-201-4/+12
| | | | | | | | | | | | | | | | | | | | When constructing code text for compilation, the REPL should prefer standard escape sequences, in case unicode escapes are disabled.
| * | | Merge commit '23159d2' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-229-29/+103
| |\| |
| | * | Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove `M2_REPO`. All dependencies are picked up from `build/deps` - add script to update an existing workspace directory with the required path variables - add the default Scala library to several projects for better out-of-the-box experience. This means that changes in the scale-library project may not be visible in the other projects, but makes it way easier to get a working config. If you really need that, you probably know what you’re doing anyway.
| | * | Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2323-234/+336
| | |\ \ | | | | | | | | | | Update IntelliJ build for use with sbt
| | * | | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | Includes tests to verify the toString representations.
* | | | | Merge pull request #5109 from lrytz/pr5064Lukas Rytz2016-04-2332-434/+781
|\ \ \ \ \ | | | | | | | | | | | | SI-9684 Deprecate JavaConversions
| * | | | | Rename the (deprecated) implicit conversion methods in JavaConversionsLukas Rytz2016-04-222-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide higher-priority implicit conversion methods whose names don't clash with methods in JavaConverters. This allows implicit conversions to work when importing both JavaConverters._ and JavaConversions._.
| * | | | | Cleaned up Scaladoc for JavaConverters and non-deprecated friendsLukas Rytz2016-04-227-872/+261
| | | | | |
| * | | | | SI-9684 Deprecate JavaConversionsSom Snytt2016-04-2232-83/+1005
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit conversions are now in package convert as ImplicitConversions, ImplicitConversionsToScala and ImplicitConversionsToJava. Deprecated WrapAsJava, WrapAsScala and the values in package object. Improve documentation.
* / / / / SI-9516 Fix the behavior of Int shift Long operations. (#5117)Sébastien Doeraene2016-04-232-7/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In any shift operation where the lhs is an Int (or smaller) and the rhs is a Long, the result kind must be Int, and not Long. This is important because the lhs must *not* be promoted to a Long, as that causes an opcode for long shift to be emitted. This uses an rhs modulo 64, instead of int shifts which use an rhs module 32. Instead, the rhs must be downgraded to an Int. The new behavior is consistent with the same operations in the Java programming language.
* | | | Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodesLukas Rytz2016-04-229-101/+68
|\ \ \ \ | |_|_|/ |/| | | Remove the duplicate implem of hash codes for numbers.
| * | | Remove the duplicate implem of hash codes for numbers.Sébastien Doeraene2016-04-219-88/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there were two separate implementations of hash code for boxed number classes: * One in Statics, used by the codegen of case class methods. * One in ScalaRunTime + BoxesRunTime, used by everything else. This commit removes the variant implemented in ScalaRunTime + BoxesRunTime, and always uses Statics instead. We use Statics because the one from ScalaRunTime causes an unnecessary module load. The entry point ScalaRunTime.hash() is kept, as deprecated, for bootstrapping reasons.
| * | | Bring Statics.doubleHash in sync with BoxesRunTime.hashFromDouble.Sébastien Doeraene2016-04-211-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two algorithms were different, and could result in different hash codes for some values, namely, valid long values that were not also valid int values. The other two functions `longHash` and `floatHash` are rewritten to keep a common style with `doubleHash`, but their algorithm does not change.
* | | | Merge pull request #5096 from lrytz/traitParentsLukas Rytz2016-04-207-240/+276
|\ \ \ \ | | | | | | | | | | Ensure ClassBTypes constructed from symbol and classfile are identical
| * | | | Ensure that lzycompute methods are entered into the scopeLukas Rytz2016-04-201-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | For some reason this was not the case, leading to spurious inliner warnings (no inline info found for method O$lzycompute).
| * | | | Ensure ClassBTypes constructed from symbol and classfile are identicalLukas Rytz2016-04-204-21/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A super call (invokespecial) to a default method T.m is only allowed if the interface T is a direct parent of the class. Super calls are introduced for example in Mixin when generating forwarder methods: trait T { override def clone(): Object = "hi" } trait U extends T class C extends U The class C gets a forwarder that invokes T.clone(). During code generation the interface T is added as direct parent to class C. Note that T is not a (direct) parent in the frontend type of class C. This commit stores interfaces that are added to a class during code generation in the InlineInfo classfile attribute. This allows filtering the interface list when constructing a ClassBType from a classfile.
| * | | | Clean up code gen for method invocationsLukas Rytz2016-04-203-211/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was patched many times in the history and became a bit scattered. When emitting a virtual call, the receiver in the bytecode cannot just be the method's owner (the class in which it is declared), because that class may not be accessible at the callsite. Instead we use the type of the receiver. This was basically done to fix - aladdin bug 455 (9954eaf) - SI-1430 (0bea2ab) - basically the same bug, slightly different - SI-4283 (8707c9e) - the same for field reads In this patch we extend the fix to field writes, and clean up the code. This patch basically reverts 6eb55d4b, the fix for SI-4560, which was rather a workaround than a fix. The underlying problem was that in some cases, in a method invocation `foo.bar()`, the method `bar` was not actually a member of `foo.tpe`, causing a NoSuchMethodErrors. The issue was related to trait implementation classes. The idea of the fix was to check, at code-gen time, `foo.tpe.member("bar")`, and if that returns `NoSymbol`, use `barSym.owner`. With the new trait encoding the underlying problem seems to be fixed - all tests still pass (run/t4560.scala and run/t4560b.scala).
| * | | | SD-98 don't emit unnecessary mixin forwardersLukas Rytz2016-04-121-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases when a class inherits a concrete method from a trait we don't need to generate a forwarder to the default method in the class. t5148 is moved to pos as it compiles without error now. the error message ("missing or invalid dependency") is still tested by t6440b.
* | | | | scala-dev-113: Sync root package words to layout (#5107)Janek Bogucki2016-04-201-1/+1
| | | | | | | | | | | | | | | The package list is on the right.
* | | | | Merge pull request #5100 from lrytz/unitBoxLukas Rytz2016-04-202-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | | SI-6710 / PR 5072 follow-up: fix Unit.box / Unit.unbox
| * | | | SI-6710 / PR 5072 follow-up: fix Unit.box / Unit.unboxLukas Rytz2016-04-202-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The backend replaces .box / .unbox methods by corresponding invocations to BoxesRunTime, but not for Unit. This commit restores the body of `Unit.box` and `Unit.unbox`.
* | | | Merge pull request #5098 from sjrd/simplify-scala-runtimeLukas Rytz2016-04-2011-167/+46
|\ \ \ \ | | | | | | | | | | Simplify scala.runtime
| * | | | Remove the unused scala.runtime.Boxed trait.Sébastien Doeraene2016-04-131-12/+0
| | | | |
| * | | | Remove plain old dead code in ScalaRunTime.Sébastien Doeraene2016-04-131-26/+0
| | | | |
| * | | | Do not rely on ScalaRunTime.{inlineEquals,hash} in JavaMirrors.Sébastien Doeraene2016-04-131-3/+3
| | | | | | | | | | | | | | | | | | | | We can use the normal Scala language constructs instead.
| * | | | Move ScalaRunTime.box to typechecker.Macros.Sébastien Doeraene2016-04-132-15/+14
| | | | | | | | | | | | | | | | | | | | Because it was its only call site.
| * | | | Inline ScalaRunTime.arrayElementClass at call sites.Sébastien Doeraene2016-04-136-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was awful. Not only it was using run-time type tests to essentially encode compile-time overloading. But it also did 2 slightly different things for the Class case and ClassTag case. All in all, it is much more readable to inline the appropriate implementation at every call site.
| * | | | Move ScalaRunTime.isAnyVal to reify.phases.Reify.Sébastien Doeraene2016-04-132-6/+5
| | | | | | | | | | | | | | | | | | | | Because that is the only call site of that method.
| * | | | Hide ScalaRunTime.isTuple inside stringOf.Sébastien Doeraene2016-04-131-2/+3
| | | | | | | | | | | | | | | | | | | | Because it is otherwise unused.
| * | | | Remove dead-code runtime hash() methods.Sébastien Doeraene2016-04-132-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScalaRunTime had a bunch of overloads of the `hash()` method, but only the `Any` version is ever used by the codegen. Worse, their implementation was not in sync with the actual implementations in BoxesRunTime, called by the `Any` version. For example, hash(0x80000000L) != hash(0x80000000L: Any) This commit simply removes all of this dead code. Similarly, we remove BoxesRunTime.hashFromObject(), which was never called either.
| * | | | Inline ArrayRuntime methods in ScalaRunTime.array_clone().Sébastien Doeraene2016-04-132-35/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for Array[T].clone() was introduced in 36ef60e68c03bc1c7fd2e910ae7d70d4ec32d3bf. At the time, all calls to array.clone() were redirected to ScalaRunTime.array_clone(), which meant that array_clone() itself could not be implemented in terms of `x.clone()`. A Java binding was necessary. Now, the rewriting to `array_clone()` is only done for unbounded generic arrays. Since all the calls within `array_clone()` are monomorphic arrays, the rewriting is not applied, and the Java binding is unnecessary.
* / / / SI-9749 REPL strip lead ws on dot continuation (#5097)som-snytt2016-04-151-7/+7
|/ / / | | | | | | | | | | | | | | | Permit leading whitespace before `.` for continued selection. This is just to handle pastes, which will typically include indented text, and not to make dot-continuation especially robust.
* | | Merge pull request #5082 from lrytz/inlineImplClassCleanupLukas Rytz2016-04-0715-283/+73
|\ \ \ | | | | | | | | Cleanups related to the removal of trait impl classes
| * | | Fix InlineInfo attribute for nested module accessorsLukas Rytz2016-04-071-5/+7
| | | |
| * | | Remove references to trait impl classes, mostly in doc commentsLukas Rytz2016-04-079-84/+25
| | | |
| * | | Remove unused optimizer warnings related to trait impl classesLukas Rytz2016-04-041-6/+0
| | | |
| * | | Remove dead code in the optimizer related to trait impl classesLukas Rytz2016-04-047-188/+41
| | | |
* | | | Delete unnecessary blank linesh0hei2016-04-071-2/+0
| | | |
* | | | Generate AnyVal source stubs from sbtStefan Zeiger2016-04-0612-565/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sbt command `generateSources` now generates both the AnyVal sources and the tuple/function sources (previously done by `genprod`). Source generation is part of the sbt build, the `scala.tools.cmd.gen` package is removed from `scala-compiler`. This simplifies bootstrapping. Generated sources are still in the same location and checked into git. The shell scripts `tools/codegen` and `tools/codegen-anyvals` are also removed. The ant build and the build scripts do not call these. Regenerating sources is a manual step at the moment.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 19:11:35 +0000