summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for SI-6595, lost modifiers in early defs.Paul Phillips2012-12-103-1/+20
| | | | | | | Saw this by accident; the trees created for early defs would wholesale replace the modifiers with PRESUPER rather than combining them. FINAL was lost that way, as would be any other modifiers which might be valid there.
* Merge pull request #1730 from JamesIry/smallcleanupPaul Phillips2012-12-104-15/+12
|\ | | | | Small cleanup work done during my initial visits to the code.
| * Small cleanup work done during my initial visits to the code.James Iry2012-12-074-15/+12
| | | | | | | | | | | | | | | | | | These are just a series of small cleanups I did while reading the code base during my first few days. None are actual functionality bugs and none warrant a full blown bug. Now that I'm moving on to doing real work small stuff like this will likely be swept up in other bugs, so this commit just captures that initial pass of stuff.
* | Merge pull request #1724 from paulp/merge-msil-genjvm-deletePaul Phillips2012-12-08168-29786/+120
|\ \ | |/ |/| Merge msil and genjvm deletions.
| * Surgery on MANIFEST.MF.Paul Phillips2012-12-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this thing depends on trailing spaces because I can't change it in my trailing-space-stripping editor without the build failing with this informative message: BUILD FAILED /scala/trunk/build.xml:1403: Existing manifest /scala/trunk/build/pack/META-INF/MANIFEST.MF is invalid The whole diff between working and not working is whitespace: --- i/META-INF/MANIFEST.MF +++ w/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: Scala Distribution Bundle-SymbolicName: org.scala-ide.scala.compiler;singleton:=true Bundle-Version: 2.10.0.alpha Eclipse-LazyStart: true -Bundle-ClassPath: +Bundle-ClassPath: ., bin, lib/jline.jar, -Export-Package: +Export-Package: scala.tools.nsc, scala.tools.nsc.ast, scala.tools.nsc.ast.parser, @@ -45,7 +45,7 @@ Export-Package: scala.reflect.runtime, scala.reflect.internal.transform, scala.reflect.api, -Require-Bundle: +Require-Bundle: org.apache.ant, org.scala-ide.scala.library - +
| * Misc touchup after purging msil/fjbg/genjvm.Paul Phillips2012-12-067-21/+21
| |
| * Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-deletePaul Phillips2012-12-06111-19508/+78
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1718/head': Expunged the .net backend. Conflicts: build.detach.xml build.examples.xml build.xml project/Build.scala src/compiler/scala/tools/ant/Scalac.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala src/compiler/scala/tools/nsc/transform/Mixin.scala src/intellij/compiler.iml.SAMPLE tools/buildcp
| | * Expunged the .net backend.Paul Phillips2012-12-05111-19513/+83
| | | | | | | | | | | | | | | | | | | | | | | | It lives on in a branch born from this commit's parent. It's abrupt; no attempt is made to offer a "smooth transition" for the serious msil userbase, population zero. If anyone feels very strongly that such a transition is necessary, I will be happy to talk you into feeling differently.
| * | Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-deletePaul Phillips2012-12-0668-10258/+29
|/| | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1717/head': SI-6769 Removes GenJVM backend Conflicts: src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
| * | SI-6769 Removes GenJVM backendJames Iry2012-12-0568-10258/+29
| | | | | | | | | | | | | | | Get rid of GenJVM and everything that refers to it. Also get rid of GenAndroid since it's dead code that refers to GenJVM.
* | | Merge pull request #1697 from retronym/ticket/6745-2Adriaan Moors2012-12-062-1/+30
|\ \ \ | | | | | | | | Don't return unimportables from importedSymbol.
| * | | Don't return unimportables from importedSymbol.Jason Zaugg2012-12-032-1/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardening against the symptom of SI-6745, which yielded: wat.scala:4: error: too many arguments for constructor Predef: ()object Predef def this() = this(0) ^ The fix for the underlying problem in that bug has been targetted at branch 2.10.x.
* | | Merge pull request #1693 from paulp/name-implicit-removalAdriaan Moors2012-12-0639-149/+130
|\ \ \ | | | | | | | | Name implicit removal
| * | | Remove TermName -> String implicit.Paul Phillips2012-12-0215-61/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These implicits were crutches going back to a much Stringier time. Of course "with great type safety comes great verbosity" and no doubt this could be cleaned up significantly further. At least the underpinnings are consistent now - the only implicits involving name should be String -> TypeName and String -> TermName.
| * | | Remove Name -> TermName implicit.Paul Phillips2012-12-0125-88/+78
| | | | | | | | | | | | | | | | And simplify the name implicits.
* | | | Merge pull request #1714 from JamesIry/remove_review_scriptPaul Phillips2012-12-052-2584/+0
|\ \ \ \ | |_|_|/ |/| | | SI-6770 Removes unused and unusable review scripts
| * | | SI-6770 Removes unused and unusable review scriptsJames Iry2012-12-052-2584/+0
| | |/ | |/| | | | | | | Delete review and postreview.py scripts since they depend on SVN and aren't necessary under the github pull-request system.
* | | Merge pull request #1716 from paulp/merge-2.10Adriaan Moors2012-12-0553-139/+675
|\ \ \ | |/ / |/| | Merged 2.10.0/x into master.
| * | Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-0553-139/+675
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-2.10-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. Asserts about Tree qualifiers. Fix for SI-6731, dropped trees in selectDynamic. neg test added SI-5753 macros cannot be loaded when inherited from a class or a trait Take advantage of the margin stripping interpolator. Adds a margin stripping string interpolator. SI-6718 fixes a volatile test Mark pattern matcher synthetics as SYNTHETIC. Set symbol flags at creation. Fix for SI-6687, wrong isVar logic. Fix for SI-6706, Symbol breakage under GC. findEntry implementation code more concise and DRYer. Fix for SI-6357, cycle with value classes. Refactoring of adaptMethod SI-6677 Insert required cast in `new qual.foo.T` Conflicts: src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/SymbolTable.scala src/reflect/scala/reflect/internal/util/package.scala test/files/neg/gadts1.check
| * | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10-wipPaul Phillips2012-12-054-6/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (1) and others # Via Adriaan Moors (2) and others * origin/2.10.0-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply
| | * \ Merge pull request #1704 from retronym/ticket/6754-2v2.10.0-RC5v2.10.0Adriaan Moors2012-12-053-2/+9
| | |\ \ | | | | | | | | | | Fix for rangepos crasher.
| | | * | Fix for rangepos crasher.Paul Phillips2012-12-043-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | wrapClassTagUnapply was generating an unpositioned tree which would crash under -Yrangepos. See SI-6338.
| | * | | Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4Adriaan Moors2012-12-051-1/+6
| | |\ \ \ | | | |/ / | | |/| | Fixing OSGi distribution.
| | | * | Fixing OSGi distribution.Josh Suereth2012-12-051-1/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some kind of wierd filesystem issue where ANT would overwrite jars or not, depending on timestamps. It was a non-repeatable failure. Rather than overwrite JARs and rely on ANT, let's just spell out the non-OSGI bundles. While I had hoped to avoid hard-coding these, it's probably best we've done so.
| | * | Merge pull request #1686 from scalamacros/ticket/6685Eugene Burmako2012-12-021-3/+2
| | |\ \ | | | | | | | | | | Ticket/6685
| | | * | SI-6685 fixes error handling in typedApplyEugene Burmako2012-11-301-3/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MissingClassTagError doesn't lead to an exception, but rather silently sets an error, we need to bubble the resulting erroneous tree up the responsibility chain instead of mindlessly typechecking this again. This wasn't an issue before, because as far as I can guess the aforementioned error setter was always throwing exceptions in the most common usage scenarios (therefore the typecheck-again-fail-again vicious loop wasn't triggered).
| * | | Merge pull request #1681 from paulp/issue/6731Adriaan Moors2012-12-0510-48/+331
| |\ \ \ | | | | | | | | | | Fix for SI-6731, dropped trees in selectDynamic.
| | * | | Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.Paul Phillips2012-11-297-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | All tickets involving selectDynamic fixed by the prior commit. It also fixes SI-6663, but that already has a test case.
| | * | | Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-283-47/+221
| | | | | | | | | | | | | | | | | | | | I rewrote mkInvoke entirely, and boosted the test coverage.
| * | | | Merge pull request #1682 from paulp/assert-about-qualifierPaul Phillips2012-12-034-7/+20
| |\ \ \ \ | | | | | | | | | | | | Asserts about Tree qualifiers.
| | * | | | Asserts about Tree qualifiers.Paul Phillips2012-11-294-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding recent revelations about certain tree invariants in the form of asserts.
| * | | | | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-2915-10/+57
| |\ \ \ \ \ | | |/ / / / | |/| | | | SI-5753 macros cannot be loaded when inherited from a class or a trait
| | * | | | neg test addedmartende2012-11-276-0/+22
| | | | | |
| | * | | | SI-5753 macros cannot be loaded when inherited from a class or a traitmartende2012-11-279-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enclClass should be taken from Tree otherwise we can jump to declaration class/trait.
| * | | | | Merge pull request #1676 from retronym/topic/sm-interpolatorPaul Phillips2012-11-2813-55/+148
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Adds a margin stripping string interpolator.
| | * | | | Take advantage of the margin stripping interpolator.Jason Zaugg2012-11-269-55/+52
| | | | | | | | | | | | | | | | | | | | | | | | Safer and shorter.
| | * | | | Adds a margin stripping string interpolator.Jason Zaugg2012-11-264-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only for compiler internal use. Designed to avoid surprises if the interpolated values themselves contain the margin delimiter. Before: val bip = "\n |.." s"""fooo |bar $bip |baz""".stripMargin "fooo bar .. baz" After: sm"""fooo |bar $bip |baz""" "fooo bar |.. baz"
| * | | | | Merge pull request #1674 from scalamacros/topic/showrawJosh Suereth2012-11-272-4/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | | SI-6718 fixes a volatile test
| | * | | | SI-6718 fixes a volatile testEugene Burmako2012-11-262-4/+6
| | | | | |
| * | | | | Merge pull request #1666 from paulp/issue/6707Adriaan Moors2012-11-252-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Flag pattern matcher synthetics as synthetic.
| | * | | | | Mark pattern matcher synthetics as SYNTHETIC.Paul Phillips2012-11-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flagging synthetics accurately is important to allow for useful static analysis.
| | * | | | | Set symbol flags at creation.Paul Phillips2012-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All should prefer passing flags at symbol creation to mutating the flags field after creation.
| * | | | | | Merge pull request #1665 from paulp/issue/6687Adriaan Moors2012-11-252-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for SI-6687, wrong isVar logic.
| | * | | | | | Fix for SI-6687, wrong isVar logic.Paul Phillips2012-11-242-1/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fields which back lazy vals need to be excluded via !isLazy lest isVar return true.
| * | | | | | Merge pull request #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-2540-141/+410
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge 2.10.0-wip into 2.10.x.
| * \ \ \ \ \ \ Merge pull request #1652 from jedesah/FlatHashTableAdriaan Moors2012-11-251-7/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | findEntry implementation code more concise and DRYer.
| | * | | | | | | findEntry implementation code more concise and DRYer.Jean-Remi Desjardins2012-11-201-7/+6
| | | | | | | | |
| * | | | | | | | Merge pull request #1647 from adriaanm/backport-1626-2.10.xAdriaan Moors2012-11-253-1/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix for SI-6357, cycle with value classes.
| | * | | | | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-193-1/+12
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Don't force the owner info.
| * | | | | | | | Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-253-6/+77
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-6677 Insert required cast in `new qual.foo.T`
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 05:09:26 +0000