summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'odersky/topic/inline' into inline-remergePaul Phillips2012-02-0644-62/+81
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/tools/nsc/typechecker/Namers.scala src/library/scala/AnyVal.scala test/files/run/primitive-sigs-2.check test/files/run/t4172.check test/files/scalap/abstractClass/result.test test/files/scalap/abstractMethod/result.test test/files/scalap/caseClass/result.test test/files/scalap/cbnParam/result.test test/files/scalap/classPrivate/result.test test/files/scalap/classWithExistential/result.test test/files/scalap/classWithSelfAnnotation/result.test test/files/scalap/covariantParam/result.test test/files/scalap/implicitParam/result.test test/files/scalap/paramClauses/result.test test/files/scalap/paramNames/result.test test/files/scalap/sequenceParam/result.test test/files/scalap/simpleClass/result.test test/files/scalap/traitObject/result.test test/files/scalap/typeAnnotations/result.test test/files/scalap/valAndVar/result.test test/files/scalap/wildcardType/result.test
| * Added hook in erasure.Martin Odersky2012-02-061-0/+3
| |
| * Fixed a bunch of scalap check files to account for absence of ScalaObjectMartin Odersky2012-02-0619-24/+24
| |
| * A first bunch of Any-extending traits.Martin Odersky2012-02-0616-18/+22
| |
| * Removing AnyVal as a source class. Removing automatic addition of ↵Martin Odersky2012-02-0619-95/+49
| | | | | | | | ScalaObject. Undoing wrong fix in ExtensionMethods.
| * Definitions are now initialized in reflection (was missing before).Martin Odersky2012-02-062-0/+7
| |
| * Different treatment of Null <:< T, to allow for Any-extending traits. ↵Martin Odersky2012-02-061-83/+87
| | | | | | | | | | | | | | | | | | | | | | | | Without the change, val x: List[String] with Ordered[String] = null would be illegal. The change is reflected in my local copy of the spec. Where it now says in the section of conformance: \item For every non-bottom class type $T$, $\mbox{\code{scala.Null}} \conforms T$, unless $T \conforms \mbox{\code{scala.AnyVal}}$ or $T \conforms \mbox{\code{scala.NotNull}}$.
| * Fix in Definitions that now enables bootstrap without AnyVal.scala present. ↵Martin Odersky2012-02-031-1/+1
| | | | | | | | This should be a new starr.
* | 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
|\ \
| * \ Merge branch 'fix-script'Paul Phillips2012-02-041-13/+18
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/get-scala-revision
| | * | Establish more baseline tags.Paul Phillips2012-02-041-13/+18
| | | | | | | | | | | | | | | | So we can turn out a build string regardless of local conditions.
| | * | Time-traveled get-scala-revision to 3-way merge base.Paul Phillips2012-02-041-16/+28
| | | |
| * | | An IntelliJ module for the root directory.Jason Zaugg2012-02-042-1/+12
| | | | | | | | | | | | | | | | This allows any file to be be edited, rather than just the ones under library, compiler, actors, ...
| * | | Merge branch 'publish-fix'Paul Phillips2012-02-031-2/+2
| |\| | | | | | | | | | | | | | | | | | Conflicts: tools/epfl-publish
| | * | Fix 2.9.2 scaladoc replacing nightlies in jenkinsVlad Ureche2012-02-031-2/+2
| | | |
| | * | Injecting epfl-publish into merge-base.Paul Phillips2012-02-031-0/+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
|\| | |
| * | | Updated and added some runners.Paul Phillips2012-02-036-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Easier ways to invoke scala/scalac based on starr, locker, or quick. % tools/starr_scalac -version Scala compiler version 2.10.0.r26060-b20111123092602 -- Copyright 2002-2011, LAMP/EPFL % tools/locker_scalac -version Scala compiler version v2.10.0-M1-0140-g4619a48c1e-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL % tools/quick_scalac -version Scala compiler version v2.10.0-M1-0144-g0c59a25a81-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL
* | | | Mostly eliminated ScalaObject.Paul Phillips2012-02-0322-61/+19
| | | |
* | | | Merge branch 'master' into topic/inlinePaul Phillips2012-02-03156-944/+1902
|\| | | | |_|/ |/| |
| * | Restored build.number.Paul Phillips2012-02-031-0/+5
| | | | | | | | | | | | | | | | | | | | | As it is apparently used by maven. We're now at a local minimum of sensibility for the construction of build strings, but the good thing about local minima is that one can reasonably anticipate an upward climb. Or at least flatlining.
| * | Updated Flags toString/documentation.Paul Phillips2012-02-029-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a stunningly unusual demonstration of farsightedness, I was able to generate these changes only by running: scala scala.tools.nsc.util.FlagsUtilCompiler With this much time in between runs: -// Generated by mkFlagsTable() at Mon Oct 11 10:01:09 PDT 2010 +// Generated by mkFlagsTable() at Thu Feb 02 20:31:52 PST 2012
| * | Cleanups in classfile parser symbol creation.Paul Phillips2012-02-021-18/+18
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-24 05:02:19 +0000