Skip to content
Commits on Dec 9, 2012
  1. @paulp
Commits on Dec 6, 2012
  1. @adriaanm

    Merge pull request #1697 from retronym/ticket/6745-2

    adriaanm committed
    Don't return unimportables from importedSymbol.
  2. @adriaanm

    Merge pull request #1693 from paulp/name-implicit-removal

    adriaanm committed
    Name implicit removal
  3. @paulp

    Merge pull request #1714 from JamesIry/remove_review_script

    paulp committed
    SI-6770 Removes unused and unusable review scripts
  4. @adriaanm

    Merge pull request #1716 from paulp/merge-2.10

    adriaanm committed
    Merged 2.10.0/x into master.
Commits on Dec 5, 2012
  1. @paulp

    Merge branch 'merge-2.10-wip' into merge-2.10

    paulp committed
    * 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
  2. @paulp

    Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10-wip

    paulp committed
    # 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
  3. @adriaanm

    Merge pull request #1704 from retronym/ticket/6754-2

    adriaanm committed
    Fix for rangepos crasher.
  4. SI-6770 Removes unused and unusable review scripts

    James Iry committed
    Delete review and postreview.py scripts since they depend on SVN and aren't necessary under the github pull-request system.
  5. @adriaanm

    Merge pull request #1712 from jsuereth/fix/osgi-dist

    adriaanm committed
    Fixing OSGi distribution.
  6. @jsuereth

    Fixing OSGi distribution.

    jsuereth committed
    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.
  7. @adriaanm

    Merge pull request #1681 from paulp/issue/6731

    adriaanm committed
    Fix for SI-6731, dropped trees in selectDynamic.
Commits on Dec 4, 2012
  1. @paulp @retronym

    Fix for rangepos crasher.

    paulp committed with retronym
    wrapClassTagUnapply was generating an unpositioned tree
    which would crash under -Yrangepos.  See SI-6338.
Commits on Dec 3, 2012
  1. @retronym

    Don't return unimportables from importedSymbol.

    retronym committed
    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.
  2. @paulp

    Merge pull request #1682 from paulp/assert-about-qualifier

    paulp committed
    Asserts about Tree qualifiers.
  3. @paulp

    Merge pull request #1673 from paulp/serialversionuid

    paulp committed
    Fix for SerialVersionUID instability.
Commits on Dec 2, 2012
  1. @xeno-by
  2. @paulp

    Remove TermName -> String implicit.

    paulp committed
    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.
Commits on Dec 1, 2012
  1. @paulp

    Remove Name -> TermName implicit.

    paulp committed
    And simplify the name implicits.
Commits on Nov 30, 2012
  1. @xeno-by

    SI-6685 fixes error handling in typedApply

    xeno-by committed
    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).
Commits on Nov 29, 2012
  1. @xeno-by

    Merge pull request #1678 from martende/ticket/5753

    xeno-by committed
    SI-5753 macros cannot be loaded when inherited from a class or a trait
  2. @paulp

    Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.

    paulp committed
    All tickets involving selectDynamic fixed by the prior commit.
    It also fixes SI-6663, but that already has a test case.
  3. @paulp

    Asserts about Tree qualifiers.

    paulp committed
    Encoding recent revelations about certain tree invariants
    in the form of asserts.
Commits on Nov 28, 2012
  1. @paulp

    Merge pull request #1669 from paulp/update-asm

    paulp committed
    Updated asm to 4.1.
  2. @paulp

    Merge pull request #1676 from retronym/topic/sm-interpolator

    paulp committed
    Adds a margin stripping string interpolator.
  3. @paulp

    Fix for SI-6731, dropped trees in selectDynamic.

    paulp committed
    I rewrote mkInvoke entirely, and boosted the test coverage.
Commits on Nov 27, 2012
  1. @jsuereth

    Merge pull request #1674 from scalamacros/topic/showraw

    jsuereth committed
    SI-6718 fixes a volatile test
  2. @martende

    neg test added

    martende committed
  3. @martende

    SI-5753 macros cannot be loaded when inherited from a class or a trait

    martende committed
    enclClass should be taken from Tree otherwise we can jump to declaration
    class/trait.
Commits on Nov 26, 2012
  1. @retronym

    Take advantage of the margin stripping interpolator.

    retronym committed
    Safer and shorter.
  2. @retronym

    Adds a margin stripping string interpolator.

    retronym committed
    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"
  3. @xeno-by

    SI-6718 fixes a volatile test

    xeno-by committed
  4. @paulp

    Disabled part of a test.

    paulp committed
    Hmmm, the giant blob of binary data embedded in a test
    suddenly stopped working. What does one do in this spot.
  5. @paulp

    Account for existence of scala's ClassfileAnnotation.

    paulp committed
    Apparently this thing is not real well tested, as the
    scaladoc code was written as if it does not exist.
  6. @paulp

    Eliminate some one-arg asserts.

    paulp committed
    The only thing more fun than debugging non-deterministic
    scaladoc crashes unrelated to one's change is doing so with
    all one-argument asserts.
Something went wrong with that request. Please try again.