summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5162 from milessabin/t9361Lukas Rytz2016-05-233-2/+19
|\ | | | | SI-9361 fixed assert allowing display of improved error message.
| * SI-9361 fixed assert allowing display of improved error message.Miles Sabin2016-05-143-2/+19
| |
* | Merge pull request #5153 from petermz/ticket/5463Lukas Rytz2016-05-232-1/+32
|\ \ | | | | | | SI-5463 Check .jars before using them
| * | SI-5463 Check .jars before using thempeterz2016-05-172-1/+32
| | | | | | | | | | | | Make broken JAR files on compiler classpath cause a fatal error
* | | Merge pull request #5168 from xuwei-k/range-value-classLukas Rytz2016-05-231-1/+1
|\ \ \ | | | | | | | | Make Range.Partial a value class
| * | | Make Range.Partial a value classxuwei-k2016-05-171-1/+1
| | | |
* | | | Merge pull request #5180 from lrytz/junit-passJason Zaugg2016-05-2346-2036/+2051
|\ \ \ \ | | | | | | | | | | Clean up JUnit tests, make sure they pass without bootstrap [ci: last-only]
| * | | | Adapt naming convention for collection.convert null safety testLukas Rytz2016-05-203-279/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test classes not ending in "Test" are not executed in sbt. IntelliJ runs them. After this patch: 803 tests executed both in sbt and junit.
| * | | | All JUnit tests pass without bootstrap (when run in intellij, sbt)Lukas Rytz2016-05-203-92/+123
| | | | |
| * | | | Split RunTest and BytecodeTest into parts, put in matching packages.Lukas Rytz2016-05-2013-610/+660
| | | | |
| * | | | Cleanup in BytecodeTestLukas Rytz2016-05-201-28/+20
| | | | |
| * | | | Small cleanup in JUnit testLukas Rytz2016-05-201-5/+1
| | | | |
| * | | | Clean up bytecode testing methods.Lukas Rytz2016-05-2022-462/+496
| | | | |
| * | | | Better abstraction for JUnit run testsLukas Rytz2016-05-202-11/+22
| | | | |
| * | | | Better abstraction for bytecode tests. Also organize some imports.Lukas Rytz2016-05-2030-555/+453
| | | | |
| * | | | Rename nsc.backend.jvm.CodeGenTools to testing.BytecodeTestingLukas Rytz2016-05-2030-39/+35
| | | | |
* | | | | Merge pull request #4988 from som-snytt/issue/backtick-barAdriaan Moors2016-05-202-2/+9
|\ \ \ \ \ | | | | | | | | | | | | SI-9665 Backquoted vbar in extractor pattern
| * | | | | SI-9665 Backquoted vbar in extractor patternSom Snytt2016-03-152-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Allow an infix extractor named `|`, when backquoted.
* | | | | | Merge pull request #4819 from som-snytt/issue/7916-ScriptEngine-deferredStefan Zeiger2016-05-2011-189/+471
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-7916: ScriptEngine support
| * | | | | | SI-7916: ScriptEngine supportSom Snytt2016-05-1911-189/+471
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the ScriptEngine support to an adaptor atop the IMain API. Allow references to resolve to context attributes. (The attributes must be defined at compilation time, though they may resolve to updated values at evaluation time.) This means that attributes are not bound statically in REPL history. In particular, we forgo the trick of binding attributes named "name: Type" as typed values. Instead, an `x` bound in dynamic context is injected into the script as a dynamic selection `$ctx.x` where `ctx` performs the look-up in the script context. When a compiled script is re-evaluated, a new instance of the script class is created and defined symbols are rebound. The context stdout writer is handled with `Console.withOut`, with bytes decoded using the default charset. Compilation errors are thrown as ScriptException with the first reported error. This commit doesn't attempt dynamic selection from objects in context. Currently, script must cast.
* | | | | | Merge pull request #5093 from jodersky/scaladoc-include-assetsStefan Zeiger2016-05-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [Build] Include missing web assets in scaladoc
| * | | | | Include missing web assets in scaladocscaladoc-include-assetsJakob Odersky2016-05-191-1/+1
|/ / / / /
* | | | | Test case for SI-5183, tagged primitives in case classes (#5144)Ben Hutchison2016-05-192-0/+42
| | | | | | | | | | | | | | | Test for SI-7088, arrays containing tagged primitives
* | | | | Merge pull request #5176 from lrytz/t9671Lukas Rytz2016-05-196-36/+155
|\ \ \ \ \ | | | | | | | | | | | | SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to Object
| * | | | | SI-9066 fix null.asInstanceOf[Unit]Lukas Rytz2016-05-183-23/+27
| | | | | |
| * | | | | SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to ObjectLukas Rytz2016-05-186-30/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erasure first replaces null.asInstanceOf[Int] by unbox(null). If the expected type erases to object, erasure then introduces a box operation, yielding box(unbox(null)). Note that this value is a box of zero, not null. Erasure has an optimization to replace box(unbox(x)) in case x is of primitive type. 60f1b4b extended this to the case when x is null, which is incorrect in general. The reason was to prevent creating a primitive box to be stored in the unused generic field when creating an instance of a specialized class. A special case ensures that this optimization is still performed.
* | | | | | Generate static forwarders for object members in companion interface (#5131)Jason Zaugg2016-05-194-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to disable generation of static forwarders when a object had a trait as a companion, as one could not add methods with bodies to an interface in JVM 6. The JVM lifted this restriction to support default methods in interfaces, so we can lift the restriction on static forwarders, too. Fixes https://github.com/scala/scala-dev/issues/59
* | | | | | Merge pull request #5130 from retronym/ticket/SD-129Jason Zaugg2016-05-1923-23/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SD-129 Mark JFunctionN as serializable
| * | | | | SD-129 Mark JFunctionN as serializableJason Zaugg2016-04-2723-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, if these were used as the target type of a lambda in Java source code, the lambda would not be serializable. This is somewhat suprising when contrasted with the way that Scala lambdas work in Scala source. Since we copied these classes over from scala-java8-compat, that project has opted to add Serializable as a parent to solve this issue. This commit brings our copy of these interfaces into line with that change.
* | | | | | Merge pull request #5174 from retronym/ticket/8756Lukas Rytz2016-05-183-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-8756 Fix generic signature for refinement of primitive
| * | | | | | SI-8756 Fix generic signature for refinement of primitiveJason Zaugg2016-05-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java generic signature generation was making the wrong assumption about how refinement types should erase to Java generics. This commit passes through the current value of `primitiveOk`, rather than forcing it to `true`. This flag is true when generating the signature for `f2`, but false in `i2` (as we are in a type argument position).
| * | | | | | SI-8756 Test to demonstrate the status quoJason Zaugg2016-05-182-0/+31
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java generic signatures assume that refinement types should be boxed. Why did `g2` in the test seem to be immune to this bug demonstrated by `f2`? Because we opt to elide the generic signature altogether when no generics are involved.
* | | | | | improve README (#5163)Lukas Rytz2016-05-183-185/+287
| | | | | |
* | | | | | Merge pull request #5103 from ruippeixotog/improve-list-map-set-perfLukas Rytz2016-05-1710-346/+306
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improve performance and behavior of ListMap and ListSet
| * | | | | Add SerialVersionUID to ListSetRui Gonçalves2016-05-172-1/+6
| | | | | |
| * | | | | Make ListMap and ListSet implementations similarRui Gonçalves2016-05-174-251/+160
| | | | | | | | | | | | | | | | | | | | | | | | ListSet and ListMap are two collections which share the exact same internal structure. This commit makes the two approaches as similar as possible by renaming and reordering internal methods, improving their Scaladoc and their code style. The Scaladoc of the classes and companion objects is also improved in order to alert users of the time complexity of the collections' operations.
| * | | | | Improve performance and behavior of ListMap and ListSetRui Gonçalves2016-05-179-98/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #5170 from retronym/merge/2.11.x-to-2.12.x-20160517Lukas Rytz2016-05-179-27/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 2.11.x to 2.12.x [ci: last-only]
| * \ \ \ \ \ Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2016-05-179-27/+115
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20160517 Conflicts: build.sbt test/files/run/repl-javap-app.check test/files/run/repl-javap-app.scala
| | * | | | | Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-173-9/+46
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Eliminate major sources of daily noise in SBT build.
| | | * | | | | [backport] sbt build targets build/Adriaan Moors2016-05-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It avoids confusion with existing test/partest scripts that test the compiler in build/, while sbt it targeting build-sbt/.
| | | * | | | | Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-163-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Intercept incorrect "binary conflict" warning issued by SBT. Fixes https://github.com/scala/scala-dev/issues/100 - Bump to a new version of pantsbuild/jarjar to fix an incompatibility with Java 8 parameter names in class files, which we run into on the 2.12.x branch. See: https://github.com/pantsbuild/jarjar/pull/19 - Disable info level logging for dependency resolve/download.
| | * | | | | | Merge pull request #5090 from som-snytt/issue/9740-repl-bad-importLukas Rytz2016-05-118-92/+80
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-9740 Repl import fix -Yrepl-class-based
| | | * | | | | | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-028-92/+80
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under `-Yrepl-class-based`, templating must follow the same scoping as under traditional object-based. The new test shows a typical case where two values of the same simple name must be imported in different scopes.
* | | | | | | | SI-9773 Fix doc for "".lines (#5161)som-snytt2016-05-171-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | An empty string yields an empty iterator.
* | | | | | | | SI-2458 Clarify spec for package syms (#5151)som-snytt2016-05-171-37/+54
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package definitions are priority 4. Update the big example to be cut/pastable.
* | | | | | / Reduce boilerplate in compiler JUnit tests (#5158)Jason Zaugg2016-05-1625-258/+112
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many JUnit tests share a compiler instance between all test cases in a class to reduce overhead. This commit refactors the mechanism to reduce the boilerplate. In the new scheme: - Using the `@ClassRule` hook in JUnit, we create a per-class map for each test class. - Per-class values are registered from the test class itself by calling `cached("someKey", () => mkExpensiveThing)` - At the end of the test, the entries in this map are `close()`-ed (if they implement `Closable`), and are released for garbage collection.)
* | | | | | Add summary reporting to Scaladoc (#5063)Felix Mulder2016-05-137-23/+81
| | | | | |
* | | | | | Merge pull request #5146 from som-snytt/issue/9045-msgLukas Rytz2016-05-137-39/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9045 Error on recursive ctor
| * | | | | | SI-9045 Error on recursive ctorSom Snytt2016-05-047-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the constructor invokes itself, say so.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 09:05:16 +0000