summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'ac432bcde6' into pr/merge-2.10Paul Phillips2013-01-2532-61/+622
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac432bcde6': Fix broken build. SI-6434 Pretty print function types with by name arg as (=> A) => B Removed class files. SI-6994 Avoid spurious promiscuous catch warning Addressing warnings. SI-6439 Avoid spurious REPL warnings about companionship use ArrayBuffer instead of Array to build Formulae SI-6942 more efficient unreachability analysis use Constant::isIntRange even if it's NIH SI-6956 determine switchability by type, not tree SI-5568 Comment improvements for getClass on primitive intersection. SI-5568 Fixes verify error from getClass on refinement of value type SI-6923 Context now buffers warnings as well as errors Conflicts: src/compiler/scala/tools/nsc/interpreter/IMain.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala test/files/neg/t4851.check Note: This merge excludes b07228aebe7a as it breaks master.
| * Merge pull request #1929 from retronym/ticket/6439Paul Phillips2013-01-243-1/+90
| |\ | | | | | | SI-6439 Avoid spurious REPL warnings about companionship
| | * SI-6439 Avoid spurious REPL warnings about companionshipJason Zaugg2013-01-193-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `val m` isn't a companion of `trait m`, check the pair of eponymous symbols are a ((class|trait), object) pair before emitting the warning. In order to correctly check this one a type alias is involved, `definedSymbols` must avoid normalizing through type aliases. AFAICT this is an improvement to the other clients of that Map, one such power mode progression is demonstrated at the end of the test case.
| * | Merge pull request #1934 from retronym/ticket/6923-sweepPaul Phillips2013-01-245-7/+4
| |\ \ | | | | | | | | Addressing warnings.
| | * | Addressing warnings.Jason Zaugg2013-01-195-7/+4
| | |/ | | | | | | | | | | | | | | | | | | - SI-6923 uncovered a few valid warnings, these have been addressed. - A pair of "catches all throwable" warnings appeared; one of the is spurious and the subject of SI-6994.
| * | Merge pull request #1935 from retronym/ticket/6994Paul Phillips2013-01-243-1/+10
| |\ \ | | | | | | | | SI-6994 Avoid spurious promiscuous catch warning
| | * | SI-6994 Avoid spurious promiscuous catch warningJason Zaugg2013-01-203-1/+10
| | |/ | | | | | | | | | | | | It was being issued upon re-typechecking of a transformed tree. Now we disable the warning post-typer.
| * | Merge pull request #1968 from paulp/pr/fixbuildPaul Phillips2013-01-241-1/+1
| |\ \ | | | | | | | | Fix broken build.
| | * | Fix broken build.Paul Phillips2013-01-241-1/+1
| |/ / | | | | | | | | | It's all system admin, all the time, here at scala ranch.
| * | Merge pull request #1958 from JamesIry/SI-6434_2.10.xPaul Phillips2013-01-243-2/+22
| |\ \ | | | | | | | | SI-6434 Pretty print function types with by name arg as (=> A) => B
| | * | SI-6434 Pretty print function types with by name arg as (=> A) => BJames Iry2013-01-233-2/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We were pretty printing a function type with one by name arg as => A => B, but because => is right associative that's formally equivalent to => (A => B) and that's entirely a different thing. This commit changes the pretty printer in Typers.scala to check for a byname argument on a function type and wrap it in parens. A REPL test is included.
| * | Merge pull request #1944 from paulp/pr/remove-classfilesPaul Phillips2013-01-222-0/+0
| |\ \ | | | | | | | | Removed class files.
| | * | Removed class files.Paul Phillips2013-01-212-0/+0
| |/ / | | | | | | | | | Someone checked in a pair of .class files.
| * | Merge pull request #1915 from adriaanm/ticket-6942Paul Phillips2013-01-204-25/+349
| |\ \ | | |/ | |/| SI-6942 more efficient CNF conversion in patmat analysis
| | * use ArrayBuffer instead of Array to build FormulaeAdriaan Moors2013-01-171-3/+3
| | |
| | * SI-6942 more efficient unreachability analysisAdriaan Moors2013-01-174-24/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid blowing the stack/the analysis budget by more eagerly translating the propositions that model matches to CNF. First building a large proposition that represents the match, and then converting to CNF tends to blow the stack. Luckily, it's easy to convert to CNF as we go. The optimization relies on `CNF(P1 /\ ... /\ PN) == CNF(P1) ++ CNF(...) ++ CNF(PN)`: Normalizing a conjunction of propositions yields the same formula as concatenating the normalized conjuncts. CNF conversion is expensive for large propositions, so we push it down into the conjunction and then concatenate the resulting arrays of clauses (which is cheap). (CNF converts a free-form proposition into an `Array[Set[Lit]]`, where: - the Array's elements are /\'ed together; - and the Set's elements are \/'ed; - a Lit is a possibly negated variable.) NOTE: - removeVarEq may throw an AnalysisBudget.Exception - also reworked the interface used to build formula, so that we can more easily plug in SAT4J when the time comes
| * | Merge pull request #1904 from JamesIry/SI-5568_2.10.xGrzegorz Kossakowski2013-01-183-6/+46
| |\ \ | | |/ | |/| SI-5568 Fixes verify error from getClass on refinement of value type
| | * SI-5568 Comment improvements for getClass on primitive intersection.James Iry2013-01-152-7/+9
| | | | | | | | | | | | | | | Based on code review here are a few comment cleanups and the removal of some dead test code.
| | * SI-5568 Fixes verify error from getClass on refinement of value typeJames Iry2013-01-153-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | ().asInstanceOf[AnyRef with Unit].getClass and 5.asInstanceOf[AnyRef with Int].getClass would cause a verify error. Going the other way, i.e. [Unit with AnyRef] or [Int with AnyRef] worked fine. This commit fixes it that both directions work out to BoxedUnit or java.lang.Integer.
| * | Merge pull request #1914 from retronym/ticket/6601Grzegorz Kossakowski2013-01-175-1/+10
| |\ \ | | | | | | | | SI-6601 Publicise derived value contstructor after pickler
| | * | SI-6601 Publicise derived value contstructor after picklerJason Zaugg2013-01-165-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the access restrictions are not enforced under separate compilation. See also SI-6608.
| * | | Merge pull request #1854 from pufuwozu/ticket-SI-6923Paul Phillips2013-01-175-3/+39
| |\ \ \ | | | | | | | | | | SI-6923 Context now buffers warnings as well as errors
| | * | | SI-6923 Context now buffers warnings as well as errorsBrian McKenna2013-01-075-3/+39
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code that was silently typed would not report warnings, even if it returned a successful result. This appeared in the following code which didn't show warnings even with -Ywarn-adapted-args: def foo(a: Any) = a; foo(1, 2) While the following would show the expected warning: def foo[A](a: Any) = a; foo(1, 2)
| * | | Merge pull request #1905 from adriaanm/ticket-6956Paul Phillips2013-01-173-2/+31
| |\ \ \ | | | | | | | | | | SI-6956 determine switchability by type, not tree
| | * | | use Constant::isIntRange even if it's NIHAdriaan Moors2013-01-151-1/+1
| | | | |
| | * | | SI-6956 determine switchability by type, not treeAdriaan Moors2013-01-153-2/+31
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constant folding will set the type of a constant tree to `ConstantType(Constant(folded))`, while the tree itself can be many different things (in casu, an Ident). We used to look at the tree directly when deciding whether to emit a switch. Now we look at the tree's type. Voilà.
* | | | Merge pull request #1971 from paulp/pr/revertPaul Phillips2013-01-255-25/+5
|\ \ \ \ | | | | | | | | | | Revert "SI-5824 Fix crashes in reify with _*"
| * | | | Revert "SI-5824 Fix crashes in reify with _*"Paul Phillips2013-01-255-25/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit 0a25ee3431d0314c782dd2e6620bc75c4de0d1a4. It came with a test failure which I overlooked.
* | | | Merge pull request #1930 from aztek/ticket/5824Paul Phillips2013-01-255-5/+25
|\ \ \ \ | | | | | | | | | | SI-5824 Fix crashes in reify with _*
| * | | | SI-5824 Fix crashes in reify with _*Evgeny Kotelnikov2013-01-225-5/+25
| | | | | | | | | | | | | | | | | | | | Reification crashes if "foo: _*" construct is used. This happens besause type tree is represented either with TypeTree, or with Ident (present case), and `toPreTyperTypedOrAnnotated' only matches of the former. The fix is to cover the latter too. A test is included.
* | | | | Merge pull request #1931 from danielhopkins/remove-pimpingPaul Phillips2013-01-259-146/+145
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Small terminology change aimed at improving inclusion.
| * | | | | Grammatical fixDan Hopkins2013-01-191-1/+1
| | | | | |
| * | | | | Remove the term "pimp" from the repositoryDan Hopkins2013-01-199-145/+145
| | | | | | | | | | | | | | | | | | | | | | | | Small terminology change aimed at improving inclusion.
* | | | | | Merge pull request #1913 from adriaanm/partest-script-no-deprecationPaul Phillips2013-01-251-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | align partest script with ant
| * | | | | | align partest script with antAdriaan Moors2013-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't silently pass -deprecation to scalac by default
* | | | | | | Merge pull request #1965 from Dinduks/fix_some_typosPaul Phillips2013-01-2521-94/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos
| * | | | | | | Fix some typosSamy Dindane2013-01-2421-94/+80
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mostly "a int", "a a thing" kind of typos. Also removes trailing whitespaces, useless empty lines and commented println() from "test/files/run/ctries-new/iterator.scala".
* | | | | | | Merge pull request #1900 from paulp/pr/maybe-rewrap-lessPaul Phillips2013-01-255-11/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Modifies "maybeRewrap" to focus more on the maybe.
| * | | | | | | Modifies "maybeRewrap" to focus more on the maybe.Paul Phillips2013-01-145-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existential types are rewrapped under a bunch of conditions unless the operation performed on the underlying type returns the same type by reference equality. That depends on a foundation of predictability which doesn't exist. The upshot is that existential types were rewrapped with abandon, even when the type were identical. This had both performance and correctness implications. Note where the test case output changes like so: -scala.collection.immutable.List[Any] +scala.collection.immutable.List[<?>] That's correctness.
* | | | | | | | Merge pull request #1939 from soc/SI-6811-movesPaul Phillips2013-01-2417-52/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-6811 Move scala.util.{automata,regexp} ...
| * | | | | | | | SI-6811 Move scala.util.{automata,regexp} ...Simon Ochsenreither2013-01-2117-52/+31
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ... to scala.xml.dtd.impl and make it private[dtd]
* | | | | | | | Merge pull request #1921 from soc/SI-6811-removalsPaul Phillips2013-01-2480-2389/+144
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | SI-6811 Scheduled removal of deprecated items for 2.11
| * | | | | | | SI-6811 Remove scala.xml.include.sax.MainSimon Ochsenreither2013-01-201-82/+0
| | | | | | | |
| * | | | | | | SI-6811 Remove scala.ScalaObjectSimon Ochsenreither2013-01-181-16/+0
| | | | | | | |
| * | | | | | | SI-6811 Remove the scala.annotation.target packageSimon Ochsenreither2013-01-171-29/+0
| | | | | | | |
| * | | | | | | SI-6811 Misc. removals in util, testing, io, ...Simon Ochsenreither2013-01-1717-870/+82
| | | | | | | |
| * | | | | | | SI-6811 Remove deprecated elements in scala.collectionSimon Ochsenreither2013-01-1715-663/+9
| | | | | | | |
| * | | | | | | SI-6811 Remove parts of scala.concurrent not needed by scala.actorsSimon Ochsenreither2013-01-177-291/+3
| | | | | | | |
| * | | | | | | SI-6811 Remove the scala.util.grammar packageSimon Ochsenreither2013-01-172-48/+0
| | | | | | | |
| * | | | | | | SI-6811 Remove scala.collection.mutable.ConcurrentMapSimon Ochsenreither2013-01-1712-254/+8
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 09:37:59 +0000