summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Made "mode" into a value class.Paul Phillips2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | This is an obvious place to apply value class goodness and collect some safety/sanity in typing modes. It does show off a challenge in introducing value classes without disruption: there's no way to deprecate the old signature of 'typed', 'adapt', etc. because they erase the same. class Bippy(val x: Int) extends AnyVal class A { @deprecated("Use a bippy") def f(x: Int): Int = 5 def f(x: Bippy): Int = x.x } ./a.scala:5: error: double definition: method f:(x: Bippy)Int and method f:(x: Int)Int at line 4 have same type after erasure: (x: Int)Int An Int => Mode implicit handles most uses, but nothing can be done to avoid breaking anything which e.g. extends Typer and overrides typed.
* Merge branch '2.10.x'Adriaan Moors2013-01-0826-87/+314
|\ | | | | | | | | | | | | | | | | | | | | | | | | Patches applied: - rename of `dropRepeatedParamType` to `dropIllegalStarTypes` -- required since 8886d22cd6 - fixed test/files/neg/t6406-regextract.flags -- how could this have worked before? Conflicts: src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala src/library/scala/collection/LinearSeqOptimized.scala src/library/scala/util/Properties.scala test/files/run/streams.check test/files/run/streams.scala
| * Merge pull request #1834 from paulp/issue/6897Paul Phillips2013-01-061-0/+6
| |\ | | | | | | SI-6897, lubs and varargs star.
| | * SI-6897, lubs and varargs star.Paul Phillips2012-12-311-0/+6
| | | | | | | | | | | | | | | Don't allow lubs to calculate refinement types which contain a varargs star outside of legal varargs star position.
| * | Merge pull request #1835 from paulp/issue/6896Paul Phillips2013-01-062-0/+8
| |\ \ | | | | | | | | SI-6896, spurious warning with overloaded main.
| | * | SI-6896, spurious warning with overloaded main.Paul Phillips2012-12-312-0/+8
| | |/ | | | | | | | | | | | | Make sure there's no legit main signature before issuing any warnings about missing main methods.
| * | Merge pull request #1840 from paulp/issue/6911Paul Phillips2013-01-063-69/+106
| |\ \ | | | | | | | | SI-6911, regression in generated case class equality.
| | * | SI-6911, regression in generated case class equality.Paul Phillips2013-01-033-69/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caught out by the different semantics of isInstanceOf and pattern matching. trait K { case class CC(name: String) } object Foo extends K object Bar extends K Foo.CC("a") == Bar.CC("a") That expression is supposed to be false, and with this commit it is once again.
| * | | Merge pull request #1841 from adriaanm/rebase-6827-2.10.xAdriaan Moors2013-01-042-0/+46
| |\ \ \ | | | | | | | | | | Fix Iterator#copyToArray (fixes SI-6827).
| | * | | Fix Iterator#copyToArray (fixes SI-6827).Erik Osheim2013-01-042-0/+46
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #scala, when using a non-zero start it's possible to get an ArrayIndexOutOfBoundsException due to an incorrect bounds check. This patch fixes this, as well as another potential bounds error, and adds test cases. Incorporates some other suggestions by Som-Snytt to ensure that callers will get useful error messages in cases where the start parameter is wrong (negative or out-of-array-bounds). Review by @som-snytt.
| * | | Merge pull request #1739 from jedesah/Array_optPaul Phillips2013-01-042-0/+15
| |\ \ \ | | |/ / | |/| | SI-5017 Poor performance of :+ operator on Arrays
| | * | SI-5017 Poor performance of :+ operator on ArraysJean-Remi Desjardins2012-12-232-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control performance of :+ and +: operator on my machine were 700-800 ms After adding size hint on the implementation in SeqLike, it went down to 500-600 ms But with specialixed implementation in ArrayOps, brings it down to 300-400 ms Unfortunatly, this method will only be called when the Array object is being referenced directly as it's type, but that should be the case enough times to justify the extra method. I ended up removing the sizeHint in SeqLike because it made the execution of the "benchmark" slower when the Array was being manipulated as a Seq. Side note: Interestingly enough, the benchmark performed better on my virtualized Fedora 17 with JDK 7 than natively on Mac OS X with JDK 6
| * | | Merge pull request #1822 from paulp/issue/6194Paul Phillips2013-01-032-0/+9
| |\ \ \ | | |_|/ | |/| | SI-6194, repl crash.
| | * | SI-6194, repl crash.Paul Phillips2012-12-272-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Always a bad idea to use replaceAll on unknown strings, as we saw here when windows classpaths arrived containing escape-requiring backslashes.
| * | | Merge pull request #1824 from paulp/pr/partest-likes-deprecationPaul Phillips2012-12-317-3/+7
| |\ \ \ | | | | | | | | | | Remove -deprecation from partest default options.
| | * | | Remove -deprecation from partest default options.Paul Phillips2012-12-277-3/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Who knows why it was ever like this; it's not like anyone sees the deprecation warnings. In PR #1807 there is now a test which depends on partest not making this move, so it's a good time to finally expunge it.
| * | | LinearSeq lengthCompare without an iterator.Paul Phillips2012-12-282-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Had to fix up an iffy test: not only was it testing undefined behavior, it demanded just the right numbers be printed in a context where all negative or positive numbers are equivalent. It's the ol' "get them coming and going" trick.
| * | | SI-6415, overly eager evaluation in Stream.Jean-Remi Desjardins2012-12-282-0/+34
| |/ / | | | | | | | | | | | | | | | | | | The lengthCompare method in LinearSeqOptimized was looking one step further than it needed to in order to give the correct result, which was creating some unwanted side effects related to Streams.
| * | SI-6829, SI-6788, NPEs during erroneous compilation.Paul Phillips2012-12-244-0/+112
| | | | | | | | | | | | | | | | | | Have to intercept trees which have a null type due to errors before they leave the warm confines of 'def typed' because from that point everything assumes tree.tpe != null.
* | | Merge pull request #1817 from scalamacros/topic/introduce-top-levelv2.11.0-M1Eugene Burmako2013-01-0619-7/+139
|\ \ \ | | | | | | | | adds c.introduceTopLevel
| * | | adds c.introduceTopLevelEugene Burmako2013-01-0519-7/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first in the family of mutators for the global symbol table, `introduceTopLevel` is capable of creating synthetic top-level classes and modules. The addition of nme.EMPTY_PACKAGE_NAME is necessary to let programmers insert definitions into the empty package. That's explicitly discouraged in the docs, but at times might come in handy. This patch introduce workarounds to avoid incompatibilities with SBT. First of all SBT doesn't like VirtualFiles having JFile set to null. Secondly SBT gets confused when someone depends on synthetic files added by c.introduceTopLevel. Strictly speaking these problems require changes to SBT, and that will be done later. However the main target of the patch is paradise/macros, which needs to be useful immediately, therefore we apply workarounds.
* | | | Merge pull request #1847 from JamesIry/SI-6916_masterPaul Phillips2013-01-062-0/+19
|\ \ \ \ | | | | | | | | | | SI-6916 makes FlatHashTable#remove a Boolean not Option[A]
| * | | | SI-6916 makes FlatHashTable#remove a Boolean not Option[A]James Iry2013-01-042-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes FlatHashTable#remove return a boolean instead of Option[A]. Updates HashSet accordingly. Adds a test to make sure remove works as advertised.
* | | | | SI-6918 Changes REPL output from "defined module" to "defined object"Simon Ochsenreither2013-01-057-10/+10
|/ / / /
* | | | Merge pull request #1839 from JamesIry/SI-6908_masterAdriaan Moors2013-01-042-0/+74
|\ \ \ \ | |/ / / |/| | | SI-6908 Makes FlatHashTable as well as derived classes support nulls
| * | | SI-6908 Makes FlatHashTable as well as derived classes support null valuesJames Iry2013-01-032-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a null sentinel object which is used to indicate that a null value has been inserted in FlatHashTable. It also makes a strong distinction between logical elements of the Set vs entries in the hash table. Changes are made to mutable.HashSet and ParHashSet accordingly.
* | | | Merge pull request #1785 from non/bug/fix-copyToArrayAdriaan Moors2013-01-042-0/+46
|\ \ \ \ | | | | | | | | | | Fix Iterator#copyToArray (fixes SI-6827).
| * | | | Fix Iterator#copyToArray (fixes SI-6827).Erik Osheim2012-12-202-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #scala, when using a non-zero start it's possible to get an ArrayIndexOutOfBoundsException due to an incorrect bounds check. This patch fixes this, as well as another potential bounds error, and adds test cases. Incorporates some other suggestions by Som-Snytt to ensure that callers will get useful error messages in cases where the start parameter is wrong (negative or out-of-array-bounds). Review by @som-snytt.
* | | | | Updated copyright to 2013Carlo Dapor2013-01-0212-12/+12
| |/ / / |/| | |
* | | | Merge pull request #1816 from scalamacros/topic/enclosuresEugene Burmako2012-12-305-1/+59
|\ \ \ \ | | | | | | | | | | enclosures are now strongly typed and are no longer vals
| * | | | enclosures are now strongly typed and are no longer valsEugene Burmako2012-12-255-1/+59
| | | | |
* | | | | Merge pull request #1807 from scalamacros/topic/ident-deprecation-warningsEugene Burmako2012-12-303-0/+20
|\ \ \ \ \ | | | | | | | | | | | | the scanner is now less eager about deprecations
| * | | | | changes the flags to not depend on partestEugene Burmako2012-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to some reason, partest always enables -deprecation. Since Paul has just submitted a pull request, which removes this behavior, I'm updating the flags to make sure this test works even after Paul's change.
| * | | | | the scanner is now less eager about deprecationsEugene Burmako2012-12-253-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When healing braces it isn't very useful to report deprecation warnings, especially since this process is just simple context-free skimming, which can't know about what positions can accept what identifiers.
* | | | | Merge pull request #1809 from scalamacros/topic/ident-attachmentsPaul Phillips2012-12-294-0/+23
|\ \ \ \ \ | | | | | | | | | | | | fixes the typedIdent problem for good
| * | | | | fixes the typedIdent problem for goodEugene Burmako2012-12-284-0/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Previous attachment retaining fix was only working for Idents which get turned into Selects. Now it works for all transformations applied to Idents (e.g. when an ident refers to something within a package obj).
* | | | | Merge pull request #1818 from scalamacros/topic/auto-duplicate-expansionsEugene Burmako2012-12-294-0/+36
|\ \ \ \ \ | | | | | | | | | | | | macro expansions are now auto-duplicated
| * | | | | macro expansions are now auto-duplicatedEugene Burmako2012-12-254-0/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix still requires macro developers to be careful about sharing trees by references, because attributed DefTrees will still bring trouble. However this is an improvement, because it doesn't make matters worse and automatically fixes situations similar to one in the test. A much more thorough discussion with a number of open questions left: http://groups.google.com/group/scala-internals/browse_thread/thread/492560d941b315cc
* | | | | Merge pull request #1814 from scalamacros/topic/reflectionEugene Burmako2012-12-29155-342/+394
|\ \ \ \ \ | | | | | | | | | | | | adds extractors for TypeName, TermName and Modifiers
| * | | | | cleans up usages of <init>Eugene Burmako2012-12-299-9/+9
| | | | | |
| * | | | | Changes reflection tests to use shorter name constructorsDen Shabalin2012-12-25154-341/+341
| | | | | |
| * | | | | Adds extractors for TypeName, TermName and ModifiersDen Shabalin2012-12-251-0/+52
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to pattern match over type names, term names and modifiers. Otherwise it can be quite painful to match over complex trees as each name or modifiers requires a guard. This pull request also changes the name of default constructor for term and type names i.e. TypeName(s) instead of newTermName(s). This is shorter to type, more consistent with the rest of reflection api and consistent with the way it will be pattern matched later on.
* | | | | SI-6846, regression in type constructor inference.Paul Phillips2012-12-281-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 658ba1b4e6 some inference was gained and some was lost. In this commit we regain what was lost and gain even more. Dealiasing and widening should be fully handled now, as illustrated by the test case.
* | | | | Cleaning up type alias usage.Paul Phillips2012-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I determined that many if not most of the calls to .normalize have no intent beyond dealiasing the type. In light of this I went call site to call site knocking on doors and asking why exactly they were calling any of .normalize .widen.normalize .normalize.widen and if I didn't like their answers they found themselves introduced to 'dropAliasesAndSingleTypes', the recursive widener and dealiaser which I concluded is necessary after all. Discovered that the object called 'deAlias' actually depends upon calling 'normalize', not 'dealias'. Decided this was sufficient cause to rename it to 'normalizeAliases'. Created dealiasWiden and dealiasWidenChain. Dropped dropAliasesAndSingleTypes in favor of methods on Type alongside dealias and widen (Type#dealiasWiden). These should reduce the number of "hey, the type alias doesn't work" bugs.
* | | | | Shored up a hidden dealiasing dependency.Paul Phillips2012-12-284-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the comment says: // This way typedNew always returns a dealiased type. This // used to happen by accident for instantiations without type // arguments due to ad hoc code in typedTypeConstructor, and // annotations depended on it (to the extent that they worked, // which they did not when given a parameterized type alias // which dealiased to an annotation.) typedTypeConstructor // dealiases nothing now, but it makes sense for a "new" to // always be given a dealiased type. PS: Simply running the test suite is becoming more difficult all the time. Running "ant test" includes time consuming activities of niche interest such as all the osgi tests, but test.suite manages to miss the continuations tests.
* | | | | Fix and simplify typedTypeConstructor.Paul Phillips2012-12-2841-108/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Investigating the useful output of devWarning (-Xdev people, it's good for you) led back to this comment: "normalize to get rid of type aliases" You may know that this is not all the normalizing does. Normalizing also turns TypeRefs with unapplied arguments (type constructors) into PolyTypes. That means that when typedParentType would call typedTypeConstructor it would find its parent had morphed into a PolyType. Not that it noticed; it would blithely continue and unwittingly discard the type arguments by way of appliedType (which smoothly logged the incident, thank you appliedType.) The simplification of typedTypeConstructor: There was a whole complicated special treatment of AnyRef here which appears to have become unnecessary. Removed special treatment and lit a candle for regularity. Updated lots of tests regarding newly not-so-special AnyRef.
* | | | | Merge pull request #1786 from retronym/ticket/6745-3Paul Phillips2012-12-267-0/+42
|\ \ \ \ \ | | | | | | | | | | | | SI-6745 Fix <init> lookup
| * | | | | SI-6745 Fix <init> lookupJason Zaugg2012-12-187-0/+42
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | We should only consult the decls of the enclosing class. Members of the self type, enclosing scopes, or imports should not be considered.
* | | | | Removed old pattern matcher.Paul Phillips2012-12-2616-145/+32
| |/ / / |/| | |
* | | | Merge pull request #1506 from som-snytt/issue/6446-plugin-descPaul Phillips2012-12-2221-32/+225
|\ \ \ \ | | | | | | | | | | PluginComponent contributes description to -Xshow-phases. (Fixes SI-6446)