summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* SI-6766 Makes the -Pcontinuations:enable flag a project specific preferenceJames Iry2012-12-062-4/+4
| | | | | | | | | | | Make the continuations plugin flag specific to the continuations library. Remove the documentation about adding the continuation plugin from the eclipse README.md. One consequence of this change is that if a programmer has prefs for the continuations eclipse project then there will be a merge conflict. That's unavoidable without having a more sophisticated way to build the eclipse projects.
* SI-6766 Create a continuations project in eclipseJames Iry2012-12-067-2/+46
| | | | | | | | | We're missing a continuations dependency when we try to build reflect in eclipse which causes things to die horribly. This commit adds an eclipse project for the library portion of continuations, makes projects that depend on the scala-library also depend on continuations-library, and adds another bullet to the eclipse readme to turn on the continuations plugin.
* Merge pull request #1681 from paulp/issue/6731Adriaan Moors2012-12-051-47/+38
|\ | | | | Fix for SI-6731, dropped trees in selectDynamic.
| * Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-281-47/+38
| | | | | | | | I rewrote mkInvoke entirely, and boosted the test coverage.
* | Merge pull request #1682 from paulp/assert-about-qualifierPaul Phillips2012-12-033-5/+18
|\ \ | | | | | | Asserts about Tree qualifiers.
| * | Asserts about Tree qualifiers.Paul Phillips2012-11-293-5/+18
| | | | | | | | | | | | | | | Encoding recent revelations about certain tree invariants in the form of asserts.
* | | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-291-10/+3
|\ \ \ | |/ / |/| | 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-271-10/+3
| |/ | | | | | | | | 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-2812-55/+107
|\ \ | |/ |/| Adds a margin stripping string interpolator.
| * Take advantage of the margin stripping interpolator.Jason Zaugg2012-11-269-55/+52
| | | | | | | | Safer and shorter.
| * Adds a margin stripping string interpolator.Jason Zaugg2012-11-263-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1666 from paulp/issue/6707Adriaan Moors2012-11-252-4/+4
|\ \ | | | | | | Flag pattern matcher synthetics as synthetic.
| * | Mark pattern matcher synthetics as SYNTHETIC.Paul Phillips2012-11-242-2/+2
| | | | | | | | | | | | | | | Flagging synthetics accurately is important to allow for useful static analysis.
| * | Set symbol flags at creation.Paul Phillips2012-11-241-2/+2
| | | | | | | | | | | | | | | All should prefer passing flags at symbol creation to mutating the flags field after creation.
* | | Merge pull request #1665 from paulp/issue/6687Adriaan Moors2012-11-251-1/+1
|\ \ \ | | | | | | | | Fix for SI-6687, wrong isVar logic.
| * | | Fix for SI-6687, wrong isVar logic.Paul Phillips2012-11-241-1/+1
| |/ / | | | | | | | | | | | | 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-2521-111/+171
|\ \ \ | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-xPaul Phillips2012-11-2321-111/+171
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | Removing controversial `either` method from Futures API.Josh Suereth2012-11-211-23/+0
| | | | | | | | | | | | | | | | | | | | * Removes `either` from Future * No tests need to change, since this was an untested method.
| | * | Merge pull request #1607 from retronym/ticket/6640Josh Suereth2012-11-196-26/+61
| | |\ \ | | | | | | | | | | SI-6640 Better reporting of deficient classpaths.
| | | * | SI-6440 Address regressions around MissingRequirementErrorJason Zaugg2012-11-136-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| | | * | Refine the message and triggering of MissingRequirementError.Jason Zaugg2012-11-103-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To force a failure of the stub, call a new method `failIfStub` rather than `info`. - Offer a broader range of potential root causes in the error message.
| | | * | SI-6640 Better reporting of deficient classpaths.Jason Zaugg2012-11-103-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a55788e, StubSymbols were introduced to fail-slow when the classpath was deficient. This allowed compilation to succeed in cases when one didn't actually use the part of class A which referred to some missing class B. But a few problems were introduced. Firstly, when the deferred error eventually happened, it was signalled with abort(msg), rather than through a thrown MissingRequirementError. The latter is desirable, as it doesn't lead to printing a stack trace. Second, the actual error message changed, and no longer included the name of the class file that refers to the missing class. Finally, it seems that we can end up with a stub term symbol in a situation where a class symbol is desired. An assertion in the constructor of ThisType throws trips when calling .isClass, before the useful error message from StubSymbol can be emitted. This commit addresses these points, and rewords the error a little to be more accessible. The last point is the most fragile in this arrangement, there might be some whack-a-mole required to find other places that also need this. I don't see a clean solution for this, but am open to suggestions. We should really build a facility in partest to delete specified classfiles between groups in separate compilation tests, in order to have tests for this. I'll work on that as a followup. For now, here's the result of my manual testing: [info] Set current project to default-821d14 (in build file:/Users/jason/code/scratch1/) > compile [info] Compiling 1 Scala source to /Users/jason/code/scratch1/target/scala-2.10/classes... [error] [error] while compiling: /Users/jason/code/scratch1/test.scala [error] during phase: typer [error] library version: version 2.10.0-RC2 [error] compiler version: version 2.10.0-RC2 ... [error] last tree to typer: Ident(SwingWorker) [error] symbol: <none> (flags: ) [error] symbol definition: <none> [error] symbol owners: [error] context owners: object Test -> package <empty> ... [error] uncaught exception during compilation: java.lang.AssertionError [trace] Stack trace suppressed: run last compile:compile for the full output. [error] (compile:compile) java.lang.AssertionError: assertion failed: value actors [error] Total time: 2 s, completed Nov 10, 2012 3:18:34 PM > > set scalaHome := Some(file("/Users/jason/code/scala/build/pack")) [info] Defining *:scala-home [info] The new value will be used by no settings or tasks. [info] Reapplying settings... [info] Set current project to default-821d14 (in build file:/Users/jason/code/scratch1/) ^[compile [info] Compiling 1 Scala source to /Users/jason/code/scratch1/target/scala-2.10/classes... [error] /Users/jason/code/scratch1/test.scala:4: A signature in SwingWorker.class refers to term actors in package scala which is missing from the classpath. [error] object Test extends SwingWorker [error] ^ [error] one error found [error] (compile:compile) Compilation failed [error] Total time: 2 s, completed Nov 10, 2012 3:18:45 PM
| | * | | Merge pull request #1638 from adriaanm/ticket-6624Josh Suereth2012-11-191-1/+11
| | |\ \ \ | | | | | | | | | | | | 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-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-168-36/+20
| | |\ \ \ \ | | | | | | | | | | | | | | Fixes SI-6628, Revert "Fix for view isEmpty."
| | | * | | | Fixes SI-6628, Revert "Fix for view isEmpty."Paul Phillips2012-11-158-36/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-6559 Fix raw string interpolator: string parts which were after the first argument were still escaped
| | | * | | | | Fix raw string interpolator: string parts which were after the first ↵Julien Richard-Foy2012-11-131-1/+1
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | argument were still escaped
| | * | | | | Merge pull request #1615 from retronym/ticket/6648Adriaan Moors2012-11-161-0/+13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-6648 copyAttrs must preserve TypeTree#wasEmpty
| | | * | | | | SI-6648 copyAttrs must preserve TypeTree#wasEmptyJason Zaugg2012-11-141-0/+13
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge pull request #1614 from phaller/issue/correct-promise-signatureAdriaan Moors2012-11-161-3/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method
| | | * | | | SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise methodphaller2012-11-151-3/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarification of @heathermiller: This is an inconsistency introduced after refactoring implicit ExecutionContexts. In commit 1dfce90246f7d334 the implicit ExecutionContexts were removed from everything else in Promise.scala, but it appears that method promise was missed in the scala.concurrent package object, which would've made sense to remove back then.
| | * | | | Merge pull request #1608 from retronym/ticket/6644Josh Suereth2012-11-141-3/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | | SI-6644 Account for varargs in extmethod forwarder
| | | * | | SI-6644 Account for varargs in extmethod forwarderJason Zaugg2012-11-101-3/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | Which sounded difficult, so instead I offshored the work to the friendly republic of TreeGen.
| | * | | Update comment.Jason Zaugg2012-11-131-1/+2
| | | | |
| | * | | SI-6646 `ident` or Ident is always new binding.Jason Zaugg2012-11-131-25/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-19/+28
| | |/ / | | | | | | | | | | | | | | | | | | | | The early check in the parser of pattern irrefutability, added in c82ecab, failed to consider InitCaps and `backquoted` identifiers.
* | | | Merge pull request #1652 from jedesah/FlatHashTableAdriaan Moors2012-11-251-7/+6
|\ \ \ \ | | | | | | | | | | findEntry implementation code more concise and DRYer.
| * | | | findEntry implementation code more concise and DRYer.Jean-Remi Desjardins2012-11-201-7/+6
| | | | |
* | | | | Merge pull request #1647 from adriaanm/backport-1626-2.10.xAdriaan Moors2012-11-251-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix for SI-6357, cycle with value classes.
| * | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-191-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Don't force the owner info.
* | | | | Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-251-6/+16
|\ \ \ \ \ | | | | | | | | | | | | SI-6677 Insert required cast in `new qual.foo.T`
| * | | | | Refactoring of adaptMethodJason Zaugg2012-11-181-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the early return, and address micro-duplication between adaptType and adaptMember.
| * | | | | SI-6677 Insert required cast in `new qual.foo.T`Jason Zaugg2012-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | SI-6023 reify abstract valsYour Name2012-11-232-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+22
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-6673 fixes macro problems with eta expansions
| * | | | adds comments to standard attachmentsEugene Burmako2012-11-181-0/+15
| | | | |
| * | | | SI-6673 fixes macro problems with eta expansionsEugene Burmako2012-11-182-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-15 23:26:07 +0000