summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4988 from som-snytt/issue/backtick-barAdriaan Moors2016-05-201-2/+2
|\ | | | | SI-9665 Backquoted vbar in extractor pattern
| * SI-9665 Backquoted vbar in extractor patternSom Snytt2016-03-151-2/+2
| | | | | | | | Allow an infix extractor named `|`, when backquoted.
* | SI-7916: ScriptEngine supportSom Snytt2016-05-193-163/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #5176 from lrytz/t9671Lukas Rytz2016-05-193-20/+33
|\ \ | | | | | | SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to Object
| * | SI-9066 fix null.asInstanceOf[Unit]Lukas Rytz2016-05-181-0/+4
| | |
| * | SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to ObjectLukas Rytz2016-05-183-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | SI-8756 Fix generic signature for refinement of primitiveJason Zaugg2016-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | improve README (#5163)Lukas Rytz2016-05-181-16/+48
| | |
* | | Merge pull request #5103 from ruippeixotog/improve-list-map-set-perfLukas Rytz2016-05-172-305/+194
|\ \ \ | | | | | | | | Improve performance and behavior of ListMap and ListSet
| * | | Add SerialVersionUID to ListSetRui Gonçalves2016-05-171-0/+3
| | | |
| * | | Make ListMap and ListSet implementations similarRui Gonçalves2016-05-172-247/+156
| | | | | | | | | | | | | | | | 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-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 #5170 from retronym/merge/2.11.x-to-2.12.x-20160517Lukas Rytz2016-05-172-19/+25
|\ \ \ \ | | | | | | | | | | Merge 2.11.x to 2.12.x [ci: last-only]
| * \ \ \ Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2016-05-172-19/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-022-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Add summary reporting to Scaladoc (#5063)Felix Mulder2016-05-137-23/+81
| | | | |
* | | | | Merge pull request #5146 from som-snytt/issue/9045-msgLukas Rytz2016-05-132-36/+34
|\ \ \ \ \ | | | | | | | | | | | | SI-9045 Error on recursive ctor
| * | | | | SI-9045 Error on recursive ctorSom Snytt2016-05-042-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | If the constructor invokes itself, say so.
| * | | | | SI-9045 Refactor to abuse of matchSom Snytt2016-05-041-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse conditionals into match for legible. Yes, guards have scary eval order.
* | | | | | Add check to scala REPL package to improve feedback about implicits (#5159)Jens2016-05-131-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the repl is started with additional compiler flags that prevent implicits being in scope (like -Yno-predef) the default message of implicits in scope using :implicits stays the same. This additional check will return the same message if predef is indeed in scope and an adjusted message if Predef is not in scope.
* | | | | | Merge pull request #5156 from retronym/topic/partest-1.0.14Jason Zaugg2016-05-122-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump to scala-partest 1.0.14
| * | | | | | Bump to scala-partest 1.0.14Jason Zaugg2016-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the bootstrap build by incorporating https://github.com/scala/scala-partest/pull/58
* | | | | | | Correct off-by-one error in Product documentation (#5148)Janek Bogucki2016-05-111-1/+1
| | | | | | |
* | | | | | | SI-9397 Add "_root_" to "GenUtils.scalaFactoryCall" to avoid the scala ↵Shixiong Zhu2016-05-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package name conflits (#5150) When a user imports some package ending with `scala`, the macro expansion of TypeTag may not work because it uses `scala.collection.immutable.List` but it's overrided. This patch adds the `_root_` prefix to avoid the scala package name conflits. Of cause, after this fix, importing a package ending with `_root_` has the same issue. However, people rarely do that.
* | | | | | | SI-9666: Use inline group names in Regex (#4990)som-snytt2016-05-111-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate `Match group name` to the underlying `matcher`. If that fails, try explicit group names as a fall back. No attempt is made to correlate inline and explicit names. In the following case, either name is accepted: ``` new Regex("a(?<Bar>b*)c", "Bee") ``` But if names are reversed, the error is undetected: ``` new Regex("a(?<Bee>b*)(?<Bar>c)", "Bar", "Bee") ``` Throw IllegalArg on bad group name to be consistent with Java.
* | | | | | | BitSet{1,2} conversion (#5127)Ruslan Sennov2016-05-111-5/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In current implementation when we set high word (elems1) of BitSet2 to zero, the result is BitSet2 again. I believe it is leading to excessive memory usage and result should be BitSet1. Private helper method createSmall(a: Long, b: Long) introduced.
* | | | | | Merge pull request #5042 from soc/SI-9539Jason Zaugg2016-05-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9539 Specify charset when reading ScalaSignatures, ...
| * | | | | | SI-9539 Specify charset when reading ScalaSignatures, ...Simon Ochsenreither2016-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... without it we would use the platform's default charset.
* | | | | | | Merge pull request #5083 from xuwei-k/fix-Future-scaladocJason Zaugg2016-05-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use Future#foreach instead of onSuccess in example code
| * | | | | | | use Future#foreach instead of onSuccess in example codexuwei-k2016-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bacause Future#onSuccess is deprecated https://github.com/scala/scala/commit/fa0743c32338f147eaf7a
* | | | | | | | Merge pull request #5112 from lrytz/dropRecursiveClasspathJason Zaugg2016-05-0527-945/+350
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove legacy recursive classpath implementation
| * | | | | | | | Remove abstraction layer in classpath implementationLukas Rytz2016-05-0227-408/+313
| | | | | | | | |
| * | | | | | | | faster AggregateClassPath.findClassLukas Rytz2016-04-231-13/+12
| | | | | | | | |
| * | | | | | | | remove recursive classpath implementationLukas Rytz2016-04-2319-577/+78
| | | | | | | | |
* | | | | | | | | Merge pull request #5132 from acdenhartog/patch-1Jason Zaugg2016-05-051-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid function chaining with reverse method
| * | | | | | | | | Avoid function chaining with reverse methodArno den Hartog2016-04-271-3/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #5140 from lrytz/inlineDefaultMethodsJason Zaugg2016-05-055-53/+161
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | SD-140 inline the correct default method
| * | | | | | | | SD-140 inline the correct default methodLukas Rytz2016-04-285-53/+161
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inheriting multiple default methods, select the correct one to inline. Implements method resolution according to the JVM spec.
* | | | | | | | Emit a warning when a constant expression evaluates to an ↵Olli Helenius2016-05-022-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArithmeticException (#5123)
* | | | | | | | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behavior when parsing the content of a tag text (like after `@example`) was to ignore empty lines. That's fine, except when we are in the middle of a code block, where preserving formatting matters.
* | | | | | | | SD-142 Avoid noisy log output in backend (#5134)Jason Zaugg2016-05-022-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `withCurrentUnit` is designed to be called once per compilation unit as it side effects by logging and updating progress counters. `GenBCode` was calling it more frequently (once per `ClassDef`.) This is due to the somewhat convoluted internal architecture of that phase, which is designed to support paralellism in the future. This commit factors out the internal part of `withCompilationUnit` that modifies `currentUnit`, and calls that instead in the loop over classes. After this change: ``` % qscala -Ydebug ... [running phase jvm on <console>] // only once ```
* | | | | | | | Add examples to Exception object and group members (#5111)Janek Bogucki2016-05-021-25/+165
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extend main comment with additional examples - Group methods from a user perspective - List exceptions special cased by shouldRethrow - Include overlooked withTry in opt, either notes.
* | | | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 07:57:22 +0000