summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Rename ClassPath.findSourceFile to ClassPath.findClassFileGrzegorz Kossakowski2014-09-243-4/+4
| | | | | | | If you look at the implementation of that method and its usage its clear that it should have been named `findClassFile` from the beginning because that's what it does: find a class file and not a source file.
* Merge pull request #3994 from puffnfresh/feature/system-compiler-propertiesGrzegorz Kossakowski2014-09-242-4/+4
|\ | | | | Make compiler.properties fall back to prefixed
| * Make compiler.properties fall back to prefixedBrian McKenna2014-09-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | Previously, if we wanted to override the shell.prompt property, we had to modify compiler.properties in the jar. This change lets us do the following, instead: scala -Dscala.shell.prompt="$(echo -e "\npuffnfresh> ")" All properties previously loaded from compiler.properties now fall back to "scala." in the system properties when not found.
* | HasSet to HashSet typo fixKrystian Nowak2014-09-221-1/+1
|/
* Merge pull request #3988 from ghik/issue/8459Jason Zaugg2014-09-181-1/+1
|\ | | | | SI-8459 fix incorrect positions for incomplete selection trees
| * SI-8459 fix incorrect positions for incomplete selection treesghik2014-09-171-1/+1
| | | | | | | | | | | | The mentioned issue is a presentation compiler issue, but its root cause is a bug in the parser which incorrectly assigned positions to incomplete selection trees (i.e. selections that lack an indentifier after dot and have some whitespace instead). In detail: for such incomplete selection trees, the "point" of the position should be immediately after the dot but instead was at the start of next token after the dot. For range positions, this caused a pathological situation where the "point" was greater than the "end" of the position. This position is later used by the typechecker during resolution of dynamic calls and causes it to crash. Of course, because a syntactically incorrect code is required for the bug to manifest, it only happens in the presentation compiler.
* | Merge pull request #3989 from retronym/ticket/8852Grzegorz Kossakowski2014-09-181-2/+3
|\ \ | | | | | | SI-8852 Support joint compilation of Java interfaces w. statics
| * | SI-8852 Support joint compilation of Java interfaces w. staticsJason Zaugg2014-09-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had to change the java parser to accomodate this language change in Java 8. The enclosed test does not require JDK8 to run, it only tests JavaParsers. Here is a transcript of my manual testing using Java 8. ``` % tail test/files/run/8852b/{Interface.java,client.scala} ==> test/files/run/8852b/Interface.java <== public interface Interface { public static int staticMethod() { return 42; } } ==> test/files/run/8852b/client.scala <== object Test extends App { assert(Interface.staticMethod() == 42) } // Under separate compilation, statics in interfaces were already working % rm /tmp/*.class 2> /dev/null; javac -d /tmp test/files/run/8852b/Interface.java && scalac-hash v2.11.2 -classpath /tmp -d /tmp test/files/run/8852b/client.scala && scala-hash v2.11.2 -classpath /tmp -nc Test // Under joint compilation, statics in interfaces now work. % rm /tmp/*.class 2> /dev/null; qscalac -d /tmp test/files/run/8852b/{client.scala,Interface.java} && javac -d /tmp test/files/run/8852b/Interface.java && qscala -classpath /tmp -nc Test ```
* | | Merge pull request #3974 from xeno-by/topic/buffer-pattern-expander-errorsGrzegorz Kossakowski2014-09-184-12/+13
|\ \ \ | |_|/ |/| | This ensures that typechecking custom unapplications in silent mode
| * | This ensures that typechecking custom unapplications in silent modeEugene Burmako2014-09-114-12/+13
| | | | | | | | | | | | | | | | | | doesn't leak uncatchable errors. Interestingly enough, the problem only manifested itself for custom unapply methods, not for synthetic ones generated for case classes.
* | | Merge pull request #3980 from retronym/ticket/8844Lukas Rytz2014-09-171-1/+1
|\ \ \ | |_|/ |/| | SI-8844 Fix regression with existentials + type aliases
| * | SI-8844 Fix regression with existentials + type aliasesJason Zaugg2014-09-131-1/+1
| | | | | | | | | | | | | | | | | | Regressed in 2a1b15e / SI-8283. Another specimen of an archetypal bug: unwanted dealising by using `typeSymbol`, rather than `typeSymbolDirect`.
* | | Merge pull request #3848 from Ichoran/issue/8680Lukas Rytz2014-09-161-14/+111
|\ \ \ | | | | | | | | SI-8680 Stream.addString is too eager
| * | | SI-8680 Stream.addString is too eagerRex Kerr2014-09-121-14/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used the standard method of sending out two iterators, one twice as fast as the others, to avoid hanging on .force, .hasDefiniteSize, and .addString. .addString appends a "..." as the last element if it detects a cycle. It knows how to print the cycle length, but there's no good way to specify what you want right now, so it's not used. Added tests in t8680 that verify that cyclic streams give the expected results. Added to whitelist names of methods formerly used for recursion (now looping).
* | | | Merge pull request #3941 from Ichoran/issue/8815Lukas Rytz2014-09-161-27/+11
|\ \ \ \ | | | | | | | | | | SI-8815 mutable.LongMap makes different choices for splitAt vs etc.
| * | | | SI-8815 mutable.LongMap makes different choices for splitAt vs etc.Rex Kerr2014-09-111-27/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that take/drop/splitAt/takeWhile/dropWhile inherit a smattering of foreach vs. iterator-based implementations. These aren't consistent unless they iterate in the same order. This probably reflects an undesirable underlying weakness, but in this particular case it was easy to make LongMap's foreach order agree with iterator. Made traversal order of other foreach-like methods match also. Also fixed a bug where Long.MinValue wasn't iterated. Added unit test for iteration coverage of extreme values.
* | | | Merge pull request #3936 from som-snytt/issue/8806Jason Zaugg2014-09-161-1/+8
|\ \ \ \ | | | | | | | | | | SI-8806 Add lower bound check to Any lint
| * | | | SI-8806 Add lower bound check to Any lintSom Snytt2014-09-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already exclude the lint check for infer-any if Any is somewhere explicit. This commit adds lower bounds of type params to the somewheres. Motivated by: ``` scala> f"${42}" <console>:8: warning: a type was inferred to be `Any`; this may indicate a programming error. f"${42}" ^ res0: String = 42 ```
* | | | | Merge pull request #3972 from lrytz/BCodeDelambdafyFixJason Zaugg2014-09-164-31/+34
|\ \ \ \ \ | | | | | | | | | | | | isAnonymousClass/Function for delambdafy classes is not true
| * | | | | isAnonymousClass/Function for delambdafy classes is not trueLukas Rytz2014-09-124-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ydelambdafy:method lambda classes are not anonymous classes, and not anonymous function classes either. They are somethig new, so there's a new predicate isDelambdafyFunction. They are not anonymous classes (or functions) because anonymous classes in Java speak are nested. Delambdafy classes are always top-level, they are just synthetic. Before this patch, isAnonymous was sometimes accidentailly true: if the lambda is nested in an anonymous class. Now it's always false.
* | | | | | Merge pull request #3971 from lrytz/opt/dceJason Zaugg2014-09-1611-80/+542
|\ \ \ \ \ \ | | | | | | | | | | | | | | GenBCode: eliminate unreachable code
| * | | | | | Address review feedback.Lukas Rytz2014-09-114-9/+7
| | | | | | |
| * | | | | | Remove stale local variables and exception handlers after DCELukas Rytz2014-09-106-29/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for correctness of the generated bytecode. Exception handlers and local variable descriptors specify code offset ranges. These offsets have to exist, not be eliminated.
| * | | | | | Clarify why we emit ATHROW after expressions of type NothingLukas Rytz2014-09-101-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for emitting expressions of type Nothing.
| * | | | | | Tools to run the compiler in JUnit testsLukas Rytz2014-09-101-2/+21
| | | | | | |
| * | | | | | JUnit tests for dead code elimination.Lukas Rytz2014-09-102-65/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JUnit tests may use tools from partest-extras (ASMConverters)
| * | | | | | -Yopt mulit-choice flagLukas Rytz2014-09-092-1/+27
| | | | | | |
| * | | | | | Eliminate unreachable code in GenBCodeLukas Rytz2014-09-096-4/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We rely on dead code elimination provided by the ASM framework, as described in the ASM User Guide (http://asm.ow2.org/index.html), Section 8.2.1. It runs a data flow analysis, which only computes information for reachable instructions. Instructions for which no data is available after the analyis are unreachable. There's one issue with the ASM framework (or the way we use it): Data flow analysis requires the maxlocals and maxstack of each method to be computed. The ASM framework calculates these maxes only when writing the classfiles, not during code generation. In order to run DCE, we therefore run a MethodWriter beforehand on every method. This assings the MethodNode's maxStack/maxLocals, but it does more work (writes the instructions to a byte array). This is also what Miguel uses on his branch. The change is basically the same as https://github.com/lrytz/scala/commit/bfadf92c20. We could probably make this faster (and allocate less memory) by hacking the ASM framework: create a subclass of MethodWriter with a /dev/null byteVector. Another option would be to create a separate visitor for computing those values, duplicating the functionality from the MethodWriter. For now, I added some timers to be able to measure the time DCE takes. Here's compiling the library with -Ystatistics:jvm time in backend : 1 spans, 6597ms bcode initialization : 1 spans, 8ms (0.1%) code generation : 1 spans, 4580ms (69.4%) dead code elimination : 3771 spans, 742ms (11.2%) classfile writing : 1 spans, 879ms (13.3%)
| * | | | | | Removed empty class, unused importsLukas Rytz2014-09-092-8/+2
| |/ / / / /
* | | | | | Merge pull request #3977 from terma/issue/8817Vlad Ureche2014-09-121-5/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | SI-8817 Correct scaladoc for scala.sys.addShutdownHook
| * | | | | SI-8817 Correct scaladoc for scala.sys.addShutdownHookterma2014-09-111-5/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | - Remove mention that shutdown hook is daemon thread - Add link on scala.sys.ShutdownHookThread class
* | | | | moves the impl of quasiquotes to scala.reflectEugene Burmako2014-09-116-6/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This brings consistency with scala.reflect.reify and scala.reflect.macros already existing in scala-compiler. To the contrast, scala.tools.reflect, the previous home of quasiquotes, is a grab bag of various stuff without any central theme.
* | | | SI-8398 - unused warning reports lazy val as a methodKonstantin Fedorov2014-09-101-1/+1
| |/ / |/| | | | | | | | Compiler internals treat lazy vals as methods. Therefore, we need to have a special case for them when assembling the warning message.
* | | Merge pull request #3938 from gourlaysama/wip/t8764Grzegorz Kossakowski2014-09-091-1/+1
|\ \ \ | | | | | | | | SI-8764 fix return type of case class productElement under Xexperimental
| * | | [nomaster] SI-8764 fix return type of case class productElement under ↵Antoine Gourlay2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xexperimental Under Xexperimental, productElement now returns the lub instead of the weak lub of case class parameter types (numeric widening shouldn't magically happen *inside* productElement). This was removed from 2.12.x in 6317ae2.
* | | | Merge pull request #3946 from gourlaysama/wip/t5254Grzegorz Kossakowski2014-09-091-11/+23
|\ \ \ \ | | | | | | | | | | SI-5254 running an empty scala script should succeed
| * | | | SI-5254 running an empty scala script should succeedAntoine Gourlay2014-08-261-11/+23
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script runner made the assumption that "compilation succeeded" implies "there is a Main class to run", but this can be wrong if the script is empty (or only contains imports/comments). The ScriptRunner now uses the ClassPath utility to check if there really is a main class. If not, it doesn't try to run it and returns peacefully. This also makes `scala -e ''` succeed.
* | | | Merge pull request #3801 from Ichoran/issue/8474Grzegorz Kossakowski2014-09-092-16/+47
|\ \ \ \ | | | | | | | | | | SI-8474 Inconsistent behavior of patch method
| * | | | SI-8474 Inconsistent behavior of patch methodRex Kerr2014-08-242-16/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed Iterator to be consistent with other collections. Also fixed SeqViewLike to validate/constrain inputs. No specific tests; quasi-comprehensive collection tests will cover this later.
* | | | Merge pull request #3939 from lrytz/ystatsLukas Rytz2014-09-0810-202/+296
|\ \ \ \ | |_|_|/ |/| | | -Ystatistics accepts a list of phases for which to print stats
| * | | Make MultiChoiceSetting.compute easier to understandLukas Rytz2014-09-081-18/+11
| | | |
| * | | Address PR feedback, fix MultiChoiceSetting.containsLukas Rytz2014-09-082-22/+18
| | | |
| * | | Use Enumeration for MultiChoiceSettingSom Snytt2014-09-057-167/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is pretty easy, since a ValueSet is a BitSet. When the setting is updated, recompute the current set of values, which is cheap and succinct. Checking a flag is also easy and fast. Choices in MultiChoiceSettings may enable other choices.
| * | | -Ystatistics accepts a list of phases, cleanups in MultiChoiceSettingLukas Rytz2014-09-029-163/+192
| | | | | | | | | | | | | | | | | | | | MultiChoiceSetting and Xlint with its deprecated aliases is now a bit simpler, but there's still room for improvement, as noted in comments.
* | | | Merge pull request #3935 from lrytz/t8803Jason Zaugg2014-09-052-5/+17
|\ \ \ \ | | | | | | | | | | SI-8803 generate super accessor for super[A], if A is outer superclass
| * | | | SI-8803 generate super accessor for super[A], if A is outer superclassLukas Rytz2014-08-202-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class C extends A with T { class I { C.super[T] C.super[A] } } A super call in a nested class of the form super[T] where T is a parent trait of the outer class doesn't need an accessor: mixin can directly re-route the call to the correct implementation class - it's statically known to be T$class. However, if a nested class accesses super[A] and A is the superclass of the outer class (not a trait), then we need a super accessor in the outer class. We need to add the mixin name to the super accessor name, otherwise it clashes with non-qualified super accessors.
* | | | | Merge pull request #3932 from gourlaysama/wip/t8498Jason Zaugg2014-09-041-1/+2
|\ \ \ \ \ | | | | | | | | | | | | SI-8498 @compileTimeOnly should be aware of bridge methods.
| * | | | | SI-8498 @compileTimeOnly should be aware of bridge methods.Antoine Gourlay2014-08-211-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Calling a @compileTimeOnly method from another @compileTimeOnly method happens when the former gets a bridge method. It should not throw an error. Calling the bridge or the method will anyway.
* | | | | Merge pull request #3951 from pawel-wiejacha/2.11.x_SI-8810_fixGrzegorz Kossakowski2014-09-031-42/+8
|\ \ \ \ \ | | | | | | | | | | | | scaladoc: fixed code block indentation normalization
| * | | | | SI-8810 scaladoc: fixed code block indentation normalizationPaweł Wiejacha2014-09-031-42/+8
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 16:15:42 +0000