summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2792 from ScrapCodes/partest-script-fixedAdriaan Moors2013-08-151-1/+4
|\
| * Added a warning from scala runner script.Prashant Sharma2013-08-131-0/+3
| * Bug fix ! , if $color_opts is unset partest script does not work.Prashant Sharma2013-08-011-1/+1
* | Merge pull request #2819 from som-snytt/issue/regextract-charAdriaan Moors2013-08-142-0/+96
|\ \
| * | SI-7737 Regex matches CharSom Snytt2013-08-102-0/+96
* | | Merge pull request #2791 from som-snytt/issue/7265-2.11Adriaan Moors2013-08-143-31/+16
|\ \ \
| * | | SI-7265 javaSpecVersion, adjust isJava... testsSom Snytt2013-08-013-31/+16
| | |/ | |/|
* | | Merge pull request #2780 from lcycon/lcycon-deprecate_lockAdriaan Moors2013-08-141-0/+1
|\ \ \
| * | | Add deprecation warning to lock classLuke Cycon2013-07-291-0/+1
* | | | Merge pull request #2804 from adriaanm/rebase-2763Adriaan Moors2013-08-123-3/+28
|\ \ \ \
| * | | | SI-7690 ghost error message fails compilePaul Phillips2013-08-113-3/+28
| | |_|/ | |/| |
* | | | Merge pull request #2807 from som-snytt/issue/partest-dirAdriaan Moors2013-08-127-67/+55
|\ \ \ \
| * | | | Log file is zapped before test runSom Snytt2013-08-081-0/+3
| * | | | SI-7729 Does Par-Test work? Absolutely!Som Snytt2013-08-084-22/+16
| * | | | Par-Test split checks work againSom Snytt2013-08-084-45/+36
* | | | | Merge pull request #2764 from folone/masterGrzegorz Kossakowski2013-08-124-13/+99
|\ \ \ \ \
| * | | | | Make map2Conserve occupy constant stack space in spirit of SI-2411George Leontiev2013-08-083-7/+92
| * | | | | 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-127-9/+9
|\ \ \ \ \
| * | | | | DefDef.name is now TermName againEugene Burmako2013-08-107-9/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #2797 from paulp/pr/erasure-n-squaredGrzegorz Kossakowski2013-08-122-1/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix N^2 spot in erasure.Paul Phillips2013-08-052-1/+37
| | |_|/ | |/| |
* | | | Merge pull request #2741 from retronym/topic/intellij-modularAdriaan Moors2013-08-0816-23/+153
|\ \ \ \ | |_|/ / |/| | |
| * | | Scrubbing up the IntelliJ ConfigJason Zaugg2013-07-2916-23/+153
* | | | Merge pull request #2776 from gkossakowski/symbolTable-refactoringsGrzegorz Kossakowski2013-08-0625-223/+434
|\ \ \ \ | |_|/ / |/| | |
| * | | Add sample to SymbolTableTest using custom symbols and type.Grzegorz Kossakowski2013-08-021-0/+21
| * | | Address TODOs around SymbolLoaders and SymbolTable.Grzegorz Kossakowski2013-07-3010-75/+49
| * | | Fix Platform type in Global to be JavaPlatform.Grzegorz Kossakowski2013-07-273-40/+14
| * | | Add example of SymbolTable unit test.Grzegorz Kossakowski2013-07-272-0/+118
| * | | Make junit runner quiet when tests pass.Grzegorz Kossakowski2013-07-271-1/+1
| * | | 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
| * | | Update sbt interface version to 0.12.4.Grzegorz Kossakowski2013-07-271-1/+1
| * | | Deprecate Platform.BinaryRepr.Grzegorz Kossakowski2013-07-274-26/+16
| * | | Remove dependency on typer phase in ClassfileParser.Grzegorz Kossakowski2013-07-277-10/+63
| * | | Move ICodeReader-specific logic out of ClassfileParser.Grzegorz Kossakowski2013-07-273-95/+109
| | |/ | |/|
* | | Merge pull request #2783 from gkossakowski/merge-2.10.xGrzegorz Kossakowski2013-07-3131-67/+888
|\ \ \
| * \ \ Merge remote-tracking branch 'scala/master' into merge-2.10.xGrzegorz Kossakowski2013-07-2931-417/+592
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2746 from soc/topic/paulp-typer-debug-outputAdriaan Moors2013-07-2930-415/+590
|\ \ \ \
| * | | | Make -Ytyper-debug output readable.Paul Phillips2013-07-1726-333/+517
| * | | | Cleanups in type printing.Paul Phillips2013-07-176-82/+73
| | * | | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.xGrzegorz Kossakowski2013-07-2931-67/+888
| |/| | | |/| | | |
| | * | | Merge pull request #2782 from adriaanm/fixup-7636Grzegorz Kossakowski2013-07-291-0/+0
| | |\ \ \
| | | * | | Rename t7636-neg.check to the standard t7636.check.Adriaan Moors2013-07-291-0/+0
| | |/ / /
| | * | | Merge pull request #2750 from retronym/ticket/7455-2.10.xGrzegorz Kossakowski2013-07-274-2/+76
| | |\ \ \
| | | * | | SI-7455 Drop dummy param for synthetic access constructorJason Zaugg2013-07-284-2/+76
| | * | | | Merge pull request #2738 from retronym/ticket/7636Grzegorz Kossakowski2013-07-273-0/+19
| | |\ \ \ \
| | | * | | | SI-7636 Fix a NPE in typing class constructorsChristopher Vogt2013-07-163-0/+19
| | * | | | | 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