summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Test infrastructure for scope completionJason Zaugg2013-11-1514-33/+82
| | | | | Adds a new marker /*_*/ to trigger scope completion test. Original type completion test oracles update for the tweaked output
* Merge pull request #3143 from retronym/ticket/reflection-sync-restorAdriaan Moors2013-11-143-2/+9
|\ | | | | Revert "temporarily disables run/reflection-sync-subtypes"
| * Revert "temporarily disables run/reflection-sync-subtypes"Jason Zaugg2013-11-143-2/+9
| | | | | | | | | | | | | | | | | | This reverts commit 04e2dbb29830d0e511cdfa8c132a9fad91d657ed, by avoiding the ill-fated attempt to short-circuit the global reflection lock. I think we can do better performance wise, but lets at least get something correct to start with.
* | Merge pull request #3139 from dotta/issue/updated-eclipse-project-filesAdriaan Moors2013-11-142-4/+4
|\ \ | |/ |/| Updated Eclipse .classpath for partest and scaladoc projects
| * Updated Eclipse .classpath for partest and scaladoc projectsMirco Dotta2013-11-142-4/+4
| |
* | Merge pull request #3133 from adriaanm/merge-2.10Adriaan Moors2013-11-1412-11/+109
|\ \ | | | | | | Merge 2.10
| * \ Merge branch '2.10.x' into merge-2.10Adriaan Moors2013-11-130-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intermediate steps: ``` g merge -s ours e350bd2cbc 2bfe0e797c2b9c57277475c9296e36cbf868b7db g merge 25bcba59ce g merge -s ours 50c8b39ec4 g merge 075f6f260c e09a8a2b7f g merge 6045a05b83 # update check file for presentation/completion-implicit-chained g merge -s ours 2.10.x ```
| | * \ Merge pull request #3116 from retronym/topic/backport-character-ignoreJason Zaugg2013-11-101-0/+1
| | |\ \ | | | | | | | | | | Add buildcharacter.properties to .gitignore.
| | | * | [backport] Add buildcharacter.properties to .gitignore.Paul Phillips2013-11-101-0/+1
| | |/ / | | | | | | | | | | | | (cherry picked from commit 693e55e1cb75055bb243ffca2e18b8e44e80bb8c)
| | * | Merge pull request #3109 from adriaanm/faster-build-2.10Adriaan Moors2013-11-082-0/+34
| | |\ \ | | | | | | | | | | Faster build 2.10
| | | * | IDE needs swing/actors/continuationsAdriaan Moors2013-11-081-0/+5
| | | | |
| | | * | Allow retrieving STARR from non-standard repo for PR validationAdriaan Moors2013-11-061-0/+3
| | | | |
| | | * | Allow publishing only core (pr validation)Adriaan Moors2013-11-061-0/+15
| | | | |
| | | * | Render relevant properties to buildcharacter.propertiesAdriaan Moors2013-11-061-0/+11
| | | | |
| | * | | Merge pull request #3110 from xeno-by/topic/7776-backportEugene Burmako2013-11-083-2/+18
| | |\ \ \ | | | | | | | | | | | | [backport] SI-7776 post-erasure signature clashes are now macro-aware
| | | * | | [backport] SI-7776 post-erasure signature clashes are now macro-awareEugene Burmako2013-11-083-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "double definition: macro this and method that have same type after erasure" This error doesn't make sense when macros are involved, because macros expand at compile-time, where we're not affected by erasure. Moreover, macros produce no bytecode, which means that we're safe from VerifyErrors.
| | * | | | Merge pull request #3105 from retronym/ticket/completionGrzegorz Kossakowski2013-11-084-2/+51
| | |\ \ \ \ | | | |/ / / | | |/| | | Fix completion after application with implicit arguments
| | * | | | Merge pull request #3097 from paulp/issue/6546-for-210James Iry2013-11-065-2/+25
| | |\ \ \ \ | | | |_|/ / | | |/| | | SI-6546 InnerClasses attribute refers to absent class
| | * | | | Merge pull request #3102 from VladUreche/issue/4012James Iry2013-11-062-0/+22
| | |\ \ \ \ | | | | | | | | | | | | | | SI-4012 Mixin and specialization work well
| * | \ \ \ \ Merge commit '6045a05b83' into merge-2.10Adriaan Moors2013-11-134-2/+52
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/interactive/scala/tools/nsc/interactive/Global.scala
| | * | | | | Fix completion after application with implicit argumentsJason Zaugg2013-11-064-2/+51
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `List(1, 2, 3).map(f).<ctrl-space>` now works; before the tree had the type `(bf: CanBuildFrom[...]):...` and did not contribute completions from the result type. This commit checks if the tree has an implicit method type, and typechecks it as a qualifier. That is enough to get to `adaptToImplicitMethod` in the type checker, infer the implicit arguments, and compute the final result type accordingly.
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge commit '075f6f260c'; commit 'e09a8a2b7f' into merge-2.10Adriaan Moors2013-11-137-2/+47
| |\ \ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | | * | | SI-4012 Mixin and specialization work wellVlad Ureche2013-11-052-0/+22
| | | |/ / | | | | | | | | | | | | | | | The bug was fixed along with SI-7638 in 504b5f3.
| | * / / SI-6546 InnerClasses attribute refers to absent classPaul Phillips2013-11-045-2/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At issue is that the optimizer would eliminate closure classes completely, then neglect to eliminate those classes from the container's InnerClasses attribute. This breaks tooling which expects those entries to correspond to real classes. The code change is essentially mgarcia's - I minimized it and put the caches in perRunCaches, and added the test case which verifies that after being compiled under -optimise, there are no inner classes. Before/after: 7,8d6 < InnerClasses: < public final #22; //class A_1$$anonfun$f$1 37,45c35,40 < #21 = Utf8 A_1$$anonfun$f$1 < #22 = Class #21 // A_1$$anonfun$f$1 < #23 = Utf8 Code --- > #21 = Utf8 Code
| | * | Merge pull request #3072 from retronym/backport/7519Adriaan Moors2013-10-246-2/+54
| | |\ \ | | | | | | | | | | [nomaster] SI-7519 Less brutal attribute resetting in adapt fallback
| | * \ \ Merge pull request #3053 from som-snytt/issue/6026-AFCL-findresourceJason Zaugg2013-10-233-1/+33
| | |\ \ \ | | | | | | | | | | | | [nomaster] SI-6026 backport getResource bug fix
| | * \ \ \ Merge pull request #3052 from som-snytt/issue/6026-javap-loadingJason Zaugg2013-10-231-12/+16
| | |\ \ \ \ | | | | | | | | | | | | | | SI-6026 REPL checks for javap before tools.jar
| * | \ \ \ \ Merge commit '50c8b39ec4' into merge-2.10Adriaan Moors2013-11-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | SI-7519: Additional test case covering sbt/sbt#914Mark Harrah2013-10-233-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e72c32db03b44d6eaf1c1872765a578c5445e15f)
| | * | | | | [nomaster] SI-7519 Less brutal attribute resetting in adapt fallbackJason Zaugg2013-10-233-2/+28
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefers `resetLocalAttrs` over `resetAllAttrs`. The latter loses track of which enclosing class of the given name is referenced by a `This` node which prefixes the an applied implicit view. The code that `resetAllAttrs` originally landed in: https://github.com/scala/scala/commit/d4c63b#L6R804 Cherry picked from 433880e91cba9e1e926e9fcbf04ecd4aeb1d73eb Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | | | Merge pull request #3065 from retronym/ticket/7295Jason Zaugg2013-10-231-7/+10
| | |\ \ \ \ | | | | | | | | | | | | | | Fix windows batch file with args containing parentheses
| * | \ \ \ \ Merge commit '25bcba59ce' into merge-2.10Adriaan Moors2013-11-131-7/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | SI-7295 Fix windows batch file with args containing parenthesesJason Zaugg2013-10-211-7/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In command scripts, substitution of `FOO` in `if cond ( %FOO% )` happens *before* the condition is evaluated. One can use delayed expansion with `if cond (!FOO!)` to get a saner behaviour. Or, as I ended up doing here, use a goto in the body of the if rather than referring directly to variables there. Here's a cut down version to demonstrate the old problem: C:\Users\IEUser>type test.cmd @echo off setlocal enableextensions enabledelayedexpansion if [%~1]==[-toolcp] ( set CP=%~2 shift shift ) echo -toolcp %CP% echo %~1 %~2 C:\Users\IEUser>test.cmd a b -toolcp a b C:\Users\IEUser>test.cmd -toolcp "c:\program files" a b -toolcp c:\program files a b C:\Users\IEUser>test.cmd -toolcp "c:\program files" "a()b" "c()d" -toolcp c:\program files a()b c()d C:\Users\IEUser>test.cmd "a()b" "c()d" d was unexpected at this time. I don't understand exactly why the parentheses only mess things up in this situation. But regardless, lets find another way. My first attempt to fix this was based on the suggestion in the ticket. But, as shown below, this fails to capture the -toolcp. C:\Users\IEUser>type test.cmd @echo off setlocal enableextensions enabledelayedexpansion if [%~1]==[-toolcp] ( set CP=!2! shift shift ) echo -toolcp %CP% echo %~1 %~2 C:\Users\IEUser>test.cmd "a()b" "c()d" -toolcp a()b c()d C:\Users\IEUser>test.cmd -toolcp "c:\program files" "a()b" "c()d" -toolcp a()b c()d Last stop was the goto you'll find in this patch. With this patch applied, I tested on Windows 8 with the following: C:\Users\IEUser>type Desktop\temp.cmd ::#! @echo off call scala %0 %* goto :eof ::!# println("hello, world") println(argv.toList) C:\Users\IEUser>scala Desktop\temp.cmd "foo(bar)baz" "java" -Xmx256M -Xms32M -Dscala.home="C:\PROGRA~3\scala\bin\.." -Denv.emacs="" -Dscala.usejavacp=true -cp "..." scala.tools.nsc.MainGenericRunner Desktop\temp.cmd "foo(bar)baz" hello, world List(foo(bar)baz) C:\Users\IEUser>scala -toolcp "c:\program files" Desktop\temp.cmd "foo(bar)baz" "java" -Xmx256M -Xms32M -Dscala.home="C:\PROGRA~3\scala\bin\.." -Denv.emacs="" -Dscala.usejavacp=true -cp "...;c:\program files" scala.tools.nsc.MainGenericRunner -toolcp "c:\program files" Desktop\temp.cmd "foo(bar)baz" hello, world List(foo(bar)baz)
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge commit 'e350bd2cbc'; commit '2bfe0e797c2b9c57277475c9296e36cbf868b7db' ↵Adriaan Moors2013-11-130-0/+0
| |\ \ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | | into merge-2.10
| | | * | | SI-6026 REPL checks for javap before tools.jarSom Snytt2013-10-181-12/+16
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | If javap is already available, don't go hunting for tools.jar This avoids the getResource bug in AbstractFileClassLoader.
| | * / / [nomaster] SI-6026 backport getResource bug fixSom Snytt2013-10-183-1/+33
| | |/ / | | | | | | | | | | | | | | | | Submitted to master under SI-4936, this fix allows :javap to work when tools.jar is discovered by REPL.
* | | | Merge pull request #3142 from skyluc/bad-markdown-guidelinesGrzegorz Kossakowski2013-11-141-1/+1
|\ \ \ \ | | | | | | | | | | Fixes markdown syntax
| * | | | Fixes markdown syntaxLuc Bourlier2013-11-141-1/+1
|/ / / /
* | | | Merge pull request #3127 from ↵Adriaan Moors2013-11-131-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | RajivKurian/OpenHashMap-nextPowerOfTwo-implementation Use an intrinsic for the next power of two calculation.
| * | | | Use an intrinsic for the next power of two calculation and also return the ↵Rajiv2013-11-111-3/+2
| | | | | | | | | | | | | | | | | | | | input as is if it is already a power of two
* | | | | Merge pull request #3129 from adriaanm/pr-rebase-3001Adriaan Moors2013-11-13277-692/+1133
|\ \ \ \ \ | |_|/ / / |/| | | | [rebase] blackbox and whitebox macros
| * | | | blackbox restriction #4: can't customize pattern matchingEugene Burmako2013-11-128-4/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application of a blackbox macro is used as an extractor in a pattern match, it triggers an unconditional compiler error, preventing customizations of pattern matching implemented with macros.
| * | | | blackbox restriction #3: can't affect implicit searchEugene Burmako2013-11-1214-64/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application of a blackbox macro is used as an implicit candidate, no expansion is performed until the macro is selected as the result of the implicit search. This makes it impossible to dynamically calculate availability of implicit macros.
| * | | | blackbox restriction #2: can't guide type inferenceEugene Burmako2013-11-1212-5/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application of a blackbox macro still has undetermined type parameters after Scala’s type inference algorithm has finished working, these type parameters are inferred forcedly, in exactly the same manner as type inference happens for normal methods. This makes it impossible for blackbox macros to influence type inference, prohibiting fundep materialization.
| * | | | blackbox restriction #1: can't refine the official return typeEugene Burmako2013-11-1219-31/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application of a blackbox macro expands into a tree `x`, the expansion is wrapped into a type ascription `(x: T)`, where `T` is the declared return type of the blackbox macro with type arguments and path dependencies applied in consistency with the particular macro application being expanded. This invalidates blackbox macros as an implementation vehicle of type providers.
| * | | | blackbox and whitebox macrosEugene Burmako2013-11-12246-619/+788
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first commit in the series. This commit only: 1) Splits Context into BlackboxContext and WhiteboxContext 2) Splits Macro into BlackboxMacro and WhiteboxMacro 3) Introduces the isBundle property in the macro impl binding Here we just teach the compiler that macros can now be blackbox and whitebox, without actually imposing any restrictions on blackbox macros. These restrictions will come in subsequent commits. For description and documentation of the blackbox/whitebox separation see the official macro guide at the scaladoc website: http://docs.scala-lang.org/overviews/macros/blackbox-whitebox.html Some infrastructure work to make evolving macros easier: compile partest-extras with quick so they can use latest library/reflect/...
* | | | | Merge pull request #3090 from densh/pull/undo-forAdriaan Moors2013-11-1333-557/+1046
|\ \ \ \ \ | | | | | | | | | | | | Add support for For loops to quasiquotes
| * | | | | add comments that explain FreshName extractor from Quasiquotes cakeDen Shabalin2013-11-121-0/+4
| | | | | |
| * | | | | add comments that explain new for loop enumerator encodingDen Shabalin2013-11-121-0/+28
| | | | | |
| * | | | | test legacy .filter support in for loop resugaringDen Shabalin2013-11-121-0/+11
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 11:18:29 +0000