summaryrefslogtreecommitdiff
path: root/src/compiler
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2704 from adriaanm/modularizeAdriaan Moors2013-07-092-16/+7
|\ | | | | Separate jars for XML, Parser Combinators. Use released JLine.
| * Unfork jline: use vanilla jline 2.11 as a dependency.Adriaan Moors2013-07-051-1/+1
| | | | | | | | | | | | | | | | Notes: - no longer specifying terminal by class name in scripts (using 'unix') - jline doesn't need a separate jansi dependency; it includes its own version according to: http://mvnrepository.com/artifact/jline/jline/2.11
| * Spin off src/library/scala/xml to src/xml/scala/xml.Adriaan Moors2013-07-051-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: - Remove the last vestiges of xml from Predef and Contexts. - Change build to compile scala.xml to scala-xml.jar. - Deploy scala-xml module to maven. - Update partest accordingly. Note: An older compiler cannot use the new standard library to compile projects that use XML. Thus, skipping locker will break the build until we use 2.11.0-M4 for STARR. In the future build process, where we drop locker, we would have to release a milestone that supports the old and the new approach to xml. As soon as we'd be using that new milestone for starr, we could drop support for the old approach.
* | Merge pull request #2650 from paulp/issue/6221Adriaan Moors2013-07-081-11/+6
|\ \ | | | | | | SI-6221 inference with Function1 subtypes.
| * | SI-6221 inference with Function1 subtypes.Paul Phillips2013-06-131-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | There appears to be no upper bound on the number of places we have to remove calls to typeSymbol and introduce calls to baseType. This one was type inference for function parameter types: worked when expected type was A => B, but not if there was an implicit conversion from A => B to the expected type.
* | | Merge pull request #2687 from soc/topic/io-to-interactiveAdriaan Moors2013-07-034-791/+0
|\ \ \ | | | | | | | | Move some code from s.t.n.io to s.t.n.interactive
| * | | Move some code from s.t.n.io to s.t.n.interactiveSimon Ochsenreither2013-06-274-791/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The only usages of scala.tools.nsc.io.{Lexer,Pickler,PrettyWriter, Replayer} can be found in scala.tools.nsc.interactive. Let's move those files closer to their dependencies.
* | | | Merge pull request #2660 from retronym/ticket/7582Adriaan Moors2013-07-032-4/+13
|\ \ \ \ | |_|_|/ |/| | | SI-7582 Only inline accessible calls to package-private Java code
| * | | SI-7582 Only inline accessible calls to package-private Java codeJason Zaugg2013-06-191-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems here. The inliner was using `isPrivate` / `isProtected` to determine access. The fallthrough considered things to be (bytecode) public. This is okay in practice for Scala code, which never emits package private code. Secondly, we must check accessibility of the called symbol *and* its owner. This case is tested in `run/t7582b`. This commit tightens the check for Java defined symbols: a) check the owner, and b) don't assume that `! isPrivate` is accessible.
| * | | SI-7582 ClassfileParser: populate privateWithin of Java module classJason Zaugg2013-06-161-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | The `privateWithin` attribute of Java companion module classes was correctly set under joint compilation (ie, when using JavaParser), but not under separate compilation. This commit remedies this. The test covers variety of Java symbols.
* | | Merge pull request #2663 from soc/SI-7592Adriaan Moors2013-07-013-84/+20
|\ \ \ | | | | | | | | SI-7592 Replace s.t.n.u.TreeSet with s.c.m.TreeSet
| * | | SI-7592 Replace s.t.n.u.TreeSet with s.c.m.TreeSetSimon Ochsenreither2013-06-193-84/+20
| |/ / | | | | | | | | | | | | | | | | | | This means - migrating usages from the compiler-specific implementation to the one in the standard library - removing the now unused compiler-specific implementation
* | | Merge pull request #2693 from lexspoon/semmle-lintAdriaan Moors2013-07-019-19/+41
|\ \ \ | | | | | | | | Lint-like fixes found by Semmle
| * | | Adds equals and hashCode to three classes that implement Ordered.Lex Spoon2013-06-261-0/+8
| | | |
| * | | Adds a hashCode method to the Settings class for Ant.Lex Spoon2013-06-261-0/+14
| | | |
| * | | Seals some case class hierarchies.Lex Spoon2013-06-267-19/+19
| | | |
* | | | Merge pull request #2694 from adriaanm/masterGrzegorz Kossakowski2013-07-015-8/+48
|\ \ \ \ | | | | | | | | | | Merge 2.10.x into master
| * \ \ \ Merge 2.10.x into masterAdriaan Moors2013-06-281-3/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Namers.scala src/partest/scala/tools/partest/PartestTask.scala
| | * \ \ \ Merge pull request #2680 from retronym/ticket/7603Adriaan Moors2013-06-271-3/+12
| | |\ \ \ \ | | | | | | | | | | | | | | SI-7603 Speculative fix for annotation binding error
| | | * | | | SI-7603 Speculative fix for annotation binding errorJason Zaugg2013-06-241-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reports of: error: trait Test is abstract; cannot be instantiated 11:09:50 [ant:scalac] @Test def testClientRequestNum = { 11:09:50 [ant:scalac] ^ Suggest that the deferred processing of a LazyAnnotationInfo is binding the identifier `Test` to the wrong symbol. Inspection of the code shows that the closure also defers capture of the (mutable) field `Namer#typer.context`. This commit captures the context eagerly, and adds logging to let us know if that eagerly captured context ever differs from the its value at the point when the annotation info is forced. I spent a few hours trying to craft a test to back this up, but to no avail. Here's what the log output will look like: [log typer] The var `typer.context` in scala.tools.nsc.typechecker.Namers$NormalNamer@1f5ebb08 was mutated before the annotation new a() was forced. current value = Context(C@Import unit=<console> scope=123861466 errors=false, reportErrors=true, throwErrors=false) original value = Context(C@Import unit=<console> scope=123861466 errors=false, reportErrors=true, throwErrors=false) This confirms the hypothesis for the cause of SI-7603. If you see this message, please comment on that ticket.
| | * | | | | Merge pull request #2655 from VladUreche/issue/7344Adriaan Moors2013-06-261-24/+94
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-7344 Specialize methods in private scopes
| | | * | | | | SI-7344 Specialize methods in private scopesVlad Ureche2013-06-251-24/+94
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This performs method specialization inside a scope other than a {class, trait, object}: could be another method or a value. This specialization is much simpler, since there is no need to record the new members in the class signature, their signatures are only visible locally. It works according to the usual logic: - we use normalizeMember to create the specialized symbols - we leave DefDef stubs in the tree that are later filled in by tree duplication and adaptation The solution is limited by SI-7579: since the duplicator loses the sym annotations when duplicating, this expansion and rewiring can only take place in code that has not been subject to duplication. You can see the test case for an example. Review by @dragos, @paulp or @axel22.
| * | | | | | Merge 2.10.x into masterAdriaan Moors2013-06-284-5/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Duplicators.scala src/library/scala/concurrent/Future.scala test/files/jvm/scala-concurrent-tck.scala
| | * | | | | Merge pull request #2648 from retronym/ticket/7571Grzegorz Kossakowski2013-06-251-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | SI-7571 Allow nesting of anonymous classes in value classes
| | | * | | | SI-7571 Allow nesting of anonymous classes in value classesJason Zaugg2013-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d9cde105e added deep prohibition of nested classes within a value class. This has the undesirable side effect of prohibiting partial functions literals in method bodies of a value class. The intention of that prohibition was to avoid problems in code using Type Tests, such as: class C(val inner: A) extends AnyVal { class D } def foo(a: Any, other: C) = a match { case _ : other.D } Here, the pattern usually checks that `a.$outer == other`. But that is incongruent with the way that `other` is erased to `A`. However, not all nested classes could lead us into this trap. This commit slightly relaxes the restriction to allow anonymous classes, which can't appear in a type test. The test shows that the translation generates working code.
| | * | | | | SI-7343 Fixed phase ordering in specializationVlad Ureche2013-06-122-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specialization rewires class parents during info transformation, and the new info then guides the tree changes. But if a symbol is created during duplication, which runs after specialization, its info is not visited and thus the corresponding tree is not specialized. One manifestation is the following: ``` object Test { class Parent[@specialized(Int) T] def spec_method[@specialized(Int) T](t: T, expectedXSuper: String) = { class X extends Parent[T]() // even in the specialized variant, the local X class // doesn't extend Parent$mcI$sp, since its symbol has // been created after specialization and was not seen // by specialzation's info transformer. ... } } ``` We can fix this by forcing duplication to take place before specialization. Review by @dragos, @paulp or @axel22.
| | * | | | | Removed redundant `retypedMethod` in `Duplicators`Vlad Ureche2013-06-121-18/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was never used since its introduction in 3ee6b3653 by @dragos. Review by @dragos or @axel22 or @paulp.
* | | | | | Merge pull request #2692 from soc/SI-7591Adriaan Moors2013-07-013-184/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-7591 Migrate command-line parsing to s.t.cmd
| * | | | | | SI-7591 Make s.t.p.n.ConsoleRunner use s.t.c.CommandLineSimon Ochsenreither2013-07-011-98/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change s.t.n.u.CommandLine was used instead. Remove command-line options --ansi, --buildmanager, --show-log which don't have any effect and don't seem to be used anywhere.
| * | | | | | SI-7591 Minor cleanupsSimon Ochsenreither2013-07-011-1/+1
| | | | | | |
| * | | | | | SI-7591 Move command-line spec usage demo to testsSimon Ochsenreither2013-07-011-85/+0
| |/ / / / /
* | | | | | Merge pull request #2620 from magarciaEPFL/backendish33Adriaan Moors2013-07-0115-4/+6687
|\ \ \ \ \ \ | |/ / / / / |/| | | | | new bytecode emitter, GenBCode (11th attempt)
| * | | | | GenBCode: Eliminate needless OptionsMiguel Garcia2013-06-271-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit brings GenBCode in line with "Eliminate needless Options" as promoted by https://github.com/scala/scala/commit/45d61774eb255416c96e983cdb87960ad6415b74
| * | | | | more informative name for backend-selection via command-lineMiguel Garcia2013-06-271-5/+5
| | | | | |
| * | | | | catching up with a fix in master after this PR was submittedMiguel Garcia2013-06-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-7151 Emit final in bytecode for final inner classes was fixed in https://github.com/scala/scala/commit/b49b6cf7f0f42d74da854d96eeb0f863357c04cd
| * | | | | additional documentation for GenBCodeMiguel Garcia2013-06-263-2/+7
| | | | | |
| * | | | | SI-5031 fixed in GenBCodeMiguel Garcia2013-06-062-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The GenASM-based fix for SI-5031 is 0527b2549bcada2fda2201daa630369b377d0877
| * | | | | new bytecode emitter, GenBCode, for now under a flagMiguel Garcia2013-06-0114-4/+6681
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenBCode is a drop-in replacement for GenASM with several advantages: - faster: ICode isn't necessary anymore. Instead, the ASTs delivered by CleanUp (an expression language) are translated directly into a stack-language (ASM Tree nodes) - future-proofing for Java 8 (MethodHandles, invokedynamic). - documentation included, shared mutable state kept to a minimum, all contributing to making GenBCode more maintainable than its counterpart (its counterpart being GenICode + GenASM). A few tests are modified in this commit, for reasons given below. (1) files/neg/case-collision Just like GenASM, GenBCode also detects output classfiles differing only in case. However the error message differs from that of GenASM (collisions may be show in different order). Thus the original test now has a flags file containing -neo:GenASM and a new test (files/neg/case-collision2) has been added for GenBCode. The .check files in each case show expected output. (2) files/pos/t5031_3 Currently the test above doesn't work with GenBCode (try with -neo:GenBCode in the flags file) The root cause lies in the fix to https://issues.scala-lang.org/browse/SI-5031 which weakened an assertion in GenASM (GenBCode keeps the original assertion). Actually that ticket mentions the fix is a "workaround" (3) files/run/t7008-scala-defined This test also passes only under GenASM and not GenBCode, thus the flags file. GenASM turns a bling eye to: An AbstractTypeSymbol (SI-7122) has reached the bytecode emitter, for which no JVM-level internal name can be found: ScalaClassWithCheckedExceptions_1.E1 The error message above (shown by GenBCode) highlights there's no ScalaClassWithCheckedExceptions_1.E1 class, thus shouldn't show up in the emitted bytecode (GenASM emits bytecode that mentions the inexistent class).
| * | | | | an ICode InvokeStyle can now answer whether it isSuperMiguel Garcia2013-06-011-0/+3
| | | | | |
* | | | | | SI-7344 Specialize methods in private scopesVlad Ureche2013-06-281-23/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This performs method specialization inside a scope other than a {class, trait, object}: could be another method or a value. This specialization is much simpler, since there is no need to record the new members in the class signature, their signatures are only visible locally. It works according to the usual logic: - we use normalizeMember to create the specialized symbols - we leave DefDef stubs in the tree that are later filled in by tree duplication and adaptation The solution is limited by SI-7579: since the duplicator loses the sym annotations when duplicating, this expansion and rewiring can only take place in code that has not been subject to duplication. You can see the test case for an example. Review by @dragos, @paulp or @axel22.
* | | | | | Remove dependency on combinators from CommandLinerParser.Adriaan Moors2013-06-256-100/+79
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools.cmd.CommandLineParser uses a small hand-rolled parser TODO: replace partest's usage of scala.tools.nsc.util.CommandLine by scala.tools.cmd.CommandLine
* | | | | Merge pull request #2667 from adriaanm/modularize-xmlAdriaan Moors2013-06-2411-69/+548
|\ \ \ \ \ | |_|_|/ / |/| | | | Spin off xml library as scala-library-xml.
| * | | | Set scene for Predef.$scope's demise.Jason Zaugg2013-06-204-10/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's no Predef.$scope but xml is being used, the compiler aliases scala.xml.TopScope to $scope. There must be a scala.xml package when xml literals were parsed. For compatibility with the old library, which relied on $scope being in scope, synthesize a `import scala.xml.{TopScope => $scope}` when xml is needed, but there's no Predef.$scope and the old library is detected (scala.xml.TopScope exists).
| * | | | Remove dependency on xml in ast.parserAdriaan Moors2013-06-205-14/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied the following files from scala.xml to ast.parser.xml: - MarkupParsers differs from scala.xml.MarkupParsers only in the first 17 lines - Utility.scala was refactored and reduced (also includes TokenTests)
| * | | | Remove dependency on xml in MarkupParsersAdriaan Moors2013-06-201-6/+14
| | | | | | | | | | | | | | | | | | | | Inlined TextBuffer.
| * | | | Remove dependency on xml in plugin loading.Adriaan Moors2013-06-202-39/+31
| | | | |
* | | | | SI-7569 Fix end position in PostfixSelect treeFrançois Garillot2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduced in 5b54681: the end position of Postfix operators should take the operator length into account. review by @som-snytt
* | | | | Merge pull request #2653 from retronym/ticket/7433Grzegorz Kossakowski2013-06-231-1/+7
|\ \ \ \ \ | | | | | | | | | | | | SI-7433 Fix spurious warning about catching control throwable
| * | | | | SI-7433 Fix spurious warning about catching control throwableJason Zaugg2013-06-231-1/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the same vein as SI-6994, we have to be careful not to warn about synthetic code. In that case, the spurious warnings came because we warned in the typechecker, which was also called in erasure. In this case, we are issuing the warning in Uncurry, so we must be mindful of the pattern matchers translations of non-trivial catch patterns, which look like: case (ex8 @ _) => { <synthetic> val x5: Throwable = ex8; case11(){ if ({ case14(){ if (x5.$isInstanceOf[NullPointerException]()) matchEnd13(true) else case15() }; case15(){ if (x5.$isInstanceOf[RuntimeException]()) matchEnd13(true) else case16() }; case16(){ matchEnd13(false) }; matchEnd13(x: Boolean){ x } }) This commit detects that `ex8` is synthetic and disables the warning.
* | | | | Merge pull request #2342 from soc/SI-7292Adriaan Moors2013-06-201-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | | SI-7292 Deprecate octal escape literals
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-15 18:16:39 +0000