summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* SI-6310 AbsTypeTag => WeakTypeTagEugene Burmako2012-09-1427-120/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new name for AbsTypeTag was a matter of a lengthy discussion: http://groups.google.com/group/scala-internals/browse_thread/thread/fb2007e61b505c4d I couldn't decide until having fixed SI-6323 today, which is about trying to reflect against a local class using typeOf. The problem with local classes is that they aren't pickled, so their metadata isn't preserved between Scala compilation runs. Sure, we can restore some of that metadata with Java reflection, but you get the idea. Before today typeOf of a local class created a free type, a synthetic symbol, with a bunch of synthetic children that remember the metadata, effectively creating a mini symbol table. That might be useful at time, but the problem is that this free type cannot be reflected, because the global symbol table of Scala reflection doesn't know about its mini symbol table. And then it struck me. It's not the presence of abs types (type parameters and abs type members) that differentiates arbitrary type tags from good type tags. It's the presence of types that don't map well on the runtime world - ones that can't be used to instantiate values, ones that can't be reflected. So we just need a name for these types. Phantom types are compile-time only concept, whereas our types can have partial correspondence with the runtime. "Weak types" sound more or less okish, so let's try them out.
* SI-6323 outlaws free types from TypeTagEugene Burmako2012-09-144-5/+9
| | | | | | | | | | | | | | | | | Free types are no longer acceptable in normal type tags. Like type parameters or abstract type members they don't map on any real type, therefore I think this is a justified change. The main reason for doing is this is to prohibit people from using `typeOf` on local classes. Sure, the guard introduced in the previous commit will raise runtime errors about that, but this commit provides static checking. Those especially persistent might use `absTypeOf` and then try to play around with the weak type it returns, but that's advanced usage scenario, and I don't worry much about it. Bottom line: `typeOf` should just work. Things that work with additional effort should be explicitly marked as such.
* SI-6323 prohibits reflection against free typesEugene Burmako2012-09-141-3/+20
| | | | | | | | | | | | | | | One of the use cases for free types is reification of local classes. The result is very seamless. Despite that local classes are not pickled, free types recreated the symbols referenced by local classes, so that we get our own symbol table, which can be analyzed with usual precision of pickled symbols and types. However when we try to use those symbols for reflection, we hit a problem. Scala runtime reflection uses its own mechanism for dealing with non-pickled types, which is incompatible with mini symbol tables used in free types. Therefore to prevent confusion, I prohibit using those symbols for reflection.
* improvements for reification of free symbolsEugene Burmako2012-09-1411-104/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Free symbols no longer carry signatures in their constructors. Previously to reify a free symbol (i.e. to generate a ValDef that creates it) one had to reify sym.info first. However reification of sym.info might lead to unexpected side effects, including stack overflows, if reification of sym.info recursively required reifying sym itself. Now it's not a problem. First we reify a "header" of a free symbol by emitting something like: val free$Foo1 = build.newFreeTerm("Foo", Foo.this, NoFlags)` Afterwards, when doing code generation for the reification symbol table, we populate free symbols by inserting calls to `build.setTypeSignature($sym.info)` This techniques transforms recursion into memoized iteration, because even if reifying sym.info indirectly requires reification of sym itself, we remember that we already reified sym and simply return things like Ident(free$Foo1). 2) Unfortunately I haven't been able to get rid of recursion completely. Since some symbols (e.g. local classes) aren't pickled, we need to recreate them during reification (this is necessary e.g. to reify RefinedTypes). Reifier uses a special function, named `reifySymDef`, for that purpose. Here's an example of how it works: val symdef$_1 = build.newNestedSymbol(free$U1, newTypeName("_"), NoPosition, DEFERRED | PARAM, false); `reifySymDef` expands into a call to `newNestedSymbol`, which requires an owner This essentially turns `reifySymDef` into a recursion of `reifySymDef` calls, so that the entire owner chain get reified. This is an implementation strategy that was employed in the first revision of the reifier written by Martin, and personally I have no clue whether it's really necessary to reify the parents. I leave this as a future work. 3) When working with free symbols, it's necessary to attach free symbols to their reification. This is required in obscure nested reification scenarios, when a symbol that was free for an inner reifee is no longer free for an outer reifee. In that case we need to remove that free symbol from the symbol table of the inner reification. Back then we didn't have tree attachments, so I had to introduce a phantom "value" parameter for `newFreeType` to keep track of the original symbols for free types. Now when we have attachments, this is no longer necessary and allowed me to clean up the code.
* removes build.newFreeExistentialEugene Burmako2012-09-146-24/+4
| | | | | | build.newFreeType does exactly the same, so we don't have a need in two different methods. Type parameters and existentially bound syms can later be distinguished using flags.
* Merge pull request #1300 from retronym/ticket/6359Josh Suereth2012-09-131-8/+9
|\ | | | | SI-6359 Deep prohibition of templates in value class
| * SI-6359 Deep prohibition of templates in value classJason Zaugg2012-09-141-8/+9
| | | | | | | | This seems to have been the intent of 95d532 / SI-5882.
* | Fixes SI-6259. Unable to use typeOf in super call of top-level object.Josh Suereth2012-09-131-2/+18
| | | | | | | | | | | | | | | | | | This works around the issue of the inability to use classOf for top-level object classes by inventing a new anonymous class and instantiating it just to grab its class. Since the class is a nested type of the top-level object it'll be in the same classloader unless some kind of evil behavior is afoot. This patch should be undone if ever SI-2453 ever gets fixed, or we wind up with a direct way to grab the class of an object.
* | Merge pull request #1294 from paulp/issue/6367Josh Suereth2012-09-131-13/+17
|\ \ | | | | | | Fix for SI-6367, exponential time in inference.
| * | Fix for SI-6367, exponential time in inference.Paul Phillips2012-09-121-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pathology is not new - it can be witnessed in 2.9, where compiling the test case enclosed with this ticket with -Yinfer-debug will print a line with (pinky to lips) one million type parameters. 1048576 actually, aka 2^20. But in 2.9 we were somehow getting away with creating the list, presumably by not spending much time looking at it. Somewhere between there and M1, that changed. I cut it off at the knees - don't create a list of one million upper bound constraints when 1 will suffice. It would not be too surprising if this proves to be a boon for performance.
* | | Merge pull request #1296 from paulp/210-errors-and-treesJosh Suereth2012-09-138-25/+51
|\ \ \ | | | | | | | | 210 errors and trees
| * | | Better error message for pattern arity errors.Paul Phillips2012-09-125-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | Because friends don't tell friends: "wrong number of arguments for <none>"
| * | | Rescued TreeBuilder from the parser.Paul Phillips2012-09-123-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For too long, Tree Builder has ruled over those who would like to build their own trees. Today marks the start of a new era. Trees are for building, not for parsers to hoard. It's in Global now. The particular motivation is exposing makeNew, and I also added makeAnonymousNew, so rather than this... Apply(Select( Block(List(ClassDef( Modifiers(scala.tools.nsc.symtab.Flags.FINAL), tpnme.ANON_CLASS_NAME, Nil, Template(List(Ident(definitions.AnyRefClass)), emptyValDef, List( DefDef(NoMods, nme.CONSTRUCTOR, Nil, List(Nil), TypeTree(), Block( List(Apply(Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), nme.CONSTRUCTOR), Nil)), Literal(Constant(())) )))))), Apply(Select(New(Ident(tpnme.ANON_CLASS_NAME)), nme.CONSTRUCTOR), Nil)) , sn.GetClass), Nil) We can write this. Apply(Select(makeAnonymousNew(Nil), nme.getClass_), Nil)
* | | | Merge pull request #1255 from Blaisorblade/issue/6306Josh Suereth2012-09-122-6/+1
|\ \ \ \ | |/ / / |/| | | Fix SI-6306 on testcase
| * | | SI-6306 Remove incorrect eta-expansion optimization in UncurryPaolo Giarrusso2012-09-122-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix SI-6306 by removing the offending code. Moreover, clarify comment and add testcase. This pattern match only matches on testcases triggering SI-6306; the transformation it performs in that case is unsafe. The intended optimization is to undo eta-expansion of nullary functions, that is, transform `() => foo()` to `foo`. But that's only valid when `foo` is an instance of `Function0`, so the optimization is unsafe. Moreover, the pattern match will fail because at the end of typer that code has become `() => foo.apply()`, and `isExprSafeToInline(foo.apply)` always (correctly) fails the isExprSafeToInline test. The pattern match should thus be different - this code was dead even when it was introduced (45bcd02f6ba099277bedbf83ec2bda07435c7797), since it was not invoked either when building the compiler or when compiling function attempt2() in the included testcase. Thanks to all commenters on SI-6306 and https://github.com/scala/scala/pull/1255, in particular to Jason Zaugg for diagnosing the underlying fault and Lukas Rytz for understanding the goal of the code.
* | | | Merge pull request #1247 from jsuereth/fix/SI-6114Josh Suereth2012-09-121-0/+7
|\ \ \ \ | | | | | | | | | | Fix t6114 - ++ on JList wrapper modifies underlying collection.
| * | | | Fix t6114 - ++ on JList wrapper modifies underlying collection.Josh Suereth2012-09-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We solve this by overriding clone for JListWrapper to actually do a full clone. Note: This fix may need to be included other places, *but* we're not sure we've cloned the collection sensibly. I.e. is ArrayList a good default?
* | | | | Merge pull request #1261 from rkuhn/fix-duration-issues-RKJosh Suereth2012-09-122-108/+521
|\ \ \ \ \ | |_|_|/ / |/| | | | several fixes to scala.concurrent.util.Duration
| * | | | improve Promise.tryAwait by converting to match statementRoland2012-09-121-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | - also use type FiniteDuration due to a previous change to Deadline’s type signature
| * | | | Merge remote-tracking branch 'origin/2.10.x' into fix-duration-issues-RKRoland2012-09-1247-450/+627
| |\ \ \ \
| * | | | | restrict Deadline to finite durations (would have to throw otherwise)Roland2012-09-121-9/+10
| | | | | |
| * | | | | make private methods private[this] to avoid conflicts when importing Duration._Roland2012-09-121-15/+15
| | | | | |
| * | | | | retronym had one more improvement hidden up his sleeve for DurationRoland2012-09-121-7/+9
| | | | | |
| * | | | | factor out more constants in Duration, thanks paulp!Roland2012-09-121-8/+18
| | | | | |
| * | | | | two more minor cleanups to DurationRoland2012-09-112-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - copy partest TestUtil.intercept change from PR 1279 branch - add comment on non-obvious match cases
| * | | | | fix two minor issues in DurationRoland2012-09-091-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make constants for fromNanos(Long) actually inlined constants - clarify origin of require() check constants in FiniteDuration
| * | | | | fix some one more issue in DurationRoland2012-09-071-54/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Inf / Zero == Inf - add some more missing test cases - clarify magic constant - move exception descriptions into proper @throws docs
| * | | | | second round of Duration cleanupRoland2012-09-071-97/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make Duration behave consistent with Double's non-finite semantics - add ScalaDoc - add complete test suite - change overflow protection impl after review comments - clean up code
| * | | | | several fixes to scala.concurrent.util.DurationRoland2012-09-051-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add test cases (migrated from Akka sources) - add overflow checking (will throw IllegalArgumentException instead of giving wrong results) - make string parsing more precise when giving >100days in nanoseconds - make method signatures more precise in retaining FiniteDuration throughout calculations - fix mul/div of infinities by negative number - add Ordering for Deadline (was accidentally left out earlier)
* | | | | | Merge pull request #1288 from jsuereth/fix/SI-6268Josh Suereth2012-09-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fixes SI-6268. Improper multistring setting unparse.
| * | | | | Fixes SI-6268. Review by @paulp and @lrytz.Josh Suereth2012-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a refactoring from https://github.com/scala/scala/commit/963aabbeb4 MultiString settings would not properly write an unparse string that could be reparsed, leading to failures when forking scalac in ant. Specifically, if a setting was empty, it was getting added to the unparse string and causing scalac to fail. This at least reverts to previous behavior (also more correct for multiple values). Whatever we do here has to work with the @file style argument reading and can't place empty options on the command line. Also, This assumes there are tests around the behvior the REPL needs. Note: The test is not automated yet, so unfortunately, we need to improve ANT testing capabilities to prevent regressons
* | | | | | Avoid spurious warning for `def foo = x.foo`.Jason Zaugg2012-09-111-1/+6
| |_|_|_|/ |/| | | | | | | | | | | | | | Followup to SI-6276.
* | | | | Merge pull request #1279 from rkuhn/fix-duration-usageJosh Suereth2012-09-118-35/+82
|\ \ \ \ \ | | | | | | | | | | | | fix usage of Duration in Promise impl
| * | | | | improve docs and Promise implRoland2012-09-114-34/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - scaladoc the exceptions thrown by Await.* and Awaitable.* - move intercept[Exception] into partest’s TestUtil object - improve Promise.tryAwait implementation following Viktor’s comments and make use of Deadline to avoid calling System.nanoTime too often
| * | | | | fix usage of Duration in Promise implRoland2012-09-107-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - correctly treat MinusInf and Undefined - don't toMillis in the timeout message (could be MinusInf) - also notice that Inf did not actually wait unbounded - and further notice that tryAwait swallows InterruptedException instead of bailing out early => changed to do so and added throws annotation - also removed some unused imports of Duration
* | | | | | Merge pull request #1286 from paulp/topic/inliner-loggingJosh Suereth2012-09-1121-240/+264
|\ \ \ \ \ \ | | | | | | | | | | | | | | Topic/inliner logging
| * \ \ \ \ \ Merge branch '2.10.x' into topic/inliner-loggingPaul Phillips2012-09-1156-982/+811
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
| * | | | | | | Large logging cleanup effort.Paul Phillips2012-09-0118-211/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quieted down many logging statements which contribute disproportionate noise. Made others emit something more sensible. Spent lots of time on the inliner trying to find a regular format to make the logs more readable. Long way to go here but it'd be so worth it to have readable logs instead of mind-numbing indiscriminate text dumps.
| * | | | | | | Took measures to quiet down specialization logging.Paul Phillips2012-09-012-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While hopefully still hearing about certain things (like symbol renames) when it's not a specialized symbol.
| * | | | | | | Worked around SI-6161 by annotating abstract type.Paul Phillips2012-09-015-9/+13
| | | | | | | |
| * | | | | | | Added a heuristic to the inliner.Paul Phillips2012-09-011-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But it's commented out because I want to get this logging code into 2.10 without including anything "interesting".
* | | | | | | | Merge pull request #1262 from jsuereth/fix/SI-6271Josh Suereth2012-09-111-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixes SI-6271 - Missing isEmpty override for views.
| * | | | | | | Fixes SI-6271 - Missing isEmpty override for views.Josh Suereth2012-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenIterableView didn't override isEmpty for views to look at *filtered* iterator, but was instead pulling unfiltered iterator and causing issues. Chalk up another bizzare bug to lack of insight/visibility into linearization and what havoc overriding new methods can spew on our library.
* | | | | | | | Merge pull request #1274 from retronym/ticket/6335Grzegorz Kossakowski2012-09-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6335 More precise location of the implicit class synthetic method.
| * | | | | | | | SI-6335 More precise location of the implicit class synthetic method.Jason Zaugg2012-09-091-2/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One approach would be to disallow an implicit class in a template that already has a member with the same name. But this commit doesn't do this; instead it uses `isSynthetic` to find the synthesized implicit conversion method from the potentially overloaded alternatives.
* | | | | | | | Merge pull request #1284 from retronym/topic/deprecated-inheritanceGrzegorz Kossakowski2012-09-118-0/+74
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6162 Adds private[scala] @deprecatedInheritance/@deprecatedOverriding
| * | | | | | | | Pull request feedbackJason Zaugg2012-09-111-1/+1
| | | | | | | | |
| * | | | | | | | Rescues @deprecated{Inheritance, Overriding}Jason Zaugg2012-09-114-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While they ought to be generalized to aribirary modifier changes before being offered in the standard library, the opportunity to use them in 2.10 is too important to pass up. So for now, they're private[scala]. En route: - made the error messages more concise - fix positioning of inheritance error - improve test coverage
| * | | | | | | | Adds @deprecatedInheritance to BigInt and BigDecimalSimon Ochsenreither2012-09-102-0/+2
| | | | | | | | |
| * | | | | | | | SI-6162 Adds @deprecatedInheritance/@deprecatedOverridingSimon Ochsenreither2012-09-106-0/+73
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These annotations are meant to warn from inheriting a class or from overriding a member, due to the reasons given in `msg`. The naming and placement of the methods is in line with @deprecated and @deprecatedName.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 16:38:36 +0000