Permalink
Commits on Sep 21, 2012
  1. Merge pull request #1367 from retronym/ticket/6381

    SI-6381 Honour -Yrangepos in the REPL
    gkossakowski committed Sep 21, 2012
  2. Merge pull request #1368 from paulp/merge-210

    Merge 2.10.x into master
    jsuereth committed Sep 21, 2012
Commits on Sep 20, 2012
  1. Merge branch '2.10.x'

    * 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
    paulp committed Sep 20, 2012
  2. Merge pull request #1348 from scalamacros/ticket/6394

    SI-6394 fixes macros.Context.enclosingClass
    gkossakowski committed Sep 20, 2012
  3. Merge pull request #1252 from mt2309/master

    Remove extraneous null check in RedBlackTree
    paulp committed Sep 20, 2012
  4. Merge pull request #1325 from odersky/ticket/6337

    Fixes SI-6337 by disallowing nested value classes.
    paulp committed Sep 20, 2012
  5. Merge pull request #1344 from jsuereth/wip/osgi-support

    Fixes SI-5822 & SI-6305 - OSGi tests + fixes
    xeno-by committed Sep 20, 2012
  6. Merge pull request #1356 from paulp/pullreq-1342

    Pullreq 1342
    jsuereth committed Sep 20, 2012
  7. Merge pull request #1339 from rkuhn/wip-6389-finite-duration-mult

    enable integer multiplication/divison on FiniteDuration, see SI-6389
    jsuereth committed Sep 20, 2012
  8. Merge pull request #1363 from jsuereth/wip/use-faster-repo

    Use faster download URL now that artifactory is fixed.
    jsuereth committed Sep 20, 2012
  9. Merge pull request #1360 from scalamacros/hotfix/sbt

    don't try to create tags w/o scala-reflect.jar
    xeno-by committed Sep 20, 2012
  10. Normalized line endings.

    This brings all the files into line with the .gitattributes
    settings, which should henceforth be automatically maintained
    by git.
    paulp committed Sep 20, 2012
  11. New .gitattributes file.

    This should assist in keeping line endings straight.
    It is designed to enforce LF endings everywhere except
    for files specifically for windows.
    paulp committed Sep 16, 2012
  12. Merge branch 'pull-1352-reformatted' into 2.10.x

    # 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
    paulp committed Sep 20, 2012
  13. Disabled failing build manager tests.

    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
    odersky committed with paulp Sep 19, 2012
  14. New test case for SI-6337

    This test case shows that the variant in the comment of SI-6337 now
    compiles also.
    odersky committed with paulp Sep 19, 2012
  15. New test case for closing SI-6385

    The fixes for SI-6260 + elimination of hlaf-boxing also solve
    SI-6385
    odersky committed with paulp Sep 19, 2012
  16. Value classes: eliminated half-boxing

    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.
    odersky committed with paulp Sep 19, 2012
  17. Cleanup of OverridingPairs

    Added a default value to a hashmap so that we can work with it
    without Option acrobatics.
    odersky committed with paulp Sep 16, 2012
  18. Fixes SI-6260

    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.
    odersky committed with paulp Sep 10, 2012
  19. Merge pull request #1353 from gkossakowski/SI-6376-scalap-is-broken

    Fix problem with names encoding in scalap.
    gkossakowski committed Sep 20, 2012
  20. Merge pull request #1331 from scalamacros/ticket/5943

    SI-5943 toolboxes now autoimport Predef and scala
    gkossakowski committed Sep 20, 2012
  21. Merge pull request #1338 from scalamacros/ticket/5418

    existentially typed macro expansions now work fine
    gkossakowski committed Sep 20, 2012
  22. don't try to create tags w/o scala-reflect.jar

    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
    xeno-by committed Sep 20, 2012
  23. some small remaining fixes

    - 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)
    rkuhn committed Sep 19, 2012
  24. SI-5943 toolboxes now autoimport Predef and scala

    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.
    xeno-by committed Sep 17, 2012
  25. Fix for loud test.

    paulp committed Sep 20, 2012
  26. Merge pull request #1358 from scalamacros/ticket/6392

    SI-6392 wraps non-terms before typecheck/eval
    gkossakowski committed Sep 20, 2012
Commits on Sep 19, 2012
  1. Merge pull request #1354 from scalamacros/ticket/6363

    merges scala.reflect.base into scala.reflect.api
    xeno-by committed Sep 19, 2012