Skip to content

Commit c09f617

Browse files
author
michelou
committed
updates Scala examples, added detach plugin
1 parent 363a145 commit c09f617

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+3580
-14
lines changed

‎build.detach.xml

+186
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<project name="sabbus" default="build">
4+
5+
<description>
6+
SuperSabbus for Scala detach plugin.
7+
</description>
8+
9+
<echo level="info" message="Running SABBUS for ${ant.project.name}..."/>
10+
11+
<!-- ===========================================================================
12+
END-USER TARGETS
13+
============================================================================ -->
14+
15+
<target name="build" depends="pack.done"
16+
description="Builds the Scala detach plugin."/>
17+
18+
<target name="clean" depends="quick.clean">
19+
</target>
20+
21+
<target name="all.clean" depends="quick.clean, pack.clean">
22+
</target>
23+
24+
<!-- ===========================================================================
25+
PROPERTIES
26+
============================================================================ -->
27+
28+
<property environment="env"/>
29+
<!-- Prevents system classpath from being used -->
30+
<property name="build.sysclasspath" value="ignore"/>
31+
32+
<!-- Defines the repository layout -->
33+
<property name="lib.dir" value="${basedir}/lib"/>
34+
<property name="src.dir" value="${basedir}/src"/>
35+
<property name="partest.dir" value="${basedir}/test"/>
36+
37+
<!-- Loads custom properties definitions -->
38+
<property file="${basedir}/build.properties"/>
39+
40+
<!-- Sets location of build folders -->
41+
<property name="build.dir" value="${basedir}/build"/>
42+
<property name="build-quick.dir" value="${build.dir}/quick"/>
43+
<property name="build-pack.dir" value="${build.dir}/pack"/>
44+
45+
<!-- if ANT_OPTS is already set by the environment, it will be unaltered,
46+
but if it is unset it will take this default value. -->
47+
<property name="env.ANT_OPTS" value="-Xms1024M -Xmx1024M -Xss1M -XX:MaxPermSize=128M -XX:+UseParallelGC" />
48+
49+
<property
50+
name="scalacfork.jvmargs"
51+
value="${env.ANT_OPTS}"/>
52+
53+
<property name="scalac.args.quick" value="-deprecation"/>
54+
<property name="scalac.args.optimise" value=""/>
55+
56+
<!-- Setting-up Ant contrib tasks -->
57+
<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/>
58+
59+
<!-- ===========================================================================
60+
QUICK BUILD (QUICK)
61+
============================================================================ -->
62+
63+
<target name="quick.clean">
64+
<delete includeemptydirs="yes" quiet="yes" failonerror="no">
65+
<fileset dir="${build-quick.dir}/classes/detach-library"/>
66+
<fileset dir="${build-quick.dir}/classes/detach-plugin"/>
67+
</delete>
68+
</target>
69+
70+
<target name="quick.done">
71+
<stopwatch name="quick.done.timer"/>
72+
<path id="quick.classpath">
73+
<pathelement location="${build-quick.dir}/classes/library"/>
74+
<pathelement location="${build-quick.dir}/classes/compiler"/>
75+
<pathelement location="${lib.dir}/fjbg.jar"/>
76+
<pathelement location="${lib.dir}/msil.jar"/>
77+
<pathelement location="${lib.dir}/forkjoin.jar"/>
78+
<pathelement location="${ant.home}/lib/ant.jar"/>
79+
</path>
80+
<taskdef
81+
resource="scala/tools/ant/sabbus/antlib.xml"
82+
classpathref="quick.classpath"
83+
/>
84+
<mkdir dir="${build-quick.dir}/classes/detach-plugin"/>
85+
<scalacfork
86+
destdir="${build-quick.dir}/classes/detach-plugin"
87+
compilerpathref="quick.classpath"
88+
params="${scalac.args.quick}"
89+
srcdir="${src.dir}/detach/plugin"
90+
jvmargs="${scalacfork.jvmargs}">
91+
<include name="**/*.scala"/>
92+
<compilationpath>
93+
<pathelement location="${build-quick.dir}/classes/library"/>
94+
<pathelement location="${build-quick.dir}/classes/compiler"/>
95+
<pathelement location="${build-quick.dir}/classes/detach-plugin"/>
96+
<pathelement location="${lib.dir}/forkjoin.jar"/>
97+
</compilationpath>
98+
</scalacfork>
99+
<copy
100+
file="${src.dir}/detach/plugin/scalac-plugin.xml"
101+
todir="${build-quick.dir}/classes/detach-plugin"
102+
/>
103+
<mkdir dir="${build-quick.dir}/classes/detach-library"/>
104+
<scalacfork
105+
destdir="${build-quick.dir}/classes/detach-library"
106+
compilerpathref="quick.classpath"
107+
params="${scalac.args.quick}"
108+
srcdir="${src.dir}/detach/library"
109+
jvmargs="${scalacfork.jvmargs}">
110+
<include name="**/*.scala"/>
111+
<compilationpath>
112+
<pathelement location="${build-quick.dir}/classes/library"/>
113+
<pathelement location="${lib.dir}/forkjoin.jar"/>
114+
</compilationpath>
115+
</scalacfork>
116+
<touch file="${build-quick.dir}/plugins.complete" verbose="no"/>
117+
<stopwatch name="quick.done.timer" action="total"/>
118+
</target>
119+
120+
<!-- ===========================================================================
121+
PACKED QUICK BUILD (PACK)
122+
============================================================================ -->
123+
124+
<target name="pack.start" depends="quick.done"/>
125+
126+
<target name="pack.pre-lib" depends="pack.start">
127+
<uptodate
128+
property="pack.lib.available"
129+
targetfile="${build-pack.dir}/lib/scala-detach.jar"
130+
srcfile="${build-quick.dir}/plugins.complete"/>
131+
</target>
132+
133+
<target name="pack.lib" depends="pack.pre-lib" unless="pack.lib.available">
134+
<mkdir dir="${build-pack.dir}/misc/scala-devel/plugins"/>
135+
<jar destfile="${build-pack.dir}/misc/scala-devel/plugins/detach.jar">
136+
<fileset dir="${build-quick.dir}/classes/detach-plugin"/>
137+
</jar>
138+
<mkdir dir="${build-pack.dir}/lib"/>
139+
<jar destfile="${build-pack.dir}/lib/scala-detach.jar">
140+
<fileset dir="${build-quick.dir}/classes/detach-library">
141+
<include name="scala/**"/>
142+
</fileset>
143+
</jar>
144+
</target>
145+
146+
<target name="pack.done" depends="pack.lib">
147+
<path id="pack.classpath">
148+
<pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
149+
<pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
150+
<pathelement location="${build-pack.dir}/lib/scala-detach.jar"/>
151+
<pathelement location="${build-pack.dir}/lib/scala-partest.jar"/>
152+
<pathelement location="${build-pack.dir}/lib/scalap.jar"/>
153+
<pathelement location="${ant.home}/lib/ant.jar"/>
154+
<pathelement location="${lib.dir}/jline.jar"/>
155+
</path>
156+
<taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.classpath"/>
157+
<taskdef resource="scala/tools/partest/antlib.xml" classpathref="pack.classpath"/>
158+
</target>
159+
160+
<target name="pack.clean">
161+
<delete includeemptydirs="yes" quiet="yes" failonerror="no">
162+
<fileset dir="${build-pack.dir}/lib" includes="scala-detach.jar"/>
163+
<fileset dir="${build-pack.dir}/misc/scala-devel/plugins" includes="detach.jar"/>
164+
</delete>
165+
</target>
166+
167+
<!-- ===========================================================================
168+
TEST SUITE
169+
============================================================================ -->
170+
171+
<target name="test.suite" depends="pack.done">
172+
<property name="partest.srcdir" value="files" />
173+
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
174+
timeout="2400000"
175+
srcdir="${partest.srcdir}"
176+
scalacopts="${scalac.args.optimise} -Xpluginsdir ${build-pack.dir}/misc/scala-devel/plugins -Xplugin-require:detach -P:detach:enable">
177+
<compilationpath>
178+
<path refid="pack.classpath"/>
179+
<fileset dir="${partest.dir}/files/lib" includes="*.jar" />
180+
</compilationpath>
181+
<negtests dir="${partest.dir}/${partest.srcdir}/detach-neg" includes="*.scala"/>
182+
<runtests dir="${partest.dir}/${partest.srcdir}/detach-run" includes="*.scala"/>
183+
</partest>
184+
</target>
185+
186+
</project>

‎build.examples.xml

+14-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ PROPERTIES
3030
<property name="scala.comp.jar" value="${lib.dir}/scala-compiler.jar"/>
3131
<property name="fjbg.name" value="fjbg.jar"/>
3232
<property name="fjbg.jar" value="${lib.dir}/${fjbg.name}"/>
33+
<property name="msil.name" value="msil.jar"/>
34+
<property name="msil.jar" value="${lib.dir}/${msil.name}"/>
3335
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
3436
<property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/>
3537
<!-- -->
@@ -61,7 +63,7 @@ INITIALISATION
6163
classpath="${scala.lib.jar}"
6264
/>
6365
<available
64-
classname="scala.List"
66+
classname="scala.collection.immutable.List"
6567
classpath="${scala.lib.jar}"
6668
/>
6769
<available
@@ -88,6 +90,15 @@ INITIALISATION
8890
/>
8991
</not></condition>
9092
</fail>
93+
<echo level="verbose" message="msil.jar=${msil.jar}"/>
94+
<fail message="MSIL library in '${lib.dir}/' is not available">
95+
<condition><not>
96+
<available
97+
classname="ch.epfl.lamp.compiler.msil.MemberInfo"
98+
classpath="${msil.jar}"
99+
/>
100+
</not></condition>
101+
</fail>
91102
<echo level="verbose" message="ant.jar=${ant.jar}"/>
92103
<echo level="verbose" message="ant-contrib.jar=${ant-contrib.jar}"/>
93104
<fail message="Additional Ant tasks in '${lib.dir}/' is not available">
@@ -101,6 +112,7 @@ INITIALISATION
101112
<!-- Creating class-pathes -->
102113
<path id="common.classpath">
103114
<pathelement location="${fjbg.jar}"/>
115+
<pathelement location="${msil.jar}"/>
104116
</path>
105117
<path id="scala.classpath">
106118
<pathelement location="${scala.lib.jar}"/>
@@ -202,7 +214,7 @@ BUILD
202214
<for list="${list}" param="file">
203215
<sequential>
204216
<scalac srcdir="${src.dir}"
205-
destdir="${build.dir}">
217+
destdir="${build.dir}" deprecation="true">
206218
<classpath>
207219
<pathelement location="${scala.lib.jar}"/>
208220
<pathelement location="${build.dir}"/>

‎docs/examples/boundedbuffer.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ object boundedbuffer {
44

55
import concurrent.ops._
66

7-
class BoundedBuffer[a](N: Int) {
7+
class BoundedBuffer[A](N: Int)(implicit m: ClassManifest[A]) {
88
var in, out, n = 0
9-
val elems = new Array[a](N)
9+
val elems = new Array[A](N)
1010

1111
def await(cond: => Boolean) = while (!cond) { wait() }
1212

13-
def put(x: a) = synchronized {
13+
def put(x: A) = synchronized {
1414
await (n < N)
1515
elems(in) = x; in = (in + 1) % N; n += 1
1616
if (n == 1) notifyAll()
1717
}
1818

19-
def get: a = synchronized {
19+
def get: A = synchronized {
2020
await (n != 0)
2121
val x = elems(out); out = (out + 1) % N ; n -= 1
2222
if (n == N - 1) notifyAll()

‎docs/examples/gadts.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package examples
33
object gadts extends Application {
44

55
abstract class Term[T]
6-
case class Lit(x: int) extends Term[int]
7-
case class Succ(t: Term[int]) extends Term[int]
8-
case class IsZero(t: Term[int]) extends Term[boolean]
9-
case class If[T](c: Term[boolean],
6+
case class Lit(x: Int) extends Term[Int]
7+
case class Succ(t: Term[Int]) extends Term[Int]
8+
case class IsZero(t: Term[Int]) extends Term[Boolean]
9+
case class If[T](c: Term[Boolean],
1010
t1: Term[T],
1111
t2: Term[T]) extends Term[T]
1212

@@ -16,7 +16,7 @@ object gadts extends Application {
1616
case IsZero(u) => eval(u) == 0
1717
case If(c, u1, u2) => eval(if (eval(c)) u1 else u2)
1818
}
19-
Console.println(
19+
println(
2020
eval(If(IsZero(Lit(1)), Lit(41), Succ(Lit(41)))))
2121
}
2222

‎docs/examples/iterators.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ object iterators {
1010
}
1111

1212
def printArray(xs: Array[Double]) =
13-
Iterator.fromArray(xs) foreach { x => println(x) }
13+
xs.iterator foreach { x => println(x) }
1414

1515
def findGreater(xs: Array[Double], limit: Double) =
16-
Iterator.fromArray(xs)
16+
xs.iterator
1717
.zip(Iterator.from(0))
1818
.filter{case Pair(x, i) => x > limit }
1919
.map{case Pair(x, i) => i}

‎src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ trait ScalaSettings extends AbsScalaSettings with StandardScalaSettings {
112112
val noCompletion = BooleanSetting ("-Yno-completion", "Disable tab-completion in the REPL")
113113
val Xdce = BooleanSetting ("-Ydead-code", "Perform dead code elimination")
114114
val debug = BooleanSetting ("-Ydebug", "Output debugging messages")
115-
val Xdetach = BooleanSetting ("-Ydetach", "Perform detaching of remote closures")
116115
// val doc = BooleanSetting ("-Ydoc", "Generate documentation")
117116
val inline = BooleanSetting ("-Yinline", "Perform inlining when possible")
118117
val Xlinearizer = ChoiceSetting ("-Ylinearizer", "Linearizer to use", List("normal", "dfs", "rpo", "dump"), "rpo") .

0 commit comments

Comments
 (0)