summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Add convenience attribute operator to NodeSeqRoberto Tyley2012-11-271-0/+7
| | | | | | | | | | | | | | | | | | Compared to the current method of reading the string text of an attribute: (x \ "@bar").text ...the new operator removes the need for a pair of parenthesis and shortens the overall expression by 7 chars : x \@ "bar" Discussion on scala-internals: https://groups.google.com/d/topic/scala-internals/BZ-tfbebDqE/discussion
* Merge branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-2331-27/+509
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10.wip-x: (24 commits) SI-6023 reify abstract vals Removing controversial `either` method from Futures API. SI-6695 Test case for fixed Array match bug adds comments to standard attachments SI-6673 fixes macro problems with eta expansions Restore the opimization apparently lost after merge. SI-6624 set info of case pattern binder to help find case field accessors Scaladoc update for collection.mutable.MultiMap SI-6663: don't ignore type parameter on selectDynamic invocation SI-6551: don't insert apply call in polymorphic expression. SI-6634 Fixes data corruption issue in ListBuffer#remove Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6150 - backport to 2.10.x branch. SI-5330, SI-6014 deal with existential self-type Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped sane printing of renamed imports SI-6440 Address regressions around MissingRequirementError ... Conflicts: src/library/scala/collection/generic/IndexedSeqFactory.scala src/library/scala/collection/mutable/ListBuffer.scala src/reflect/scala/reflect/internal/Symbols.scala src/reflect/scala/reflect/internal/Types.scala test/files/run/t6150.scala
| * Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-xPaul Phillips2012-11-2318-29/+238
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jason Zaugg (8) and others # Via Adriaan Moors (6) and Josh Suereth (5) * origin/2.10.0-wip: Removing controversial `either` method from Futures API. SI-6624 set info of case pattern binder to help find case field accessors Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped Update comment. SI-6646 `ident` or Ident is always new binding. SI-6440 Address regressions around MissingRequirementError Refine the message and triggering of MissingRequirementError. SI-6640 Better reporting of deficient classpaths. SI-6644 Account for varargs in extmethod forwarder SI-6646 Fix regression in for desugaring. Update tools/epfl-publish
| | * Merge pull request #1607 from retronym/ticket/6640Josh Suereth2012-11-199-27/+139
| | |\ | | | | | | | | SI-6640 Better reporting of deficient classpaths.
| | | * SI-6440 Address regressions around MissingRequirementErrorJason Zaugg2012-11-139-27/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go back to using globalError to report when a stub's info is referenced, and only throw the MissingRequirementError when compilation really must abort due to having a StubTermSymbol in a place where a StubClassSymbol would have been a better choice. This situation arises when an entire package is missing from the classpath, as was the case in the reported bug. Adds `StoreReporterDirectTest`, which buffers messages issued during compilation for more structured interrogation. Use this in two test for manifests -- these tests were using a crude means of grepping compiler console output to focus on the relevant output, but this approach was insufficient with the new multi-line error message emitted as part of this change. Also used that base test class to add two new tests: one for the reported error (package missing), and another for a simpler error (class missing). The latter test shows how stub symbols allow code to compile if it doesn't the subset of signatures in some type that refer to a missing class. Gave the INFO/WARNING/ERROR members of Reporter sensible toString implementations; they inherit from Enumeration#Value in an unusual manner (why?) that means the built in toString of Enumeration printed `Severity@0`.
| | * | Merge pull request #1638 from adriaanm/ticket-6624Josh Suereth2012-11-191-0/+28
| | |\ \ | | | | | | | | | | SI-6624 better lookup of case field accessors for case class pattern with complicated type
| | | * | SI-6624 set info of case pattern binder to help find case field accessorsAdriaan Moors2012-11-161-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes the type checker infers a weird type for a sub-pattern of a case class/extractor pattern this confuses the pattern matcher and it can't find the case field accessors for the sub-pattern use the expected argument type of the extractor corresponding to the case class that we're matching as the info for the sub-pattern binder -- this type more readily admits querying its caseFieldAccessors
| | * | | Merge pull request #1636 from paulp/issue/6628Adriaan Moors2012-11-162-0/+13
| | |\ \ \ | | | | | | | | | | | | Fixes SI-6628, Revert "Fix for view isEmpty."
| | | * | | Fixes SI-6628, Revert "Fix for view isEmpty."Paul Phillips2012-11-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit caf7eb6b56817fd1e1fbc1cf017f30e6f94c6bea. I don't have a better idea right now than wholesale reversion.
| | * | | | Merge pull request #1616 from retronym/backport/6559Adriaan Moors2012-11-163-2/+19
| | |\ \ \ \ | | | | | | | | | | | | | | SI-6559 Fix raw string interpolator: string parts which were after the first argument were still escaped
| | | * | | | Fixes SI-6559 - StringContext not using passed in escape function.Josh Suereth2012-11-141-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Curtis Stanford, with indication of what to fix. standardInterpolator was not correctly calling the passed in process function, so raw strings were not really raw.
| | | * | | | Fix raw string interpolator: string parts which were after the first ↵Julien Richard-Foy2012-11-132-2/+2
| | | | |_|/ | | | |/| | | | | | | | | | | | | | argument were still escaped
| | * | | | Merge pull request #1615 from retronym/ticket/6648Adriaan Moors2012-11-161-0/+24
| | |\ \ \ \ | | | |_|/ / | | |/| | | SI-6648 copyAttrs must preserve TypeTree#wasEmpty
| | | * | | SI-6648 copyAttrs must preserve TypeTree#wasEmptyJason Zaugg2012-11-141-0/+24
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field tracks whether the type is an inferred on, subject to removal in `resetAttrs`, or an explicit type, which must remain. In ae5ff662, `ResetAttrs` was modified to duplicate trees, rather than mutate trees in place. But the tree copier didn't pass `wasEmpty` on to the new tree, which in turn meant that the subsequent typing run on the tree would not re-infer the types. If the type refers to a local class, e.g. the anonymous function in the enclosed test case, the reference to the old symbol would persist. This commit overrides `copyAttrs` in TypeTree to copy `wasEmpty`. We might consider representing this as a tree attachment, but this would need to be validated for the performance impact.
| * | | | SI-6023 reify abstract valsYour Name2012-11-232-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type trees created by MethodSynthesis for abstract val getters carry symless originals, which are unusable for reification purposes (or the result of reification will be unhygienic). To combat this, type trees for such getters are now created empty, i.e. without any `tpe` set, just having an original assigned. Subsequent `typedTypeTree` invocations fill in the `tpe` and update the original to be symful.
| * | | | Merge pull request #1645 from scalamacros/ticket/6673Josh Suereth2012-11-212-0/+6
| |\ \ \ \ | | | | | | | | | | | | SI-6673 fixes macro problems with eta expansions
| | * | | | SI-6673 fixes macro problems with eta expansionsEugene Burmako2012-11-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eta expansions previously caused the typer to disable macros. That was done in order to detect eta expansion of macro defs and show the user an appropriate error message. Macros were disabled because to find out whether we're expanding a macro def, we need to get its symbol, and to get a symbol of something we need to typecheck that something. However typechecking automatically expands macros, so, unless we disable macros, after a typecheck we won't be able to analyze macro occurrences anymore. Unfortunately this solution has a fatal flaw. By disabling macros we not only prevent the eta-expandee from macro expanding, but also all the subtrees of that eta-expandee (see SI-6673). This commit adds a mechanism for fine-grained control over macro expansion. Now it's possible to prohibit only the node, but not its children from macro expanding.
| * | | | | Merge pull request #1653 from retronym/ticket/6695Josh Suereth2012-11-211-0/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-6695 Test case for fixed Array match bug
| | * | | | | SI-6695 Test case for fixed Array match bugJason Zaugg2012-11-211-0/+18
| | | | | | |
| * | | | | | Merge pull request #1596 from soc/SI-6632+SI-6633Josh Suereth2012-11-204-0/+68
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-6632 SI-6633 Fixes issues and data corruption in ListBuffer
| | * | | | | | SI-6632 SI-6633 Fixes issues and data corruption in ListBufferSimon Ochsenreither2012-11-094-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disallow negative positions for ListBuffer#insert/insertAll/update - Fix data corruption issue in ListBuffer#insert
| * | | | | | | Merge pull request #1597 from soc/SI-6634Josh Suereth2012-11-202-0/+111
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6634 Fixes data corruption issue in ListBuffer#remove
| | * | | | | | | SI-6634 Fixes data corruption issue in ListBuffer#removeSimon Ochsenreither2012-11-162-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the cut-down version with minimally invasive changes, e. g. keeping the "auto-correcting" bounds algorithm.
| * | | | | | | | Merge pull request #1620 from namin/si-6551Josh Suereth2012-11-201-0/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes SI-6551.
| | * | | | | | | | SI-6551: don't insert apply call in polymorphic expression.Nada Amin2012-11-161-0/+13
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't rewrite an explicit apply method to dynamic polytypes.
| * | | | | | | | Merge pull request #1621 from jannic/SI-6663-2.10.xJosh Suereth2012-11-204-0/+43
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Si 6663 2.10.x fix type parameter on selectDynamic
| | * | | | | | | SI-6663: don't ignore type parameter on selectDynamic invocationJan Niehusmann2012-11-164-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mkInvoke to handle selectDynamic calls of the form new C.foo[T].xyz or new C.foo[T].xyz :U (where C extends Dynamic) Without this patch, the type parameter was silently ignored, and possibly inferred to a different. This patch fixes mkInvoke to handle these cases, where ctxTree has the form Select(TypeApply(fun, targs), nme) or Typed(...)
| * | | | | | | | Merge pull request #1628 from axel22/issue/6150-backportJosh Suereth2012-11-191-0/+44
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes SI-6150 - backport to 2.10.x branch.
| | * | | | | | | | Fixes SI-6150 - backport to 2.10.x branch.Aleksandar Prokopec2012-11-141-0/+44
| | |/ / / / / / /
| * | | | | | | | Merge pull request #1624 from adriaanm/paulp-issue/5330-2.10.xAdriaan Moors2012-11-164-0/+46
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | SI-5330, SI-6014 deal with existential self-type
| | * | | | | | | SI-5330, SI-6014 deal with existential self-typeAdriaan Moors2012-11-144-0/+46
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been broken since https://github.com/scala/scala/commit/b7b81ca2#L0L567. The existential rash is treated in a similar manner as in fc24db4c. Conceptually, the fix would be `def selfTypeSkolemized = widen.skolemizeExistential.narrow`, but simply widening before narrowing achieves the same thing. Since we're in existential voodoo territory, let's go for the minimal fix: replacing `this.narrow` by `widen.narrow`. -- Original patch by @retronym in #1074, refined by @paulp to only perform widen.narrow incantation if there are existentials present in the widened type, as narrowing is expensive when the type is not a singleton. The result is that compiling the entirety of quick, that code path is hit only 143 times. All the other calls hit .narrow directly as before. It looks like the definition of negligible in the diff of -Ystatistics when compiling src/library/scala/collection: < #symbols : 306315 --- > #symbols : 306320 12c13 < #unique types : 293859 --- > #unique types : 293865 I'm assuming based on the 2/1000ths of a percent increase in symbol and type creation that wall clock is manageable, but I didn't measure it.
| * | | | | | | Merge pull request #1612 from scalamacros/topic/showrawEugene Burmako2012-11-152-0/+17
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | sane printing of renamed imports
| | * | | | | | sane printing of renamed importsEugene Burmako2012-11-132-0/+17
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Having a select named "foo" with an underlying symbol named "bar" and trying to make sense of all that by prettyprinting is very confusing
* | | | | | | Merge pull request #1570 from retronym/ticket/6448Adriaan Moors2012-11-212-0/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-6448 Collecting the spoils of PartialFun#runWith
| * | | | | | | SI-6448 Collecting the spoils of PartialFun#runWithJason Zaugg2012-11-042-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids calling both `isDefinedAt` and `apply`. This pathological case that would benefit the most looks like: xs collect { case x if {expensive(); true} => x } The typical change looks like: - for (x <- this) if (pf.isDefinedAt(x)) b += pf(x) + foreach(pf.runWith(b += _)) Incorporates feedback provided by Pavel Pavlov: https://github.com/retronym/scala/commit/ef5430 A few more opportunities for optimization are noted in the `Pending` section of the enclosed test. `Iterator.collect` would be nice, but a solution eludes me. Calling the guard less frequently does change the behaviour of these functions in an obervable way, but not contravene the documented semantics. That said, there is an alternative opinion on the comment of the ticket: https://issues.scala-lang.org/browse/SI-6448
* | | | | | | | Merge pull request #1640 from paulp/xdevAdriaan Moors2012-11-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added -Xdev setting... you know, for devs
| * | | | | | | | Added -Xdev setting... you know, for devsPaul Phillips2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A setting we developers can give all the time and expect to hear useful things without being buried in debugging output. As the comment says: This is for WARNINGS which should reach the ears of scala developers whenever they occur, but are not useful for normal users. They should be precise, explanatory, and infrequent. Please don't use this as a logging mechanism. !!! is prefixed to all messages issued via this route to make them visually distinct. This is what I always intended for "debugwarn", the method I have deprecated in favor of the more accurate: def devWarning(msg: => String): Unit In this VERY SAME COMMIT, I performed the CLOSELY RELATED task of quieting down an -Xlint warning which had become too noisy thanks to implicit classes tickling it. I tightened that warn condition to include both -Xlint and -Xdev.
* | | | | | | | | Merge pull request #1626 from paulp/issue/6357Adriaan Moors2012-11-192-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix for SI-6357, cycle with value classes.
| * | | | | | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-142-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't force the owner info.
* | | | | | | | | | Merge pull request #1586 from retronym/ticket/6247Adriaan Moors2012-11-162-5/+82
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Optimize primitive Array(e1, ..., en)
| * | | | | | | | | Optimize primitive Array(e1, ..., en)Jason Zaugg2012-11-072-5/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expands an existing optimization for reference arrays to apply to primitives, as well. Fixes one aspect of SI-6247.
* | | | | | | | | | Merge pull request #1623 from paulp/merge-2.10.xAdriaan Moors2012-11-1610-1/+76
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merge 2.10.0-wip/.x into master
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Merge remote-tracking branches 'origin/2.10.x' and 'origin/2.10.0-wip' into ↵Paul Phillips2012-11-1410-1/+76
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | / / / / / / | | | |_|_|/ / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | | master Conflicts: src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
| | | * | | | | | | Merge pull request #1608 from retronym/ticket/6644Josh Suereth2012-11-141-0/+8
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | SI-6644 Account for varargs in extmethod forwarder
| | | | * | | | | | SI-6644 Account for varargs in extmethod forwarderJason Zaugg2012-11-101-0/+8
| | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which sounded difficult, so instead I offshored the work to the friendly republic of TreeGen.
| | | * | | | | | SI-6646 `ident` or Ident is always new binding.Jason Zaugg2012-11-132-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit regressed in these cases: // no withFilter for (X <- List("A single ident is always a pattern")) println(X) for (`x` <- List("A single ident is always a pattern")) println(`x`) At the top level of the LHS of a <-, such identifiers represent new bindings, not stable identifier patterns.
| | | * | | | | | SI-6646 Fix regression in for desugaring.Jason Zaugg2012-11-102-0/+16
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The early check in the parser of pattern irrefutability, added in c82ecab, failed to consider InitCaps and `backquoted` identifiers.
| | * | | | | | Merge pull request #1585 from retronym/ticket/6539-2Eugene Burmako2012-11-143-0/+26
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6539 Annotation for methods unfit for post-typer ASTs
| | | * | | | | | Refine @compileTimeOnlyJason Zaugg2012-11-083-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't default the message, and show it exclusively. - Fix cut-and-pasto in the @since tag - Be tolerant if the annotaion class is missing, as seems to have been the case compiling the continuations plugin. - s/\t/ / in the test file to show the errors are positioned correctly. - Use defensive getOrElse
| | | * | | | | | SI-6539 Annotation for methods unfit for post-typer ASTsJason Zaugg2012-11-063-0/+26
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivated by the `.value` method in the SBT task-syntax branch, which should only be called within the context of the argument to a setting initialization macro. The facility is akin to a fatal deprecation.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 04:14:03 +0000