Skip to content

Commit 47d161a

Browse files
santiagobasultosantiagobasulto
committed
Merge remote branch 'upstream/master'
2 parents 66c59a1 + 1dd23cf commit 47d161a

15 files changed

+120
-43
lines changed

‎_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ scala-version: 2.9.1
1616
pygments: true
1717
permalink: /:categories/:title.html
1818

19+
#markdown: rdiscount

‎_includes/allsids.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
<h3>Pending SIPs</h3>
22
<ul class="post-list">
33
{% for post in site.categories.pending %}
4-
<li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
4+
<li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span>
5+
{% if post.vote-status %}
6+
{% if post.vote-status == 'accepted' %}
7+
<span class="label success">Accepted</span>
8+
{% elsif post.vote-status == 'deferred' %}
9+
<span class="label warning">Deferred</span>
10+
{% elsif post.vote-status == 'postponed' %}
11+
<span class="label warning">Postponed</span>
12+
{% elsif post.vote-status == 'not accepted' %}
13+
<span class="label danger">Not Accepted</span>
14+
{% endif %}
15+
{% endif %}
16+
</li>
517
{% endfor %}
618
</ul>
719

‎_includes/toc.txt

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
<div id="scroller-anchor">
22
<div id="scroller">
33
<p class="contents">Contents</p>
4-
<div id="toc"></div>
4+
<div id="toc"></div>
5+
{% if page.vote-status %}
6+
{% if page.vote-status == 'accepted' %}
7+
<p class="contents">SIP Committee Decision</p>
8+
<div class="alert-message success" style="margin-left: 15px;">
9+
<strong style="font-size: 15px;">Accepted</strong>
10+
<p>{{ page.vote-text }}</p>
11+
</div>
12+
{% elsif page.vote-status == 'deferred' %}
13+
<p class="contents">SIP Committee Decision</p>
14+
<div class="alert-message warning" style="margin-left: 15px;">
15+
<strong style="font-size: 15px;">Decision Deferred Until Next SIP Committee Meeting</strong>
16+
<p style="padding-top: 10px">{{ page.vote-text }}</p>
17+
</div>
18+
{% elsif page.vote-status == 'postponed' %}
19+
<p class="contents">SIP Committee Decision</p>
20+
<div class="alert-message warning" style="margin-left: 15px;">
21+
<strong style="font-size: 15px;">Postponed To A Future Release</strong>
22+
<p style="padding-top: 10px">{{ page.vote-text }}</p>
23+
</div>
24+
{% elsif page.vote-status == 'not accepted' %}
25+
<p class="contents">SIP Committee Decision</p>
26+
<div class="alert-message danger" style="margin-left: 15px;">
27+
<strong style="font-size: 15px;">Not Accepted</strong>
28+
<p style="padding-top: 10px">{{ page.vote-text }}</p>
29+
</div>
30+
{% endif %}
31+
{% endif %}
532
</div>
633
</div>

‎_layouts/sip.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@
55
{% include sips-topbar.txt %}
66

77
<div class="container">
8-
<div class="row">
9-
10-
{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}
11-
12-
<div class="span10">
8+
<div class="row">
9+
10+
<div class="span12">
11+
{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}
1312
{{ content }}
1413
{% if page.disqus == true %}{% include disqus.txt %}{% endif %}
1514
</div>
1615

17-
<div class="span6">
16+
<div class="span4">
1817
{% include toc.txt %}
1918
</div>
20-
21-
19+
2220
</div>
2321
</div>
2422

‎overviews/parallel-collections/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Generally, one has two choices for creating a parallel collection:
122122

123123
First, by using the `new` keyword and a proper import statement:
124124

125-
import scala.collection.parallel.mutable.ParArray
125+
import scala.collection.parallel.immutable.ParVector
126126
val pv = new ParVector[Int]
127127

128128
Second, by _converting_ from a sequential collection:

‎sips/pending/_posts/2011-10-12-implicit-classes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
layout: sip
33
disqus: true
44
title: SIP-13 - Implicit classes
5+
6+
vote-status: accepted
7+
vote-text: This SIP is in Accepted status currently. Barring a completed implementation.
58
---
69

710
**By: Josh Suereth**

‎sips/pending/_posts/2011-10-13-string-interpolation.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
layout: sip
33
title: SIP-11 - String Interpolation
4+
5+
vote-status: accepted
6+
vote-text: This SIP is in Accepted status currently. We expect a SIP for 2.11 that will allow the desugared form of interpolated strings in the pattern matcher to become valid syntax. This SIP only allows the sugared interpolated strings to work.
47
---
58

69
**By: Martin Odersky**
@@ -10,5 +13,5 @@ document on Google Docs](https://docs.google.com/document/d/1NdxNxZYodPA-c4MLr33
1013

1114
<iframe
1215
src="https://docs.google.com/document/d/1NdxNxZYodPA-c4MLr33KzwzKFkzm9iW9POexT9PkJsU/edit?hl=en_US"
13-
style="width:800px;height:600px;"></iframe>
16+
style="width:720px;height:800px;"> </iframe>
1417

‎sips/pending/_posts/2011-10-13-uncluttering-control.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
layout: sip
33
disqus: true
44
title: SIP-12 Uncluttering Scala’s syntax for control structures.
5+
6+
vote-status: postponed
7+
vote-text: This SIP is in Postponed status currently, with the current action for 2.10. (1) Deprecate "then" in identifiers to reserve for future keyword status. (2) Deprecate problematic "while() do" syntax. ("do" loops in while loops require braces).
58
---
69

710
**By: Martin Odersky**

‎sips/pending/_posts/2012-01-21-futures-promises.md

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
layout: sip
33
disqus: true
44
title: SIP-14 - Futures and Promises
5+
6+
vote-status: accepted
7+
vote-text: This SIP is in Accepted status currently.
58
---
69

710
**By: Philipp Haller, Aleksandar Prokopec, Heather Miller, Viktor Klang, Roland Kuhn, and Vojin Jovanovic**
@@ -659,46 +662,52 @@ for clients
659662
for library writers
660663
-->
661664

662-
663665
## Utilities
664666

665-
To simplify the handling of time units, Akka's `Duration`
666-
type should be added to the `scala.util` package.
667+
To simplify handling of time in concurrent applications `scala.concurrent`
668+
will introduce a `Duration` abstraction. Duration is not supposed be yet another
669+
general time abstraction. It is meant to be used with concurrency libraries and
670+
will reside in `scala.concurrent.util` package.
667671

668-
`Duration` is a base class representing a time interval. An instance
669-
can either be a `FiniteDuration` that contains a length and a
670-
`TimeUnit`, or an infinite duration (`Duration.Inf` or
671-
`Duration.MinusInf`). `Duration` contains methods that allow:
672+
`Duration` is the base class representing length of time. It can be either finite or infinite.
673+
Finite duration is represented with `FiniteDuration` class which is constructed from `Long` length and
674+
`java.util.concurrent.TimeUnit`. Infinite durations, also extended from `Duration`,
675+
exist in only two instances , `Duration.Inf` and `Duration.MinusInf`. Library also
676+
provides several `Duration` subclasses for implicit conversion purposes and those should
677+
not be used.
672678

673-
1. Conversion to different time units (`toNanos`, `toMicros`, `toMillis`, `toSeconds`, `toMinutes`, `toHours`, `toDays` and `toUnit(unit: TimeUnit)`).
679+
Abstract `Duration` contains methods that allow :
680+
681+
1. Conversion to different time units (`toNanos`, `toMicros`, `toMillis`,
682+
`toSeconds`, `toMinutes`, `toHours`, `toDays` and `toUnit(unit: TimeUnit)`).
674683
2. Comparison of durations (`<`, `<=`, `>` and `>=`).
675684
3. Arithmetic operations (`+`, `-`, `*`, `/` and `unary_-`).
676-
4. Minimum and maximum between this duration and the one supplied in the argument (`min`, `max`).
685+
4. Minimum and maximum between `this` duration and the one supplied in the argument (`min`, `max`).
677686
5. Check if the duration is finite (`finite_?`).
678687

679-
Instances of `Duration` should be created using factory methods in the companion object. `Duration` instances can be instantiated in the following ways:
688+
`Duration` can be instantiated in the following ways:
680689

681690
1. Implicitly from types `Int` and `Long`. For example `val d = 100 millis`.
682-
2. By passing a length and a `java.util.concurrent.TimeUnit`. For example `val d = Duration(100, MILLISECONDS)`.
683-
3. By parsing strings that represent a time period. For example `val d = Duration("1.2 µs")`.
684-
691+
2. By passing a `Long` length and a `java.util.concurrent.TimeUnit`.
692+
For example `val d = Duration(100, MILLISECONDS)`.
693+
3. By parsing a string that represent a time period. For example `val d = Duration("1.2 µs")`.
694+
695+
Duration also provides `unapply` methods so it can be used in pattern matching constructs.
685696
Examples:
686697

687-
import scala.util.Duration
698+
import scala.concurrent.util.Duration
699+
import scala.concurrent.util.duration._
688700
import java.util.concurrent.TimeUnit._
689701

702+
// instantiation
690703
val d1 = Duration(100, MILLISECONDS) // from Long and TimeUnit
691704
val d2 = Duration(100, "millis") // from Long and String
692705
val d3 = 100 millis // implicitly from Long, Int or Double
693706
val d4 = Duration("1.2 µs") // from String
694707

695-
Duration also provides `unapply` methods so it can be pattern matched against and constructed as follows:
696-
708+
// pattern matching
697709
val Duration(length, unit) = 5 millis
698710

699-
<!--
700-
The `Duration` class also provides adequate Java API for above mentioned operator methods.
701-
-->
702711

703712
## References
704713
1. [The Task-Based Asychronous Pattern, Stephen Toub, Microsoft, April 2011][1]

‎sips/pending/_posts/2012-01-30-value-classes.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
layout: sip
33
title: SIP-15 - Value Classes
4+
5+
vote-status: accepted
6+
vote-text: This is in Accepted status. There is concern for numerical computing. We think future SIP(s), using work from SIP-15, can provide more benefit to numerical computing users. The SIP as it exists benefits all users of implicit enrichment classes, and takes us much further to unboxed high performance code. This SIP does not exclude further work towards improving numerical computing in Scala.
47
---
58

69

710
This SIP is an embedded google document. If you have trouble with this embedded document, you can visit the [document on Google Docs](https://docs.google.com/document/d/10TQKgMiJTbVtkdRG53wsLYwWM2MkhtmdV25-NZvLLMA/edit?hl=en_US).
811

912
<iframe
1013
src="https://docs.google.com/document/d/10TQKgMiJTbVtkdRG53wsLYwWM2MkhtmdV25-NZvLLMA/edit?hl=en_US"
11-
style="width:800px;height:600px;"></iframe>
14+
style="width:720px;height:800px;"> </iframe>
1215

‎sips/pending/_posts/2012-03-09-self-cleaning-macros.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
22
layout: sip
33
title: SIP-16 - Self-cleaning Macros
4+
5+
vote-status: postponed
6+
vote-text: This is in Postponed status, but experimental implemntation expected for 2.10. Additionally the following actions the use of macro identifiers will be deprecated in in 2.10.
47
---
58

69

710
This SIP is an embedded google document. If you have trouble with this embedded document, you can visit the [document on Google Docs](https://docs.google.com/document/d/1O879Iz-567FzVb8kw6N5OBpei9dnbW0ZaT7-XNSa6Cs/edit?hl=en_US).
811

912
<iframe
1013
src="https://docs.google.com/document/d/1O879Iz-567FzVb8kw6N5OBpei9dnbW0ZaT7-XNSa6Cs/edit?hl=en_US"
11-
style="width:800px;height:600px;"></iframe>
14+
style="width:720px;height:800px;"> </iframe>

‎sips/pending/_posts/2012-03-13-type-dynamic.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
22
layout: sip
33
title: SIP-17 - Type Dynamic
4+
5+
vote-status: accepted
6+
vote-text: This is in Accept status.
47
---
58

69

710
This SIP is an embedded google document. If you have trouble with this embedded document, you can visit the [document on Google Docs](https://docs.google.com/document/d/1XaNgZ06AR7bXJA9-jHrAiBVUwqReqG4-av6beoLaf3U/edit).
811

912
<iframe
1013
src="https://docs.google.com/document/d/1XaNgZ06AR7bXJA9-jHrAiBVUwqReqG4-av6beoLaf3U/edit"
11-
style="width:800px;height:600px;"></iframe>
14+
style="width:720px;height:800px;"> </iframe>

‎sips/pending/_posts/2012-03-17-modularizing-language-features.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
layout: sip
33
title: SIP-18 - Modularizing Language Features
4+
5+
vote-status: accepted
6+
vote-text: This is in Accept status, pending implementation. Let the record show Paul is against it.
47
---
58

69

@@ -10,4 +13,4 @@ To see or contribute to the discussion on this topic, please see the [thread](ht
1013

1114
<iframe
1215
src="https://docs.google.com/document/d/1nlkvpoIRkx7at1qJEZafJwthZ3GeIklTFhqmXMvTX9Q/edit"
13-
style="width:800px;height:600px;"></iframe>
16+
style="width:720px;height:800px;"> </iframe>

‎sips/pending/_posts/2012-03-30-source-locations.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
layout: sip
33
disqus: true
44
title: SIP-19 Implicit Source Locations
5+
6+
vote-status: not accepted
7+
vote-text: This is in Not Accepted status. We expect this to be easily implemented using macros without going through a full SIP.
58
---
69

710
**Philipp Haller**
@@ -58,11 +61,7 @@ First, if there is already an implicit argument of type `SourceLocation`, this a
5861

5962
## Implementation ##
6063

61-
An implementation of this proposal can be found at:
62-
63-
https://github.com/phaller/scala/tree/topic/source-location
64-
65-
An extension of this proposal is also part of Scala-Virtualized. The extension adds a subtrait `SourceContext` which in addition provides access to information, such as variable names in the context of a method invocation. More information can be found at:
64+
An implementation of this proposal can be found at: [https://github.com/phaller/scala/tree/topic/source-location](https://github.com/phaller/scala/tree/topic/source-location)
6665

67-
https://github.com/TiarkRompf/scala-virtualized/wiki/SourceLocation-and-SourceContext
66+
An extension of this proposal is also part of Scala-Virtualized. The extension adds a subtrait `SourceContext` which in addition provides access to information, such as variable names in the context of a method invocation. More information can be found at: [https://github.com/TiarkRompf/scala-virtualized/wiki/SourceLocation-and-SourceContext](https://github.com/TiarkRompf/scala-virtualized/wiki/SourceLocation-and-SourceContext)
6867

‎sips/sip-submission.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,19 @@ The SIP will get a unique number. It should be discussed on the scala-sips maili
3030

3131
Before a SIP can be accepted, it also needs a full implementation that can be evaluated in practice. That implementation can be done before the SIP is submitted, or else concurrently with the discussion period.
3232

33-
## What happens last ##
33+
## What is the provisonal voting status? ##
3434

35-
The committee will decide for each SIP whether it should be accepted, rejected, or kept under discussion for further improvements. Accepted SIPs will be rolled into an upcoming Scala release. Rejected SIPs will be left in the SIP repository under the "rejected sips" section.
35+
When a release is drawing near, the SIP committee will hold on provisonal vote on pending SIPs. This vote places sips in one of the current status:
36+
37+
* `Accepted` - The SIP will be included in the next release, pending an acceptable implementation.
38+
* `Deferred - Next Meeting` - The committee has concerned that need to be addressed in the SIP before inclusion in the Release. If the concerns are handled before the next release, the SIP will be re-evaluated.
39+
* `Delay - Next Release` - The SIP comittee has larger concerns with the state of the SIP and would prefer to wait until the next Scala release to consider inclusion.
40+
* `Not Accepted` - The SIP comittee feels the SIP is not needed for the Scala language and turns down the proposal, with an explanation of why.
41+
42+
## What happens for a Scala major release? ##
43+
44+
Before a Scala release, the committee will make a final decision for each SIP whether it should be accepted, rejected, or delayed for the next release. Accepted SIPs will be rolled into an upcoming Scala release and placed in the accepted folder. Rejected SIPs will be left in the SIP repository under the "rejected sips" section. Delayed SIPs will remain pending.
45+
3646

3747
## Who is on the SIP committee ##
3848

0 commit comments

Comments
 (0)