summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Made speclib less of a maintenance headache.Paul Phillips2012-02-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Now it copies in the current versions of BoxesRunTime and ScalaRunTime and applies patches to them, and the whole build is automated. # This is the only thing I actually typed, the rest is fancy echo. $ test/instrumented/mkinstrumented.sh build % rm -rf /scratch/trunk1/test/instrumented/classes % cp /scratch/trunk1/test/instrumented/../../src/library/scala/runtime/BoxesRunTime.java /scratch/trunk1/test/instrumented/../../src/library/scala/runtime/ScalaRunTime.scala /scratch/trunk1/test/instrumented/library/scala/runtime % patch BoxesRunTime.java /scratch/trunk1/test/instrumented/boxes.patch patching file BoxesRunTime.java % patch ScalaRunTime.scala /scratch/trunk1/test/instrumented/srt.patch patching file ScalaRunTime.scala Hunk #3 succeeded at 63 (offset 23 lines). Hunk #4 succeeded at 78 (offset 23 lines). Hunk #5 succeeded at 81 (offset 23 lines). Hunk #6 succeeded at 96 (offset 23 lines). % /scratch/trunk1/test/instrumented/../../build/pack/bin/scalac -d /scratch/trunk1/test/instrumented/classes /scratch/trunk1/test/instrumented/library/scala/runtime/BoxesRunTime.java /scratch/trunk1/test/instrumented/library/scala/runtime/ScalaRunTime.scala % javac -cp /scratch/trunk1/test/instrumented/../../build/pack/lib/scala-library.jar -d /scratch/trunk1/test/instrumented/classes /scratch/trunk1/test/instrumented/library/scala/runtime/BoxesRunTime.java % cd /scratch/trunk1/test/instrumented/classes % jar cf instrumented.jar . % mv -f instrumented.jar /scratch/trunk1/test/instrumented/../../test/files/speclib /scratch/trunk1/test/files/speclib/instrumented.jar has been created.
* Merge remote-tracking branch 'jsuereth/wip-ossrh-deployment'Paul Phillips2012-02-141-1/+1
|\
| * changed repo id to denote new credentials for new serer.Josh Suereth2012-02-141-1/+1
| |
| * Modified repository deployments to point to OSSRHJosh Suereth2012-02-131-5/+2
| |
* | Modified repository deployments to point to OSSRHJosh Suereth2012-02-141-5/+2
| |
* | Make fix for SI-5452 not break other things.Paul Phillips2012-02-142-4/+7
| | | | | | | | If this looks hacky, that's because it is.
* | Fix for set/list/oops bug in MutableSettings#copy.Paul Phillips2012-02-131-2/+1
| | | | | | | | | | | | | | | | Closes SI-5446. I am morally certain that fixes of this nature could be performed by someone who has logged fewer than ten thousand hours with the compiler.
* | Fix for SI-5452.Paul Phillips2012-02-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Why is calling the error function not enough to register the error, why does "setError(tree)" have to be called as well? That was the cause of this particular stackoverflow. In ContextErrors I see lots of methods which call setError and lots more which do not, and frankly it's all pretty terrifying. There is zero documentation attached to setError. Maybe there's an explanation somewhere I'm not seeing. Review by @hubertp.
* | Fix for SI-5444.Paul Phillips2012-02-134-15/+32
| | | | | | | | | | Fix for trait/impl renaming in 5cbd7d06eb was incomplete. Looks more complete now.
* | Man, these one argument asserts.Paul Phillips2012-02-131-1/+1
| | | | | | | | Some day, outlawed!
* | Modest deverbosification of recent commit.Paul Phillips2012-02-131-17/+6
| | | | | | | | Review by @scalamacros.
* | Merge branch 'master' into developPaul Phillips2012-02-138-50/+146
|\ \
| * | Existential printing, plus more compiler testing infrastructure.Paul Phillips2012-02-138-50/+146
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Direct compiler internals testing. It's really easy, you should probably use it about 1000 times each. Look at the test: run/existentials-in-compiler.scala The checkfile contains the (string representations of the) actual existentials from the compiler to make sure they correspond properly to the ones in the source. Existentials were being printed with wildcards too freely; this has been tightened up.
* | Merge remote-tracking branches 'scalamacros/pullrequest/5453' and ↵Paul Phillips2012-02-136-62/+119
|\ \ | | | | | | | | | 'scalamacros/pullrequest/5229' into develop
| * | Fixes https://issues.scala-lang.org/browse/SI-5229Eugene Burmako2012-02-146-62/+119
| |/
* / Fixes https://issues.scala-lang.org/browse/SI-5453Eugene Burmako2012-02-131-6/+2
|/ | | | | | | | | | | Originally we thought that macros declared inside objects should not provide _this to their bodies. However, it: 1) contradicts vanilla Scala rules, according to which both class and object methods can use this, 2) imposes unnecessary burden on macro developers without providing any conveniences to us. Review by @odersky.
* reifyAnnotationsEugene Burmako2012-02-1211-497/+825
| | | | | | | | | | | | | | | | | | | | | | | Annotations are now supported by the reifier: * AnnotationInfos from symbols get transformed back into mods. * AnnotatedTypes are retained and are reified along with AnnotationInfos. Reification is no magic, and reification of annotations especially: * Annotations cannot refer to symbols defined inside the quasiquote. This restriction is due to the fact that we need to erase locally defined symbols before reifying to make subsequent reflective compilations succeed. However, while doing that, we also need to make sure that we don't make resulting ASTs non-compilable by removing essential information. This is tricky, and it more or less works for TypeTrees, but not for annotations that can contain arbitrary ASTs. For more details look into the comments to Reifiers.scala. * Classfile annotations that contain array arguments and are applied to types, i.e. the ones that generate AnnotatedTypes, cannot be reified. This is because of limitations of manifest infrastructure. Typechecking "Array(mirror.LiteralAnnotArg(...))" would require the compiler to produce a manifest for a path-dependent type, which cannot be done now. Review by @odersky.
* Fix for overly suppressive repl.Paul Phillips2012-02-123-8/+7
| | | | | | | | | At some point in the past, trying to prevent deprection warnings from being issue in triplicate in the repl, I suppressed too much output, leading to a class of breakdowns where the failure would be swallowed completely. This went on for far too long. The deprecation warnings are back in triplicate for the moment, but the repl should now be less "strong, silent type" and more emo.
* Fixed bug in DefDef creation.Paul Phillips2012-02-111-1/+1
| | | | | | | | | | | | What's improbable about 29f933b60 is that a good chunk of the commit exists only so you can pass "mods" to the DefDef constructor. And then the body isn't updated to use it, the parameter dies on the vine. That was five years ago. I logged when mods didn't match Modifiers(sym.flags) and there were a bunch of differences, but I didn't see any interesting behavior emerging. Still, I bet something changed somewhere (hopefully in the fixy direction.)
* Another existential problem down.Paul Phillips2012-02-111-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a window of danger when multiple related elements are being typed where something which is conceptually one thing can slip into two things, and those two things can be incompatible with one another. Less mysteriously, c478eb770d fixed this: def f = { object Bob ; Bob } ; val g = f But, it did not fix this: def f = { case class Bob() ; Bob } ; val g = f See test case pos/existentials-harmful.scala for an "in the wild" code example fixed by this commit. The root of the problem was that the getter and the field would each independently derive the same existential type to describe Bob, but those existentials were not the same as one another. This has been the most elusive bug I have ever fixed. I want to cry when I think of how much time I've put into it over the past half decade or so. Unfortunately the way the repl works it is particularly good at eliciting those grotesque found/required error messages and so I was never able to let the thing go. There is still a cosmetic issue (from the last commit really) where compound types wind up with repeated parents. Closes SI-1195, SI-1201.
* Overcame long-maddening existential issue.Paul Phillips2012-02-101-2/+30
| | | | | | | | | | | | | | | | | When performing an existential transform, the bounds produced by the hidden symbols may contain references to the hidden symbols, but these references were not accounted for. This was at the root of some bad behavior with existentials. If you've ever seen a message like this: <console>:8: error: type mismatch; found : B(in value res0) where type B(in value res0) <: A with ScalaObject required: B(in value res0) forSome { type B(in value res0) <: A with ScalaObject; type A <: Object with ScalaObject } ...then you know what I mean. Closes SI-4171, not quite yet on SI-1195, SI-1201.
* Merge remote-tracking branch 'scalamacros/pullrequest/5451' into developPaul Phillips2012-02-092-12/+14
|\
| * Fixes https://issues.scala-lang.org/browse/SI-5451Eugene Burmako2012-02-092-12/+14
| | | | | | | | | | | | | | | | | | | | Macro implementations now get type arguments as TypeTrees, not Types. Keeping the situation with AnnotationInfos in mind, I decided to go for the most future-proof solution. Another argument for this decision is that we will most likely have to support untyped macros. Review by @odersky.
* | Added back `internal.Symbol.toplevelSymbol` to resurrect the IDE for trunk.Iulian Dragos2012-02-091-0/+4
|/
*---. Merge remote-tracking branches 'VladUreche/issue/5287-cleanup', ↵Paul Phillips2012-02-083-34/+13
|\ \ \ | | | | | | | | | | | | 'scalamacros/pullrequest/removecodedotscala' and 'scalamacros/pullrequest/macrodoc' into develop
| | | * Updated information about desugaring of macrosEugene Burmako2012-02-081-7/+11
| | | |
| | * | Removed Code.scalaEugene Burmako2012-02-081-25/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | This is a logical next step after deprecating and removing LiftCode: https://github.com/scala/scala/commit/ffc2389840852a120fecd772206d55db9a79f30e Now when Paul has uploaded a starr that doesn't need Code, Code$ and Code.lift we can finally remove the last remaining pieces of the old reification logic.
| * / Fixed misplaced @usecase annotationVlad Ureche2012-02-081-2/+2
| |/ | | | | | | That was preventing the compiler API scaladoc from building
* / fix maven publish version numbersLukas Rytz2012-02-071-0/+3
|/
* Added a rootdoc page for the compiler API scaladocVlad Ureche2012-02-063-3/+7
|
* Scaladoc @usecase annotation overriding / SI-5287Vlad Ureche2012-02-061-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From now on, the usecases inherit the comments from their parents, such as the explanation and the annotations: @param, @tparam, @return, etc. An example of usecase comment inheritance is: /** * The test function tests the parameter param for ... * * @param theParam the implicit parameter to be tested for ... * @return the result of the test * * * * @usecase def test(): Bool * * The test function tests the parameter taken implicitly from scope. * Example: `test()` * * @return the result of the test for the current scope * * * * @usecase def test(theParam: SomeType): Bool * * This takes the explicit value passed. * Example: `test(3)` * * @param theParam the explicit parameter to be tested for ... */ def test(implicit theParam: SomeType): Bool Notice both usecases override the explanation with their own examples. The first usecase also overrides the "@return" annotation while the 2nd usecase overrides the "@param theParam" annotation. If they didn't override the explanations and annotations, they would inherit the values from the actual implementation, def test(implicit ...) This will be followed by @inheritdoc, which enables more fine-grained control over comment inheritance. The full explanation of using comment inheritance and @inheritdoc and their interaction with variables is given at https://wiki.scala-lang.org/display/SW/Tags+and+Annotations in the "Comment inheritance" and "Inheritance Example" sections.
*-----. Merge remote-tracking branches 'rklaehn/SI-5139', 'axel22/feature/pc-ctrie', ↵Paul Phillips2012-02-0670-884/+2175
|\ \ \ \ | | | | | | | | | | | | | | | 'greedy/auto-fetch-jars', 'scalamacros/pullrequest/assorted' and 'VladUreche/feature/scaladoc-nofail' into develop
| | | | * Added the "nofail" flag to the scaladoc ant taskVlad Ureche2012-02-061-5/+22
| | | |/ | | |/| | | | | | | | | | | | | To use it, we need to update starr and then add nofail="yes" to the build.xml scaladoc tasks.
| | | * Assorted fixesEugene Burmako2012-02-068-62/+85
| | |/ | | | | | | | | | | | | Multiple fixes that have been accumulated during my investigations of 5273. Too heterogeneous to describe here, too minor to split into changesets.
| * | Merge branch 'master' into feature/pc-ctrieAleksandar Prokopec2012-02-0663-1319/+1623
| |\|
| | * Revert "Added a rootdoc page for the compiler API scaladoc"Paul Phillips2012-02-053-7/+3
| | | | | | | | | | | | This reverts commit e34098b7f6e37420198fa5c7c2820d0443b46cc4.
| | * Revert "Scaladoc @usecase annotation overriding / SI-5287"Paul Phillips2012-02-051-24/+2
| | | | | | | | | | | | This reverts commit 7946ac410ad74894cd0eb6dfd29447f173911b99.
| | * Refining the reflection api.Paul Phillips2012-02-0526-183/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the pursuit of simplicity and consistency. - Method names like getType, getClass, and getValue are far too ambiguous, both internally and especially with java reflection names. Methods which accept or return scala symbols should not refer to them as "classes" in the reflection library. (We can live with the FooClass convention for naming the well-known symbols, it's names like "getClass" and "classToType" which are needlessly conflationary.) - Meaningless names like "subst" have to be expanded. - We should hew closely to the terms which are used by scala programmers wherever possible, thus using "thisType" to mean "C.this" can only beget confusion, given that "thisType" doesn't mean "this.type" but what is normally called the "self type." - It's either "enclosing" or "encl", not both, and similar consistency issues. - Eliminated getAnnotations. - Removed what I could get away with from the API; would like to push those which are presently justified as being "required for LiftCode" out of the core. - Changed a number of AnyRefs to Any both on general principles and because before long it may actually matter. - There are !!!s scattered all over this commit, mostly where I think the name could be better. - I think we should standardize on method names like "vmSignature, vmClass" etc. when we are talking about jvm (and ostensibly other vm) things. There are a bunch more places to make this distinction clear (e.g. Symbol's javaBinaryName, etc.) - There is a lot more I want to do on this and I don't know where the time will come from to do it. Review by @odersky, @scalamacros.
| | * Reimplemented Modifer.Paul Phillips2012-02-058-44/+94
| | | | | | | | | | | | | | | Couldn't live with a scala.Enumeration being a permanent fixture in the reflection library. Rolled it by hand.
| | *-----. Merge remote-tracking branches 'VladUreche/feature/compiler-rootdoc', ↵Paul Phillips2012-02-055-7/+33
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'scalamacros/pullrequest/5334', 'scalamacros/pullrequest/5272' and 'VladUreche/issue/5287-cleanup' into develop
| | | | | | * Scaladoc @usecase annotation overriding / SI-5287Vlad Ureche2012-02-051-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From now on, the usecases inherit the comments from their parents, such as the explanation and the annotations: @param, @tparam, @return, etc. An example of usecase comment inheritance is: /** * The test function tests the parameter param for ... * * @param theParam the implicit parameter to be tested for ... * @return the result of the test * * * * @usecase def test(): Bool * * The test function tests the parameter taken implicitly from scope. * Example: `test()` * * @return the result of the test for the current scope * * * * @usecase def test(theParam: SomeType): Bool * * This takes the explicit value passed. * Example: `test(3)` * * @param theParam the explicit parameter to be tested for ... */ def test(implicit theParam: SomeType): Bool Notice both usecases override the explanation with their own examples. The first usecase also overrides the "@return" annotation while the 2nd usecase overrides the "@param theParam" annotation. If they didn't override the explanations and annotations, they would inherit the values from the actual implementation, def test(implicit ...) This will be followed by @inheritdoc, which enables more fine-grained control over comment inheritance. The full explanation of using comment inheritance and @inheritdoc and their interaction with variables is given at https://wiki.scala-lang.org/display/SW/Tags+and+Annotations in the "Comment inheritance" and "Inheritance Example" sections.
| | | | | * | Fixes https://issues.scala-lang.org/browse/SI-5272Eugene Burmako2012-02-051-2/+2
| | | | |/ /
| | | * | / Added a rootdoc page for the compiler API scaladocVlad Ureche2012-02-053-3/+7
| | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'szabolcsberecz/small-cleanup' into developPaul Phillips2012-02-052-3/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | one less TODO and null checkSzabolcs Berecz2012-02-052-3/+2
| | | | |
| | * | | Replaced LiftCode with a function in MacroContextEugene Burmako2012-02-0524-262/+232
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major cleanup of reification: * LiftCode phase has been removed * Code has been deprecated and will be removed as we roll a new starr * Logic related to type-directed lifting has been purged scala.reflect.macro.Context#reify now provides the same services as LiftCode provided (except that it returns Tree, not Code). For testing purposes, I've retained the oh-so-convenient automagic lift. test/files/codelib/code.jar now hosts Code.lift reimplemented in a macro, so that the tests can continue working as if nothing has happened.
| * | | Add tests for parallel Ctrie.Aleksandar Prokopec2012-02-031-1/+0
| | | | | | | | | | | | | | | | Changed parameters in some tests to speed them up.
| * | | Fix some issues in parallel Ctrie.Aleksandar Prokopec2012-02-034-46/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change resolves some issues with ParCtrie splitters and their `remaining` method, which currently evaluates the size of the Ctrie. Since this is still not done lazily, nor in parallel, it has a certain cost, which is unacceptable. Change #1: The `shouldSplitFurther` method is by default implemented by calling the `remaining` method. This method now forwards the call to the same method in the splitter which is by default implemented in the same way as before, but can be overridden by custom collections such as the ParCtrie. Change #2: ParCtrie splitter now has a `level` member which just counts how many times the method has been split. This information is used to override the default `shouldSplitFurther` implementation. Change #3: The tasks and splitters rely heavily on the `remaining` method in the splitter for most operations. There is an additional method called `isRemainingCheap` which returns true by default, but can be overridden by custom collections such as the `Ctrie`.
| * | | Add parallel Ctrie parallel collection.Aleksandar Prokopec2012-02-025-10/+151
| | | |
| * | | Incorporate Ctrie into standard library.Aleksandar Prokopec2012-02-021-11/+92
| | | | | | | | | | | | | | | | Implemented Ctrie serialization. Improved hashcode computation.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 05:16:19 +0000