aboutsummaryrefslogtreecommitdiff
path: root/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Fix #2230: Add regression test.Nicolas Stucki2017-04-121-0/+1
|
* Merge pull request #2225 from dotty-staging/fix-#2192odersky2017-04-111-26/+22
|\ | | | | Fix #2212: Avoid imports in the wrong namespace
| * Fix #2212: Avoid imports in the wrong namespaceMartin Odersky2017-04-111-26/+22
| | | | | | | | | | | | Don't issue an error if when considering a named import that refers to a valoe or type which does not exist. Instead, disregard the import an continue.
* | Merge pull request #2228 from dotty-staging/fix-#2218odersky2017-04-111-1/+1
|\ \ | | | | | | Fix #2218: Add fullyDefinedType for class parent types
| * | Add fullyDefinedType for class parent typesMartin Odersky2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | If we do not do that, any type variables in the parent type get interpolated later, when the whole primary constructor is typed. But by then we miss the context of what their variance was.
* | | Merge pull request #2191 from dotty-staging/sync-classpath-scalacGuillaume Martres2017-04-1118-382/+1241
|\ \ \ | | | | | | | | Fix #2186: Synchronize classpath handling with Scala 2.12
| * | | DirectoryClassPath: handle directory being removed under usGuillaume Martres2017-04-111-15/+17
| | | | | | | | | | | | | | | | | | | | `dir.listFiles` will return null if called on a directory that no longer exists, somehow partest triggers that.
| * | | Fix #2186: Synchronize classpath handling with Scala 2.12Guillaume Martres2017-04-1118-382/+1239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a very crude port of the classpath handling as it exists in the 2.12.x branch of scalac (hash: 232d95a198c94da0c6c8393624e83e9b9ac84e81), this replaces the existing Classpath code that was adapted from scalac years ago. This code was written by Grzegorz Kossakowski, MichaƂ Pociecha, Lukas Rytz, Jason Zaugg and other scalac contributors, many thanks to them! For more information on this implementation, see the description of the PR that originally added it to scalac: https://github.com/scala/scala/pull/4060 Changes made to the copied code to get it to compile with dotty: - Rename scala.tools.nsc.util.ClassPath to dotty.tools.io.ClassPath - Rename scala.tools.nsc.classpath.* to dotty.tools.dotc.classpath.* - Replace "private[nsc]" by "private[dotty]" - Changed `isClass` methods in FileUtils to skip Scala 2.11 implementation classes (needed until we stop being retro-compatible with Scala 2.11) I also copied PlainFile.scala from scalac to get access to `PlainNioFile`.
* | | | Merge pull request #2216 from dotty-staging/fix-2163odersky2017-04-111-4/+8
|\ \ \ \ | |_|/ / |/| | | fix #2163: don't narrow liftedOwner if symbol is InSuperCall
| * | | Handle supercalls in inner classes correctlyMartin Odersky2017-04-111-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | The previous fix was too coarse. We need to move an anonymous function in a supercall towards the call, we just have to make sure it's not in the directly enclosing class.
| * | | fix #2163: don't narrow liftedOwner if symbol is InSuperCallliu fengyun2017-04-111-0/+1
| |/ /
* / / Fix #2219: Fix type applications on WildcardTypeGuillaume Martres2017-04-111-1/+1
|/ / | | | | | | | | | | | | Previously we just returned the unapplied WildcardType which is incorrect if the WildcardType is bounded. The proper thing to do is to do the type application on the bounds of the WildcardType and wrap the result in a WildcardType.
* | Fix master compilationOlivier Blanvillain2017-04-111-1/+1
| |
* | Merge pull request #1938 from dotty-staging/named-based-patmatFelix Mulder2017-04-116-51/+73
|\ \ | | | | | | Change case class desugaring and decouple Products and name-based-pattern-matching
| * | Move isProductSubType to Applications & rename to canProductMatchOlivier Blanvillain2017-04-114-9/+8
| | |
| * | Decouple Product and pattern-matchingOlivier Blanvillain2017-04-064-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Product pattern use to: - have a `<: Product` requirement - compute the arity of a pattern by looking at `N` in a `ProductN` superclass. This commit changes `<: Product`, instead we look for a `_1` member. The arity is determined by inspecting `_1` to `_N` members instead. --- Here another attempt to formalize Dotty's pattern-matching (base on #1805). This covers the *Extractor Patterns* [section of the spec](https://www.scala-lang.org/files/archive/spec/2.12/08-pattern-matching.html#extractor-patterns). Dotty support 4 different extractor patterns: Boolean Pattern, Product Pattern, Seq Pattern and Name Based Pattern. Boolean Pattern - Extractor defines `def unapply(x: T): Boolean` - Pattern-matching on exactly `0` patterns Product Pattern - Extractor defines `def unapply(x: T): U` - `N > 0` is the maximum number of consecutive (parameterless `def` or `val`) `_1: P1` ... `_N: PN` members in `U` - Pattern-matching on exactly `N` patterns with types `P1, P2, ..., PN` Seq Pattern - Extractor defines `def unapplySeq(x: T): U` - `U` has (parameterless `def` or `val`) members `isEmpty: Boolean` and `get: S` - `S <: Seq[V]` - Pattern-matching on any number of pattern with types `V, V, ..., V` Name Based Pattern - Extractor defines `def unapply(x: T): U` - `U` has (parameterless `def` or `val`) members `isEmpty: Boolean` and `get: S` - If there is exactly `1` pattern, pattern-matching on `1` pattern with type `S` - Otherwise fallback to Product Pattern on type `U` In case of ambiguities, *Product Pattern* is preferred over *Name Based Pattern*.
| * | Generate synthetic productElement/productArity methods above 22Olivier Blanvillain2017-04-062-28/+56
| | |
| * | Workaround #1932 (bug trigged by desugaring changes)Olivier Blanvillain2017-04-061-1/+1
| | |
* | | Fix type errorMartin Odersky2017-04-111-1/+1
| | |
* | | Better documentation of sharable structures in Names, NameKindsMartin Odersky2017-04-112-1/+5
| | |
* | | Adapt isPackageObject to semantic namingMartin Odersky2017-04-112-3/+4
| | | | | | | | | | | | Used a hardcoded string before, which caused test failures.
* | | Fix pickling/unpickling of namesMartin Odersky2017-04-113-3/+12
| | | | | | | | | | | | | | | Running the test suite with the pickling printer on showed up two more problems which are fixed in this commit.
* | | Fix rebase breakageMartin Odersky2017-04-114-22/+6
| | |
* | | Make extension method names semanticMartin Odersky2017-04-113-10/+29
| | |
* | | Lazy entering of names with internal $'s in package scopesMartin Odersky2017-04-1113-66/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Names with internal $'s are entered in package scopes only if - we look for a name with internal $'s. - we want to know all the members of a package scope This optimization seems to be fairly effective. The typical range of package scopes that need $-names is between 0 and 20%. The optimization seems to improve execution time of all unit tests by about 3%. Also. drop the inheritance from Iterable to Scope. The reason is that we now need a context parameter for toList and other Iterable operations which makes them impossible to fit into the Iterable framework.
* | | Scope refactoringMartin Odersky2017-04-113-56/+31
| | | | | | | | | | | | | | | | | | Since we now have separate package-scopes, it's easier to have them take into account the special role played by the scala package. So we can drop the funky logic of `makeScalaSpecial`.
* | | Avoid setter in NameMartin Odersky2017-04-112-2/+2
| | | | | | | | | | | | and fix a bug in TreeUnpickler
* | | Fix and activate package scopesMartin Odersky2017-04-114-14/+33
| | | | | | | | | | | | Prevviously they were actually unused.
* | | Introduce mangled methodMartin Odersky2017-04-114-6/+13
| | | | | | | | | | | | Mangled is like toSimpleName, except that it keeps the term/type distinction.
* | | Keep package member names mangledMartin Odersky2017-04-116-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Once we start using unencoded operators internally, we will face the problem that one cannot decode realiably a class file filename. We therefore turn things around, keeping members of package scopes in mangled and encoded form. This is compensated by (1) mangling names for lookup of such members and (2) when unpickling from Scala 2 info or Tasty, comparing mangled names when matching a read class or module object against a root.
* | | Simplify classfile parser "own name" checkingMartin Odersky2017-04-111-12/+5
| | | | | | | | | | | | | | | | | | | | | Simplifies the test that the class represented by a classfile is the class logically referenced by the file. The simplification is needed if we want to populate package scopes with unmangled classnames.
* | | Don't unmangle names in ClassfileParserMartin Odersky2017-04-111-13/+12
| | | | | | | | | | | | | | | Classfile parsing is about JVM-level names, not Scala level ones. So it is more consistent to use mangled names throughout.
* | | Memoize toSimpleNameMartin Odersky2017-04-111-1/+6
| | | | | | | | | | | | | | | | | | | | | toSimpleName is called a lot from the backend, so it makes sense to memoize it. It would be even better to communicate with the backend using strings, because then we would not have to enter all these simple names in the name table.
* | | Bugfix in stripModuleClassSuffixMartin Odersky2017-04-111-2/+2
| | |
* | | Further simplification for NameMartin Odersky2017-04-117-34/+17
| | |
* | | Merge likeTyped and likeKinded into likeSpacedMartin Odersky2017-04-112-23/+19
| | |
* | | Names are no longer SeqsMartin Odersky2017-04-1116-139/+124
| | | | | | | | | | | | | | | | | | | | | | | | Drop Seq implementation of name. This implementation was always problematic because it entailed potentially very costly conversions to toSimpleName. We now have better control over when we convert a name to a simple name.
* | | Run compileStdLib only as junit testMartin Odersky2017-04-111-1/+3
| | | | | | | | | | | | It fails without any test output in partest
* | | Cleanups of NameOpsMartin Odersky2017-04-116-100/+15
| | | | | | | | | | | | Remove unused functionality
* | | Make outer select names semanticMartin Odersky2017-04-119-24/+27
| | |
* | | Make module var names semanticMartin Odersky2017-04-115-25/+5
| | |
* | | Avoid duplicate hashCode/equalsMartin Odersky2017-04-113-5/+4
| | |
* | | Fix dropModule logicMartin Odersky2017-04-112-3/+3
| | |
* | | Fix ParallelTesting NPEMartin Odersky2017-04-111-1/+2
| | |
* | | Make field names semanticMartin Odersky2017-04-114-22/+12
| | |
* | | Make "direct names" semanticMartin Odersky2017-04-114-5/+7
| | |
* | | Revise qualified namesMartin Odersky2017-04-118-87/+63
| | | | | | | | | | | | | | | 1. Fix problem in fullNameSeparated 2. Revise expandedName operations
* | | Fix inner class name table emission with semantic namesGuillaume Martres2017-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backend contains: val outerName = innerClassSym.rawowner.javaBinaryName // Java compatibility. See the big comment in BTypes that summarizes the InnerClass spec. val outerNameModule = if (innerClassSym.rawowner.isTopLevelModuleClass) outerName.dropModule Where `dropModule` is defined in the backend interface as: def dropModule: Name = n.stripModuleClassSuffix This will only work as expected if `javaBinaryName` returns a name with proper semantic information, but before this commit we just used the output of `fullNameSeparated` which contains no semantic information.
* | | New unmangling for ExpandedNameMartin Odersky2017-04-113-45/+40
| | |
* | | Decentralize unmangling, add new nameKindsMartin Odersky2017-04-1110-58/+62
| | | | | | | | | | | | | | | | | | | | | Start scheme where unmangling is done by NameKinds instead of in NameOps. Also add namekinds for protected accessors.