summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
* Tree adjustments.Paul Phillips2012-03-192-8/+19
| | | | | | | | | | | | | | I noticed that if we gave Ident a "qualifier" method which is always EmptyTree, a whole bunch of code could be simplified. A transparent subclass of Apply which preserves the source level "new" a little longer than never. Since productPrefix is tied up in reification - and oh I detest this "String"-based programming, we shouldn't have to wait until everyone learns this independently to change it - I added "printingPrefix" to Tree, which defaults to productPrefix but can be changed without breaking reify.
* Added +: and :+ extractors to mirror append/prepend.Josh Suereth2012-03-162-0/+24
| | | | | | | | * +: does head/tail decomposition on any Seq * :+ does init/last decomposition on any Seq * Both preserve specific Seq types. Review by @odersky
* Eliminating warnings in Cleanup.Paul Phillips2012-03-161-1/+1
| | | | | | | | And un-overabstracting it a bit. When a method takes four parameters in two parameter lists, one of which is a closure acting on a tuple, and it turns out there are a total of three call sites and they all pass identical values for the first three parameters, it may be time to brush up on your YAGNI.
*-----. Merge remote-tracking branches 'VladUreche/feature/inheritdoc-clean', ↵Paul Phillips2012-03-1614-130/+192
|\ \ \ \ | | | | | | | | | | | | | | | 'acruise/t1118', 'hubertp/issue/5572', 'hubertp/topic/nightly-checkinit', 'axel22/feature/pc-ctrie', 'jsuereth/master-version-fixin' and 'axel22/feature/checkinit-transient' into develop
| | | | * Finished migrating to new versioning schemeJosh Suereth2012-03-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.xml tools/get-scala-revision.bat
| | | | * properties loading is now maven/osgi version aware. yippie.Josh Suereth2012-03-161-14/+13
| |_|_|/ |/| | |
| | | * Renamed concurrent trie source files.Aleksandar Prokopec2012-03-162-0/+0
| | | |
| | | * Renaming Ctrie to ConcurrentTrieMap.Aleksandar Prokopec2012-03-162-77/+77
| |_|/ |/| |
| | * Tweaked deprecation annotations to avoid warningAlex Cruise2012-03-152-2/+2
| | |
| | * SI-1118:Alex Cruise2012-03-152-462/+459
| | | | | | | | | | | | | | | | | | * Use new-style deprecation annotations * Slightly less cutesy test text * Move t1118.scala to the right directory
| | * Cleaned up failed manual patchAlex Cruise2012-03-151-459/+459
| | |
| | * SI-1118 WIPAlex Cruise2012-03-1511-40/+107
| | |
* | | New option -Ypos-debug, and fixed range position breakage.Paul Phillips2012-03-151-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Looks like there is more range position breakage yet, but this gets the outermost layer.) Channeling my struggles into a slightly easier future. % scalac -Ypos-debug -d /tmp ./src/library/scala/Predef.scala ./src/library/scala/Predef.scala:222: warning: Positioned tree has unpositioned child in phase extmethods def x = __resultOfEnsuring ^ parent: #7109 line 222 Select // (value __resultOfEnsuring in class Ensuring) child: #7108 Ident // (value $this) ./src/library/scala/Predef.scala:258: warning: Positioned tree has unpositioned child in phase extmethods def x = __leftOfArrow ^ parent: #7280 line 258 Select // (value __leftOfArrow in class ArrowAssoc) child: #7279 Ident // (value $this) two warnings found Or try this to really see some output: % scalac -Yrangepos -Ypos-debug
* | | Merge remote-tracking branches 'axel22/feature/checkinit-transient' and ↵Paul Phillips2012-03-1589-161/+342
|\ \ \ | | |/ | |/| | | | 'lrytz/relativeLinks' into develop
| * | Whitespace and a couple checkfile updates.Paul Phillips2012-03-142-4/+4
| | |
| * | Merge remote-tracking branch 'odersky/topic/inline' into merge-inlinePaul Phillips2012-03-1475-130/+320
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/Symbols.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala src/library/scala/Function0.scala src/library/scala/Function1.scala src/library/scala/Function10.scala src/library/scala/Function11.scala src/library/scala/Function12.scala src/library/scala/Function13.scala src/library/scala/Function14.scala src/library/scala/Function15.scala src/library/scala/Function16.scala src/library/scala/Function17.scala src/library/scala/Function18.scala src/library/scala/Function19.scala src/library/scala/Function2.scala src/library/scala/Function20.scala src/library/scala/Function21.scala src/library/scala/Function22.scala src/library/scala/Function3.scala src/library/scala/Function4.scala src/library/scala/Function5.scala src/library/scala/Function6.scala src/library/scala/Function7.scala src/library/scala/Function8.scala src/library/scala/Function9.scala test/files/codelib/code.jar.desired.sha1 test/files/neg/anyval-children-2.check test/files/run/programmatic-main.check
| | * | Allows case classes as value classesMartin Odersky2012-03-071-1/+1
| | | |
| | * | Fixes to value classes: Flags now double definitions, private constructors ↵Martin Odersky2012-03-0668-148/+140
| | | | | | | | | | | | | | | | as errors. Fixed erasure scheme.
| | * | Made 3 classes in the standard library into value classes.Martin Odersky2012-02-222-3/+3
| | | |
| | * | Compiler now ready to accept value classes in standard library. Time for a ↵Martin Odersky2012-02-222-1/+16
| | | | | | | | | | | | | | | | new STARR!
| | * | Split StringAdd into StringAdd and StringFormatMartin Odersky2012-02-223-11/+26
| | | |
| | * | Made more traits universal.Martin Odersky2012-02-224-5/+5
| | | |
| | * | New FlatArray scheme for handling value classes.Martin Odersky2012-02-174-67/+155
| | | |
| | * | New scheme for "Rows" of value classes.Martin Odersky2012-02-152-0/+67
| | | |
| | * | Changed erasure behavior of arrays to use always boxed representation.Martin Odersky2012-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/files/run/Meter.scala
| | * | Fixing problems with generation of isInstanceOf, classOf.Martin Odersky2012-02-141-4/+4
| | | |
| | * | Deprecating /:\. Fold should be used instead.Martin Odersky2012-02-121-0/+1
| | | |
| | * | Rename isValueClass -> isPrimitiveValueClassMartin Odersky2012-02-071-1/+1
| | | |
| | * | Merge branch 'master' into topic/inlinePaul Phillips2012-02-0636-482/+1846
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/Global.scala test/files/run/programmatic-main.check
| | * \ \ Merge remote-tracking branch 'odersky/topic/inline' into inline-remergePaul Phillips2012-02-0616-18/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | 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-061-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | ScalaObject. Undoing wrong fix in ExtensionMethods.
| * | | | | Merge branch 'merge-inline' of /scratch/trunk3 into developPaul Phillips2012-03-1418-35/+26
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into merge-inlinePaul Phillips2012-03-14137-1277/+6635
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Making AnyVal into a class instead of a trait.Paul Phillips2012-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- 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.
| | * | | | Having Proxy extend Any as well.Paul Phillips2012-02-041-3/+2
| | | | | |
| | * | | | Made Any parents work more.Paul Phillips2012-02-042-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Working on type printing logic.
| | * | | | Eliminated ScalaObject.Paul Phillips2012-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | "This too shall pass."
| | * | | | Mostly eliminated ScalaObject.Paul Phillips2012-02-032-14/+1
| | | | | |
| | * | | | Merge branch 'master' into topic/inlinePaul Phillips2012-02-036-31/+14
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | intermediate work towards a new starr for value classes.Martin Odersky2012-02-035-8/+10
| | | | | |
| | * | | | More work on inline classes.Paul Phillips2012-01-302-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Eliminated 2500 lines of whitespace changes.Paul Phillips2012-01-305-280/+280
| | | | | |
| | * | | | Merge branch 'master' into inlinePaul Phillips2012-01-303-136/+171
| | |\ \ \ \
| | * | | | | Resinstantiating anyval-children test. Getting he complete build to run.Martin Odersky2012-01-301-1/+2
| | | | | | |
| | * | | | | Merge remote-tracking branch 'paulp/inline' into topic/inlineMartin Odersky2012-01-2913-304/+315
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily removed getClass from AnyVal to get build going. Disabled anyval-childen test. Fixed some other build problems. Implemented step 1 + 2 of inline classes proposal.
| | | * | | | | Unsealed AnyVal.Paul Phillips2012-01-2810-290/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hacks here and there to allow them to survive at least to erasure. Since nothing is done with them there yet, they inevitably crash and burn a little ways beyond that.
* | | | | | | | Remove some custom serialization boilerplate.Aleksandar Prokopec2012-03-158-66/+0
|/ / / / / / /
* | | | | | | Merge remote-tracking branches 'soc/fix-todos' and ↵Paul Phillips2012-03-149-4/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'axel22/feature/pc-execution-contexts' into develop
| * | | | | | | Fix tasksupport field initialization for the checkInit build.Aleksandar Prokopec2012-03-149-4/+78
| | |_|_|_|/ / | |/| | | | |