summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* More retrofit of scaladoc model factory.Eugene Vigdorchik2012-10-011-23/+14
|
* Merge pull request #1367 from retronym/ticket/6381Grzegorz Kossakowski2012-09-213-1/+34
|\ | | | | SI-6381 Honour -Yrangepos in the REPL
| * SI-6381 Honour -Yrangepos in the REPLJason Zaugg2012-09-203-1/+34
| |
* | Merge pull request #1368 from paulp/merge-210Josh Suereth2012-09-20564-7286/+7312
|\ \ | |/ |/| Merge 2.10.x into master
| * A couple minor .gitattributes additions.Paul Phillips2012-09-201-0/+6
| |
| * Merge branch '2.10.x'Paul Phillips2012-09-20564-7286/+7306
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.10.x: (36 commits) Normalized line endings. New .gitattributes file. Disabled failing build manager tests. New test case for SI-6337 New test case for closing SI-6385 Value classes: eliminated half-boxing Cleanup of OverridingPairs Fixes SI-6260 Use faster download URL now that artifactory is fixed. don't try to create tags w/o scala-reflect.jar some small remaining fixes SI-5943 toolboxes now autoimport Predef and scala Fix for loud test. SI-6363 deploys the updated starr SI-6363 removes scala.reflect.base SI-6392 wraps non-terms before typecheck/eval SI-6394 fixes macros.Context.enclosingClass Error message improvement for SI-6336. Adjustments to scala.concurrent.duration. prepping for the refactoring ... Conflicts: src/actors-migration/scala/actors/Pattern.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/library/scala/collection/immutable/Vector.scala test/files/jvm/actmig-PinS_1.scala test/files/jvm/actmig-PinS_2.scala test/files/jvm/actmig-PinS_3.scala test/files/jvm/actmig-public-methods_1.scala
| * Merge remote-tracking branch 'paulp/treecheckers' into 2.10.xPaul Phillips2012-09-201-1/+1
| |\
| | * Fix for loud test.Paul Phillips2012-09-201-1/+1
| | |
| * | Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.xPaul Phillips2012-09-20340-2948/+2992
| |\ \
| | * | Normalized line endings.Paul Phillips2012-09-20336-2948/+2948
| | | | | | | | | | | | | | | | | | | | | | | | This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git.
| | * | New .gitattributes file.Paul Phillips2012-09-204-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | This should assist in keeping line endings straight. It is designed to enforce LF endings everywhere except for files specifically for windows.
| * | | Merge pull request #1348 from scalamacros/ticket/6394Grzegorz Kossakowski2012-09-205-1/+19
| |\ \ \ | | | | | | | | | | SI-6394 fixes macros.Context.enclosingClass
| | * | | SI-6394 fixes macros.Context.enclosingClassEugene Burmako2012-09-195-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Previously I used typer.context.enclClass, but it seems to do something completely unexpected, so I switched to manual context traversal.
| * | | | Merge pull request #1325 from odersky/ticket/6337Paul Phillips2012-09-205-10/+42
| |\ \ \ \ | | | | | | | | | | | | Fixes SI-6337 by disallowing nested value classes.
| | * | | | Fixed comment.Martin Odersky2012-09-171-0/+1
| | | | | |
| | * | | | Fixes SI-6337 by disallowing nested value classes.Martin Odersky2012-09-175-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | It seems for the moment too hard to allow this, and the functionality to have value classes wrap other value classes does not seem essential.
| * | | | | Merge pull request #1344 from jsuereth/wip/osgi-supportEugene Burmako2012-09-2030-34/+521
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixes SI-5822 & SI-6305 - OSGi tests + fixes
| | * | | | | Additional OSGi tests.Josh Suereth2012-09-195-8/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure scala-library can be resolved on its own, and with sun.misc.Unsafe usage. * Ensure reflection works without scala-compiler.jar * Ensure ToolBox's can see all classes necessary when evaluating expressions. * Cleanup test helper for filtering in/out bundles.
| | * | | | | Adds very simplistic reflection in OSGi test. Provides the frameworkJosh Suereth2012-09-181-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to discover important reflection bugs in OSGi containers.
| | * | | | | Adds OSGi support / tests to Scala. Fixes SI-5822.Josh Suereth2012-09-1810-7/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds BND manifest generation to the build. * Adds OSGi pax-exam testing infrastructure * Adds simple OSGi verification test for bundle resolution. * Modifies distribution to use bundles.
| | * | | | | Fixes SI-6305 scala.tools.nsc.io split between jars.Josh Suereth2012-09-1817-27/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * migrates scala.tools.nsc.io portions into scala.reflect.io * marks all classes in scala.reflect.io experimental/internal * rewires src/reflect to use new io locations * creates forwarders in scala.tools.nsci.io package object.
| * | | | | | Merge pull request #1356 from paulp/pullreq-1342Josh Suereth2012-09-206-23/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Pullreq 1342
| | * | | | | | Error message improvement for SI-6336.Paul Phillips2012-09-195-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Position error messages about structural type members at the problematic parameter or type.
| | * | | | | | SI-6336 Now also catches return typesMartin Odersky2012-09-183-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Mark's comments on SI-6336 shows, we also need to disallow value classes as return types of structural types.
| * | | | | | | Merge pull request #1339 from rkuhn/wip-6389-finite-duration-multJosh Suereth2012-09-2029-283/+443
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389
| | * | | | | | | some small remaining fixesRoland2012-09-205-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added test for “span” and “fromNow” qualifiers - make those actually work even when there is an expected type - add ScalaDoc to them - verify (and fix) conversion Deadline -> FiniteDuration - also make Int * Duration => FiniteDuration work (and test it)
| | * | | | | | | Adjustments to scala.concurrent.duration.Paul Phillips2012-09-196-206/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More use of implicit classes and value classes; aliased units to make importing TimeUnit and TimeUnit._ unnecessary; placed some classes in their own files because "the unit of compilation is the file" and we shouldn't bundle more than necessary; fixed some examples.
| | * | | | | | | move Duration (incl. DSL) into scala.concurrent.duration packageRoland2012-09-1926-62/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that the full package can be imported naturally: import scala.concurrent.duration._ will give you all the types (Duration, FiniteDuration, Deadline) and the DSL for constructing these.
| | * | | | | | | improve performance of integer multiplication overflow check on DurationRoland2012-09-192-20/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also rename divisor arguments to “divisor” - and add a scalacheck for multiplication overflow detection
| | * | | | | | | enable integer multiplication/divison on FiniteDuration, see SI-6389Roland2012-09-182-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - without this "2.seconds * 2" will not return FiniteDuration but Duration - added test case verifying this behavior - matches normal arithmetics: integers throw on div-by-zero while doubles yield infinity; extended here to include overflow protection on integer multiplication
| * | | | | | | | Merge pull request #1363 from jsuereth/wip/use-faster-repoJosh Suereth2012-09-201-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use faster download URL now that artifactory is fixed.
| | * | | | | | | | Use faster download URL now that artifactory is fixed.Josh Suereth2012-09-201-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1360 from scalamacros/hotfix/sbtEugene Burmako2012-09-207-6/+135
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | don't try to create tags w/o scala-reflect.jar
| | * | | | | | | | don't try to create tags w/o scala-reflect.jarEugene Burmako2012-09-207-6/+135
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since recently type tags have relocated to scala-reflect.jar, meaning that they are no longer always on library classpath. In the compiler we do have code that generates type tags, and this code is bound to fail if scala-reflect.jar isn't there. I though this wouldn't be a problem, because type tag materialization is only going to be triggered by users explicitly requesting a type tag. That's generally true, but I overlooked a corner case. Since we provide manifest <-> type tag compatibility, manifest lookup can sometimes trigger tag lookup, which might result in tag synthesis, which blows up like this: http://groups.google.com/group/scala-internals/browse_thread/thread/166ce4b71b7c46bb This commit also ensures that type tag generation/interop doesnt sneak into the code of the libraries that don't have scala-reflect.jar on their classpath. For details refer to the discussion at scala-internals: http://groups.google.com/group/scala-internals/browse_thread/thread/72f6ce3010f4d8
| * | | | | | | | Merge branch 'pull-1352-reformatted' into 2.10.xPaul Phillips2012-09-2024-57/+258
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Martin Odersky * pull-1352-reformatted: Disabled failing build manager tests. New test case for SI-6337 New test case for closing SI-6385 Value classes: eliminated half-boxing Cleanup of OverridingPairs Fixes SI-6260
| | * | | | | | | | Disabled failing build manager tests.Martin Odersky2012-09-206-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the refined build manager computes its change sets it mixes up the types. It computes constructors of inner classes of the first compilation that point to types of the second compilation. This breaks a useful assertion in ExtensionMethods. The error you get for t4245 is java.lang.AssertionError: assertion failed: unexpected constructor erasure A#6956.this.B#20211 for class B#6963 What goes on here is that the primary constructor of inner class B#6963 points to the new version of that inner class A#6956.this.B#20211. This happens during the computation of change sets, not during normal compilation. Since it looks like the computation of change sets is broken I have disabled the tests, rather than disabling the assertion. It seems that during residential compilation, the result type of a constructor can be a different version of the enclosing class. I could not reproduce this
| | * | | | | | | | New test case for SI-6337Martin Odersky2012-09-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test case shows that the variant in the comment of SI-6337 now compiles also.
| | * | | | | | | | New test case for closing SI-6385Martin Odersky2012-09-202-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixes for SI-6260 + elimination of hlaf-boxing also solve SI-6385
| | * | | | | | | | Value classes: eliminated half-boxingMartin Odersky2012-09-209-18/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now apply erasure of value classes everywhere. previously, erasure was disabled in the value class itself. This led to irregegularities and bugs. See test run/valueclasses-pavlov.scala for something that led to a ClassCastException before.
| | * | | | | | | | Cleanup of OverridingPairsMartin Odersky2012-09-201-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a default value to a hashmap so that we can work with it without Option acrobatics.
| | * | | | | | | | Fixes SI-6260Martin Odersky2012-09-206-21/+112
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guards against bridge methods that clash with other methods. Two tests: The neg test is the original ticket. The run test tweaks things slightly so that the generated bridge method does not clash, and tests that the necessary unboxings are indeed performed at runtime.
| * | | | | | | | Merge pull request #1353 from gkossakowski/SI-6376-scalap-is-brokenGrzegorz Kossakowski2012-09-201-3/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix problem with names encoding in scalap.
| | * | | | | | | | Fix problem with names encoding in scalap.Grzegorz Kossakowski2012-09-191-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring performed in 020053c321 made use of naming encoding more consisted but introduced a regression in scalap. The problem is that the old encoder that scalap had didn't escape any characters that were not included in its opcode list. `NameTransformer` performs full encoding so it also encodes dots that are being used as separators for packages. Therefore, in order to retain the old behaviour we need to split the name by dots before feeding each fragment to `NameTransformer`. Review by @paulp.
| * | | | | | | | | Merge pull request #1331 from scalamacros/ticket/5943Grzegorz Kossakowski2012-09-208-2/+42
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | SI-5943 toolboxes now autoimport Predef and scala
| | * | | | | | | | | SI-5943 toolboxes now autoimport Predef and scalaEugene Burmako2012-09-208-2/+42
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously tb.typeCheck used default typer, which builds upon NoContext. Changing the context to analyzer.rootContext(NoCompilationUnit, EmptyTree) fixed the missing imports problem. Unfortunately this doesn't help in cases like "math.sqrt(4.0)" because of https://issues.scala-lang.org/browse/SI-6393. But anyways I'm adding this test case to pending.
| * | | | | | | | | Merge pull request #1338 from scalamacros/ticket/5418Grzegorz Kossakowski2012-09-206-3/+31
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | existentially typed macro expansions now work fine
| | * | | | | | | | test case closes SI-5418Eugene Burmako2012-09-182-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, when the existential reification bug is fixed, I've been able to take a look at SI-5418, and, apparently, the problem with importers has fixed itself during these 9 months of the bug being active.
| | * | | | | | | | existentially typed expansions now work fineEugene Burmako2012-09-184-3/+18
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one tries to compile the following code with the parent of this commit: ru.reify(new Object().getClass) then the following error will occur: Test.scala:2: error: type mismatch; found : $u.Expr[Class[_ <: Object]] required: reflect.runtime.universe.Expr[Class[?0(in value <local Test>)]] where type ?0(in value <local Test>) <: Object ru.reify(new Object().getClass) ^ This happens because macro expansions are always typechecked against the return type of their macro definitions instantiated in the context of expandee. In this case the expected type contains skolems which are incompatible with wildcards in the type of the expansion. I tried all the incantations I could think of - without any success. Luckily I met Martin who pointed me at the same problem solved in adapt (see the diff w.r.t Typers.scala).
| * | | | | | | | Merge pull request #1358 from scalamacros/ticket/6392Grzegorz Kossakowski2012-09-205-2/+33
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | SI-6392 wraps non-terms before typecheck/eval
| | * | | | | | | SI-6392 wraps non-terms before typecheck/evalEugene Burmako2012-09-195-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap non-term arguments of typecheck and eval, so that toolboxes can work with full-fledged files (except for package declarations).
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 03:14:12 +0000