summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-inline' of /scratch/trunk3 into developPaul Phillips2012-03-14127-459/+897
|\
| * Cleaning up stray ScalaObject references.Paul Phillips2012-03-142-10/+1
| |
| * New starr to support new fundamental laws of reality.Paul Phillips2012-03-1421-649/+75
| | | | | | | | | | | | | | | | | | | | And grueling recovery from branch drift. Merges a portion (and only a portion) of topic/inline into master. The major changes which come with this merge are: AnyVal is unsealed, can be extended directly. ScalaObject is no longer with us.
| * Merge branch 'master' into merge-inlinePaul Phillips2012-03-14741-8890/+26906
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/scala-compiler.jar.desired.sha1 lib/scala-library-src.jar.desired.sha1 lib/scala-library.jar.desired.sha1 src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/reflect/internal/Importers.scala src/compiler/scala/reflect/internal/Symbols.scala src/compiler/scala/reflect/internal/Trees.scala src/compiler/scala/reflect/internal/Types.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/LiftCode.scala src/compiler/scala/tools/nsc/transform/UnCurry.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala test/files/run/programmatic-main.check test/files/speclib/instrumented.jar.desired.sha1
| * | All tests passed... not counting scaladoc.Paul Phillips2012-02-041-21/+21
| | | | | | | | | | | | | | | | | | | | | Disabled failing scaladoc test rather than fixing it because they're too hard to fix, even though it is almost certainly a trivial output change. (The fact that I don't know for sure that it is a trivial output change is also suboptimal.)
| * | A couple more checkfiles and comments.Paul Phillips2012-02-042-2/+2
| | | | | | | | | | | | | | | | | | | | | I guess I have to suck up the "C with Object" here in order to get the "Array[T with Object]" I need in a different test. Now all tests pass for reals.
| * | Made a typer hack less hacky.Paul Phillips2012-02-041-4/+6
| | |
| * | Hardening in Constructors.Paul Phillips2012-02-041-2/+2
| | |
| * | A little msil I missed un-reverting.Paul Phillips2012-02-041-5/+4
| | |
| * | Removed now superfluous bootstrapper script.Paul Phillips2012-02-041-40/+0
| | |
| * | Hardened/documented AnyVal constructor switcheroo.Paul Phillips2012-02-042-0/+3
| | |
| * | Checkfile output update for AnyVal class.Paul Phillips2012-02-041-1/+4
| | | | | | | | | | | | And with that one, I believe all tests pass.
| * | Tweaking parent printing a little further.Paul Phillips2012-02-041-5/+14
| | | | | | | | | | | | Not too many Object/AnyRef parents, not too few.
| * | Fixing AnyVal verify error and reflection.Paul Phillips2012-02-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Have to give AnyVal a constructor and simultaneously pacify both the typer (which knows Any has no constructor) and the jvm (which mandates a constructor must call its superconstructor.) It's the usual angle of adding a not-quite-right tree during parsing and then finishing it later (in this case, in AddInterfaces.)
| * | Merge branch 'master' into topic/inlinePaul Phillips2012-02-044-16/+32
| |\ \
| * | | Fixed all but one of the scalap tests.Paul Phillips2012-02-0420-28/+26
| | | |
| * | | Restored msil.Paul Phillips2012-02-0412-371/+366
| | | |
| * | | Utilizing convenience methods martin hasn't discovered yet.Paul Phillips2012-02-041-7/+2
| | | |
| * | | Fixed specialized tests.Paul Phillips2012-02-041-1/+1
| | | |
| * | | Fixed scalacheck tests.Paul Phillips2012-02-041-1/+1
| | | |
| * | | Making AnyVal into a class instead of a trait.Paul Phillips2012-02-0411-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- traits can extend Any, AnyRef, or AnyVal -- classes can extend AnyRef or AnyVal but not Any. This breaks reflection for the moment as it smuggles AnyVal so far downstream that it's reflecting its way into bytecode (or something) but the following test case goes five for six as anticipated. trait Foo1 extends Any trait Foo2 extends AnyVal trait Foo3 extends AnyRef class Bar1 extends Any // fail @inline class Bar2 extends AnyVal class Bar3 extends AnyRef Eliminated various hijinx from definitions.
| * | | Simple test manipulating Any-derived traits.Paul Phillips2012-02-041-0/+16
| | | |
| * | | Having Proxy extend Any as well.Paul Phillips2012-02-041-3/+2
| | | |
| * | | Guard List_apply from premature forcitude.Paul Phillips2012-02-044-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solved the annotation cycle puzzle. Was being burned again by the hack which preferentially treats List() as Nil to avoid List's extractor. This commit includes a new starr which fully bootstraps. Also at this point traits can extend Any and will not be given an AnyRef parent (until erasure.) This is the case for AnyVal and NotNull.
| * | | Made Any parents work more.Paul Phillips2012-02-0410-67/+91
| | | | | | | | | | | | | | | | Working on type printing logic.
| * | | Updated checkfiles to subtract ScalaObject.Paul Phillips2012-02-0418-37/+26
| | | |
| * | | Updated bootstrap script.Paul Phillips2012-02-041-14/+20
| | | |
| * | | ant and diff friendlier msil-disabling.Paul Phillips2012-02-046-3564/+3570
| | | |
| * | | Temporary bootstrapper script.Paul Phillips2012-02-031-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working around new cycle arising when reading annotations from classfiles. Run ./bootstrapper.sh and it will blow away ./build and perform the necessary gyrations and incantations. I wonder if this is what that old gypsy woman meant when she whispered almost inaudibly "The ghost of ScalaObject will haunt this repository... forever... forever... forever..."
| * | | New shas for bootstrap libs.Paul Phillips2012-02-033-3/+3
| | | | | | | | | | | | | | | | | | | | Free at last, free at last, of ScalaObject we're free at last. (With apologies to the Reverend, but the man had a way with words.)
| * | | Disabled all things MSIL.Paul Phillips2012-02-0312-3848/+3848
| | | | | | | | | | | | | | | | It's a huge drag when making fundamental changes.
| * | | Eliminated ScalaObject.Paul Phillips2012-02-036-8/+23
| | | | | | | | | | | | | | | | "This too shall pass."
| * | | Merge branch 'master' into topic/inlinePaul Phillips2012-02-036-10/+30
| |\ \ \
| * | | | Mostly eliminated ScalaObject.Paul Phillips2012-02-0322-61/+19
| | | | |
| * | | | Merge branch 'master' into topic/inlinePaul Phillips2012-02-03156-944/+1902
| |\ \ \ \
| * | | | | intermediate work towards a new starr for value classes.Martin Odersky2012-02-0312-86/+134
| | | | | |
| * | | | | First steps towards erasure of inline classes.Martin Odersky2012-01-312-0/+20
| | | | | |
| * | | | | New trait for erasure of inline classes.Martin Odersky2012-01-311-0/+9
| | | | | |
| * | | | | Merge remote branch 'paulp/inline' into topic/inlineMartin Odersky2012-01-3148-733/+1373
| |\ \ \ \ \
| | * | | | | More work on inline classes.Paul Phillips2012-01-3012-15/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail compile if AnyVal is inherited by a trait, a non-@inline class, or a class with an AnyRef parent somewhere. Added tests. Added logging, like [log extmethods] Inline class class Bippy spawns extension method. Old: def getClass: Class[_ <: Bippy] New: final def extension$getClass($this: Bippy): Class[_ <: Bippy] Fixed what I hope was a bug in ExtensionMethods where the original method params were dropped. Since adding a NonNull parent was also inflicting an AnyRef on AnyVal subclasses, suppressed that for those. Had the bright idea that AnyVal could extend NotNull. It doesn't seem to accomplish much, but then, I don't think NotNull accomplishes much. Still, maybe it's time to restrict the ways one can use AnyVal so one can't do this: scala> var x: AnyVal = _ x: AnyVal = null
| | * | | | | Merge branch 'master' into inlinePaul Phillips2012-01-301-2/+13
| | |\ \ \ \ \
| | * | | | | | Pushed new starr and updated desired shas.Paul Phillips2012-01-303-3/+3
| | | | | | | |
| | * | | | | | Merge branch 'master' into inlinePaul Phillips2012-01-302-19/+35
| | |\ \ \ \ \ \
| | * | | | | | | Synthesize getClass method for AnyVal children.Paul Phillips2012-01-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The synthetic method is only a null for now.
| | * | | | | | | Removed obsolete checkfile.Paul Phillips2012-01-302-13/+0
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'odersky/topic/inline' into inlinePaul Phillips2012-01-301-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Eliminated 2500 lines of whitespace changes.Paul Phillips2012-01-3021-478/+478
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into inlinePaul Phillips2012-01-3013-193/+733
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Working AnyVal#getClass.Paul Phillips2012-01-301-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed newMethod in Definitions to enterNewMethod to better indicate what it does, and also so AnyVal's getClass can avoid the "enter" part.
| * | | | | | | | | | Merge remote branch 'paulp/inline' into topic/inlineMartin Odersky2012-01-3019-316/+430
| |\| | | | | | | | | | | |_|/ / / / / / / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 05:44:16 +0000