summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Refactoring. Simplify inferImplicit's boolean leversAdriaan Moors2016-03-265-58/+72
| | | | | |
| * | | | | For backwards compat, sammy comes lastAdriaan Moors2016-03-261-7/+7
| | | | | |
| * | | | | Refactoring. Decakify TypeAdaptingTransformerAdriaan Moors2016-03-263-52/+47
| | | | | |
| * | | | | Treat `Function` literals uniformly, expecting SAM or FunctionN.Adriaan Moors2016-03-266-320/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They both compile to INDY/MetaLambdaFactory, except when they occur in a constructor call. (TODO: can we lift the ctor arg expression to a method and avoid statically synthesizing anonymous subclass altogether?) Typers: - no longer synthesize SAMs -- *adapt* a Function literal to the expected (SAM/FunctionN) type - Deal with polymorphic/existential sams (relevant tests: pos/t8310, pos/t5099.scala, pos/t4869.scala) We know where to find the result type, as all Function nodes have a FunctionN-shaped type during erasure. (Including function literals targeting a SAM type -- the sam type is tracked as the *expected* type.) Lift restriction on sam types being class types. It's enough that they dealias to one, like regular instance creation expressions. Contexts: - No longer need encl method hack for return in sam. Erasure: - erasure preserves SAM type for function nodes - Normalize sam to erased function type during erasure, otherwise we may box the function body from `$anonfun(args)` to `{$anonfun(args); ()}` because the expected type for the body is now `Object`, and thus `Unit` does not conform. Delambdafy: - must set static flag before calling createBoxingBridgeMethod - Refactored `createBoxingBridgeMethod` to wrap my head around boxing, reworked it to generalize from FunctionN's boxing needs to arbitrary LMF targets. Other refactorings: ThisReferringMethodsTraverser, TreeGen.
| * | | | | Review feedback from LukasAdriaan Moors2016-03-261-1/+4
| | | | | |
| * | | | | Set the scene for Sammy.Adriaan Moors2016-03-267-76/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go beyond refactoring and introduce some hooks and patch some holes that will become acute when we set Sammy loose. Expanding sam requires class as first parent: `addObjectParent`. (Tested in pos/sam_ctor_arg.scala, coming next.)
| * | | | | Refactoring. Sweep Sammy's backyard.Adriaan Moors2016-03-265-232/+190
| | | | | |
| * | | | | SI-9449 sam expansion for explicitly eta-expanded methodAdriaan Moors2016-03-261-2/+10
| | | | | |
| * | | | | Refactor typedFunction, rework synthesizeSAMFunction for sammyAdriaan Moors2016-03-264-189/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `typedFunction` uniformly recognizes Single Abstract Method types and built-in `FunctionN` types, type checking literals regardless of expected type. `adapt` synthesizes an anonymous subclass of the SAM type, if needed to meet the expected (non-`FunctionN`) type. (Later, we may want to carry `Function` AST nodes with SAM types through the whole pipeline until the back-end, and treat them uniformly with built-in function types there too, emitting the corresponding `invokedynamic` & `LambdaMetaFactory` bytecode. Would be faster to avoid synthesizing all this code during type checking...) Refactor `typedFunction` for performance and clarity to avoid non-local returns. A nice perk is that the error message for missing argument types now indicates with `<error>` where they are missing (see updated check file). Allow pattern matching function literals when SAM type is expected (SI-8429). Support `return` in function body of SAM target type, by making the synthetic `sam$body` method transparent to the `enclMethod` chain, so that the `return` is interpreted in its original context. A cleaner approach to inferring unknown type params of the SAM method. Now that `synthesizeSAMFunction` operates on typed `Function` nodes, we can take the types of the parameters and the body and compare them against the function type that corresponds to the SAM method's signature. Since we are reusing the typed body, we do need to change owners for the symbols, and substitute the new method argument symbols for the function's vparam syms. Impl Notes: - The shift from typing as a regular Function for SAM types was triggered by limitation of the old approach, which deferred type checking the body until it was in the synthetic SAM type subclass, which would break if the expression was subsequently retypechecked for implicit search. Other problems related to SAM expansion in ctor args also are dodged now. - Using `<:<`, not `=:=`, in comparing `pt`, as `=:=` causes `NoInstance` exceptions when `WildcardType`s are encountered. - Can't use method type subtyping: method arguments are in invariant pos. - Can't use STATIC yet, results in illegal bytecode. It would be a better encoding, since the function body should not see members of SAM class. - This is all battle tested by running `synthesizeSAMFunction` on all `Function` nodes while bootstrapping, including those where a regular function type is expected. The only thing that didn't work was regarding Function0 and the CBN transform, which breaks outer path creation in lambdalift.
| * | | | | SI-9415 Turn on SAM by defaultJason Zaugg2016-03-263-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial work to change settings and test by Svyatoslav Ilinskiy Thanks! To avoid cycles during overload resolution (which showed up during bootstrapping), and to improve performance, I've guarded the detection of SAM types in `isCompatible` to cases when the LHS is potentially compatible.
| * | | | | Refactor. Extract mkLiteralUnit and mkUnitBlockAdriaan Moors2016-03-262-5/+8
| | | | | |
| * | | | | Remove dead code now that `genBCodeActive` is always true.Adriaan Moors2016-03-266-347/+57
| | | | | |
| * | | | | TypeHistory's toString time travels consistentlyAdriaan Moors2016-03-261-1/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | For each history entry, run the `Type`'s `toString` at the corresponding phase, so that e.g., a method type's parameter symbols' `info`'s `toString` runs at the phase corresponding to the type history we're turning into a string.
* | | | | Merge pull request #5066 from acjay/cleanup_scaladoc_hoverAdriaan Moors2016-03-301-3/+3
|\ \ \ \ \ | | | | | | | | | | | | minor style updates for Scaladoc formatting
| * | | | | minor style updates for Scaladoc formattingAlan Johnson2016-03-281-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | - lighten hover highlight color for higher text/background contrast - adjust border-left for div.members to prevent content shifts on-hover
* | | | | Merge pull request #5033 from szeiger/issue/9623-2.12Adriaan Moors2016-03-301-44/+46
|\ \ \ \ \ | | | | | | | | | | | | Replace JoinIterator & improve ConcatIterator
| * | | | | Replace JoinIterator & improve ConcatIteratorStefan Zeiger2016-03-111-44/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `ConcatIterator` requires only one extra lightweight wrapper object (cons cell) to be allocated compared to `JoinIterator`. All additional concatenations are then done in place with one cons cell per appended iterator. Running 1000000 iterations of the following benchmark for LHS recursion: ``` def lhs(n: Int) = (1 to n).foldLeft(Iterator.empty: Iterator[Int])((res, _) => res ++ Iterator(1)).sum ``` On 2.12.x before SI-9623 fix: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 555ms 1000000: 344ms 1000000: 397ms 1000000: 309ms 1000000: 290ms 1000000: 283ms 1000000: 282ms 1000000: 281ms 1000000: 290ms 1000000: 279ms ``` With SI-9623 fix: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 610ms 1000000: 324ms 1000000: 387ms 1000000: 315ms 1000000: 296ms 1000000: 300ms 1000000: 341ms 1000000: 294ms 1000000: 291ms 1000000: 281ms ``` With this version: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 362ms 1000000: 162ms 1000000: 140ms 1000000: 150ms 1000000: 110ms 1000000: 57ms 1000000: 79ms 1000000: 109ms 1000000: 120ms 1000000: 49ms ``` And for RHS recursion: ``` def rhs(n: Int) = (1 to n).foldLeft(Iterator.empty: Iterator[Int])((res, _) => Iterator(1) ++ res).sum ``` On 2.12.x before SI-9623 fix: ``` StackOverflowError ``` With SI-9623 fix: ``` StackOverflowError ``` With this version: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 3156ms 1000000: 1536ms 1000000: 1240ms 1000000: 1575ms 1000000: 439ms 1000000: 706ms 1000000: 1043ms 1000000: 1211ms 1000000: 515ms 1000000: 314ms ```
* | | | | | Merge pull request #5062 from felixmulder/topic/scaladoc-search-historySeth Tisue2016-03-301-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add back to search for Scaladoc
| * | | | | | Add search history for ScaladocFelix Mulder2016-03-301-0/+24
| | | | | | |
* | | | | | | Add type and class/trait member search, fixes SI-9721 and SI-9722Felix Mulder2016-03-302-14/+29
|/ / / / / /
* | | | | | Merge pull request #5058 from lrytz/newTraitsInlinerLukas Rytz2016-03-302-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Inline super calls, as they are statically resolved
| * | | | | | Inline super calls, as they are statically resolvedLukas Rytz2016-03-232-3/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that mixin methods of `@inline` annotated concrete trait methods inline the trait method. Fixes https://github.com/scala/scala-dev/issues/86
* | | | | | Merge pull request #5060 from scala/DarkDimius-patch-1Lukas Rytz2016-03-291-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a bug in multi-dimensional array creation
| * | | | | | Fix a bug in multi-dimensional array creationDmitry Petrashko2016-03-231-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `']' * 5` is not `]]]]]` but `245`. I guess this code is never executed, because it would never work.
* | | | | | Merge pull request #5008 from janekdb/2.12.x-remove-Predef-errorSeth Tisue2016-03-291-7/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove deprecated Predef.error
| * | | | | | Remove deprecated Predef.errorJanek Bogucki2016-03-261-7/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | error was deprecated in 2.9.0 but remained to ensure compatibility with sbt. This changes follows on from an update to the latest sbt version (0.13.11).
* | | | | | Merge pull request #5021 from szeiger/wip/remove-deprecationsSeth Tisue2016-03-2917-248/+204
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Seal collection classes that were annotated with deprecatedInheritance in 2.11.0
| * | | | | Make some collection classes final or sealedStefan Zeiger2016-03-2317-248/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were all annotated with `@deprecatedInheritance` in 2.11.0. Some deprecated classes are moved to new source files in order to seal the parent class. The package-private class `DoublingUnrolledBuffer` is moved from `scala.collection.parallel.mutable` to `scala.collection.mutable` in order to seal `UnrolledBuffer`.
* | | | | | scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Member description auto-expands * If member comes from implicits is now becomes visible * Member is no longer hidden by search bar after scrolling * Permalink button now works when member is in a group (scrolling is still broken)
* | | | | | Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
| | | | | |
* | | | | | Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21Adriaan Moors2016-03-2323-228/+364
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 2.11 to 2.12
| * | | | | | Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-212-32/+41
| | | | | | |
| * | | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-2123-228/+355
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Update IntelliJ build for use with sbtLukas Rytz2016-03-2123-234/+336
| | | |_|_|/ | | |/| | |
* | | | | | Merge pull request #5051 from kmizu/improve-api-docsAdriaan Moors2016-03-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve documentation of `GenSeqLike#length`
| * | | | | | Add scaladoc comment about the case when Exception will be thrown by ↵Kota Mizushima2016-03-241-0/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | invocation of length method
* | | | | | Merge pull request #5053 from som-snytt/issue/9314Lukas Rytz2016-03-231-7/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-9314 Marginal edge case to warn-missing-interp
| * | | | | SI-9314 No warn on ${nonid}Som Snytt2016-03-231-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the sym test on an expr that happens to be a subset of idents and is not in scope. Other `${ operator_* }` warn.
| * | | | | SI-9314 Ignore "${}"Som Snytt2016-03-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an Easter egg, let "${} $x" forego the check on `x`. In other words, empty expression interpolation looks too degenerate to check.
| * | | | | SI-9314 Don't warn on "$pkg"Som Snytt2016-03-201-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Edge cases of things not to warn about include package names.
* | | | | Merge pull request #5057 from lrytz/flatClasspathLukas Rytz2016-03-2316-202/+361
|\ \ \ \ \ | | | | | | | | | | | | Enable -YclasspathImpl:flat by default
| * | | | | Support :require when using the flat classpath representation.Lukas Rytz2016-03-227-82/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :require was re-incarnated in https://github.com/scala/scala/pull/4051, it seems to be used by the spark repl. This commit makes it work when using the flat classpath representation.
| * | | | | Enable flat classpath by defaultLukas Rytz2016-03-2210-120/+163
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements VirtualDirectoryFlatClassPath, which is required for the presentation compiler created for the repl's tab-completion. Various minor cleanups in the flat classpath implementation.
* | | | | Merge pull request #5047 from kmizu/resolve-several-warningsAdriaan Moors2016-03-226-12/+12
|\ \ \ \ \ | | | | | | | | | | | | Resolve several deprecation warnings
| * | | | | Resolve warnings related to SyncVar#setKota Mizushima2016-03-183-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Replace it with SyncVar#put
| * | | | | * Replace isPackage with hasPackageFlagKota Mizushima2016-03-172-2/+2
| | | | | |
| * | | | | Fix one warning in Util.scalaKota Mizushima2016-03-171-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Explicitly annotate return type of trace macro to avoid type inference
* | | | | Merge pull request #5034 from janekdb/topic/2.12.x-scaladoc-Predef-method-groupsSeth Tisue2016-03-211-0/+106
|\ \ \ \ \ | |_|/ / / |/| | | | Organise Predef methods into Scaladoc groups
| * | | | Organise Predef members into Scaladoc groupsJanek Bogucki2016-03-161-0/+106
| |/ / / | | | | | | | | | | | | | | | | By grouping members and providing descriptions the signal to noise ratio in Predef is usefully enhanced.
* | | | Merge pull request #5043 from dongjoon-hyun/fix_typos_in_spec_and_commentsJason Zaugg2016-03-2123-28/+28
|\ \ \ \ | | | | | | | | | | Fix some typos in `spec` documents and comments.