summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Incorporated reviewer feedback.Paul Phillips2013-05-164-62/+60
| | | | | | | | | | | | | | | | | | | | Made things a little more consistent and self-apparent.
| | * | | Merge branch 'master' into HEADPaul Phillips2013-05-1664-857/+396
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: SI-7469 Remove @deprecated scala.util.logging SI-3943 Test case for already-fixed Java interop bug Fix formatting for couple of docs in the compiler SI-7476 Add documentation to GenericTraversableTemplate SI-7469 Remove @deprecated scala.util.parsing.ast SI-7469 Remove @deprecated MurmurHash elements SI-7469 Remove deprecated elements in s.u.parsing.combinator SI-7469 Make @deprecated elems in scala.concurrent private[scala] removes duplication in inferImplicitValue SI-7047 fixes silent for c.inferImplicitXXX SI-7167 implicit macros decide what is divergence macroExpandAll is now triggered in all invocations of typed SI-5923 instantiates targs in deferred macro applications SI-6406 Restore deprecated API SI-6039 Harden against irrelevant filesystem details Limit unnecessary calls to Type#toString. fix typo in comment SI-7432 add testcases SI-7432 Range.min should throw NoSuchElementException on empty range AbstractFile.getDirectory does not return null when outDir is "." Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
| | * | | | Incorporated reviewer feedback.Paul Phillips2013-05-113-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | Made things a little more consistent and self-apparent.
| | * | | | Refactored stabilize.Paul Phillips2013-05-114-85/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mode elimination ramps up in difficulty now, so I pursued other forms of code hygiene.
| | * | | | Eliminated HKmode.Paul Phillips2013-05-114-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "TypeConstructor".
| | * | | | Eliminated RETmode.Paul Phillips2013-05-114-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "ReturnExpr".
| | * | | | Eliminated SNDTRYmode.Paul Phillips2013-05-115-28/+38
| | | | | | | | | | | | | | | | | | | | | | | | It becomes context mode "SecondTry".
| | * | | | Started eliminating modes.Paul Phillips2013-05-115-111/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidating the scattered typer state in Context, where it's relatively easy to keep an eye on, rather than threaded throughout the typer in sneaky/sticky bitmasks. The general pattern will be what was once an explicitly passed around bit in Mode becomes an implicitly propagated-as-appropriate bit in Context. In this commit: ALTmode becomes context mode "PatternAlternative" STARmode becomes context mode "StarPatterns" SUPERCONSTRmode becomes context mode "SuperInit"
| | * | | | Corralling Modes into a smaller pen.Paul Phillips2013-05-1111-261/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to reduce the frequency of low-level operations with modes. I mean stuff like this: if ((mode & (EXPRmode | LHSmode)) == EXPRmode) THey don't make those ten line boolean guards any easier to understand. Hopefully this will lead us toward eliminating some of the modes entirely, or at least better isolating their logic rather than having it interspersed at arbitrary points throughout the typer. Modes are in their entirety a leaked implementation detail. Typing a tree requires a tree and optionally an expected type. It shouldn't require a bucket of state bits. In subsequent commits I will start eliminating them. This commit also breaks adapt down into more digestible chunks.
* | | | | | Merge pull request #2571 from paulp/pr/canonicalize-pathsPaul Phillips2013-05-202-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Harden partest against duplicate paths.
| * | | | | | Harden partest against duplicate paths.Paul Phillips2013-05-202-6/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A serious issue: partest would launch the same test multiple times if a test path was given in multiple forms (e.g. absolute and relative paths.) Unfortunately all those tests would share the same logfile, output directory, etc. which would predictably lead to explosions. Since overwriting classfiles while being loaded can lead to jvm core dumps, it's possible this is involved in recent jvm crashes and other test breakdowns. This commit also alters the default partest verbosity to only full print test transcripts under --verbose.
* | | | | | Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3Jason Zaugg2013-05-2064-150/+137
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-7494 Each plugin must only be instantiated once.
| * | | | | SI-7494 Tests for status quoSom Snytt2013-05-1963-143/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exploit SI-6446 fix to move old pending tests for plugins to the active pool. Also, nuance the partest runner to allow the compiler to crash with a FatalError if a check file is present. Some of the plugin tests make phase assembly throw. One of the legacy tests was moved back to pending: There seems to be a race for who shall be deemed truly dependent. Back to pending for you! apm@mara:~/projects/snytt/test$ ./partest files/neg/t7494-cyclic-dependency/ Selected 1 tests drawn from specified tests > starting 1 test in neg ok 1 - neg/t7494-cyclic-dependency 1/1 passed (elapsed time: 00:00:04) Test Run PASSED apm@mara:~/projects/snytt/test$ ./partest files/neg/t7494-cyclic-dependency/ Selected 1 tests drawn from specified tests > starting 1 test in neg !! 1 - neg/t7494-cyclic-dependency [output differs] > 0/1 passed, 1 failed in neg >>>>> Transcripts from failed tests >>>>> > partest files/neg/t7494-cyclic-dependency % scalac t7494-cyclic-dependency/ThePlugin.scala % scalac t7494-cyclic-dependency/sample_2.scala error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice! % diff files/neg/t7494-cyclic-dependency-neg.log files/neg/t7494-cyclic-dependency.check @@ -1 +1 @@ -error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice! +error: Cycle in compiler phase dependencies detected, phase cyclicdependency2 reacted twice! 0/1 passed, 1 failed (elapsed time: 00:00:04) Test Run FAILED
| * | | | | SI-7494 Each plugin must only be instantiated once.Som Snytt2013-05-181-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old behavior was that Plugin.loadAllFrom took a distinct list of plugin locations. The broken behavior incorrectly punted to the pruning algorithm in Plugins.loadPlugins$pick. The new behavior is to distinctify the list of class names to load. This is more robust; under the old scheme, specifying the continuations.jar under two file names would fail as described in the ticket. Pruning a plugin by disabling (-Xplugin-disable) or because it steps on someone else's phase name suffers the same defect. There is no way to tell the plugin it has been benched. And you know that global I gave you? Can I have it back?
* | | | | | Merge pull request #2566 from paulp/pr/nondeterminismPaul Phillips2013-05-194-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | An attempt to make tests deterministic.
| * | | | | | An attempt to make tests deterministic.Paul Phillips2013-05-194-3/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nondeterminism presently showing itself in presentation/implicit-member is a consequence of the presentation compiler tests relying on details of the behavior of toString calls. We need to stomp this out, but it will take a while. Based on the check file changes enclosed with this commit, this will suffice for the presentation compiler tests. A broader assault will have to take place, but not yet.
* | | | | | Merge pull request #2565 from paulp/issue/7427Paul Phillips2013-05-194-19/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | SI-7427 stop crashing under -Ydebug.
| * | | | | SI-7427 stop crashing under -Ydebug.Paul Phillips2013-05-194-19/+22
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "dumpClassesAndAbort" to "devWarning". You can witness it happen like so. % scalac test/files/pos/t7427.scala -Ydebug -Xdev ... [running phase cleanup on t7427.scala] [running phase icode on t7427.scala] warning: !!! PJUMP(method matchEnd4)/scala.tools.nsc.backend.icode.GenICode$PJUMP is not a control flow instruction warning: !!! PJUMP(method case6)/scala.tools.nsc.backend.icode.GenICode$PJUMP is not a control flow instruction [running phase inliner on t7427.scala] [running phase inlinehandlers on t7427.scala] Having now lived with this for months, I have no ambition to unravel the actual problem, I just want it to stop crashing.
* | | | | Merge pull request #2556 from adriaanm/merge-2.10.xAdriaan Moors2013-05-1712-17/+65
|\ \ \ \ \ | | | | | | | | | | | | Merge 2.10.x
| * | | | | Merge 2.10.x into masterAdriaan Moors2013-05-1712-17/+65
|/| | | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Implicits.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala
| * | | | Merge pull request #2540 from adriaanm/ticket-7201v2.10.2-RC1Adriaan Moors2013-05-174-1/+12
| |\ \ \ \ | | | | | | | | | | | | SI-7201 scala-library's pom points to scaladoc url
| | * | | | SI-7201 scaladoc url in scala-(library,actors,swing,reflect) pomAdriaan Moors2013-05-174-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The project/properties/info.apiURL pom property is used by SBT to link to an artifact's scaladoc. For scala library version $v, the url is http://www.scala-lang.org/api/$v/ Note that actors, reflect and swing are included in the library docs in 2.10.x.
| * | | | | Merge pull request #2530 from kzys/jira-6424Adriaan Moors2013-05-171-9/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementException
| | * | | | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementExceptionKato Kazuyoshi2013-05-151-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mapNodes.get(_) instead of mapNodes(_) to avoid NoSuchElementException.
| * | | | | | Merge pull request #2549 from vigdorchik/slash_slashAdriaan Moors2013-05-171-4/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent slash duplication.
| | * | | | | | Prevent slash duplication.Eugene Vigdorchik2013-05-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add trailing slash to external doc URL if it already ends with one.
| * | | | | | | Merge pull request #2536 from adriaanm/ticket-7359Adriaan Moors2013-05-176-81/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [backport #1727] SI-7359 cyclic nested java class
| | * | | | | | | [backport #1727] SI-7359 cyclic nested java classAdriaan Moors2013-05-166-81/+32
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original commit message (from 54a84a36d5): SI-6548 reflection correctly enters jinners When completing Java classes, runtime reflection enumerates their fields, methods, constructors and inner classes, loads them and enters them into either the instance part (ClassSymbol) or the static part (ModuleSymbol). However unlike fields, methods and constructors, inner classes don't need to be entered explicitly - they are entered implicitly when being loaded. This patch fixes the double-enter problem, make sure that enter-on-load uses the correct owner, and also hardens jclassAsScala against double enters that can occur in a different scenario.
| * | | | | | | Merge pull request #2553 from paulp/issue/7486Adriaan Moors2013-05-172-3/+15
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | SI-7486 regression in implicit resolution.
| | * | | | | | SI-7486 regression in implicit resolution.Paul Phillips2013-05-172-3/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | What a touchy beast the compiler is.
| * | | | | | Merge pull request #2550 from scalamacros/2.10.xJason Zaugg2013-05-171-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [nomaster] unbreaks test.bc
| | * | | | | | [nomaster] unbreaks test.bcEugene Burmako2013-05-171-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimizer behaves unexpectedly smartly, stripping off unused private methods. Unfortunately, sometimes private methods might be compiled down to public Java methods, so stripping them off might lead to binary incompatibilities. This particular commit recovers from this problem caused by https://github.com/scala/scala/commit/5e715396af.
* | | | | | | Merge pull request #2555 from soc/SI-7492Adriaan Moors2013-05-173-217/+113
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-7492 Remove -Ystruct-dispatch and associated code
| * | | | | | | SI-7492 Remove -Ystruct-dispatch and associated codeSimon Ochsenreither2013-05-173-217/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that the private option is gone as well as the untested code for no-cache and mono-cache and the non-working code for invoke-dynamic. poly-cache is now always used. For the future it probably makes more sense to let the backend decide how it wants to treat structural dispatch instead of allowing the user to “mix and match” backends with structural dispatch implementations.
* | | | | | | | Merge pull request #2518 from paulp/issue/1786Adriaan Moors2013-05-174-35/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-1786 incorporate defined bounds in inference
| * | | | | | | | No bounds-driven inference for the named.Paul Phillips2013-05-143-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a variation on the previous commit which excludes named type parameters, so this works def f(x: Class[_]) = x.foo.bar But this does not: def f[T](x: Class[T]) = x.foo.bar This seems undesirable to me, but I offer it in case it makes the patch more attractive to others.
| * | | | | | | | SI-1786 incorporate defined bounds in inferencePaul Phillips2013-05-125-40/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes SI-5459. Look, you don't have to redeclare the bounds, isn't it exciting? For instance, there are eight places in JavaMirrors with this: jTypeVariable[_ <: GenericDeclaration] After this code is in starr, those can look like this: jTypeVariable[_] Since TypeVariable's definition looks like this: interface TypeVariable<D extends GenericDeclaration> We already know that!
* | | | | | | | | Merge pull request #2541 from rjolly/scripting11Adriaan Moors2013-05-171-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ScriptEngine.eval() forwards Error instead of new ScriptException
| * | | | | | | | | ScriptEngine.eval() forwards Error instead of new ScriptExceptionRaphael Jolly2013-05-161-1/+9
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2544 from ↵Adriaan Moors2013-05-174-31/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | viktorklang/wip-normalize-parameter-names-in-scala-concurrent-2.11-√ Deprecate parameter names in scala.concurrent
| * | | | | | | | | | Deprecate parameter names in scala.concurrentViktor Klang2013-05-164-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the purpose of being consistent. Also switches to Future.successful iso Promise.successful(..).future for brevity in implementation code.
* | | | | | | | | | | Merge pull request #2539 from soc/SI-7484Adriaan Moors2013-05-175-48/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SI-7484 Add @SupressWarning("rawtypes") to MainNode.java
| * | | | | | | | | | | SI-7484 Indentation and whitespace fixesSimon Ochsenreither2013-05-175-51/+30
| | | | | | | | | | | |
| * | | | | | | | | | | SI-7484 Add @SupressWarning(rawtypes/unchecked)Simon Ochsenreither2013-05-173-0/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroyAdriaan Moors2013-05-174-15/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6488 Interrupt i/o threads on process destroy
| * | | | | | | | | | | | SI-6488 Interrupt i/o threads on process destroySom Snytt2013-05-154-15/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix uses Thread.stop to stop the threads which drain outputs, but should do something orderly. This commit interrupts the threads, which must check isInterrupted before attempting further i/o. The reading thread will suppress either the interruption or the IOException cited in the ticket. Similarly, i/o handlers must preserve and communicate interrupted status. The modest goal of this fix is to ameliorate any stack traces when the process is destroyed. The test runs itself as a sample process with output.
* | | | | | | | | | | | | Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-masterAdriaan Moors2013-05-1773-1291/+2518
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge v2.10.1-326-g4f8c306 into master
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-172891-80543/+42569
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ================================================================ Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala ================================================================ Merge -s ours 4e64a27 ([nomaster commit range]) ================================================================ Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/Macros.scala
| * | | | | | | | | | | | Merge pull request #2504 from scalamacros/ticket/7464Jason Zaugg2013-05-174-14/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-7464 allows FieldMirror.set to update vals
| | * | | | | | | | | | | | SI-7464 allows FieldMirror.set to update valsEugene Burmako2013-05-174-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to leave such sentinels in place inside a facility designed to circumvent usual restrictions of static types / visibility.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-22 14:06:36 +0000