summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2690 from soc/SI-7620Adriaan Moors2013-07-298-57/+7
|\ | | | | SI-7620 Remove floating-point-literals-without-digit-after-dot
| * SI-7620 Remove floating-point-literals-without-digit-after-dotSimon Ochsenreither2013-06-288-57/+7
| |
* | Merge pull request #2733 from soc/SI-6811-textGrzegorz Kossakowski2013-07-271-0/+8
|\ \ | | | | | | SI-6811 Deprecate scala.text
| * | SI-6811 Deprecate scala.textSimon Ochsenreither2013-07-141-0/+8
| | |
* | | Merge pull request #2751 from soc/SI-7592-defaultmapmodelGrzegorz Kossakowski2013-07-271-0/+1
|\ \ \ | | | | | | | | SI-7592 Deprecate s.c.m.DefaultMapModel
| * | | SI-7592 Deprecate s.c.m.DefaultMapModelSimon Ochsenreither2013-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | “This class is used internally.” — No, it isn't. It isn't used anywhere else either and it doesn't add much benefit, considering that it lacks documentation and has no tests at all.
* | | | Merge pull request #2754 from soc/SI-7679-remove-standardscalasettings-makeGrzegorz Kossakowski2013-07-271-2/+0
|\ \ \ \ | | | | | | | | | | SI-7679 Remove deprecated StandardScalaSettings#make
| * | | | SI-7679 Remove deprecated StandardScalaSettings#makeSimon Ochsenreither2013-07-201-2/+0
| |/ / /
* | | | Merge pull request #2756 from soc/SI-7681-dead-code-settinggroupGrzegorz Kossakowski2013-07-271-7/+0
|\ \ \ \ | | | | | | | | | | SI-7681 Remove dead code in s.t.n.s.AbsScalaSettings
| * | | | SI-7681 Remove dead code in s.t.n.s.AbsScalaSettingsSimon Ochsenreither2013-07-201-7/+0
| |/ / /
* | | | Merge pull request #2758 from soc/SI-7681-dead-code-phasesGrzegorz Kossakowski2013-07-273-60/+8
|\ \ \ \ | | | | | | | | | | SI-7681 Remove Phases, clean up TableDef
| * | | | SI-7681 Clean up scala.reflect.internal.util.TableDefSimon Ochsenreither2013-07-202-17/+8
| | | | | | | | | | | | | | | | | | | | ... now that scala.tools.nsc.Phases is gone.
| * | | | SI-7681 Remove scala.tools.nsc.PhasesSimon Ochsenreither2013-07-201-43/+0
| |/ / /
* | | | Merge pull request #2757 from soc/SI-7681-dead-code-changesGrzegorz Kossakowski2013-07-271-221/+0
|\ \ \ \ | | | | | | | | | | SI-7681 Remove s.t.n.d.Changes (dead code)
| * | | | SI-7681 Remove s.t.n.d.Changes (dead code)Simon Ochsenreither2013-07-201-221/+0
| |/ / /
* | | | Merge pull request #2765 from retronym/ticket/7689Grzegorz Kossakowski2013-07-272-1/+9
|\ \ \ \ | | | | | | | | | | SI-7689 Fix typing regression with default arguments
| * | | | SI-7689 Fix typing regression with default argumentsJason Zaugg2013-07-242-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regressed in e28c3edda4. That commit encoded upper/lower bounds of Any/Nothing as EmptyTree, which were triggering the .isEmpty check in Namers#TypeTreeSubstitutor and resulting in the default getter having TypeTree() as the return type. This resulted in a "missing parmameter type" error. This commit tightens up that condition to only consider empty TypeTrees (those wrapping null or NoType.)
* | | | | Merge pull request #2766 from xuwei-k/request/mergeable-either-value-classGrzegorz Kossakowski2013-07-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MergeableEither extends AnyVal
| * | | | | MergeableEither extends AnyValxuwei-k2013-07-241-1/+1
| |/ / / /
* | | | | Merge pull request #2772 from som-snytt/issue/6123-fix-testGrzegorz Kossakowski2013-07-276-9/+33
|\ \ \ \ \ | | | | | | | | | | | | SI-7695 Macro debug output on -explaintypes
| * | | | | SI-7695 Macro debug output on -explaintypesSom Snytt2013-07-276-9/+33
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like checkConforms should wait for error before using explainTypes, rather than turning on macro debug trace if explaintypes is set. In particular, macro debug output is Console.println instead of reporter.echo or similar, so partest can't test it.
* | | | | Merge pull request #2773 from folone/no-scalaxGrzegorz Kossakowski2013-07-275-241/+0
|\ \ \ \ \ | | | | | | | | | | | | Cleanup of scalap.
| * | | | | Removing unused things from scalap.folone2013-07-255-241/+0
| |/ / / /
* | | | | Merge pull request #2778 from xuwei-k/fix-promise-scaladocGrzegorz Kossakowski2013-07-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix Promise scaladoc
| * | | | | fix Promise scaladocxuwei-k2013-07-271-2/+2
| | | | | |
* | | | | | Merge pull request #2779 from xuwei-k/Universe-typoGrzegorz Kossakowski2013-07-271-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix typo. s/Universes/Universe
| * | | | | fix typo. s/Universes/Universexuwei-k2013-07-271-2/+2
|/ / / / /
* | | | | Merge pull request #2736 from som-snytt/issue/7488-chase-delayed-initAdriaan Moors2013-07-253-18/+113
|\ \ \ \ \ | |/ / / / |/| | | | SI-7488 REPL javap finds new style delayedEndpoint
| * | | | SI-7488 REPL javap finds new style delayedEndpointSom Snytt2013-07-153-18/+113
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The REPL :java -app command is a convenience to locate the body of DelayedInit code. Now it will look for new style delayedEndpoints on the class before it falls back to showing the apply method of the delayedInit$body closure. ``` apm@mara:~/tmp$ skala Welcome to Scala version 2.11.0-20130711-153246-eb1c3137f5 (OpenJDK 64-Bit Server VM, Java 1.7.0_21). Type in expressions to have them evaluated. Type :help for more information. scala> :javap -pv -app delayed.C public final void delayedEndpoint$delayed$C$1(); flags: ACC_PUBLIC, ACC_FINAL Code: stack=2, locals=1, args_size=1 0: getstatic #29 // Field scala/Predef$.MODULE$:Lscala/Predef$; 3: ldc #31 // String this is the initialization code of C 5: invokevirtual #35 // Method scala/Predef$.println:(Ljava/lang/Object;)V 8: return LocalVariableTable: Start Length Slot Name Signature 0 9 0 this Ldelayed/C; LineNumberTable: line 11: 0 scala> :q apm@mara:~/tmp$ rm delayed/*.class apm@mara:~/tmp$ scalac delayed.scala apm@mara:~/tmp$ skala Welcome to Scala version 2.11.0-20130711-153246-eb1c3137f5 (OpenJDK 64-Bit Server VM, Java 1.7.0_21). Type in expressions to have them evaluated. Type :help for more information. scala> :javap -pv -app delayed.C public final java.lang.Object apply(); flags: ACC_PUBLIC, ACC_FINAL Code: stack=2, locals=1, args_size=1 0: getstatic #13 // Field scala/Predef$.MODULE$:Lscala/Predef$; 3: ldc #15 // String this is the initialization code of C 5: invokevirtual #19 // Method scala/Predef$.println:(Ljava/lang/Object;)V 8: getstatic #25 // Field scala/runtime/BoxedUnit.UNIT:Lscala/runtime/BoxedUnit; 11: areturn LocalVariableTable: Start Length Slot Name Signature 0 12 0 this Ldelayed/C$delayedInit$body; LineNumberTable: line 11: 0 line 10: 8 ```
* | | | Merge pull request #2740 from som-snytt/issue/7650-jline-nobangPaul Phillips2013-07-231-0/+3
|\ \ \ \ | |_|/ / |/| | | SI-7650 No bang expansions in REPL jline
| * | | SI-7650 No bang expansions in REPL jlineSom Snytt2013-07-151-0/+3
| | | | | | | | | | | | | | | | Disable expandEvents at the earliest opportunity.
* | | | Merge pull request #2743 from retronym/topic/gitignore-in-repoAdriaan Moors2013-07-188-54/+42
|\ \ \ \ | | | | | | | | | | Commit .gitignore directly
| * | | | Commit .gitignore directlyJason Zaugg2013-07-178-54/+42
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than relying on the cloner to copy the provided gitignore.SAMPLE files. This finishes the job started in c48509598, mostly by reverting that commit and moving the two existing SAMPLE files to the final destinations. Use `.git/info/exclude` to augment the list of patterns with entries specific to your workflow.
* | | | Merge pull request #2747 from paulp/pr/warningsAdriaan Moors2013-07-186-24/+18
|\ \ \ \ | | | | | | | | | | Fixing exhaustiveness warnings.
| * | | | Fixing exhaustiveness warnings.Paul Phillips2013-07-176-24/+18
|/ / / / | | | | | | | | | | | | | | | | ClassfileAnnotArg becoming sealed brought tidings of not being exhaustive.
* | | | Merge pull request #2744 from adriaanm/starr-2.11.0-M4Adriaan Moors2013-07-167-7/+7
|\ \ \ \ | | | | | | | | | | STARR: use 2.11.0-M4, built with 2.11.0-M3
| * | | | STARR: use 2.11.0-M4, built with 2.11.0-M3Adriaan Moors2013-07-167-7/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced starr jars with 2.11.0-M4, built with Scala 2.11.0-M3. I used `ant replacestarr-opt -Dstarr.use.released=1`, with `starr.number`: ``` starr.version=2.11.0-M3 ``` Then pushed the jars to artifactory after moving `lib/jline.jar` out of the way, as it's no longer "desired" (i.e., not pulled from artifactory). Its presence seemed to break `./push-binary-libs.sh $ARTIFACTORY_USER $ARTIFACTORY_PASS`. You can by-pass the custom starr artifact download and use a (released) version of Scala by changing your `build.properties` to include ``` starr.use.released=1 ``` You may optionally change `starr.version` in `starr.number` to whichever version that maven can resolve for you.
* | | | Update README.mdAdriaan Moors2013-07-151-1/+1
| | | |
* | | | Update README.mdAdriaan Moors2013-07-151-4/+6
| | | |
* | | | A smaller readme, with content moved to our gh-pagesAdriaan Moors2013-07-152-206/+6
| |/ / |/| |
* | | Merge pull request #2729 from etaty/patch-1Adriaan Moors2013-07-151-1/+1
|\ \ \ | |/ / |/| | Fix typo in Documentation
| * | Fix typo in DocumentationValerian2013-07-141-1/+1
|/ /
* | Merge pull request #2718 from soc/SI-7592-multihashmapAdriaan Moors2013-07-122-12/+3
|\ \ | | | | | | SI-7592 Remove scala.tools.nsc.util.MultiHashMap
| * | SI-7592 Remove scala.tools.nsc.util.MultiHashMapSimon Ochsenreither2013-07-102-12/+3
| | |
* | | Merge pull request #2708 from soc/SI-7174Adriaan Moors2013-07-122-11/+10
|\ \ \ | | | | | | | | SI-7174 Fix initialization issues
| * | | SI-7174 Fix initialization issuesSimon Ochsenreither2013-07-062-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without constant inlining, the compiler would not even bootstrap because it depends on constant inlining hiding initialization issues which would cause a NPE otherwise. In this case, global is null at runtime, but no NPE is happening despite accessing members of global (see SubComponent), because constant inlining has copied the values of those members to the call-sites and eliminated the dereference of global. This commit fixes the initialization order.
* | | | Merge pull request #2725 from som-snytt/topic/repl-paste-fileAdriaan Moors2013-07-125-15/+100
|\ \ \ \ | | | | | | | | | | SI-4684 Repl supports whole-file paste (rebased)
| * | | | SI-4684 Repl supports raw pasteSom Snytt2013-07-113-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By special request, :paste -raw simply compiles the pasted code to the repl output dir. The -raw flag means no wrapping; the pasted code must be ordinary top level Scala code, not script.
| * | | | SI-4684 Repl supports whole-file pasteSom Snytt2013-07-113-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a file argument to the :paste command which loads the file's contents as though entered in :paste mode. The :paste command is replayable. Samples, including companions defined together: ``` scala> :paste junk.scala File contains no code: junk.scala scala> :paste no-file.scala That file does not exist scala> :paste obj-repl.scala Pasting file obj-repl.scala... <console>:2: error: expected start of definition private foo = 7 ^ scala> :paste hw-repl.scala Pasting file hw-repl.scala... The pasted code is incomplete! <pastie>:5: error: illegal start of simple expression } ^ scala> :replay Replaying: :paste junk.scala File contains no code: junk.scala Replaying: :paste obj-repl.scala Pasting file obj-repl.scala... defined trait Foo defined object Foo Replaying: Foo(new Foo{}) res0: Int = 7 ```
* | | | | Merge pull request #2723 from som-snytt/issue/fix-repl-save-testAdriaan Moors2013-07-122-24/+18
|\ \ \ \ \ | | | | | | | | | | | | Fix repl-save test
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-11 19:54:57 +0000