summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2764 from folone/masterGrzegorz Kossakowski2013-08-123-13/+40
|\
| * Make map2Conserve occupy constant stack space in spirit of SI-2411George Leontiev2013-08-082-7/+33
| * Move map2Conserve to a new home, next to map2.George Leontiev2013-08-082-13/+14
* | Merge pull request #2812 from xeno-by/topic/defdef-name-now-termnameGrzegorz Kossakowski2013-08-126-8/+8
|\ \
| * | DefDef.name is now TermName againEugene Burmako2013-08-106-8/+8
* | | Merge pull request #2797 from paulp/pr/erasure-n-squaredGrzegorz Kossakowski2013-08-121-1/+2
|\ \ \ | |_|/ |/| |
| * | Fix N^2 spot in erasure.Paul Phillips2013-08-051-1/+2
* | | Merge pull request #2741 from retronym/topic/intellij-modularAdriaan Moors2013-08-0815-23/+137
|\ \ \ | |_|/ |/| |
| * | Scrubbing up the IntelliJ ConfigJason Zaugg2013-07-2915-23/+137
* | | Merge pull request #2776 from gkossakowski/symbolTable-refactoringsGrzegorz Kossakowski2013-08-0621-217/+293
|\ \ \ | |_|/ |/| |
| * | Address TODOs around SymbolLoaders and SymbolTable.Grzegorz Kossakowski2013-07-309-74/+48
| * | Fix Platform type in Global to be JavaPlatform.Grzegorz Kossakowski2013-07-273-40/+14
| * | The `test-junit` Eclipse project depends on `scala-compiler`Grzegorz Kossakowski2013-07-272-4/+5
| * | Refactor the cake so SymbolTable does not depend on GlobalGrzegorz Kossakowski2013-07-2716-59/+125
| * | Deprecate Platform.BinaryRepr.Grzegorz Kossakowski2013-07-274-26/+16
| * | Remove dependency on typer phase in ClassfileParser.Grzegorz Kossakowski2013-07-276-6/+63
| * | Move ICodeReader-specific logic out of ClassfileParser.Grzegorz Kossakowski2013-07-273-95/+109
* | | Merge remote-tracking branch 'scala/master' into merge-2.10.xGrzegorz Kossakowski2013-07-2911-375/+543
|\ \ \
| * \ \ Merge pull request #2746 from soc/topic/paulp-typer-debug-outputAdriaan Moors2013-07-2911-375/+543
| |\ \ \
| | * | | Make -Ytyper-debug output readable.Paul Phillips2013-07-179-299/+481
| | * | | Cleanups in type printing.Paul Phillips2013-07-172-76/+62
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.xGrzegorz Kossakowski2013-07-298-49/+250
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2750 from retronym/ticket/7455-2.10.xGrzegorz Kossakowski2013-07-271-2/+11
| |\ \ \
| | * | | SI-7455 Drop dummy param for synthetic access constructorJason Zaugg2013-07-281-2/+11
| * | | | Merge pull request #2738 from retronym/ticket/7636Grzegorz Kossakowski2013-07-271-0/+2
| |\ \ \ \
| | * | | | SI-7636 Fix a NPE in typing class constructorsChristopher Vogt2013-07-161-0/+2
| * | | | | Merge pull request #2762 from gourlaysama/t7687Grzegorz Kossakowski2013-07-271-1/+1
| |\ \ \ \ \
| | * | | | | SI-7687 Handle spaces in %COMSPEC% path in scala.bat.Antoine Gourlay2013-07-231-1/+1
| * | | | | | [backport] SI-7569 Fix end position in PostfixSelect treeFrançois Garillot2013-07-241-1/+1
| |/ / / / /
| * / / / / SI-7657 clarifies the "macro overrides method" ruleEugene Burmako2013-07-141-2/+2
| |/ / / /
| * | | | Merge pull request #2674 from richdougherty/2.10.x-si7336-try2Adriaan Moors2013-07-122-24/+197
| |\ \ \ \
| | * | | | SI-7336 - Link flatMapped promises to avoid memory leaksRich Dougherty2013-07-062-24/+197
| | |/ / /
| * | | | Merge pull request #2666 from som-snytt/issue/7265-spec-at-leastAdriaan Moors2013-07-121-10/+25
| |\ \ \ \
| | * | | | SI-7265 General test for spec versionSom Snytt2013-07-041-10/+25
| * | | | | Merge pull request #2721 from retronym/ticket/7649Adriaan Moors2013-07-121-8/+8
| |\ \ \ \ \
| | * | | | | SI-7649 Fix positions for reshaped tag materializersJason Zaugg2013-07-111-8/+8
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2716 from SethTisue/terribly-important-typo-fixAdriaan Moors2013-07-122-2/+2
| |\ \ \ \ \
| | * | | | | fix typo in BigInt/BigDecimal deprecation messagesSeth Tisue2013-07-082-2/+2
| | |/ / / /
| * | | | | Merge pull request #2689 from scalamacros/ticket/7617Adriaan Moors2013-07-122-3/+37
| |\ \ \ \ \
| | * | | | | SI-7617 typedAssign no longer expands lhsEugene Burmako2013-07-091-1/+4
| | * | | | | makes it more convenient to work with SuppressMacroExpansionAttachmentEugene Burmako2013-06-282-2/+33
| * | | | | | SI-7638 Superaccessor lookup after specializationVlad Ureche2013-07-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2739 from retronym/ticket/7668Adriaan Moors2013-07-291-0/+3
|\ \ \ \ \ \
| * | | | | | SI-7668 Better return type inheritance for dep. method typesJason Zaugg2013-07-161-0/+3
* | | | | | | Merge pull request #2737 from retronym/ticket/7669Adriaan Moors2013-07-291-5/+16
|\ \ \ \ \ \ \
| * | | | | | | SI-7669 Fix exhaustivity warnings for recursive ADTs.Jason Zaugg2013-07-171-5/+16
| |/ / / / / /
* | | | | | | Merge pull request #2690 from soc/SI-7620Adriaan Moors2013-07-291-7/+4
|\ \ \ \ \ \ \
| * | | | | | | SI-7620 Remove floating-point-literals-without-digit-after-dotSimon Ochsenreither2013-06-281-7/+4
* | | | | | | | Merge pull request #2733 from soc/SI-6811-textGrzegorz Kossakowski2013-07-271-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-6811 Deprecate scala.textSimon Ochsenreither2013-07-141-0/+8
| | |/ / / / / / | |/| | | | | |