summaryrefslogtreecommitdiff
path: root/test/files/run
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-0521-4/+428
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. Asserts about Tree qualifiers. Fix for SI-6731, dropped trees in selectDynamic. neg test added SI-5753 macros cannot be loaded when inherited from a class or a trait Take advantage of the margin stripping interpolator. Adds a margin stripping string interpolator. SI-6718 fixes a volatile test Mark pattern matcher synthetics as SYNTHETIC. Set symbol flags at creation. Fix for SI-6687, wrong isVar logic. Fix for SI-6706, Symbol breakage under GC. findEntry implementation code more concise and DRYer. Fix for SI-6357, cycle with value classes. Refactoring of adaptMethod SI-6677 Insert required cast in `new qual.foo.T` Conflicts: src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/SymbolTable.scala src/reflect/scala/reflect/internal/util/package.scala test/files/neg/gadts1.check
| * Merge pull request #1681 from paulp/issue/6731Adriaan Moors2012-12-056-0/+264
| |\ | | | | | | Fix for SI-6731, dropped trees in selectDynamic.
| | * Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.Paul Phillips2012-11-294-0/+81
| | | | | | | | | | | | | | | All tickets involving selectDynamic fixed by the prior commit. It also fixes SI-6663, but that already has a test case.
| | * Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-282-0/+183
| | | | | | | | | | | | I rewrote mkInvoke entirely, and boosted the test coverage.
| * | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-298-0/+32
| |\ \ | | | | | | | | SI-5753 macros cannot be loaded when inherited from a class or a trait
| | * | SI-5753 macros cannot be loaded when inherited from a class or a traitmartende2012-11-278-0/+32
| | | | | | | | | | | | | | | | | | | | enclClass should be taken from Tree otherwise we can jump to declaration class/trait.
| * | | Merge pull request #1676 from retronym/topic/sm-interpolatorPaul Phillips2012-11-281-0/+41
| |\ \ \ | | |_|/ | |/| | Adds a margin stripping string interpolator.
| | * | Adds a margin stripping string interpolator.Jason Zaugg2012-11-261-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only for compiler internal use. Designed to avoid surprises if the interpolated values themselves contain the margin delimiter. Before: val bip = "\n |.." s"""fooo |bar $bip |baz""".stripMargin "fooo bar .. baz" After: sm"""fooo |bar $bip |baz""" "fooo bar |.. baz"
| * | | Merge pull request #1674 from scalamacros/topic/showrawJosh Suereth2012-11-272-4/+6
| |\ \ \ | | |_|/ | |/| | SI-6718 fixes a volatile test
| | * | SI-6718 fixes a volatile testEugene Burmako2012-11-262-4/+6
| | | |
| * | | Merge pull request #1665 from paulp/issue/6687Adriaan Moors2012-11-251-0/+10
| |\ \ \ | | | | | | | | | | Fix for SI-6687, wrong isVar logic.
| | * | | Fix for SI-6687, wrong isVar logic.Paul Phillips2012-11-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Fields which back lazy vals need to be excluded via !isLazy lest isVar return true.
| * | | | Merge pull request #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-2515-27/+178
| |\ \ \ \ | | | | | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ \ \ Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-252-0/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-6677 Insert required cast in `new qual.foo.T`
| | * | | | | SI-6677 Insert required cast in `new qual.foo.T`Jason Zaugg2012-11-182-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Short version: we sometimes need to rewrite this as new T(qual.asInstanceOf[OwnerOfFoo].foo) Long version: `adaptMember` in Erasure performs a few tasks, among them: 1. adding an empty argument list to qualifiers in `new qual.T` for which `qual` is a val template member that has (post uncurry) a MethodType with an empty parameter list. The same rewriting was already applied in uncurry for such qualifiers appearing in other contexts, e.g. `qual.foo` was already rewritten to `qual().foo`. 2. casting, if necessary, the qualifier in `Select(qual, name)` to the type of owner of the symbol that this selection references. This can be neccesary with compound types: - some val class member has type `A with B`; - we instantiate `new ab.valMemberOfB.T` - we must pass `ab.valMemberOfB` to the constructor of `T` as the `$outer` pointer - we must cast `ab` to `B` before calling `valMemberOfB`. Failure to insert this cast can lead to a LinkageError or a VerifyError. However, if 1) was performed, 2) was not. The error is pretty easy to trigger with the new reflection API: class Test { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror def error { new cm.universe.Traverser // java.lang.VerifyError } def okay1 { val cm: reflect.runtime.universe.Mirror = reflect.runtime.currentMirror new cm.universe.Traverser } } The fix applied here to `adaptMember` mirrors the existing implementation of `adaptType`.
| * | | | | | Fix for SI-6706, Symbol breakage under GC.Paul Phillips2012-11-231-0/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the map key and the String in the Symbol are the same reference by removing the old key before updating the map with the new key -> symbol relation.
* | | | | | Disabled part of a test.Paul Phillips2012-11-252-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hmmm, the giant blob of binary data embedded in a test suddenly stopped working. What does one do in this spot.
* | | | | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-2325-25/+411
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2315-27/+178
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-198-25/+131
| | |\ \ \ \ | | | | | | | | | | | | | | SI-6640 Better reporting of deficient classpaths.
| | | * | | | SI-6440 Address regressions around MissingRequirementErrorJason Zaugg2012-11-138-25/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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
| * | | | | | 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 #1621 from jannic/SI-6663-2.10.xJosh Suereth2012-11-202-0/+18
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Si 6663 2.10.x fix type parameter on selectDynamic
| | * | | | | | SI-6663: don't ignore type parameter on selectDynamic invocationJan Niehusmann2012-11-162-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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 #1586 from retronym/ticket/6247Adriaan Moors2012-11-161-4/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | Optimize primitive Array(e1, ..., en)
| * | | | | | Optimize primitive Array(e1, ..., en)Jason Zaugg2012-11-071-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expands an existing optimization for reference arrays to apply to primitives, as well. Fixes one aspect of SI-6247.
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Merge remote-tracking branches 'origin/2.10.x' and 'origin/2.10.0-wip' into ↵Paul Phillips2012-11-146-0/+49
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 04:22:40 +0000