summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4115 from retronym/ticket/8597Grzegorz Kossakowski2014-11-219-6/+137
|\ | | | | SI-8597 Improved pattern unchecked warnings
| * SI-8597 Expand documentation of CheckabilityCheckerJason Zaugg2014-11-181-1/+22
| | | | | | | | Cherry picking some of the previous commit message.
| * SI-8597 Improved pattern unchecked warningsJason Zaugg2014-11-099-5/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec says that `case _: List[Int]` should be always issue an unchecked warning: > Types which are not of one of the forms described above are > also accepted as type patterns. However, such type patterns > will be translated to their erasure (§3.7). The Scala compiler > will issue an “unchecked” warning for these patterns to flag > the possible loss of type-safety. But the implementation goes a little further to omit warnings based on the static type of the scrutinee. As a trivial example: def foo(s: Seq[Int]) = s match { case _: List[Int] => } need not issue this warning. These discriminating unchecked warnings are domain of `CheckabilityChecker`. Let's deconstruct the reported bug: def nowarn[T] = (null: Any) match { case _: Some[T] => } We used to determine that if the first case matched, the scrutinee type would be `Some[Any]` (`Some` is covariant). If this statically matches `Some[T]` in a pattern context, we don't need to issue an unchecked warning. But, our blanket use of `existentialAbstraction` in `matchesPattern` loosened the pattern type to `Some[Any]`, and the scrutinee type was deemed compatible. I've added a new method, `scrutConformsToPatternType` which replaces pattern type variables by wildcards, but leaves other abstract types intact in the pattern type. We have to use this inside `CheckabilityChecker` only. If we were to make `matchesPattern` stricter in the same way, tests like `pos/t2486.scala` would fail. I have introduced a new symbol test to (try to) identify pattern type variables introduced by `typedBind`. Its not pretty, and it might be cleaner to reserve a new flag for these. I've also included a test variation exercising with nested matches. The pattern type of the inner case can't, syntactically, refer to the pattern type variable of the enclosing case. If it could, we would have to be more selective in our wildcarding in `ptMatchesPatternType` by restricting ourselves to type variables associated with the closest enclosing `CaseDef`. As some further validation of the correctness of this patch, four stray warnings have been teased out of neg/unchecked-abstract.scala I also had to changes `typeArgsInTopLevelType` to extract the type arguments of `Array[T]` if `T` is an abstract type. This avoids the "Checkability checker says 'Uncheckable', but uncheckable type cannot be found" warning and consequent overly lenient analysis. Without this change, the warning was suppressed for: def warnArray[T] = (null: Any) match { case _: Array[T] => }
* | Merge pull request #4123 from retronym/ticket/8253Jason Zaugg2014-11-204-1/+58
|\ \ | | | | | | SI-8253 Fix incorrect parsing of <elem xmlns={f("a")}/>
| * | SI-8253 Fix incorrect parsing of <elem xmlns={f("a")}/>Jason Zaugg2014-11-104-1/+58
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spliced application was placed in the `attrMap` in `SymbolicXMLBuilder` and later incorrectly matched by a pattern intended only to match: xml.Text(s) That attribute value is generated by parsing: <elem xmlns='a'/> So the net effect was that the two fragments of XML were identical! This commit sharpens up the match to really look for a syntactic `_root_.scala.xml.Text("...")`. The test just prints the parse trees of a variety of cases, as we we should not test the modularized XML library in scala/scala.
* | Merge pull request #4132 from phaller/ticket/7444Jason Zaugg2014-11-191-8/+10
|\ \ | | | | | | SI-7444 docs: null Executor allowed in ExecutionContext factories
| * | SI-7444 docs: null Executor allowed in ExecutionContext factoriesPhilipp Haller2014-11-141-8/+10
| | | | | | | | | | | | | | | Update the ScalaDoc for the factory methods for `ExecutionContext` which allow a `null` `Executor`/`ExecutorService`.
* | | Merge pull request #4118 from retronym/ticket/5639Jason Zaugg2014-11-1913-15/+185
|\ \ \ | | | | | | | | SI-5639 Fix spurious discarding of implicit import
| * | | SI-5639 Predicate bug fix on -Xsource:2.12Jason Zaugg2014-11-185-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | To be conservative, I've predicated this fix in `-Xsource:2.12`. This is done in separate commit to show that the previous fix passes the test suite, rather than just tests with `-Xsource:2.12`.
| * | | SI-5639 Fix spurious discarding of implicit importJason Zaugg2014-11-099-15/+152
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Scala fa0cdc7b (just before 2.9.0), a regression in implicit search, SI-2866, was discovered by Lift and fixed. The nature of the regression was that an in-scope, non-implicit symbol failed to shadow an eponymous implicit import. The fix for this introduced `isQualifyingImplicit` which discards in-scope implicits when the current `Context`'s scope contains a name-clashing entry. Incidentally, this proved to be a shallow solution, and we later improved shadowing detection in SI-4270 / 9129cfe9. That picked up cases where a locally defined symbol in an intervening scope shadowed an implicit. This commit includes the test case from the comments of SI-2866. Part of it is tested as a neg test (to test reporting of ambiguities), and the rest is tested in a run test (to test which implicits are picked.) However, in the test case of SI-5639, we see that the scope lookup performend by `isQualifyingImplicit` is fooled by a "ghost" module symbol. The apparition I'm referring to is entered when `initializeFromClassPath` / `enterClassAndModule` encounters a class file named 'Baz.class', and speculatively enters _both_ a class and module symbol. AFAIK, this is done to defer parsing the class file to determine what inside. If it happens to be a Java compiled class, the module symbol is needed to house the static members. This commit adds a condition that `Symbol#exists` which shines a torch (forces the info) in the direction of the ghost module symbol. In our test, this causes it to vanish, as we only need a class symbol for the Scala defined `class Baz`. The existing `pos` test for this actually did not exercise the bug, separate compilation is required. It was originally checked in to `pending` with this error, and then later moved to `pos` when someone noticed it was not failing.
* | | Merge pull request #4051 from heathermiller/repl-cp-fix2Jason Zaugg2014-11-188-18/+354
|\ \ \ | | | | | | | | SI-6502 Reenables loading jars into the running REPL (regression in 2.10)
| * | | SI-6502 Refactorings suggested by reviewHeather Miller2014-11-103-33/+28
| | | | | | | | | | | | | | | | | | | | - Moves mergeUrlsIntoClassPath from Global into ClassPath - Revises and documents AbstractFile.getURL
| * | | SI-6502 Moving methods concerned with the state of Global from IMain to GlobalHeather Miller2014-11-052-33/+36
| | | |
| * | | Addresses review commentsHeather Miller2014-11-052-28/+9
| | | |
| * | | Adds tests that programatically generate jarsHeather Miller2014-11-052-0/+109
| | | |
| * | | SI-6502 Addresses comments by @som-snyttHeather Miller2014-11-051-9/+3
| | | |
| * | | SI-6502 Addresses @som-snytt's feedbackHeather Miller2014-11-051-4/+3
| | | |
| * | | SI-6502 Addressing review commentsHeather Miller2014-11-052-23/+26
| | | |
| * | | SI-6502 Reenables loading jars into the running REPL (regression in 2.10)Heather Miller2014-11-054-10/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes SI-6502, reenables loading jars into the running REPL (regression in 2.10). This PR allows adding a jar to the compile and runtime classpaths without resetting the REPL state (crucial for Spark SPARK-3257). This follows the lead taken by @som-snytt in PR #3986, which differentiates two jar-loading behaviors (muddled by cp): - adding jars and replaying REPL expressions (using replay) - adding jars without resetting the REPL (deprecated cp, introduced require) This PR implements require (left unimplemented in #3986) This PR is a simplification of a similar approach taken by @gkossakowski in #3884. In this attempt, we check first to make sure that a jar is only added if it only contains new classes/traits/objects, otherwise we emit an error. This differs from the old invalidation approach which also tracked deleted classpath entries.
* | | | Merge pull request #4068 from lrytz/t8925Jason Zaugg2014-11-184-1/+35
|\ \ \ \ | | | | | | | | | | SI-8925, SI-7407 test cases, fixed in new backend
| * | | | SI-8925, SI-7407 test cases, fixed in new backendLukas Rytz2014-11-044-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that the issues are old (2.10) and we move to the new backend in 2.12, I don't plan to fix them in GenASM. The test case for 7407 existed already, this commit just adds `-Yopt:l:none` to the flags to make no dead code is eliminated.
* | | | | Merge pull request #4129 from gourlaysama/wip/t8977-scalap-decoder-propertiesJason Zaugg2014-11-181-2/+1
|\ \ \ \ \ | | | | | | | | | | | | SI-8977 remove duplicate decoder.properties from scalap
| * | | | | SI-8977 remove duplicate decoder.properties from scalapAntoine Gourlay2014-11-111-2/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | All .properties files in sources folder are already included in the packed jar (see line 1028), so there is no need to add it again.
* | | | | Merge pull request #4075 from som-snytt/issue/8835-junitGrzegorz Kossakowski2014-11-1710-227/+152
|\ \ \ \ \ | | | | | | | | | | | | SI-8835 Iterator tests can be junit
| * | | | | SI-8835 Update iterator testsSom Snytt2014-11-131-50/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addressing feedback from the collections test czar, updated a few of the primitive tests. Avoided testing addition and just asserted. Updated indexOf test to test Iterator.indexOf.
| * | | | | SI-8835 Iterator tests can be junitSom Snytt2014-11-1110-227/+167
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without loss of generality or convenience, but helps reduce the number of files in test/files and may reduce compile times for test suite. This commit includes the fix from #3963 and an extra test of that fix that ensures the stack doesn't grow on chained drops.
* | | | | Merge pull request #4128 from ruippeixotog/issue/8932Grzegorz Kossakowski2014-11-178-8/+81
|\ \ \ \ \ | | | | | | | | | | | | SI-8932 Fix dropRight/takeRight implementations
| * | | | | SI-8932 Fix dropRight/takeRight implementationsRui Gonçalves2014-11-118-8/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I looked up at all the overrides of `IterableLike#takeRight` and `IterableLike#dropRight` and replaced usages of its argument `n` with `math.max(n, 0)` every time it was being used in an index subtraction. Fixes [SI-8932](https://issues.scala-lang.org/browse/SI-8932).
* | | | | | Merge pull request #4135 from soc/patch-1Grzegorz Kossakowski2014-11-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add curly brace (zero-or-more) in grammar for Bindings
| * | | | | | Add curly brace (zero-or-more) in grammar for Bindingssoc2014-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Missing closing curly brace as reported by Andre at https://groups.google.com/forum/#!topic/scala-language/4Zb6dc6EEFM.
* | | | | | | Merge pull request #4117 from retronym/ticket/8449Adriaan Moors2014-11-173-2/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-8449 Fix spurious error with Java raw type over a Scala class
| * | | | | | | SI-8449 Fix spurious error with Java raw type over a Scala classJason Zaugg2014-11-093-2/+15
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Scala typechecker typechecks signatures in Java sources, it must enable use of a type constructor without applied type arguments (a raw type). However, the check in `adaptType::properTypeRequired` was too restricive: it only allows raw types given a) we are typechecking a Java source file and b) the type constructor itself is Java defined. The second check does not make sense; it is perfectly legal to define a Java raw type for over a Scala defined type constructor. This commit removes it. The bug was noticed in the Scaladoc context, as it explores the signatures of all Java sources so it can document them. But the enclosed test demonstrates the underlying bug under normal compilation.
* | | | | | | Merge pull request #4114 from retronym/ticket/8534Adriaan Moors2014-11-176-9/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-8534 Avoid crash in erroneous SelectFromTypeTree
| * | | | | | | SI-8534 Avoid crash in erroneous SelectFromTypeTreeJason Zaugg2014-11-096-9/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2374 changed the behaviour of `typedSingletonTypeTree` in the presence of an error typed reference tree. It incorrectly returns the reference tree in case on an error. However, this is a term tree, which is an inconsistent result with the input type tree. Consequently, a `typedSelectInternal` later fails when using this as the qualifier of a `SelectFromTypeTree`. Both test cases enclosed show this symptom. This commit: - Returns `tree` rather than `refTyped` when `refTyped` is error typed or when it isn't suitable as a stable prefix. - Avoids issuing a cascading "not a stable prefix" error if the `refTyped` is error typed. - Adds an extra layer of defense in `typedSelectFromTypeTree` to bail out quickly if the qualifier is error typed. The last measure is not necessary to fix this bug.
* | | | | | | Merge pull request #4113 from retronym/ticket/8967Adriaan Moors2014-11-172-5/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | SI-8967 Only add JARs and dirs from $SCALA_HOME/lib to classpath
| * | | | | | SI-8967 Only add JARs and dirs from $SCALA_HOME/lib to classpathJason Zaugg2014-11-082-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's all we ship in that directory, but it seems that some JVMs freak out with a core dump if something else ends up in that directory and we add it to the boot classpath. Testing on unix: % rm ./build/pack/bin.complete; ant % touch /Users/jason/code/scala/build/pack/lib/foo.txt % mkdir /Users/jason/code/scala/build/pack/lib/dir   % bash -x ./build/pack/bin/scala -version ... /Library/Java/JavaVirtualMachines/jdk1.8.0_20.jdk/Contents/Home/bin/java -Xmx256M -Xms32M -Xbootclasspath/a:/Users/jason/code/scala/build/pack/lib/dir:/Users/jason/code/scala/build/pack/lib/jline.jar:/Users/jason/code/scala/build/pack/lib/scala-actors.jar:/Users/jason/code/scala/build/pack/lib/scala-compiler.jar:/Users/jason/code/scala/build/pack/lib/scala-continuations-library_2.11-1.0.2.jar:/Users/jason/code/scala/build/pack/lib/scala-continuations-plugin_2.11.2-1.0.2.jar:/Users/jason/code/scala/build/pack/lib/scala-library.jar:/Users/jason/code/scala/build/pack/lib/scala-parser-combinators_2.11-1.0.2.jar:/Users/jason/code/scala/build/pack/lib/scala-partest-extras.jar:/Users/jason/code/scala/build/pack/lib/scala-partest-javaagent.jar:/Users/jason/code/scala/build/pack/lib/scala-reflect.jar:/Users/jason/code/scala/build/pack/lib/scala-swing_2.11-1.0.1.jar:/Users/jason/code/scala/build/pack/lib/scala-xml_2.11-1.0.2.jar:/Users/jason/code/scala/build/pack/lib/scalap.jar -classpath '""' -Dscala.home=/Users/jason/code/scala/build/pack -Dscala.usejavacp=true -Denv.emacs= scala.tools.nsc.MainGenericRunner -version The boot classpath contains `build/pack/lib/dir` but not `foo.txt`. I will seek a Windows test of the same during PR review.
* | | | | | | Merge pull request #4134 from ↵Vlad Ureche2014-11-162-2/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | gourlaysama/wip/t8948-any-disappeared-from-scaladoc SI-8948 resurrect the scaladoc for Any/AnyRef/Nothing/Null.
| * | | | | | No list of subclasses for Any in scaladoc, it's useless.Antoine Gourlay2014-11-151-1/+1
| | | | | | |
| * | | | | | SI-8948 resurrect the scaladoc for Any/AnyRef/Nothing/Null.Antoine Gourlay2014-11-151-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They disappeared in dc1cd96 when `scala.tools.nsc.doc.DocParser` lost its `override def forScaladoc = true`, which used to trigger whether to parse `DocDef` nodes. This was deprecated in favor of a custom global when scaladoc was modularized out (#2226), but `DocParser` didn't get it since it didn't override `forScaladoc` anymore... I added back `forScaladoc` in `DocParser` for consistency with `ScaladocGlobal`, although it doesn't do anything anymore.
* | | | | | Merge pull request #3963 from erikerlandson/si-8835-prLukas Rytz2014-11-113-7/+47
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | SI-8835 Fix implementation of Iterator drop to remove quadratic behavior
| * | | | | SI-8835 Fix implementation of Iterator drop to remove quadratic behaviorErik Erlandson2014-10-213-7/+47
| | | | | |
* | | | | | Merge pull request #4116 from retronym/ticket/5413-2Lukas Rytz2014-11-101-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-5413 Test for fixed owner-corruption bug with names/defaults
| * | | | | | SI-5413 Test for fixed owner-corruption bug with names/defaultsJason Zaugg2014-11-091-0/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixed in SI-8111 / 2.10.4.
* | | | | | Merge pull request #4120 from retronym/ticket/5665Lukas Rytz2014-11-101-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-5665 Test case for fixed private[this], trait crasher
| * | | | | | SI-5665 Test case for fixed private[this], trait crasherJason Zaugg2014-11-091-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixed in SI-5508 / cca4d51db.
* | | | | | Merge pull request #4110 from lrytz/t8960-delambdafyJason Zaugg2014-11-101-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make t8960 pass under delambdafy:method
| * | | | | | Make t8960 pass under delambdafy:methodLukas Rytz2014-11-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using delambdafy:method, anonymous function classes are not currently specialized, as noted here: https://github.com/scala/scala/blob/f08e96571479552b103b15cc2d40ea5454999546/src/compiler/scala/tools/nsc/transform/Delambdafy.scala#L26
* | | | | | | Merge pull request #4109 from retronym/ticket/1994Lukas Rytz2014-11-101-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-1994 Test case for fixed overriding problem
| * | | | | | | SI-1994 Test case for fixed overriding problemJason Zaugg2014-11-071-0/+20
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case passes since Scala 2.9.2. Prior, it failed with: ~/scala/2.9.1/bin/scalac sandbox/t1994.scala sandbox/t1994.scala:9: error: method y overrides nothing override def y = 1 ^ one error found
* | | | | | | Merge pull request #4108 from retronym/ticket/7750Lukas Rytz2014-11-102-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-7750 Test case for fixed spurious existential feature warning
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-05 05:20:18 +0000